Remove some redundancy in the top-level production.

Previously we had two copies of all top-level actions, (once in a list
context and once in a non-list context). Much simpler to instead have
a single list-context production with no action and then only have the
actions in their own non-list contexts.

diff --git a/glcpp-parse.y b/glcpp-parse.y
index 9883a6f..91fc5b9 100644 (file)
--- a/glcpp-parse.y
+++ b/glcpp-parse.y
@@ -65,7 +65,7 @@ _list_append (list_t *list, const char *str);
 
 input:
        /* empty */
-|      content
+|      input content
 ;
 
 content:
@@ -77,14 +77,6 @@ content:
 |      NEWLINE {
                printf ("\n");
        }
-|      content token {
-               _print_resolved_token (parser, $2);
-               talloc_free ($2);
-       }
-|      content directive_with_newline
-|      content NEWLINE {
-               printf ("\n");
-       }
 ;
 
 directive_with_newline: