From: Carl Worth <cworth@cworth.org>
Date: Tue, 25 May 2010 22:28:58 +0000 (-0700)
Subject: Implement #undef.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e6fb7827c96451d4a09dfda31979a6b9cb27301e;p=mesa.git

Implement #undef.

Which is as simple as copying the former action back from the git
history.

Now all tests through test 11 pass.
---

diff --git a/glcpp-parse.y b/glcpp-parse.y
index b3ef177a6da..830a6232d80 100644
--- a/glcpp-parse.y
+++ b/glcpp-parse.y
@@ -171,7 +171,17 @@ control_line:
 	}
 |	HASH_DEFINE_FUNC IDENTIFIER '(' ')' replacement_list NEWLINE
 |	HASH_DEFINE_FUNC IDENTIFIER '(' identifier_list ')' replacement_list NEWLINE
-|	HASH_UNDEF IDENTIFIER NEWLINE
+|	HASH_UNDEF IDENTIFIER NEWLINE {
+		string_list_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
+			 * a new node with data of NULL like this. */
+			hash_table_insert (parser->defines, NULL, $2);
+			talloc_free (macro);
+		}
+		talloc_free ($2);
+	}
 |	HASH NEWLINE
 ;