Merged in the core branch. This is a major update that fixes many things, and

changes many others, including source files that were deleted and renamed.

Before doing this update, I reccomend a full clean, or even a fresh checkout.

Things to note, most outstanding about this update:
 - Bu::Socket was changed to Bu::TcpSocket and the default mode is blocking.
 - All templatized container classes are SharedCore now, which is good, but
   SharedCore is inherently non-reentrant safe.  However, all SharedCore classes
   have a "clone" function that return a non-shared copy of the object, safe for
   passing into a reentrant safe function accessing shared memory.

1 files changed, 29 insertions, 5 deletions

diff --git a/src/parser.cpp b/src/parser.cpp
index e4e8ae5..4ad4ff9 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -22,16 +22,25 @@ void Bu::Parser::popLexer()
         delete sLexer.peekPop();
 }
 
+Lexer::Token *Bu::Parser::popToken()
+{
+        return sToken.peekPop();
+}
+
+void Bu::Parser::pushToken( Lexer::Token *pTok )
+{
+        sToken.push( pTok );
+}
+
 void Bu::Parser::parse()
 {
         int iCurNt = iRootNonTerminal;
         Lexer::Token *ptCur = sLexer.peek()->nextToken();
-        sio << "Token: " << sLexer.peek()->tokenToString( *ptCur ) << sio.nl;
+        sio << "Token(a): " << sLexer.peek()->tokenToString( *ptCur ) << sio.nl;
         selectProduction( iCurNt, ptCur );
         
         while( !sState.isEmpty() )
         {
-                sio << "Currently: " << *sState.peek() << sio.nl;
                 switch( (*sState.peek()).eType )
                 {
                         case State::typeTerminal:
@@ -42,7 +51,7 @@ void Bu::Parser::parse()
                                         advanceState();
                                         delete ptCur;
                                         ptCur = sLexer.peek()->nextToken();
-                                        sio << "Token: " << sLexer.peek()->tokenToString( *ptCur ) << sio.nl;
+                                        sio << "Token(b): " << sLexer.peek()->tokenToString( *ptCur ) << sio.nl;
                                 }
                                 else
                                 {
@@ -59,7 +68,7 @@ void Bu::Parser::parse()
                                         sToken.push( ptCur );
 
                                         ptCur = sLexer.peek()->nextToken();
-                                        sio << "Token: " << sLexer.peek()->tokenToString( *ptCur ) << sio.nl;
+                                        sio << "Token(c): " << sLexer.peek()->tokenToString( *ptCur ) << sio.nl;
                                 }
                                 else
                                 {
@@ -72,7 +81,7 @@ void Bu::Parser::parse()
                                         << (*sState.peek()).iIndex << sio.nl;
                                 {
                                         int iNt = (*sState.peek()).iIndex;
-                                        advanceState();
+                                        sio << "Current state: " << *sState.peek() << sio.nl;
                                         if( !selectProduction( iNt, ptCur ) )
                                         {
                                                 throw Bu::ExceptionBase("Error parsing code.");
@@ -132,7 +141,11 @@ bool Bu::Parser::selectProduction( int iNt, Lexer::Token *ptCur )
                 }
         }
         if( nt.bCanSkip )
+        {
+                sio << "Nothing matches, skipping non-terminal." << sio.nl;
+                advanceState();
                 return true;
+        }
         sio << "-->(Found nothing)" << sio.nl;
         return false;
 }
@@ -148,6 +161,7 @@ void Bu::Parser::advanceState()
                 sio.decIndent();
                 sState.pop();
                 sio << "State advanced, End of production." << sio.nl;
+                advanceState();
                 return;
         }
         sio << "State advanced, now: " << *(sState.peek()) << sio.nl;
@@ -191,6 +205,11 @@ int Bu::Parser::getNonTerminalId( const Bu::FString &sName )
         return hNonTerminalName.get( sName );
 }
 
+bool Bu::Parser::hasNonTerminal( const Bu::FString &sName )
+{
+        return hNonTerminalName.has( sName );
+}
+
 int Bu::Parser::addReduction( const Bu::FString &sName, const Reduction &r )
 {
         int iId = aReduction.getSize();
@@ -217,6 +236,11 @@ int Bu::Parser::getReductionId( const Bu::FString &sName )
         return hReductionName.get( sName );
 }
 
+bool Bu::Parser::hasReduction( const Bu::FString &sName )
+{
+        return hReductionName.has( sName );
+}
+
 //
 // Bu::Parser::State
 //