Skip to content

Commit

Permalink
Merge SVN 4362
Browse files Browse the repository at this point in the history
  • Loading branch information
ddeclerck committed Jun 17, 2024
1 parent 973c2cf commit 8859e17
Show file tree
Hide file tree
Showing 9 changed files with 536 additions and 515 deletions.
19 changes: 19 additions & 0 deletions cobc/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,25 @@

* scanner.l, cobc.c: fix ODOSLIDE directive

2021-09-21 Simon Sobisch <simonsobisch@gnu.org>

* tree.h (cb_param_size), parser.y: new enum instead of single defines,
including new CB_SIZE_UNSET and partial addition CB_SIZE_16/CB_SIZE_32
* tree.c (set_sign_and_size_from_parameter_field): extracted from
(output_call_protocast, output_call_by_value_args)
* tree.c (get_size_parameter_type): extracted from (output_call_protocast,
output_call_by_value_args, try_get_by_value_parameter_type)

2021-09-20 Simon Sobisch <simonsobisch@gnu.org>

* cobc.c (cobc_abort, abort_if_too_many_continuation_lines,
cobc_tree_cast_error): use common diagnostic format for internal errors
* tree.c (cb_build_call_parameter), tree.h, parser.y: extracted from
parser, internally convert BY VALUE ZERO to BY VALUE 0
* parser.y (call_param): added MicroFocus SIZE IS clause for CALL BY VALUE,
but deactivated because of reduce/reduce conflicts -> needs dialect
option and scanner adjustment or drop of OpenCOBOL SIZE IS extension

2021-09-19 Simon Sobisch <simonsobisch@gnu.org>

* parser.y, typeck.c: let DISPLAY OMITTED be handled identical
Expand Down
6 changes: 3 additions & 3 deletions cobc/cobc.c
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ cobc_abort (const char * filename, const int line_num)
{
++errorcount;

cobc_err_msg ("%s: %d: %s", filename, line_num,
cobc_err_msg ("%s:%d: %s", filename, line_num,
_("internal compiler error"));
cobc_abort_terminate (1);
}
Expand Down Expand Up @@ -796,7 +796,7 @@ cobc_tree_cast_error (const cb_tree x, const char * filename, const int line_num

putc ('\n', stderr);
/* not translated as this only occurs if developer-only setup is used: */
cobc_err_msg ("%s: %d: invalid cast from '%s' type %s to type %s",
cobc_err_msg ("%s:%d: invalid cast from '%s' type %s to type %s",
filename, line_num, name, type,
cb_enum_explain (tagnum));

Expand Down Expand Up @@ -6676,7 +6676,7 @@ static void
abort_if_too_many_continuation_lines (int pline_cnt, const char *filename, int line_num)
{
if (pline_cnt >= CB_READ_AHEAD) {
cobc_err_msg (_("%s: %d: Too many continuation lines"),
cobc_err_msg (_("%s:%d: too many continuation lines"),
filename, line_num);
cobc_abort_terminate (0);
}
Expand Down
Loading

0 comments on commit 8859e17

Please sign in to comment.