Convert lexer to talloc and add xtalloc wrappers.

The lexer was previously using strdup (expecting the parser to free),
but is now more consistent, easier to use, and slightly more efficent
by using talloc along with the parser.

Also, we add xtalloc and xtalloc_strdup wrappers around talloc and
talloc_strdup to put all of the out-of-memory-checking code in one
place.

1 files changed, 4 insertions, 3 deletions

diff --git a/glcpp-lex.l b/glcpp-lex.l
index f1a3560779..ec91538a73 100644
--- a/glcpp-lex.l
+++ b/glcpp-lex.l
@@ -30,6 +30,7 @@
 %}
 
 %option reentrant noyywrap
+%option extra-type="glcpp_parser_t *"
 
 %x ST_DEFINE
 %x ST_DEFVAL
@@ -50,12 +51,12 @@ TOKEN		{NONSPACE}+
 }
 
 <ST_DEFINE>{IDENTIFIER}	{
-	yylval.str = strdup (yytext);
+	yylval.str = xtalloc_strdup (yyextra, yytext);
 	return IDENTIFIER;
 }
 
 <ST_DEFINE>{TOKEN} {
-	yylval.str = strdup (yytext);
+	yylval.str = xtalloc_strdup (yyextra, yytext);
 	return TOKEN;
 }
 
@@ -68,7 +69,7 @@ TOKEN		{NONSPACE}+
 
 	/* Anything we don't specifically recognize is a stream of tokens */
 {NONSPACE}+ {
-	yylval.str = strdup (yytext);
+	yylval.str = xtalloc_strdup (yyextra, yytext);
 	return TOKEN;
 }