some fixes, f.i. process # in actual parameter list

diff --git a/util/cpp/preprocess.c b/util/cpp/preprocess.c
index 38a3cd7..20dbaee 100644 (file)
--- a/util/cpp/preprocess.c
+++ b/util/cpp/preprocess.c
@@ -81,6 +81,7 @@ preprocess(fn)
                for (;;) {
                        if (c & 0200)  {
                                if (c == EOI) {
+                                       newline();
                                        flush(op-_obuf);
                                        return;
                                }
@@ -102,6 +103,7 @@ preprocess(fn)
                                                        echo(c);
                                                }
                                                else if (c == EOI) {
+                                                       newline();
                                                        flush(op - _obuf);
                                                        return;
                                                }
@@ -149,6 +151,7 @@ preprocess(fn)
                                                break;
                                        }
                                        else if (c == EOI) {
+                                               newline();
                                                flush(op-_obuf);
                                                return;
                                        }
@@ -161,8 +164,7 @@ preprocess(fn)
                                                }
                                                else if (c == '\'') escaped = 1;
                                        }
-                               }
-                               while (escaped || c != stopc);
+                               } while (escaped || c != stopc);
                                echo(c);
                                if (c == '\n')
                                        break;  /* Don't eat # */

diff --git a/util/cpp/replace.c b/util/cpp/replace.c
index af8c3df..4c53203 100644 (file)
--- a/util/cpp/replace.c
+++ b/util/cpp/replace.c
@@ -67,7 +67,7 @@ replace(idef)
                LoadChar(c);
                c = skipspaces(c,1);
                if (c != '(') {         /* no replacement if no ()      */
-                       error("macro %s needs arguments",
+                       warning("macro %s needs arguments",
                                idef->id_text);
                        PushBack();
                        return 0;

diff --git a/util/cpp/skip.c b/util/cpp/skip.c
index 42a6697..de2be7e 100644 (file)
--- a/util/cpp/skip.c
+++ b/util/cpp/skip.c
@@ -16,12 +16,17 @@ skipspaces(ch, skipnl)
        /*      skipspaces() skips any white space and returns the first
                non-space character.
        */
+       register int nlseen = 0;
+
        for (;;) {
-               while (class(ch) == STSKIP)
+               while (class(ch) == STSKIP) {
+                       nlseen = 0;
                        LoadChar(ch);
+               }
                if (skipnl && class(ch) == STNL) {
                        LoadChar(ch);
                        ++LineNumber;
+                       nlseen++;
                        continue;
                }
                /* How about "\\\n"?????????    */
@@ -36,7 +41,13 @@ skipspaces(ch, skipnl)
                                return '/';
                        }
                }
-               else
+               else if (nlseen && ch == '#') {
+                       domacro();
+                       LoadChar(ch);
+                       /* ch is the first character of a line. This means
+                        * that nlseen will still be true.
+                        */
+               } else
                        return ch;
        }
 }