Avoid printing a space at the beginning of lines in the output.

This fixes more differences compared to "gcc -E" so removes several
cases of erroneously failing test cases. The implementation isn't very
elegant, but it is functional.

diff --git a/glcpp-lex.l b/glcpp-lex.l
index 8e3ab661e6fb5a3498055876864e96f20fc9d049..13e4d6f0ef1f25e3f5870201ae348772b618434d 100644 (file)
--- a/glcpp-lex.l
+++ b/glcpp-lex.l
@@ -173,7 +173,12 @@ TOKEN              [^[:space:](),]+
 }
 
 \n {
+       /* XXX: Printing here (rather than in a parser production)
+        * *and* frobbing a bit of the parser state here are both ugly
+        * things. But all my attempts to avoid this by returning a
+        * NEWLINE token here have led to even more ugly things. */
        printf ("\n");
+       yyextra->just_printed_separator = 1;
 }
 
 {HSPACE}+

diff --git a/glcpp-parse.y b/glcpp-parse.y
index c6d64176b2d1e17f3ea30a26319ca7e5adb1c5bc..93713a3f0cae1328e8708aa5e43f6eec8131ea55 100644 (file)
--- a/glcpp-parse.y
+++ b/glcpp-parse.y
@@ -114,7 +114,7 @@ glcpp_parser_lex (glcpp_parser_t *parser);
 %lex-param {glcpp_parser_t *parser}
 
 %token DEFINE FUNC_MACRO IDENTIFIER IDENTIFIER_FINALIZED OBJ_MACRO NEWLINE SEPARATOR SPACE TOKEN UNDEF
-%type <ival> input punctuator
+%type <ival> punctuator
 %type <str> content FUNC_MACRO IDENTIFIER IDENTIFIER_FINALIZED OBJ_MACRO
 %type <argument_list> argument_list
 %type <string_list> macro parameter_list
@@ -144,7 +144,7 @@ glcpp_parser_lex (glcpp_parser_t *parser);
         * character between any two. */
 input:
        /* empty */ {
-               $$ = SEPARATOR;
+               parser->just_printed_separator = 1;
        }
 |      input content {
                int is_token;
@@ -157,16 +157,18 @@ input:
                                                (c >= '0' && c <= '9') ||
                                                (c == '_'));
 
-                       if ($1 == TOKEN && is_not_separator)
+                       if (! parser->just_printed_separator && is_not_separator)
+                       {
                                printf (" ");
+                       }
                        printf ("%s", $2);
+
                        if (is_not_separator)
-                               $$ = TOKEN;
+                               parser->just_printed_separator = 0;
                        else
-                               $$ = SEPARATOR;
-               } else {
-                       $$ = $1;
+                               parser->just_printed_separator = 1;
                }
+
                if ($2)
                        talloc_free ($2);
        }
@@ -561,6 +563,8 @@ glcpp_parser_create (void)
                                           hash_table_string_compare);
        parser->expansions = NULL;
 
+       parser->just_printed_separator = 1;
+
        return parser;
 }
 

diff --git a/glcpp.h b/glcpp.h
index 5432a3181736a22f80b43f9dd02ee7be23de1aa0..c25e29c6883db64b5bfd61075f95f2fba4896da0 100644 (file)
--- a/glcpp.h
+++ b/glcpp.h
@@ -101,6 +101,7 @@ struct glcpp_parser {
        yyscan_t scanner;
        struct hash_table *defines;
        expansion_node_t *expansions;
+       int just_printed_separator;
 };
 
 void