From: eck Date: Tue, 24 Oct 1989 15:02:02 +0000 (+0000) Subject: improved domacro when NOPP defined X-Git-Tag: release-5-5~2165 X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=9286928275cf751bb808f2f2e85b48225d477c26;p=ack.git improved domacro when NOPP defined --- diff --git a/lang/cem/cemcom.ansi/Makefile b/lang/cem/cemcom.ansi/Makefile index 1d32f45a8..58de7680e 100644 --- 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 6b02fe9e8..6b07c5ee0 100644 --- 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;