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, 9 insertions, 3 deletions

diff --git a/src/lexer.cpp b/src/lexer.cpp
index 87d603a..9c8b36a 100644
--- a/src/lexer.cpp
+++ b/src/lexer.cpp
@@ -96,7 +96,13 @@ Token Lexer::nextTokenNormal()
                     {

                         sTmp->append( sBuf[iBufPos] );

                     }

-                    return Token( Token::tCommand, sTmp );

+                    if( *sTmp == "quit" || *sTmp == "exit" )

+                        return Token( Token::tCmdExit );

+                    else if( *sTmp == "scale" )

+                        return Token( Token::tCmdScale );

+                    else if( *sTmp == "radix" )

+                        return Token( Token::tCmdRadix );

+                    return Token( Token::tCmdExtended, sTmp );

                 }

                 break;

 

@@ -196,13 +202,13 @@ Token Lexer::nextTokenCommand()
         if( iBufPos >= sBuf.getSize() )

         {

             iBufPos = -1;

-            return Token( Token::tEndOfLine );

+            return Token( Token::tCmdEndParams );

         }

 

         if( iBufPos < 0 )

         {

             if( rIn.isEos() )

-                return Token( Token::tEndOfInput );

+                return Token( Token::tCmdEndParams );

 

             sBuf = rIn.readLine();

             if( sBuf.getSize() == 0 )