From 03e1d6c3bf09d4c259b831224a7ec4dc0af72e89 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 30 Mar 2007 09:02:36 +0000
Subject: [PATCH] re-implement the comment lexer using states to re-learn how
 things work prior to implementing preqcc support

---
 tools/qfcc/source/qc-lex.l | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index 8b73007a6..0b91e1eda 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -99,26 +99,19 @@ NUM		({DIGIT}+("."{DIGIT}*)?)
 s		[ \t]
 m		([\-+]?)
 
-%x		grab_frame grab_other
+%x		grab_frame grab_other comment
 
 %%
 
-"/*"				{
-						int c;
-						do {
-							while ((c = input ()) != '*' && c != EOF
-								   && c != '\n')
-								;
-							while (c == '*')
-								c = input ();
-							if (c == EOF)
-								error (0, "EOF in comment");
-							if (c == '\n')
-								pr.source_line++;
-						} while (c != '/' && c != EOF);
+"/*"				{ BEGIN (comment); }
+<comment>"*/"		{ BEGIN (INITIAL); }
+<comment>\r*\n		{ pr.source_line++; }
+<comment>.			/* nothing to do */
+<comment><<EOF>>	{
+						error (0, "EOF in comment");
+						return 0;
 					}
-
-"//".*	/* nothing to do */
+"//".*				/* nothing to do */
 
 {DIGIT}+			{
 						yylval.integer_val = atoi (yytext);