diff --git a/NEWS b/NEWS index 8f0d220fb..df2e10705 100644 --- a/NEWS +++ b/NEWS @@ -54,6 +54,9 @@ NEWS - user visible changes -*- outline -*- calls to externals. The files are put into quotes, unless they start by '<'. Quoted files are expected to have absolute paths, as the C compiler is called in a temp directory instead of the project directory. + The directive >>IMP INCLUDE "file.h", >>IMP INCLUDE "", + >>IMP INCLUDE or >>IMP INCLUDE file.h can be used as an alternative + to this compiler option. ** output of unlimited errors may be requested by -fmax-errors=0, to stop compiliation at first error use -Wfatal-errors diff --git a/cobc/ChangeLog b/cobc/ChangeLog index fea626e9a..cdb977426 100644 --- a/cobc/ChangeLog +++ b/cobc/ChangeLog @@ -147,6 +147,16 @@ compiler aborts on broken expressions, bugs #933, #938 and #966 * typeck.c: minor refactoring within functions +2024-04-25 Boris Eng + + FR #176: "Implementation of GC directive to include .h (c/c++) files" + * pplex.l, ppparse.y, cobc.h, codegen.c (output_gnucobol_defines): + new >>IMP INCLUDE directive to include one or multiple header files in the + generated C code (same behavior as the --include but with one directive per + file) + * scanner.l: the leading space for all internal directives is removed in the + lexer. Source previously preprocessed may need to be adjusted + 2024-04-24 Fabrice Le Fessant * replace.c: optimize speed and memory usage. For speed, we add two diff --git a/cobc/cobc.h b/cobc/cobc.h index 2c1bcf2ca..838dfaed0 100644 --- a/cobc/cobc.h +++ b/cobc/cobc.h @@ -276,7 +276,7 @@ enum cb_sub_check { struct cb_text_list { struct cb_text_list *next; /* next pointer */ struct cb_text_list *last; - const char *text; + char *text; }; /* Structure for extended filenames */ @@ -478,7 +478,8 @@ extern int cb_depend_keep_missing; extern int cb_flag_copybook_deps; extern struct cb_text_list *cb_depend_list; extern struct cb_text_list *cb_copy_list; -extern struct cb_text_list *cb_include_file_list; +extern struct cb_text_list *cb_include_file_list; /* global */ +extern struct cb_text_list *cb_include_file_list_directive; /* temporary */ extern struct cb_text_list *cb_include_list; extern struct cb_text_list *cb_intrinsic_list; extern struct cb_text_list *cb_extension_list; diff --git a/cobc/codegen.c b/cobc/codegen.c index c46d67f24..b76407760 100644 --- a/cobc/codegen.c +++ b/cobc/codegen.c @@ -1801,6 +1801,7 @@ static void output_gnucobol_defines (const char *formatted_date) { int i; + struct cb_text_list *l; if (!strrchr (cb_source_file, '\\') && !strrchr (cb_source_file, '"')) { @@ -1832,17 +1833,23 @@ output_gnucobol_defines (const char *formatted_date) current_compile_tm.tm_sec; output_line ("#define COB_MODULE_TIME\t\t%d", i); - { - struct cb_text_list *l = cb_include_file_list ; - for (;l;l=l->next){ - if (l->text[0] == '<'){ - output_line ("#include %s", l->text); - } else { - output_line ("#include \"%s\"", l->text); - } + for (l = cb_include_file_list; l; l = l->next) { + if (l->text[0] == '<') { + output_line ("#include %s", l->text); + } else { + output_line ("#include \"%s\"", l->text); + } + } + + for (l = cb_include_file_list_directive; l; l = l->next) { + if (l->text[0] == '<') { + output_line ("#include %s", l->text); + } else { + output_line ("#include \"%s\"", l->text); } } + cb_include_file_list_directive = NULL; } /* CALL cache */ diff --git a/cobc/pplex.l b/cobc/pplex.l index 303f34ec3..5a0ffe871 100644 --- a/cobc/pplex.l +++ b/cobc/pplex.l @@ -201,6 +201,7 @@ ALNUM_LITERAL_A "\'"([^''\n]|("\'"[0-9][0-9, ]+"\'"))*"\'" ALNUM_LITERAL {ALNUM_LITERAL_Q}|{ALNUM_LITERAL_A} SET_PAREN_LIT \([^()\n]*\) DEFNUM_LITERAL [+-]?[0-9]*[\.]*[0-9]+ +RAW_SEQ [^ \n]+ AREA_A [ ]?# MAYBE_AREA_A [ ]?#? @@ -224,6 +225,7 @@ MAYBE_AREA_A [ ]?#? %x ALNUM_LITERAL_STATE %x CONTROL_STATEMENT_STATE %x DISPLAY_DIRECTIVE_STATE +%x IMP_DIRECTIVE_STATE %% @@ -357,6 +359,11 @@ MAYBE_AREA_A [ ]?#? return CALL_DIRECTIVE; } +^{MAYBE_AREA_A}[ ]*">>"[ ]?"IMP" { + BEGIN IMP_DIRECTIVE_STATE; + return IMP_DIRECTIVE; +} + ^{MAYBE_AREA_A}[ ]*">>"[ ]*\n { /* empty 2002+ style directive */ cb_plex_warning (COBC_WARN_FILLER, newline_count, @@ -721,6 +728,7 @@ ELSE_DIRECTIVE_STATE, ENDIF_DIRECTIVE_STATE, ALNUM_LITERAL_STATE, CONTROL_STATEMENT_STATE, +IMP_DIRECTIVE_STATE, COBOL_WORDS_DIRECTIVE_STATE>{ \n { BEGIN INITIAL; @@ -990,6 +998,14 @@ ENDIF_DIRECTIVE_STATE>{ } } +{ + "INCLUDE" { return INCLUDE; } /* GnuCOBOL 3.3 extension */ + {RAW_SEQ} { + pplval.s = cobc_plex_strdup (yytext); + return TOKEN; + } +} + { "IS" { return IS; } "NOT" { return NOT; } diff --git a/cobc/ppparse.y b/cobc/ppparse.y index 76b3c9a58..7779186ed 100644 --- a/cobc/ppparse.y +++ b/cobc/ppparse.y @@ -741,6 +741,9 @@ ppparse_clear_vars (const struct cb_define_struct *p) %token WITH %token LOCATION +%token IMP_DIRECTIVE +%token INCLUDE + %token TERMINATOR "end of line" %token TOKEN "Word or Literal" @@ -768,6 +771,7 @@ ppparse_clear_vars (const struct cb_define_struct *p) %type alnum_equality_list %type ec_list %type unquoted_literal +%type imp_include_sources %type _copy_replacing %type replacing_list @@ -838,6 +842,7 @@ directive: | TURN_DIRECTIVE turn_directive | LISTING_DIRECTIVE listing_directive | LEAP_SECOND_DIRECTIVE leap_second_directive +| IMP_DIRECTIVE imp_directive | IF_DIRECTIVE { current_cmd = PLEX_ACT_IF; @@ -1368,6 +1373,34 @@ leap_second_directive: | OFF ; +imp_directive: + /* GnuCOBOL 3.3 extension */ + INCLUDE + { + cb_error (_("invalid %s directive"), "IMP INCLUDE"); + yyerrok; + } +| INCLUDE imp_include_sources + { + struct cb_text_list *p = $2; + while (p != NULL) { + fprintf (ppout, "#INCLUDE %s\n", p->text); + p = p->next; + } + } +; + +imp_include_sources: + TOKEN + { + $$ = ppp_list_add (NULL, fix_filename ($1)); + } +| imp_include_sources TOKEN + { + $$ = ppp_list_add ($1, fix_filename ($2)); + } +; + turn_directive: ec_list CHECKING on_or_off { diff --git a/cobc/scanner.l b/cobc/scanner.l index 878e660e9..f92c4bbc3 100644 --- a/cobc/scanner.l +++ b/cobc/scanner.l @@ -172,6 +172,8 @@ static size_t pic2_size; static unsigned int inside_bracket = 0; static char err_msg[COB_MINI_BUFF]; +struct cb_text_list *cb_include_file_list_directive = NULL; + /* Function declarations */ static void read_literal (const char, const enum cb_literal_type); static int scan_x (const char *, const char *); @@ -189,6 +191,7 @@ static void copy_two_words_in_quotes (char ** const, char ** const); static void add_synonym (const int, const int); static void make_synonym (void); static void clear_constants (void); +static struct cb_text_list *scan_list_add (struct cb_text_list *, const char *); %} @@ -217,7 +220,7 @@ AREA_A "#AREA_A"\n cobc_in_area_a = 0; %} -<*>^[ ]?"#CALLFH".*\n { +<*>^"#CALLFH".*\n { if (current_program) { const char *p1; char *p2; @@ -240,11 +243,11 @@ AREA_A "#AREA_A"\n } -<*>^[ ]?"#DEFLIT".*\n { +<*>^"#DEFLIT".*\n { scan_define_options (yytext); } -<*>^[ ]?"#ADDRSV".*\n { +<*>^"#ADDRSV".*\n { char *word; copy_word_in_quotes (&word); @@ -252,25 +255,25 @@ AREA_A "#AREA_A"\n cobc_free (word); } -<*>^[ ]?"#ADDSYN-STD".*\n { +<*>^"#ADDSYN-STD".*\n { add_synonym (1, 0); } -<*>^[ ]?"#ADDSYN".*\n { +<*>^"#ADDSYN".*\n { add_synonym (0, 0); } -<*>^[ ]?"#MAKESYN".*\n { +<*>^"#MAKESYN".*\n { make_synonym (); } -<*>^[ ]?"#OVERRIDE-STD".*\n { +<*>^"#OVERRIDE-STD".*\n { add_synonym (1, 1); } -<*>^[ ]?"#OVERRIDE".*\n { +<*>^"#OVERRIDE".*\n { add_synonym (0, 1); } -<*>^[ ]?"#REMOVE-STD".*\n { +<*>^"#REMOVE-STD".*\n { char *word; copy_word_in_quotes (&word); @@ -283,7 +286,7 @@ AREA_A "#AREA_A"\n cobc_free (word); } -<*>^[ ]?"#REMOVE".*\n { +<*>^"#REMOVE".*\n { char *word; copy_word_in_quotes (&word); @@ -291,19 +294,19 @@ AREA_A "#AREA_A"\n cobc_free (word); } -<*>^[ ]?"#REFMOD_ZERO "[0-9]\n { +<*>^"#REFMOD_ZERO "[0-9]\n { cb_ref_mod_zero_length = (yytext[13] - '0'); } -<*>^[ ]?"#ODOSLIDE "[0-1]\n { +<*>^"#ODOSLIDE "[0-1]\n { cb_odoslide = (yytext[10] - '0'); } -<*>^[ ]?"#ASSIGN "[0-9]\n { +<*>^"#ASSIGN "[0-9]\n { cb_assign_type_default = (enum cb_assign_type)(yytext[8] - '0'); } -<*>^[ ]?"#TURN".*\n { +<*>^"#TURN".*\n { struct cb_turn_list *l; for (l = cb_turn_list; l && l->line != -1; l = l->next); @@ -312,14 +315,21 @@ AREA_A "#AREA_A"\n } } -<*>^[ ]?"#AREACHECK"\n { +<*>^"#AREACHECK"\n { cobc_areacheck = 1; } -<*>^[ ]?"#NOAREACHECK"\n { +<*>^"#NOAREACHECK"\n { cobc_areacheck = 0; } +<*>^"#INCLUDE".*/\n { + cb_include_file_list_directive = scan_list_add ( + cb_include_file_list_directive, + yytext + 9 + ); +} + <*>^{AREA_A}[ ]*/"." { count_lines (yytext + 9); /* skip "\n#area_a\n" */ if (cobc_in_procedure && cobc_areacheck) { @@ -2580,6 +2590,22 @@ clear_constants (void) top_78_ptr = NULL; } +static struct cb_text_list * +scan_list_add (struct cb_text_list *list, const char *text) +{ + struct cb_text_list *p; + + p = cobc_parse_malloc (sizeof (struct cb_text_list)); + p->text = cobc_parse_strdup (text); + if (!list) { + p->last = p; + return p; + } + list->last->next = p; + list->last = p; + return list; +} + /* Global functions */ void diff --git a/doc/gnucobol.texi b/doc/gnucobol.texi index b65511412..cff8b6dd8 100644 --- a/doc/gnucobol.texi +++ b/doc/gnucobol.texi @@ -386,6 +386,8 @@ Add a @code{#include} @file{file.h} at the beginning of the generated C source file. The file name is put into quotes, unless it starts by @code{<}. Quoted files should be absolute paths, since C files are compiled in temporary directories. +The directive @code{>>IMP INCLUDE "FILE.h"} or @code{>>IMP INCLUDE } +can be used as an alternative to this compiler option. The option also implies @option{-fno-gen-c-decl-static-call}. This option can be used to check function prototypes when static calls are used. When this option is used, the source file is diff --git a/tests/testsuite.src/syn_misc.at b/tests/testsuite.src/syn_misc.at index 06e8f75c0..14481c890 100644 --- a/tests/testsuite.src/syn_misc.at +++ b/tests/testsuite.src/syn_misc.at @@ -8414,3 +8414,72 @@ prog.cob:18: error: ANY LENGTH items may only be BY REFERENCE formal parameters AT_CLEANUP + +AT_SETUP([IMP INCLUDE directive]) +AT_KEYWORDS([IMP INCLUDE]) + +AT_DATA([prog.cob], [ + >>IMP INCLUDE "file.h" + IDENTIFICATION DIVISION. + PROGRAM-ID. prog. + PROCEDURE DIVISION. + GOBACK. +]) + +AT_CHECK([$COMPILE_ONLY prog.cob], [0], [], []) + +AT_DATA([prog.cob], [ + >>IMP INCLUDE + IDENTIFICATION DIVISION. + PROGRAM-ID. prog. + PROCEDURE DIVISION. + GOBACK. +]) + +AT_CHECK([$COMPILE_ONLY prog.cob], [0], [], []) + +AT_DATA([prog2.cob], [ + >>IMP INCLUDE + IDENTIFICATION DIVISION. + PROGRAM-ID. prog. + PROCEDURE DIVISION. + GOBACK. +]) + +AT_CHECK([$COMPILE_ONLY prog2.cob], [1], [], +[prog2.cob:2: error: invalid IMP INCLUDE directive +]) + +AT_CLEANUP + + +AT_SETUP([IMP INCLUDE directive multiple files]) +AT_KEYWORDS([IMP INCLUDE]) + +AT_DATA([prog.cob], [ + >>IMP INCLUDE "file1.h" file2.h "" + IDENTIFICATION DIVISION. + PROGRAM-ID. PROG. + PROCEDURE DIVISION. + GOBACK. +]) + +AT_DATA([prog2.cob], [ + IDENTIFICATION DIVISION. + PROGRAM-ID. prog. + PROCEDURE DIVISION. + GOBACK. +]) + +AT_CHECK([$COMPILE --save-temps -E -o prog.i prog.cob], [0], [], []) +AT_CHECK([$COMPILE -C prog.cob prog2.cob], [0], [], []) +AT_CHECK([$GREP "#INCLUDE file1.h" prog.i], [0], ignore, []) +AT_CHECK([$GREP "#INCLUDE file2.h" prog.i], [0], ignore, []) +AT_CHECK([$GREP "#INCLUDE " prog.i], [0], ignore, []) +AT_CHECK([$GREP "#INCLUDE " prog.i], [0], ignore, []) +AT_CHECK([$GREP "#INCLUDE file1.h" prog.c], [1], ignore, []) +AT_CHECK([$GREP "#INCLUDE file2.h" prog.c], [1], ignore, []) +AT_CHECK([$GREP "#INCLUDE " prog.c], [1], ignore, []) +AT_CHECK([$GREP "#INCLUDE " prog.c], [1], ignore, []) + +AT_CLEANUP diff --git a/tests/testsuite.src/used_binaries.at b/tests/testsuite.src/used_binaries.at index 405c48d0f..0dd9d415c 100644 --- a/tests/testsuite.src/used_binaries.at +++ b/tests/testsuite.src/used_binaries.at @@ -1074,7 +1074,7 @@ AT_CLEANUP AT_SETUP([check include header file]) -#AT_KEYWORDS([cobc copy]) +AT_KEYWORDS([cobc copy directive imp]) AT_DATA([filec.h], [ /* COB_EXT_IMPORT will be defined by libcob.h up-front */ @@ -1150,6 +1150,24 @@ AT_CHECK([$COMPILE_MODULE -Wno-unfinished --copy "f.copy" -fstatic-call prog2.co AT_CHECK([$COMPILE_MODULE -Wno-unfinished --copy "f.copy" -fstatic-call -L. -lfilec prog2.cob -o prog2c], [0], ignore, ignore)] ) +# additional check via directive +AT_DATA([prog3.cob], [ + >> IMP INCLUDE "filec.h" + IDENTIFICATION DIVISION. + PROGRAM-ID. prog. + DATA DIVISION. + WORKING-STORAGE SECTION. + 01 long USAGE BINARY-C-LONG. + PROCEDURE DIVISION. + CALL "f" USING "Hello" BY VALUE long RETURNING NOTHING. +]) + +# static build with correct function signature +AT_CHECK([$COMPILE_MODULE -I . -fstatic-call prog3.cob], [0], [], [], [ + # Previous test "failed" --> retry with import library + AT_CHECK([$COMPILE_MODULE -I . -fstatic-call -L. -lfilec prog3.cob], [0], ignore, ignore)] +) + AT_CLEANUP