Several fixes

OCamlPro · Dec 17, 2024 · 781f586 · 781f586
1 parent c77058e
commit 781f586
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 30 deletions.
diff --git a/NEWS b/NEWS
@@ -6,9 +6,13 @@ NEWS - user visible changes				-*- outline -*-
 
 * New GnuCOBOL features
 
-** cobc now checks for binary and multi-byte encoded files and early exit
-   parsing those; the error output for format errors (for example invalid
-   indicator column) is now limitted to 5 per source file
+** the leading space for all internal directives is removed in the lexer.
+   Source previously processed may need to be ajusted to be processed by
+   GnuCOBOL 3.3.
+
+** cobc now checks for binary files and early exit parsing those;
+   the error output for format errors (for example invalid indicator column)
+   is now limitted to 5 per source file
 
 ** support the COLLATING SEQUENCE clause on indexed files
    (currently only with the BDB backend)

diff --git a/cobc/cobc.h b/cobc/cobc.h
@@ -481,7 +481,7 @@ extern struct cb_text_list	*cb_copy_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_include_file_list_directive;
+extern struct cb_text_list	*cb_include_file_list_directive;
 extern struct cb_text_list	*cb_intrinsic_list;
 extern struct cb_text_list	*cb_extension_list;
 extern struct cb_text_list	*cb_static_call_list;

diff --git a/cobc/codegen.c b/cobc/codegen.c
@@ -1834,7 +1834,6 @@ output_gnucobol_defines (const char *formatted_date)
 
 	{
 		struct cb_text_list *l;
-		struct cb_text_list *last = NULL;
 		for (l = cb_include_file_list; l; l = l->next) {
 			if (l->text[0] == '<') {
 				output_line ("#include %s", l->text);
@@ -1844,11 +1843,6 @@ output_gnucobol_defines (const char *formatted_date)
 		}
 
 		for (l = cb_include_file_list_directive; l; l = l->next) {
-			if (last != NULL) {
-				cobc_free (last->text);
-				cobc_free (last);
-			}
-			last = l;
 			if (l->text[0] == '<') {
 				output_line ("#include %s", l->text);
 			} else {

diff --git a/cobc/ppparse.y b/cobc/ppparse.y
@@ -1377,7 +1377,8 @@ imp_directive:
   /* GnuCOBOL 3.3 extension */
   INCLUDE
   {
-	ppparse_error (_("Missing argument for IMP INCLUDE directive"));
+	cb_error (_("invalid %s directive"), "IMP INCLUDE");
+	yyerrok;
   }
 | INCLUDE imp_include_sources
   {

diff --git a/cobc/scanner.l b/cobc/scanner.l
@@ -220,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;
@@ -243,37 +243,37 @@ AREA_A		"#AREA_A"\n
 }
 
 
-<*>^[ ]?"#DEFLIT".*\n {
+<*>^"#DEFLIT".*\n {
 	scan_define_options (yytext);
 }
 
-<*>^[ ]?"#ADDRSV".*\n {
+<*>^"#ADDRSV".*\n {
 	char	*word;
 
 	copy_word_in_quotes (&word);
 	add_reserved_word_now (word, NULL);
 	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);
@@ -286,27 +286,27 @@ AREA_A		"#AREA_A"\n
 	cobc_free (word);
 }
 
-<*>^[ ]?"#REMOVE".*\n {
+<*>^"#REMOVE".*\n {
 	char	*word;
 
 	copy_word_in_quotes (&word);
 	remove_reserved_word_now (word);
 	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);
@@ -315,15 +315,15 @@ AREA_A		"#AREA_A"\n
 	}
 }
 
-<*>^[ ]?"#AREACHECK"\n {
+<*>^"#AREACHECK"\n {
 	cobc_areacheck = 1;
 }
 
-<*>^[ ]?"#NOAREACHECK"\n {
+<*>^"#NOAREACHECK"\n {
 	cobc_areacheck = 0;
 }
 
-<*>^[ ]?"#INCLUDE".*/\n {
+<*>^"#INCLUDE".*/\n {
 	cb_include_file_list_directive = scan_list_add (
 		cb_include_file_list_directive,
 		yytext + 9

diff --git a/tests/testsuite.src/syn_misc.at b/tests/testsuite.src/syn_misc.at
@@ -8447,7 +8447,7 @@ AT_DATA([prog2.cob], [
 ])
 
 AT_CHECK([$COMPILE_ONLY prog2.cob], [1], [],
-[prog2.cob:2: error: Missing argument for IMP INCLUDE directive
+[prog2.cob:2: error: invalid IMP INCLUDE directive
 ])
 
 AT_CLEANUP
@@ -8464,6 +8464,10 @@ AT_DATA([prog.cob], [
            GOBACK.
 ])
 
-AT_CHECK([$COMPILE_ONLY prog.cob], [0], [], [])
+AT_CHECK([$COMPILE --save-temps -E -o prog.i prog.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 <file3.h>" prog.i], [0], ignore, [])
+AT_CHECK([$GREP "#INCLUDE <file4.h>" prog.i], [0], ignore, [])
 
 AT_CLEANUP