Ok, libbu++ compiles again, the basic parser system is getting there, I think,

it's still a little tricky becasue you have to do the non-terminal prime
seperation yourself (I forget what it's really called), but it's going quite
well.  After a few tweaks to the core of it, we should be able to do some
math :)

1 files changed, 79 insertions, 0 deletions

diff --git a/src/tools/parser.cpp b/src/tools/parser.cpp
index a70dfa4..e4fc95f 100644
--- a/src/tools/parser.cpp
+++ b/src/tools/parser.cpp
@@ -149,12 +149,91 @@ private:
         QueueBuf qbIn;
 };
 
+void redAdd( Bu::Parser &p )
+{
+}
+
+void redPrint( Bu::Parser &p )
+{
+}
+
 int main( int argc, char *argv[] )
 {
         File fIn( argv[1], File::Read );
 
         Parser p;
 
+        {
+                Parser::NonTerminal nt;
+                int iSelf = p.addNonTerminal("expr");
+                nt.addProduction(
+                        Parser::Production(
+                                Parser::State(
+                                        Parser::State::typeTerminal,
+                                        tokPlus
+                                        )
+                                ).append(
+                                Parser::State(
+                                        Parser::State::typeNonTerminal,
+                                        iSelf
+                                        )
+                                ).append(
+                                Parser::State(
+                                        Parser::State::typeReduction,
+                                        p.addReduction("add")
+                                        )
+                                )
+                        );
+                nt.addProduction(
+                        Parser::Production()
+                        );
+                p.addNonTerminal( "expr", nt );
+        }
+        {
+                Parser::NonTerminal nt;
+                nt.addProduction(
+                        Parser::Production(
+                                Parser::State(
+                                        Parser::State::typeTerminalPush,
+                                        tokNumber
+                                        )
+                                ).append(
+                                Parser::State(
+                                        Parser::State::typeNonTerminal,
+                                        p.getNonTerminalId("expr")
+                                        )
+                                )
+                        );
+                p.addNonTerminal( "expr'", nt );
+        }
+        {
+                Parser::NonTerminal nt;
+                nt.addProduction(
+                        Parser::Production(
+                                Parser::State(
+                                        Parser::State::typeNonTerminal,
+                                        p.getNonTerminalId("expr'")
+                                        )
+                                ).append(
+                                Parser::State(
+                                        Parser::State::typeTerminal,
+                                        tokCompute
+                                        )
+                                ).append(
+                                Parser::State(
+                                        Parser::State::typeReduction,
+                                        p.addReduction("print")
+                                        )
+                                )
+                        );
+                p.addNonTerminal("input", nt );
+        }
+
+        p.setRootNonTerminal("input");
+
+        p.setReduction("add", Bu::slot( &redAdd ) );
+        p.setReduction("print", Bu::slot( &redPrint ) );
+
         p.pushLexer( new MathLexer( fIn ) );
 
         p.parse();