improved #line handling

diff --git a/lang/cem/cemcom/domacro.c b/lang/cem/cemcom/domacro.c
index d427d51..8fe2da8 100644 (file)
--- a/lang/cem/cemcom/domacro.c
+++ b/lang/cem/cemcom/domacro.c
@@ -695,9 +695,10 @@ do_line(l)
        unsigned int l;
 {
        struct token tk;
+       int t = GetToken(&tk);
 
+       SkipRestOfLine();
        LineNumber = l - 1;     /* the number of the next input line */
-       if (GetToken(&tk) == STRING)    /* is there a filespecifier? */
+       if (t == STRING)        /* is there a filespecifier? */
                FileName = tk.tk_bts;
-       SkipRestOfLine();
 }

diff --git a/util/cpp/domacro.c b/util/cpp/domacro.c
index 63b9901..3aaf9ff 100644 (file)
--- a/util/cpp/domacro.c
+++ b/util/cpp/domacro.c
@@ -444,12 +444,13 @@ do_line(l)
        unsigned int l;
 {
        struct token tk;
+       int t = GetToken(&tk);
 
-       LineNumber = l - 1;     /* the number of the next input line */
-       if (GetToken(&tk) == STRING)    /* is there a filespecifier? */
-               FileName = tk.tk_str;
        PushBack();
        skipline();
+       LineNumber = l - 1;     /* the number of the next input line */
+       if (t == STRING)        /* is there a filespecifier? */
+               FileName = tk.tk_str;
 }
 
 PRIVATE int