update grammar a bit

diff --git a/examples/easytest.c b/examples/easytest.c
index fa78c175c27f70b4b5d9bd4eb11b3b7940f74af8..6e650ff5835ed210bd20d026de835b56fde64f8f 100644 (file)
--- a/examples/easytest.c
+++ b/examples/easytest.c
@@ -1,12 +1,12 @@
 int main()
 {
 int main()
 {

-  int iters = 0;
-  printint(1);
-  printint(2);
-  printint(3);
-  printint(iters);
-  printint(iters+1);
-  while (iters < 5)
-    iters = iters + 1;
-  return iters;
-}
\ No newline at end of file
+       int iters = 0;
+       printint(1);
+       printint(2);
+       printint(3);
+       printint(iters);
+       printint(iters+1);
+       while (iters < 5)
+               iters = iters + 1;
+       return iters;
+}

diff --git a/examples/fib.c b/examples/fib.c
index 70479da74a8909e89c78fa8076a4b4304c34ebbb..da6daea6e9823456fcc8c354b98b6a7b657c1bbf 100644 (file)
--- a/examples/fib.c
+++ b/examples/fib.c
@@ -15,4 +15,4 @@ int main()
                iters = iters + 1;
        }
        return iters;
                iters = iters + 1;
        }
        return iters;

-}
\ No newline at end of file
+}

diff --git a/grammar.txt b/grammar.txt
index f8e78d259527a98e72ca7bcaf71f11fc9355ada3..ecf0dd1796d983b64f44e1dd63ac912433725b94 100644 (file)
--- a/grammar.txt
+++ b/grammar.txt
@@ -2,7 +2,7 @@ GLOBAL          := ( FUNCTION | VARIABLE )*
 FUNCTION       := TYPE MODIFIERS _IDENTIFIER ARGSLIST ( ';' | STMTLIST )
 TYPE           := 'int'
 MODIFIERS      := '*'*
 FUNCTION       := TYPE MODIFIERS _IDENTIFIER ARGSLIST ( ';' | STMTLIST )
 TYPE           := 'int'
 MODIFIERS      := '*'*

-ARGSLIST       := '(' [ TYPE _IDENTIFIER ( ',' TYPE _IDENTIFIER)]* ] ')'
+ARGSLIST       := '(' [ TYPE MODIFIERS _IDENTIFIER ( ',' TYPE MODIFIERS _IDENTIFIER )* ] ')'

 STMTLIST       := '{' ( VARIABLE | STATEMENT | STMTLIST )* '}'
 VARIABLE       := TYPE MODIFIERS _IDENTIFIER [ = EXPRESSION ] ';'
 STATEMENT      := ( ';' | EXPRESSION ';' | WHILE | IF | RETURN )
 STMTLIST       := '{' ( VARIABLE | STATEMENT | STMTLIST )* '}'
 VARIABLE       := TYPE MODIFIERS _IDENTIFIER [ = EXPRESSION ] ';'
 STATEMENT      := ( ';' | EXPRESSION ';' | WHILE | IF | RETURN )


@@ -15,4 +15,5 @@ P13EXPR               := P6EXPR ( '=' P6EXPR )*
 P6EXPR         := P5EXPR ( '==' P5EXPR )*
 P5EXPR         := P3EXPR ( ( '<' | '>' ) P3EXPR )*
 P3EXPR         := P2EXPR ( ( '+' | '-' ) P2EXPR )*
 P6EXPR         := P5EXPR ( '==' P5EXPR )*
 P5EXPR         := P3EXPR ( ( '<' | '>' ) P3EXPR )*
 P3EXPR         := P2EXPR ( ( '+' | '-' ) P2EXPR )*

-P2EXPR         := _NUMBER ( ( '*' | '/' ) _NUMBER )*
\ No newline at end of file
+P2EXPR         := SUBEXPR ( ( '*' | '/' ) SUBEXPR )*
+SUBEXPR                := ( '(' EXPRESSION ')' | _NUMBER | _IDENTIFIER )

diff --git a/lib/parser/default.lua b/lib/parser/default.lua
index 6652ac0957218aaf9c2741df798f33f90f52d568..e88747e6d9fcdd02f9990adee8453703deba3cb4 120000 (symlink)
--- a/lib/parser/default.lua
+++ b/lib/parser/default.lua
@@ -1 +1 @@
-parser.lua
\ No newline at end of file
+recdesc.lua
\ No newline at end of file

diff --git a/lib/parser/parser.lua b/lib/parser/oldstyle.lua
similarity index 100%
rename from lib/parser/parser.lua
rename to lib/parser/oldstyle.lua