Allow macro in #line directive

Using: #define LINE1 10 #line LINE1 #define LINE2 20 #define FILE "file" #line LINE2 FILE Should now work. Add new testcase tests/pp/23.S

herman ten brugge committed 1 year ago

Commit 999ec461 parent 68000c03 files · +41 −11Browse files

Unified · Split

3 files

tccpp.c+14−11

         break;
     case TOK_LINE:
-        next_nomacro();
+        next();
-        if (tok != TOK_PPNUM) {
+        if (tok != TOK_CINT) {
     _line_err:
             tcc_error("wrong #line format");
         }
+        n = tokc.i;
         goto _line_num;
     case TOK_PPNUM:
         if (parse_flags & PARSE_FLAG_ASM_FILE)
             goto ignore;
-    _line_num:
         for (n = 0, q = tokc.str.data; *q; ++q) {
             if (!isnum(*q))
                 goto _line_err;
             n = n * 10 + *q - '0';
         }
-        next_nomacro();
+    _line_num:
-        if (tok != TOK_LINEFEED) {
+        next();
-            if (tok == TOK_PPSTR && tokc.str.data[0] == '"') {
+        if (tok == TOK_STR) {
-                tokc.str.data[tokc.str.size - 2] = 0;
+            tccpp_putfile(tokc.str.data);
-                tccpp_putfile(tokc.str.data + 1);
+            n--;
-            } else
+        }
-                goto _line_err;
+        else if (tok != TOK_LINEFEED)
-        }
+            goto _line_err;
+        if (macro_ptr && *macro_ptr == 0)
+            macro_stack->save_line_num = n;
         if (file->fd > 0)
             total_lines += file->line_num - n;
+        file->line_ref += file->line_num - n;
         file->line_num = n;
         goto ignore; /* skip optional level number */

Keyboard shortcuts