fixes #255

Author: thradams

src/file.c

@@ -1 +1,2 @@
-enum {A = 18446744073709551615ULL*2};
+#define foo(b) a #b
+foo(1)

src/lib.c

@@ -8036,7 +8036,7 @@ static struct token_list replace_macro_arguments(struct preprocessor_ctx* ctx, s
                       antes copia flags dele
                     */
 
-                    const enum token_flags flags = input_list->head->flags;
+                    const enum token_flags flags = r.tail->flags;
                     token_list_pop_front(input_list);
 
                     //deleta tambem # do fim
@@ -11014,6 +11014,7 @@ int test_predefined_macros()
     }
     if (strcmp(result, output) != 0)
     {
+
     }
 
 
@@ -11034,7 +11035,26 @@ int test_utf8()
     return 0;
 }
 
+int bug_test()
+{
+    const char* input =
+        "#define M(b) a #b \n"
+        "M(1)\n";
 
+    const char* output =
+        "a \"1\""
+        ;
+
+
+    struct tokenizer_ctx tctx = { 0 };
+    struct token_list list = tokenizer(&tctx, input, "source", 0, TK_FLAG_NONE);
+
+    
+
+    assert(test_preprocessor_in_out(input, output) == 0);
+
+    return 0;
+}
 int test_line_continuation()
 {
 
@@ -25558,7 +25578,7 @@ void defer_start_visit_declaration(struct defer_visit_ctx* ctx, struct declarati
 
 //#pragma once
 
-#define CAKE_VERSION "0.10.19"
+#define CAKE_VERSION "0.10.20"
 
 
 

src/main.c

@@ -86,7 +86,7 @@ int main(int argc, char** argv)
 #ifdef TEST
     test_main();
     printf("--------------------------------------\n");
-    printf("Embedded tests in #ifdef TEST groups\n");
+    printf("Tests embedded within #ifdef TEST blocks.\n");
     printf("%d tests failed, %d tests passed\n", g_unit_test_error_count, g_unit_test_success_count);
     printf("--------------------------------------\n");
     if (g_unit_test_error_count > 0)

src/tokenizer.c

@@ -4734,7 +4734,7 @@ static struct token_list replace_macro_arguments(struct preprocessor_ctx* ctx, s
                       antes copia flags dele
                     */
 
-                    const enum token_flags flags = input_list->head->flags;
+                    const enum token_flags flags = r.tail->flags;
                     token_list_pop_front(input_list);
 
                     //deleta tambem # do fim
@@ -7671,6 +7671,7 @@ int test_predefined_macros()
     }
     if (strcmp(result, output) != 0)
     {
+
     }
 
 
@@ -7691,7 +7692,26 @@ int test_utf8()
     return 0;
 }
 
+int bug_test()
+{
+    const char* input =
+        "#define M(b) a #b \n"
+        "M(1)\n";
+
+    const char* output =
+        "a \"1\""
+        ;
+
 
+    struct tokenizer_ctx tctx = { 0 };
+    struct token_list list = tokenizer(&tctx, input, "source", 0, TK_FLAG_NONE);
+
+    
+
+    assert(test_preprocessor_in_out(input, output) == 0);
+
+    return 0;
+}
 int test_line_continuation()
 {
 

src/unit_test.c

@@ -69,6 +69,7 @@ int test_stringfy(void);
 int test_tokens(void);
 int test_predefined_macros(void);
 int test_utf8(void);
+int bug_test(void);
 int test_line_continuation(void);
 int stringify_test(void);
 
@@ -136,6 +137,7 @@ g_unit_test_success_count = 0;
     test_tokens();
     test_predefined_macros();
     test_utf8();
+    bug_test();
     test_line_continuation();
     stringify_test();
     test_get_warning_name();

src/version.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#define CAKE_VERSION "0.10.19"
+#define CAKE_VERSION "0.10.20"
 
 
 

src/web/cake.js

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>file.c</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>file.c -E</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerWorkingDirectory>$(ProjectDir)../src/</LocalDebuggerWorkingDirectory>
   </PropertyGroup>