Skip to content

Commit

Permalink
Merge SVN 4727
Browse files Browse the repository at this point in the history
  • Loading branch information
ddeclerck committed Jul 12, 2024
1 parent 61d2305 commit 171fac5
Show file tree
Hide file tree
Showing 6 changed files with 461 additions and 156 deletions.
13 changes: 13 additions & 0 deletions cobc/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,12 @@
from copy_children, copy_into_field_recursive
* tree.c (build_sum_counter): fix reference to sum counter

2022-10-01 Simon Sobisch <[email protected]>

* parser.y (function): attach ref-mod to all kind of functions to consume
them here and to pass invalid ref-mod for all numeric intrinsics to
cb_build_intrinsic enable us to create a nice diagnostic

2022-09-30 Nicolas Berthier <[email protected]>

* codegen.c, cconv.h, cconv.c: extract EBCDIC & ASCII conversion tables
Expand Down Expand Up @@ -1254,6 +1260,13 @@
Also, section/paragraph/verb names are now set via pointers
in cob_module

2021-03-18 Ron Norman <[email protected]>

* codegen.c (output_section_info, output_trace_info): current name of
section/paragraph/verb are now set via pointers in cob_module instead
of executing trace functions, which are now only generated if trace
is requested

2021-03-07 Simon Sobisch <[email protected]>

* Makefile.am: honor COBC_CPPFLAGS passed to configure
Expand Down
17 changes: 9 additions & 8 deletions cobc/parser.y
Original file line number Diff line number Diff line change
Expand Up @@ -19163,18 +19163,19 @@ function:
{
$$ = cb_build_intrinsic ($1, $3, $5, 0);
}
| LENGTH_FUNC TOK_OPEN_PAREN length_arg TOK_CLOSE_PAREN
| LENGTH_FUNC TOK_OPEN_PAREN length_arg TOK_CLOSE_PAREN func_refmod
{
$$ = cb_build_intrinsic ($1, $3, NULL, 0);
}
| LENGTH_FUNC TOK_OPEN_PAREN length_arg PHYSICAL TOK_CLOSE_PAREN
| LENGTH_FUNC TOK_OPEN_PAREN length_arg PHYSICAL TOK_CLOSE_PAREN func_refmod
{
CB_PENDING (_("PHYSICAL argument for LENGTH functions"));
$$ = cb_build_intrinsic ($1, $3, NULL, 0);
}
| NUMVALC_FUNC TOK_OPEN_PAREN numvalc_args TOK_CLOSE_PAREN
| NUMVALC_FUNC TOK_OPEN_PAREN numvalc_args TOK_CLOSE_PAREN func_refmod
{
$$ = cb_build_intrinsic ($1, $3, NULL, 0);
/* note: no ref-mod allowed, parsing here to error in the following function */
$$ = cb_build_intrinsic ($1, $3, $5, 0);
}
| LOCALE_DATE_FUNC TOK_OPEN_PAREN locale_dt_args TOK_CLOSE_PAREN func_refmod
{
Expand All @@ -19196,13 +19197,13 @@ function:
{
$$ = cb_build_intrinsic ($1, $3, $5, 0);
}
| FUNCTION_NAME func_args
| FUNCTION_NAME func_args func_refmod
{
$$ = cb_build_intrinsic ($1, $2, NULL, 0);
$$ = cb_build_intrinsic ($1, $2, $3, 0);
}
| USER_FUNCTION_NAME func_args
| USER_FUNCTION_NAME func_args func_refmod
{
$$ = cb_build_intrinsic ($1, $2, NULL, 1);
$$ = cb_build_intrinsic ($1, $2, $3, 1);
}
;

Expand Down
24 changes: 19 additions & 5 deletions libcob/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,15 @@
* intrinsic.c: extend internal docs
* fileio.c: add some guards against bad function calls

2022-10-01 Simon Sobisch <[email protected]>

* intrinsic.c (numval, cob_intr_numval_f): rewritten for improved
performance (and creating smaller temporary fields);
changed to just skip invalid data instead of doing pre-validation
(which can be re-enabled by defining [INVALID_NUMVAL_IS_ZERO])
* intrinsic.c (cob_check_numval_f, cob_intr_numval_f): correctly
recognize lowercase E

2022-09-30 Simon Sobisch <[email protected]>

* common.h (cob_frame_ext): new variant of cob_frame storing the
Expand Down Expand Up @@ -988,7 +997,7 @@

2021-06-26 Ron Norman <[email protected]>

* common.h: Add COB_DIALECT_xxx
* common.h: Add COB_DIALECT_xxx
* fileio.c: Preparing for dialect specific status codes

2021-06-11 Ron Norman <[email protected]> and Christian Lademann
Expand All @@ -1002,7 +1011,7 @@

2021-05-04 Ron Norman <[email protected]>

* common.c: Make a few variables 'static' to better
* common.c: Make a few variables 'static' to better
handle when there is an abort during dumping

2021-04-30 Ron Norman <[email protected]>
Expand Down Expand Up @@ -1049,18 +1058,23 @@
* common.h: Add to cob_symbol values for 'is_indirect'
Changed 'data' to 'adrs', 'indexes' to 'subscripts'
* common.c: Adjusted for new field names, handle ANY LENGTH/NUMERIC

2021-03-20 Ron Norman <[email protected]>

* common.h: Add 'indexes' to cob_symbol
* common.h: Add 'indexes' to cob_symbol

2021-03-18 Ron Norman <[email protected]>

* common.h: New cob_symbol defined for a table of all module symbols
Field added to cob_module for section/paragraph/verb names
* common.c: New routines added to dump a module using the symbol table
instead of a bunch in generated code to do it

2021-03-18 Ron Norman <[email protected]>

* common.h (cob_module): fields for section/paragraph/statement names
* common.c: adjusted to use new fields in cob_module

2021-03-05 Ron Norman <[email protected]>

* common.h: Add flag_isnodat
Expand Down
Loading

0 comments on commit 171fac5

Please sign in to comment.