Use tabgen, so deleted chtab.c

diff --git a/util/cpp/.distr b/util/cpp/.distr
index 48a019f..7815b2b 100644 (file)
--- a/util/cpp/.distr
+++ b/util/cpp/.distr
@@ -7,7 +7,6 @@ bits.h
 ch7bin.c
 ch7mon.c
 char.tab
-chtab.c
 class.h
 domacro.c
 error.c

diff --git a/util/cpp/Makefile b/util/cpp/Makefile
index 783257e..77a1814 100644 (file)
--- a/util/cpp/Makefile
+++ b/util/cpp/Makefile
@@ -50,7 +50,7 @@ COBJ =        LLlex.o LLmessage.o ch7bin.o ch7mon.o domacro.o \
 PRFILES = Makefile Parameters \
        make.hfiles make.tokcase make.tokfile LLlex.h bits.h file_info.h \
        idf.h input.h interface.h macro.h \
-       class.h chtab.c char.tab expression.g $(CSRC)
+       class.h char.tab expression.g $(CSRC)
 
 # Objects of other generated C files
 GOBJ = char.o symbol2str.o
@@ -77,8 +77,8 @@ hfiles: Parameters char.c charoffset.h
        ./make.hfiles Parameters
        @touch hfiles
 
-charoffset.h char.c:   chtab char.tab
-       chtab -fchar.tab > char.c
+charoffset.h char.c:   char.tab
+       $(EMHOME)/bin/tabgen -fchar.tab > char.c
 
 LLfiles: $(LSRC)
        $(GEN) $(GENOPTIONS) $(LSRC)
@@ -90,9 +90,6 @@ tokenfile.g:  tokenname.c make.tokfile
 symbol2str.c:  tokenname.c make.tokcase
        <tokenname.c ./make.tokcase >symbol2str.c
 
-chtab: chtab.o
-       $(CC) -o chtab chtab.o
-
 # Objects needed for 'cpp'
 OBJ =  $(COBJ) $(LOBJ) $(GOBJ)
 SRC =  $(CSRC) $(LCSRC) $(GSRC)
@@ -138,7 +135,7 @@ lint:       cfiles
        lint -bx $(CDEFS) $(SRC) >lint.out
 
 clean:
-       rm -f $(LCSRC) $(OBJ) $(GENERATED) $(GSRC) $(GHSRC) chtab.o chtab cpp Out
+       rm -f $(LCSRC) $(OBJ) $(GENERATED) $(GSRC) $(GHSRC) cpp Out
 
 #AUTOAUTOAUTOAUTOAUTOAUTOAUTOAUTOAUTOAUTO
 LLlex.o: LLlex.h

diff --git a/util/cpp/char.tab b/util/cpp/char.tab
index 82e52e3..ce3460a 100644 (file)
--- a/util/cpp/char.tab
+++ b/util/cpp/char.tab
@@ -3,11 +3,12 @@
 %
 % some general settings:
 %F     %s,
+%H
+%S257
 %
 %      START OF TOKEN
 %
-%C
-STGARB:\000-\377
+%iSTGARB
 STSKIP:\r \t\f\013
 STNL:\n
 STCOMP:!&<=>|