Corrected negation and single value parse bugs.

Discovered arithmetic bug in the Number class, -4 + 5 is coming back as -1, not 1.  It's getting the sign wrong somehow.  I'll have to hunt that down.

1 files changed, 18 insertions, 6 deletions

diff --git a/src/parser.cpp b/src/parser.cpp
index 982c342..8e30d24 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -8,7 +8,7 @@
 #include <bu/sio.h>

 #include <stdlib.h>

 

-// #define DEBUG_MODE 1

+//#define DEBUG_MODE 1

 #ifdef DEBUG_MODE

 #define DBG( x ) { x; } (void)0

 #else

@@ -161,6 +161,7 @@ void Parser::exprP()
         return;

     }

 

+    DBG( Bu::sio << "exprP on " << lex[0] << Bu::sio.nl );

     switch( lex[0].eType )

     {

         case Token::tNumber:

@@ -188,7 +189,7 @@ void Parser::exprP()
         case Token::tMinus:

             lex.nextToken();

             exprP();

-            shift( Token( Token::tNegate ) );     

+            shift( Token( Token::tNegate ) );

             reduce();

             break;

     }

@@ -196,7 +197,7 @@ void Parser::exprP()
 

 void Parser::statement()

 {

-    if( lex[0].eType == Token::tCommand )

+    if( (lex[0].eType&Token::mMetaCmd) )

     {

         lex.setMode( Lexer::modeCommand );

         output( lex[0] );

@@ -309,7 +310,8 @@ case Token::tCommand:
 

 void Parser::shift( const Token &t )

 {

-    if( (t.eType&(Token::mMetaOperator)) || t.eType==Token::tCloseParen )

+    if( (t.eType&(Token::mMetaOperator|Token::mMetaAltOp)) ||

+         t.eType==Token::tCloseParen )

         tsTerminal.push( t );

     else

         tsNonTerminal.push( t );

@@ -317,9 +319,20 @@ void Parser::shift( const Token &t )
 

 void Parser::reduce()

 {

-    if( tsTerminal.isEmpty() || tsNonTerminal.peek().eType == Token::tOpenParen )

+    if( tsTerminal.isEmpty() )

+    {

+        DBG( Bu::sio << "reduce: terminal stack empty." << Bu::sio.nl );

+        if( !tsNonTerminal.isEmpty() )

+        {

+            DBG( Bu::sio << "      : non-terminal stack non-empty, pushing item." << Bu::sio.nl );

+            output( tsNonTerminal.peekPop() );

+        }

+        return;

+    }

+    if( tsNonTerminal.peek().eType == Token::tOpenParen )

         return;

     Token tOp = tsTerminal.peekPop();

+    DBG( Bu::sio << "recuding on " << tOp << Bu::sio.nl );

     switch( tOp.eType )

     {

         /*

@@ -416,7 +429,6 @@ int Parser::getPriority( Token::Type eType )
     {

         case Token::tNumber:

         case Token::tVariable:

-        case Token::tCommand:

             return 0;

 

         case Token::tPlus: