From 38aa83560be3368b4e9784b3ef8f73144171ca45 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Mon, 10 May 2010 11:52:29 -0700
Subject: [PATCH] Make the lexer reentrant (to avoid "still reachable" memory).

This allows the final program to be 100% "valgrind clean", (freeing
all memory that it allocates). This will make it much easier to ensure
that any allocation that parser actions perform are also cleaned up.
---
 glcpp-lex.l   | 2 +-
 glcpp-parse.y | 7 +++++--
 glcpp.c       | 9 ++++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/glcpp-lex.l b/glcpp-lex.l
index 9779f2b92e6..276f50ddfe3 100644
--- a/glcpp-lex.l
+++ b/glcpp-lex.l
@@ -28,7 +28,7 @@
 #include "glcpp-parse.h"
 %}
 
-%option noyywrap
+%option reentrant noyywrap
 
 %%
 
diff --git a/glcpp-parse.y b/glcpp-parse.y
index 739b2935b3f..9acd549b24c 100644
--- a/glcpp-parse.y
+++ b/glcpp-parse.y
@@ -28,10 +28,13 @@
 #define YYSTYPE int
 
 void
-yyerror (const char *error);
+yyerror (const char *error, void *scanner);
 
 %}
 
+%parse-param {void *scanner}
+%lex-param {void *scanner}
+
 %token TOKEN
 
 %%
@@ -51,7 +54,7 @@ token:		TOKEN
 %%
 
 void
-yyerror (const char *error)
+yyerror (const char *error, void *scanner)
 {
 	fprintf (stderr, "Parse error: %s\n", error);
 }
diff --git a/glcpp.c b/glcpp.c
index 09641ceeadb..90a0e89cfa6 100644
--- a/glcpp.c
+++ b/glcpp.c
@@ -24,5 +24,12 @@
 int
 main (void)
 {
-	return yyparse ();
+	int ret;
+	void *scanner;
+
+	yylex_init (&scanner);
+	ret = yyparse (scanner);
+	yylex_destroy (scanner);
+
+	return ret;
 }
-- 
2.11.0