Working on the parser, some issues.

1 files changed, 35 insertions, 2 deletions

diff --git a/src/parser.h b/src/parser.h
index e163212..d50951b 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -13,6 +13,35 @@ namespace Bu
 

 class Lexer;

 

+/**

+ *

+ * expr: literal

+ *     | variable

+ *     | expr '+' expr

+ *     | expr '-' expr

+ *     | expr '*' expr

+ *     | expr '/' expr

+ *     | '(' expr ')'

+ *     | '-' expr

+ *     | variable '=' expr

+ *     ;

+ *

+ * -----

+ * 

+ * expr': literal

+ *      | variable

+ *      | '(' expr ')'

+ *      | '-' expr'

+ *      ;

+ *

+ * expr: expr' '+' expr

+ *     | expr' '-' expr

+ *     | expr' '*' expr

+ *     | expr' '/' expr

+ *     | expr'

+ *     | variable '=' expr

+ *     ;

+ */

 class Parser

 {

 public:

@@ -24,6 +53,10 @@ public:
     void setVariable( const Bu::String &sName, const Number &rValue );

 

 private:

+    void expr();

+    void exprP();

+

+private:

     void unwind();

     int reqTokens( Token::Type eType );

     int getPriority( Token::Type eType );

@@ -34,8 +67,8 @@ private:
     Bu::Stream &rOut;

     typedef Bu::List<Token> TokenStack;

     typedef Bu::Hash<Bu::String, Number> VarHash;

-    TokenStack tsTerminal;

-    TokenStack tsNonTerminal;

+    TokenStack tsStack;

+//    TokenStack tsNonTerminal;

     Number nZero;

     VarHash hVars;

 };