fixed two preprocessing bugs

diff --git a/lang/cem/cemcom.ansi/LLlex.c b/lang/cem/cemcom.ansi/LLlex.c
index fc1342a..3b789d7 100644 (file)
--- a/lang/cem/cemcom.ansi/LLlex.c
+++ b/lang/cem/cemcom.ansi/LLlex.c
@@ -147,7 +147,11 @@ firstline:
                        return ptok->tk_symb = EOI;
 
                while ((ch = GetChar()),
-                       (ch == '#' || ch == '/' || class(ch) == STSKIP)) {
+                       (ch == '#'
+#ifndef NOPP
+                       || ch == '/'
+#endif
+                       || class(ch) == STSKIP)) {
                        /* blanks are allowed before hashes */
                        if (ch == '#') {
                                /* a control line follows */

diff --git a/lang/cem/cemcom.ansi/replace.c b/lang/cem/cemcom.ansi/replace.c
index ce8408e..05afb86 100644 (file)
--- a/lang/cem/cemcom.ansi/replace.c
+++ b/lang/cem/cemcom.ansi/replace.c
@@ -435,6 +435,10 @@ a_new_line:                ch = GetChar();
 
                        if (ch == '#') {
                                domacro();
+                               /* Clear File_Inserted since domacro could
+                                * be called again, which calls GetToken().
+                                */
+                               File_Inserted = 0;
                                goto a_new_line;
                        } else if (ch == EOI) {
                                lexerror("unterminated macro call");