Fix tokenization of TOK_DOTS

We really need to use PEEKC during tokenization so as to skip line continuations automatically.

Michael Matz committed 10 years ago

Commit 8fc5a6a1 parent f85db992 files · +14 −3Browse files

Unified · Split

2 files

         } else if ((isidnum_table['.' - CH_EOF] & IS_ID) != 0) { /* asm mode */
             *--p = c = '.';
             goto parse_ident_fast;
-        } else if (c == '.' && p[1] == '.') {
+        } else if (c == '.') {
-            p += 2;
+            PEEKC(c, p);
-            tok = TOK_DOTS;
+            if (c == '.') {
+                p++;
+                tok = TOK_DOTS;
+            } else {
+                *--p = '.'; /* may underflow into file->unget[] */
+                tok = '.';
+            }
         } else {
             tok = '.';
         }

 void forward_ref(void);
 int isid(int c);
+/* Line joining happens before tokenization, so the following
+   must be parsed as ellipsis.  */
+void funny_line_continuation (int, ..\
+. );
 #define A 2
 #define N 1234 + A
 #define pf printf

Keyboard shortcuts