fixes and cleaning

lefessan · Oct 23, 2024 · 5fb3c4c · 5fb3c4c
1 parent f47a04a
commit 5fb3c4c
Show file tree

Hide file tree

Showing 7 changed files with 448 additions and 48 deletions.
diff --git a/cobc/ChangeLog b/cobc/ChangeLog
diff --git a/cobc/Makefile.am b/cobc/Makefile.am
@@ -1,4 +1,4 @@
-
+#
 # Makefile gnucobol/cobc
 #
 # Copyright (C) 2003-2012, 2014-2021 Free Software Foundation, Inc.
@@ -23,7 +23,7 @@ bin_PROGRAMS = cobc
 cobc_SOURCES = cobc.c cobc.h ppparse.y pplex.c parser.y scanner.c config.c \
 	reserved.c error.c tree.c tree.h field.c typeck.c codegen.c help.c \
 	config.def flag.def warning.def codeoptim.def ppparse.def \
-	codeoptim.c replace.c dump_tree.c 
+	codeoptim.c replace.c dump_tree.c
 
 #cobc_SOURCES = cobc.c cobc.h ppparse.y pplex.l parser.y scanner.l config.c
 
@@ -40,7 +40,7 @@ COBC = cobc$(EXEEXT)
 # sources that needs to be built *before* any other file
 # note: we actually want their header files...
 BUILT_SOURCES = ppparse.c parser.c
-EXTRA_DIST = pplex.l scanner.l ppparse.h parser.h
+EXTRA_DIST = pplex.l scanner.l ppparse.h parser.h dump_tree_gen.c
 
 MAINTAINERCLEANFILES = pplex.c scanner.c ppparse.h parser.h cobc.1
 CLEANFILES = parser.output ppparse.output

diff --git a/cobc/dump_tree.c b/cobc/dump_tree.c
@@ -1,7 +1,6 @@
 /*
- Copyright (C) 2001-2023 Free Software Foundation, Inc.
- Written by Keisuke Nishida, Roger While, Simon Sobisch, Ron Norman,
- Edward Hart, Fabrice Le Fessant
+ Copyright (C) 2023-2024 Free Software Foundation, Inc.
+ Written by Fabrice Le Fessant
 
  This file is part of GnuCOBOL.
 

diff --git a/cobc/parser.y b/cobc/parser.y
@@ -12957,7 +12957,7 @@ cancel_body:
 | ALL
   {
 	const char *all_name = "CANCEL ALL";
-	cb_tree all = cb_build_literal (CB_CATEGORY_ALPHANUMERIC, all_name, strlen (all_name));
+	struct cb_literal *all = build_literal (CB_CATEGORY_ALPHANUMERIC, all_name, strlen (all_name));
 	cb_emit_cancel (all);
   }
 ;

diff --git a/cobc/tree.c b/cobc/tree.c
@@ -1340,8 +1340,8 @@ cb_to_cname (const char *s)
 	return copy;
 }
 
-static
-struct cb_literal *build_literal (const enum cb_category category, const void *data,
+struct cb_literal *
+build_literal (const enum cb_category category, const void *data,
 	       const size_t size)
 {
 	struct cb_literal *p;
@@ -1353,13 +1353,6 @@ struct cb_literal *build_literal (const enum cb_category category, const void *d
 	return p;
 }
 
-cb_tree
-cb_build_literal (const enum cb_category category, const void *data,
-	       const size_t size)
-{
-	return CB_TREE(build_literal(category, data, size));
-}
-
 char *
 cb_name (cb_tree x)
 {
@@ -1385,7 +1378,7 @@ cb_exhbit_literal (cb_tree x)
 	s = cobc_parse_malloc (tlen + 4);
 	memcpy (s, tmp, tlen);
 	memcpy (s + tlen, " = ", 4);
-	return cb_build_literal (CB_CATEGORY_ALPHANUMERIC, s, tlen + 3);
+	return CB_TREE (build_literal (CB_CATEGORY_ALPHANUMERIC, s, tlen + 3));
 }
 
 enum cb_category

diff --git a/cobc/tree.h b/cobc/tree.h
@@ -2257,7 +2257,7 @@ extern cb_tree		cb_build_initialize (const cb_tree, const cb_tree,
 					   const enum cob_statement,
 					   const unsigned int);
 
-extern cb_tree	        cb_build_literal (enum cb_category,
+extern struct cb_literal *build_literal (enum cb_category,
 					   const void *, const size_t);
 
 extern cb_tree		cb_build_system_name (const enum cb_system_name_category,

diff --git a/cobc/typeck.c b/cobc/typeck.c
@@ -4691,7 +4691,7 @@ create_implicit_assign_dynamic_var (struct cb_program * const prog,
 #if 0
 	p->count++;
 #endif
-	x = cb_build_literal (CB_CATEGORY_ALPHANUMERIC, assign_name, strlen (assign_name));
+	x = CB_TREE (build_literal (CB_CATEGORY_ALPHANUMERIC, assign_name, strlen (assign_name)));
 	p->values = CB_LIST_INIT (x);
 	CB_FIELD_ADD (prog->working_storage, p);
 }
@@ -4763,7 +4763,7 @@ validate_assign_name (struct cb_file * const f,
 	p = check_level_78 (CB_NAME (assign));
 	if (p) {
 		char *c = (char *)CB_LITERAL (p->values)->data;
-		f->assign = cb_build_literal (CB_CATEGORY_ALPHANUMERIC, c, strlen (c));
+		f->assign = CB_TREE (build_literal (CB_CATEGORY_ALPHANUMERIC, c, strlen (c)));
 		return;
 	}