renamed: src/parser.l -> src/scanner.l

diff --git a/src/Makefile.am b/src/Makefile.am
index fca1ccc..2c2c026 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,9 +8,9 @@ AM_YFLAGS = -d
 include_HEADERS = oconfig.h
 lib_LTLIBRARIES = liboconfig.la
 
 include_HEADERS = oconfig.h
 lib_LTLIBRARIES = liboconfig.la
 

-liboconfig_la_SOURCES = oconfig.c oconfig.h parser.l parser.y
+liboconfig_la_SOURCES = oconfig.c oconfig.h scanner.l parser.y

 
 

-scanner.h: parser.l parser.h
-       $(LEX) -o scanner.c --header-file=scanner.h parser.l
+scanner.h: scanner.l parser.h
+       $(LEX) -o scanner.c --header-file=scanner.h scanner.l

 
 parser.h: parser.y
 
 parser.h: parser.y

diff --git a/src/parser.l b/src/parser.l
deleted file mode 100644 (file)
index 1d23805..0000000
--- a/src/parser.l
+++ /dev/null
@@ -1,29 +0,0 @@
-WHITE_SPACE [\ \t\b]
-ALNUM [A-Za-z0-9_]
-QUOTED_STRING \"([^\"]+|\\.)*\"
-UNQUOTED_STRING {ALNUM}+
-HEX_NUMBER 0[xX][0-9a-fA-F]+
-OCT_NUMBER 0[0-7]+
-DEC_NUMBER [\+\-]?[0-9]+
-FLOAT_NUMBER [\+\-]?[0-9]*\.[0-9]+([eE][\+\-][0-9]+)?
-NUMBER ({FLOAT_NUMBER}|{HEX_NUMBER}|{OCT_NUMBER}|{DEC_NUMBER})
-BOOL_TRUE (true|yes|on)
-BOOL_FALSE (false|no|off)
-COMMENT #.*
-
-%%
-{WHITE_SPACE}  |
-{COMMENT}      {/* nothing */}
-
-\n                     {return (EOL);}
-"/"                    {return (SLASH);}
-"<"                    {return (OPENBRAC);}
-">"                    {return (CLOSEBRAC);}
-{NUMBER}               {yylval.number = strtod (yytext, NULL); return (NUMBER);}
-{BOOL_TRUE}            {yylval.boolean = 1; return (TRUE);}
-{BOOL_FALSE}           {yylval.boolean = 0; return (FALSE);}
-
-{QUOTED_STRING}                {yylval.string = yytext; return (QUOTED_STRING);}
-{UNQUOTED_STRING}      {yylval.string = yytext; return (UNQUOTED_STRING);}
-
-%%

diff --git a/src/scanner.l b/src/scanner.l
new file mode 100644 (file)
index 0000000..1d23805
--- /dev/null
+++ b/src/scanner.l
@@ -0,0 +1,29 @@
+WHITE_SPACE [\ \t\b]
+ALNUM [A-Za-z0-9_]
+QUOTED_STRING \"([^\"]+|\\.)*\"
+UNQUOTED_STRING {ALNUM}+
+HEX_NUMBER 0[xX][0-9a-fA-F]+
+OCT_NUMBER 0[0-7]+
+DEC_NUMBER [\+\-]?[0-9]+
+FLOAT_NUMBER [\+\-]?[0-9]*\.[0-9]+([eE][\+\-][0-9]+)?
+NUMBER ({FLOAT_NUMBER}|{HEX_NUMBER}|{OCT_NUMBER}|{DEC_NUMBER})
+BOOL_TRUE (true|yes|on)
+BOOL_FALSE (false|no|off)
+COMMENT #.*
+
+%%
+{WHITE_SPACE}  |
+{COMMENT}      {/* nothing */}
+
+\n                     {return (EOL);}
+"/"                    {return (SLASH);}
+"<"                    {return (OPENBRAC);}
+">"                    {return (CLOSEBRAC);}
+{NUMBER}               {yylval.number = strtod (yytext, NULL); return (NUMBER);}
+{BOOL_TRUE}            {yylval.boolean = 1; return (TRUE);}
+{BOOL_FALSE}           {yylval.boolean = 0; return (FALSE);}
+
+{QUOTED_STRING}                {yylval.string = yytext; return (QUOTED_STRING);}
+{UNQUOTED_STRING}      {yylval.string = yytext; return (UNQUOTED_STRING);}
+
+%%