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, 5 insertions, 0 deletions

diff --git a/src/parser.h b/src/parser.h
index 5b5d4a8..a925188 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -34,6 +34,9 @@ namespace Bu
                  */
                 void popLexer();
 
+                Lexer::Token *popToken();
+                void pushToken( Lexer::Token *pTok );
+
                 /**
                  * Execute a parse.
                  */
@@ -88,11 +91,13 @@ namespace Bu
                 int addNonTerminal( const Bu::FString &sName );
                 void setNonTerminal( const Bu::FString &sName, NonTerminal &nt );
                 int getNonTerminalId( const Bu::FString &sName );
+                bool hasNonTerminal( const Bu::FString &sName );
 
                 int addReduction( const Bu::FString &sName, const Reduction &r );
                 int addReduction( const Bu::FString &sName );
                 void setReduction( const Bu::FString &sName, const Reduction &r );
                 int getReductionId( const Bu::FString &sName );
+                bool hasReduction( const Bu::FString &sName );
 
         private:
                 bool selectProduction( int iNt, Lexer::Token *ptCur );