From 428e27426d9e2503b475c4e608ee780bbb9e72e6 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 8 Jan 2012 00:20:28 +1000
Subject: Parse an actual file.

---
 LuaSL/src/LuaSL_lexer.l | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'LuaSL/src/LuaSL_lexer.l')

diff --git a/LuaSL/src/LuaSL_lexer.l b/LuaSL/src/LuaSL_lexer.l
index 3eb59fb..d52ea4b 100644
--- a/LuaSL/src/LuaSL_lexer.l
+++ b/LuaSL/src/LuaSL_lexer.l
@@ -15,12 +15,11 @@
 
 %option reentrant never-interactive batch
 %option bison-bridge yylineno 8bit 
-%option noreject noyymore noyywrap
+%option noreject noyymore
 %option backup debug perf-report perf-report verbose warn
 %option align full
 
 SPACE       [ \r\n\t]*
-ENDSPACE    {SPACE}$
 
 LETTER      [A-Za-z]
 DECIMAL     [0-9]
@@ -34,7 +33,6 @@ FLOAT       {INTEGER}("."{INTEGER})?{EXPONANT}?
 %%
 
  /* Basic tokens */
-{ENDSPACE}      %{ /* Skip blanks at end of lines. */ %}
 {SPACE}         %{ ECHO; /* Skip blanks. */ %}
 {NAME}          %{ ECHO; /* yylval->nameValue=strdup(yytext); return LSL_NAME; */ %}
 {INTEGER}       %{ ECHO; yylval->integerValue = atoi(yytext); return LSL_INTEGER; %}
@@ -64,12 +62,14 @@ FLOAT       {INTEGER}("."{INTEGER})?{EXPONANT}?
 "("             { ECHO; return LSL_PARENTHESIS_OPEN; }
 ")"             { ECHO; return LSL_PARENTHESIS_CLOSE; }
 
+<<EOF>>         { yyterminate(); }
+
  /* Everything else */
 .               %{ ECHO; printf(" unexpected character.\n"); %}
 
 %%
 
-int XXyywrap()
+int yywrap(yyscan_t yyscanner)
 {
 #ifdef FLEX_SCANNER
     #ifndef LL_WINDOWS
@@ -78,6 +78,7 @@ int XXyywrap()
 	(void) input;
     #endif
 #endif
+// TODO - If we are getting files from stdin, or multiple -f arguments, we should loop through them asd return 0.  Return 1 when there are no more files.
 	return(1);
 }
 
-- 
cgit v1.1