All macro lookups should be of type macro_t, not string_list_t.

This is what I get for using a non-type-safe hash-table implementation.

diff --git a/glcpp-parse.y b/glcpp-parse.y
index cce8a70156f9e82d1d1ae311f7d4b33a7605ffb0..a809ebf3af566dd0b09666021d43acd727e54dcc 100644 (file)
--- a/glcpp-parse.y
+++ b/glcpp-parse.y
@@ -199,7 +199,7 @@ control_line:
                _define_function_macro (parser, $2, $4, $6);
        }
 |      HASH_UNDEF IDENTIFIER NEWLINE {
-               string_list_t *macro = hash_table_find (parser->defines, $2);
+               macro_t *macro = hash_table_find (parser->defines, $2);
                if (macro) {
                        /* XXX: Need hash table to support a real way
                         * to remove an element rather than prefixing
@@ -222,12 +222,12 @@ control_line:
                glcpp_parser_lex_from (parser, expanded);
        }
 |      HASH_IFDEF IDENTIFIER NEWLINE {
-               string_list_t *macro = hash_table_find (parser->defines, $2);
+               macro_t *macro = hash_table_find (parser->defines, $2);
                talloc_free ($2);
                _glcpp_parser_skip_stack_push_if (parser, macro != NULL);
        }
 |      HASH_IFNDEF IDENTIFIER NEWLINE {
-               string_list_t *macro = hash_table_find (parser->defines, $2);
+               macro_t *macro = hash_table_find (parser->defines, $2);
                talloc_free ($2);
                _glcpp_parser_skip_stack_push_if (parser, macro == NULL);
        }
@@ -889,7 +889,7 @@ _glcpp_parser_evaluate_defined (glcpp_parser_t *parser,
                                token_list_t *list)
 {
        token_node_t *node, *next;
-       string_list_t *macro;
+       macro_t *macro;
 
        if (list == NULL)
                return;