From: Carl Worth <cworth@cworth.org>
Date: Fri, 14 May 2010 17:17:38 +0000 (-0700)
Subject: Move most printing to the action in the content production.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=04af13539a7a4bc72b566c111914b103d9e851a6;p=mesa.git

Move most printing to the action in the content production.

Previously, printing was occurring all over the place. Here we
document that it should all be happening at the top-level content
production, and we move the printing of directive newlines.

The printing of expanded macros is still happening in lower-level
productions, but we plan to fix that soon.
---

diff --git a/glcpp-parse.y b/glcpp-parse.y
index 4e5de8254d8..8dc78975114 100644
--- a/glcpp-parse.y
+++ b/glcpp-parse.y
@@ -103,6 +103,7 @@ input:
 |	input content
 ;
 
+	/* We do all printing at the content level */
 content:
 	IDENTIFIER {
 		printf ("%s", $1);
@@ -113,7 +114,7 @@ content:
 		talloc_free ($1);
 	}
 |	macro
-|	directive_with_newline
+|	directive_with_newline { printf ("\n"); }
 |	NEWLINE	{ printf ("\n"); }
 |	'('	{ printf ("("); }
 |	')'	{ printf (")"); }
@@ -154,9 +155,7 @@ argument:
 ;
 
 directive_with_newline:
-	directive NEWLINE {
-		printf ("\n");
-	}
+	directive NEWLINE
 ;
 
 directive: