Identifiers can start and/or contain '.' in PARSE_FLAG_ASM_FILE

Including labels, directives and section names

Vlad Vissoultchev committed 10 years ago

Commit 05ec6651 parent 17395ea1 file · +8 −10Browse files

Unified · Split

             cstr_reset(&tokcstr);
             cstr_ccat(&tokcstr, '.');
             goto parse_num;
-        } else if (c == '.') {
+        } else if ((isidnum_table['.' - CH_EOF] & IS_ID) != 0) { /* asm mode */
-            PEEKC(c, p);
+            *--p = c = '.';
-            if (c == '.') {
+            goto parse_ident_fast;
-                p++;
+        } else if (c == '.' && p[1] == '.') {
-                tok = TOK_DOTS;
+            p += 2;
-            } else {
+            tok = TOK_DOTS;
-                *--p = '.'; /* may underflow into file->unget[] */
-                tok = '.';
-            }
         } else {
             tok = '.';
         }
     s1->pack_stack[0] = 0;
     s1->pack_stack_ptr = s1->pack_stack;
-    isidnum_table['$' - CH_EOF] =
+    isidnum_table['$' - CH_EOF] = (parse_flags & PARSE_FLAG_ASM_FILE) ||
         tcc_state->dollars_in_identifiers ? IS_ID : 0;
+    isidnum_table['.' - CH_EOF] = (parse_flags & PARSE_FLAG_ASM_FILE) ? IS_ID : 0;
 }
 ST_FUNC void preprocess_new(void)

Keyboard shortcuts