Alright, the grammer is almost there, just debugging, in what I call extreme-

debugging mode.  If you wanted something intelligable, don't use this one.

1 files changed, 27 insertions, 1 deletions

diff --git a/src/build.l b/src/build.l
index 9a15719..8189f9d 100644
--- a/src/build.l
+++ b/src/build.l
@@ -18,7 +18,7 @@ std::string strbuf;
 %}
 %%
 
-[,:=[\]]                                                        return yytext[0];
+[,:=[\]()]                                                      return yytext[0];
 "+="                                                            return TOK_ADDSET;
 
 "default"                                                       return TOK_DEFAULT;
@@ -32,6 +32,7 @@ std::string strbuf;
 "check"                                                         return TOK_CHECK;
 "clean"                                                         return TOK_CLEAN;
 "target"                                                        return TOK_TARGET;
+"input"                                                         return TOK_INPUT;
 
 \n+                                                                     {
         yylloc->last_line += yyleng;
@@ -59,6 +60,27 @@ std::string strbuf;
 
 "#".*                                                           /* single line comment */
 
+[a-zA-Z][a-zA-Z0-9]*                                            {
+        {
+                yylval->tval = bld.getTargetType( yytext );
+                if( yylval->tval >= 0 )
+                {
+                        return TARGETTYPE;
+                }
+                else if( bld.isFunction( yytext ) )
+                {
+                        yylval->strval = stringdup( yytext );
+                        return FUNCTION;
+                }
+                bld.error( yylloc, "Invalid token" );
+        }
+}
+
+[^ \t\r\n\'\":=,/][^ \t\r\n\'\"=,]+[^ \t\r\n\'\":=,]                                            {
+        yylval->strval = stringdup( yytext );
+        return STRING;
+}
+
 \"                                                                      {
         BEGIN( strdq );
         strbuf = "";
@@ -94,6 +116,10 @@ std::string strbuf;
         return STRING;
 }
 
+.                                                                       {
+        bld.error( yylloc, "Invalid character found!" );
+}
+
 %%
 
 void Builder::scanBegin()