Use classic names in ncgen

Unidata · Nov 17, 2024 · 17a2e7a · 17a2e7a
1 parent dea9aa7
commit 17a2e7a
Show file tree

Hide file tree

Showing 8 changed files with 792 additions and 885 deletions.
diff --git a/ncgen/CMakeLists.txt b/ncgen/CMakeLists.txt
@@ -17,14 +17,14 @@ SET(ncgen_FILES bindata.c bytebuffer.c cdata.c cvt.c data.c
 debug.c dump.c escapes.c f77data.c genbin.c
 genc.c genchar.c generate.c generr.c genf77.c
 genj.c genlib.c getfill.c jdata.c list.c
-main.c ncgeny.c semantics.c
+main.c ncgen.tab.c semantics.c
 util.c bytebuffer.h data.h debug.h dump.h
 generate.h generr.h genlib.h includes.h list.h
-ncgen.h ncgeny.h util.h ${XGETOPTSRC})
+ncgen.h ncgen.tab.h util.h ${XGETOPTSRC})
 
-## 
+##
 # Turn off inclusion of particular files when using the cmake-native
-# option to turn on Unity Builds.  
+# option to turn on Unity Builds.
 #
 # For more information, see:
 #  * https://github.com/Unidata/netcdf-c/pull/2839/

diff --git a/ncgen/Makefile.am b/ncgen/Makefile.am
@@ -13,10 +13,10 @@ ncgen_SOURCES = bindata.c bytebuffer.c cdata.c cvt.c data.c \
 debug.c dump.c escapes.c f77data.c genbin.c \
 genc.c genchar.c generate.c generr.c genf77.c \
 genj.c genlib.c getfill.c jdata.c list.c \
-main.c ncgeny.c semantics.c \
+main.c ncgen.tab.c semantics.c \
 util.c bytebuffer.h data.h debug.h dump.h \
 generate.h generr.h genlib.h includes.h list.h \
-ncgen.h ncgeny.h util.h
+ncgen.h ncgen.tab.h util.h
 
 # Obsolete
 OBSOLETE = odom.c odom.h jdatastd.c jdatajni.c genjni.c cdfdata.c cmldata.c
@@ -63,8 +63,6 @@ makeparser::
 	rm -f ncgenl.c lex.ncg.c
 	flex -Pncg -8 ncgen.l
 	sed -e s/lex.ncg.c/ncgenl.c/g <lex.ncg.c >ncgenl.c
-	bison -pncg -t -d ncgen.y
-	rm -f ncgeny.c ncgeny.h
-	sed -e s/ncgen.tab.c/ncgeny.c/g -e s/ncgen.tab.h/ncgeny.h/g <ncgen.tab.c >ncgeny.c
-	sed -e s/ncgen.tab.c/ncgeny.c/g -e s/ncgen.tab.h/ncgeny.h/g <ncgen.tab.h >ncgeny.h
-	rm -f lex.ncg.c ncgen.tab.h ncgen.tab.c
+	rm -f lex.ncg.c
+	rm ncgen.tab.y ncgen.tab.h
+	bison --debug --defines -p ncg ncgen.y
diff --git a/ncgen/ncgen.l b/ncgen/ncgen.l
@@ -36,7 +36,7 @@
    definition of FILL_STRING in ../ncdump/vardata.h */
 
 #include "ncgen.h"
-#include "ncgeny.h"
+#include "ncgen.tab.h"
 #include "isnan.h"
 
 #define FILL_STRING "_"
@@ -916,7 +916,7 @@ identcheck(int token)
 	}
 	break;
     default:
-         break;    
+         break;
     }
     return token;
 }