From 0b27b5f05191f07ed31e65ff07e5233672f3c33a Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Mon, 10 May 2010 16:16:06 -0700
Subject: Implment #define

By using the recently-imported hash_table implementation.
---
 glcpp-lex.l | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'glcpp-lex.l')

diff --git a/glcpp-lex.l b/glcpp-lex.l
index 747e24056f..a220fef76b 100644
--- a/glcpp-lex.l
+++ b/glcpp-lex.l
@@ -31,12 +31,27 @@
 
 %option reentrant noyywrap
 
+%x ST_DEFINE
+%x ST_DEFVAL
+
+SPACE		[[:space:]]
+NONSPACE	[^[:space:]]
+NOTNEWLINE	[^\n]
+HSPACE		[ \t]
+HASH		^{HSPACE}*#
+IDENTIFIER	[_a-zA-Z][_a-zA-Z0-9]*
+DEFVAL		{NONSPACE}{NOTNEWLINE}*
 %%
 
-	/* Silently eat all whitespace. */
-[[:space:]]+
+{HASH}define		{ BEGIN ST_DEFINE; return DEFINE; }
+
+<ST_DEFINE>{HSPACE}+
+<ST_DEFINE>{IDENTIFIER}	{ BEGIN ST_DEFVAL; yylval = strdup (yytext); return IDENTIFIER; }
+
+<ST_DEFVAL>{SPACE}+
+<ST_DEFVAL>{DEFVAL}	{ BEGIN INITIAL; yylval = strdup (yytext); return DEFVAL; }
 
-	/* Any non-whitespace is a token. */
-[^[:space:]]+			{ return TOKEN; }
+	/* Anything we don't specifically recognize is a stream of tokens */
+{NONSPACE}+		{ yylval = strdup (yytext); return TOKEN; }
 
 %%
-- 
cgit v1.2.3