I think I've narrowed down how commands will work

It's kinda' cool for the most part, there will have to be some ways of
referencing them later.  Basically, there are global commands and
situation commands.  With any luck, it'll just work.

2 files changed, 12 insertions, 1 deletions

diff --git a/src/parser.l b/src/parser.l
index dff6507..59a0358 100644
--- a/src/parser.l
+++ b/src/parser.l
@@ -11,7 +11,7 @@
 %x dqstr tdqstr tsqstr
 %%
 
-[-{}<>=+/*,();]                                 { return yytext[0]; }
+[-{}<>=+/*,();:]                                { return yytext[0]; }
 
 game                                                    { return tokGame; }
 function                                                { return tokFunction; }
@@ -25,6 +25,7 @@ then							{ return tokThen; }
 else                                                    { return tokElse; }
 command                                                 { return tokCommand; }
 goto                                                    { return tokGoto; }
+not                                                             { return tokNot; }
 
 true                                                    { yylval.bValue = true; return tokBool; }
 false                                                   { yylval.bValue = false; return tokBool; }
diff --git a/src/parser.y b/src/parser.y
index 9fb2be9..7242df0 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -24,6 +24,7 @@ void yyerror( const char *error ) { printf("%s\n", error ); }
 %token tokIf
 %token tokThen
 %token tokElse
+%token tokNot
 %token tokCommand
 %token <sValue> tokSituationName
 %token <sValue> tokIdent
@@ -54,6 +55,7 @@ gameExprList:
                         ;
 
 cmpltGameExpr: gameExpr ';'
+                         | commandDecl
                          ;
 
 gameExpr: tokIdent '=' expr
@@ -103,6 +105,14 @@ listValues: expr
 dictValues: expr ':' expr
                   | dictValues ',' expr ':' expr
                   ;
+
+commandDecl: tokCommand ':' tokString commandParamList '{' '}'
+                   ;
+
+commandParamList:
+                                | commandParamList tokString
+                                | commandParamList tokIdent
+                                ;
 %%
 
 int main()