Avoid swallowing initial left parenthesis from nested macro invocation.

We weren't including this left parenthesis in the argument's token
list so the nested function invocation wasn not being recognized.

With this fix, tests 21 and 22 now pass.

diff --git a/glcpp-parse.y b/glcpp-parse.y
index ec966580fc497bd483a5d57b19eef1bcaa1be2fc..131102fab95d9d7e18e5e16689155d20406d4870 100644 (file)
--- a/glcpp-parse.y
+++ b/glcpp-parse.y
@@ -754,9 +754,12 @@ _arguments_parse (argument_list_t *arguments, token_node_t **node_ret)
        if (node == NULL || node->token->type != '(')
                return FUNCTION_NOT_A_FUNCTION;
 
+       last = node;
+       node = node->next;
+
        argument = NULL;
 
-       for (paren_count = 0; node; last = node, node = node->next) {
+       for (paren_count = 1; node; last = node, node = node->next) {
                if (node->token->type == '(')
                {
                        paren_count++;
@@ -770,7 +773,8 @@ _arguments_parse (argument_list_t *arguments, token_node_t **node_ret)
                                break;
                        }
                }
-               else if (node->token->type == ',' &&
+
+               if (node->token->type == ',' &&
                         paren_count == 1)
                {
                        argument = NULL;