improved domacro when NOPP defined

diff --git a/lang/cem/cemcom.ansi/Makefile b/lang/cem/cemcom.ansi/Makefile
index 1d32f45..58de768 100644 (file)
--- a/lang/cem/cemcom.ansi/Makefile
+++ b/lang/cem/cemcom.ansi/Makefile
@@ -56,7 +56,7 @@ COPTIONS =
 
 # What parser generator to use and how
 GEN = $(EMHOME)/bin/LLgen
-GENOPTIONS = -vvvx
+GENOPTIONS = #-vvvx
 
 # tabgen
 TABGEN = $(EMHOME)/bin/tabgen

diff --git a/lang/cem/cemcom.ansi/domacro.c b/lang/cem/cemcom.ansi/domacro.c
index 6b02fe9..6b07c5e 100644 (file)
--- a/lang/cem/cemcom.ansi/domacro.c
+++ b/lang/cem/cemcom.ansi/domacro.c
@@ -720,19 +720,15 @@ domacro()
 
        EoiForNewline = 1;
        if ((tok = GetToken(&tk)) == IDENTIFIER) {
-               if (! strcmp(tk.tk_idf->id_text, "line")) {
-                       tok = GetToken(&tk);
-                       if (tok == INTEGER) {
-                               do_line((unsigned int) tk.tk_ival);
-                               EoiForNewline = 0;
-                               return;
-                       }
-               }
-               else if (! strcmp(tk.tk_idf->id_text, "pragma")) {
+               if (! strcmp(tk.tk_idf->id_text, "pragma")) {
                        do_pragma();
                        EoiForNewline = 0;
                        return;
                }
+       } else if (tok == INTEGER) {
+               do_line((unsigned int) tk.tk_ival);
+               EoiForNewline = 0;
+               return;
        }
        error("illegal # line");
        EoiForNewline = 0;