1 files changed, 121 insertions, 21 deletions

diff --git a/src/build.y b/src/build.y
index 45a84f1..8345b1f 100644
--- a/src/build.y
+++ b/src/build.y
@@ -4,6 +4,8 @@
 # include "builder.h"
 # include "action.h"
 # include "command.h"
+# include "rule.h"
+# include "filetarget.h"
 # include "build.tab.h"
 void yyerror( YYLTYPE *locp, Builder &bld, char const *msg );
 %}
@@ -28,25 +30,25 @@ void yyerror( YYLTYPE *locp, Builder &bld, char const *msg );
 %token <strval>         REGEXP          "regular expression"
 
 %token TOK_ADDSET                               "+="
-%token TOK_DEFAULT                              "keyword 'default'"
-%token TOK_ACTION                               "keyword 'action'"
-%token TOK_CREATE                               "keyword 'create'"
-%token TOK_FILE                                 "keyword 'file'"
-%token TOK_FROM                                 "keyword 'from'"
-%token TOK_FILES                                "keyword 'files'"
-%token TOK_IN                                   "keyword 'in'"
-%token TOK_USING                                "keyword 'using'"
-%token TOK_RULE                                 "keyword 'rule'"
-%token TOK_REQUIRES                             "keyword 'requires'"
-%token TOK_FOR                                  "keyword 'for'"
-%token TOK_SET                                  "keyword 'set'"
-%token TOK_MATCHES                              "keyword 'matches'"
-%token TOK_ALL                                  "keyword 'all'"
-%token TOK_ONE                                  "keyword 'one'"
-%token TOK_PERFORM                              "keyword 'perform'"
-%token TOK_PRODUCES                             "keyword 'produces'"
-%token TOK_COMMAND                              "keyword 'command'"
-%token TOK_CHECK                                "keyword 'check'"
+%token TOK_DEFAULT                              "default"
+%token TOK_ACTION                               "action"
+%token TOK_CREATE                               "create"
+%token TOK_FILE                                 "file"
+%token TOK_FROM                                 "from"
+%token TOK_FILES                                "files"
+%token TOK_IN                                   "in"
+%token TOK_USING                                "using"
+%token TOK_RULE                                 "rule"
+%token TOK_REQUIRES                             "requires"
+%token TOK_FOR                                  "for"
+%token TOK_SET                                  "set"
+%token TOK_MATCHES                              "matches"
+%token TOK_ALL                                  "all"
+%token TOK_ONE                                  "one"
+%token TOK_PERFORM                              "perform"
+%token TOK_PRODUCES                             "produces"
+%token TOK_COMMAND                              "command"
+%token TOK_CHECK                                "check"
 %token TOK_EOL                                  "end of line"
 %token ',' ':' '='
 
@@ -73,9 +75,40 @@ line: TOK_DEFAULT TOK_ACTION ':'
           }
           actionlst
         | TOK_CREATE createwhat TOK_FROM createfrom TOK_USING createusing
+        | STRING TOK_REQUIRES 
+          {
+                  bld.setTmp( $1 );
+          }
+          reqlst
+        | listcmds
+        | TOK_FOR STRING
+          {
+                 bld.setContext( $2 );
+          }
+          listcmds
+          {
+                  bld.setContext();
+          }
+        | rule
         ;
 
-createwhat: TOK_FILE STRING { printf("target: %s\n", $2 ); }
+reqlst: STRING
+            {
+                        bld.requires( bld.getTmp(), $1 );
+                }
+          | reqlst ',' STRING
+            {
+                        bld.requires( bld.getTmp(), $3 );
+                }
+          ;
+
+listcmds: TOK_SET setexpr
+                ;
+
+createwhat: TOK_FILE STRING
+                    {
+                                bld.add( new FileTarget( $2 ) );
+                        }
                   ;
 
 createfrom: TOK_FILES TOK_IN createfromdirlst
@@ -88,7 +121,10 @@ createfromdirlst: createfromdir
 createfromdir: STRING { printf("  srcdir: %s\n", $1 ); }
                          ;
 
-createusing: TOK_RULE STRING { printf("  rule: %s\n", $2 ); }
+createusing: TOK_RULE STRING
+                     {
+                                 bld.lastTarget()->setRule( $2 );
+                         }
                    ;
 
 actionlst: action
@@ -101,6 +137,70 @@ action: TOK_CHECK STRING
                 }
           ;
 
+setexpr: STRING '=' STRING
+             {
+                         bld.varSet( $1, $3 );
+                 }
+           | STRING TOK_ADDSET STRING
+             {
+                         bld.varAddSet( $1, $3 );
+                 }
+           ;
+
+rule: TOK_RULE STRING
+          {
+                  bld.add( new Rule( $2 ) );
+          }
+          rulesublst TOK_PERFORM rulecompletion
+        ;
+
+rulesublst: rulesub
+                  | rulesublst rulesub
+                  ;
+
+rulesub: TOK_MATCHES rulematches
+           | TOK_PRODUCES STRING
+             {
+                         bld.lastRule()->setProduces( $2 );
+                 }
+           ;
+
+rulematches: TOK_ALL REGEXP
+                     {
+                                 try
+                                 {
+                                         bld.lastRule()->setMatches( Rule::matchAll, $2 );
+                                 }
+                                 catch( BuildException &e )
+                                 {
+                                         std::string s("RegExp compile error: ");
+                                         s += e.what();
+                                         yyerror( &yyloc, bld, s.c_str() );
+                                         return 1;
+                                 }
+                         }
+                   | TOK_ONE REGEXP
+                     {
+                                 try
+                                 {
+                                         bld.lastRule()->setMatches( Rule::matchOne, $2 );
+                                 }
+                                 catch( BuildException &e )
+                                 {
+                                         std::string s("RegExp compile error: ");
+                                         s += e.what();
+                                         yyerror( &yyloc, bld, s.c_str() );
+                                         return 1;
+                                 }
+                         }
+                   ;
+
+rulecompletion: TOK_COMMAND STRING
+                            {
+                                        bld.lastRule()->setPerforms( Rule::perfCommand, $2 );
+                                }
+                          ;
+
 %%
 
 void yyerror( YYLTYPE *locp, Builder &bld, char const *msg )