Handle macro arguments that contain parentheses, like macro((1+1),2).

Fixes unit test preprocessor/output/macro-paren-stacking.
icculus · Apr 9, 2009 · d4cf9db · d4cf9db
1 parent 3991032
commit d4cf9db
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/mojoshader_preprocessor.c b/mojoshader_preprocessor.c
@@ -1232,14 +1232,16 @@ static int handle_pp_identifier(Context *ctx)
                         paren++;
                     else if (t == ')')
                     {
-                        if (i != def->paramcount-1)
-                        {
-                            fail(ctx, "Too few macro arguments");
-                            goto handle_pp_identifier_failed;
-                        } // if
-
+                        assert(paren >= 0);
                         if (paren == 0)
+                        {
+                            if (i != def->paramcount-1)
+                            {
+                                fail(ctx, "Too few macro arguments");
+                                goto handle_pp_identifier_failed;
+                            } // if
                             break;
+                        } // if
 
                         paren--;
                     } // else if