1 files changed, 11 insertions, 11 deletions

diff --git a/src/parser.cpp b/src/parser.cpp
index 804e595..57144c2 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -31,9 +31,11 @@ void Parser::parse()
                     Bu::println( rOut, "%1").arg( deref( tsTerminal.peek() ) );

                 }

                 tsTerminal.clear();

+                lex.setMode( Lexer::modeNormal );

                 break;

 

             case Token::tCommand:

+                lex.setMode( Lexer::modeCommand );

                 if( *t.sVal == "exit" || *t.sVal == "quit" )

                     return;

                 else if( *t.sVal == "scale" )

@@ -44,9 +46,9 @@ void Parser::parse()
                         Bu::println( rOut, "Current scale: %1").

                             arg( lex.getScale() );

                     }

-                    else if( t2.eType == Token::tNumber )

+                    else if( t2.eType == Token::tString )

                     {

-                        int32_t i = t2.nVal->toInt32();

+                        int32_t i = strtol( t2.sVal->getStr(), 0, 10 );

                         lex.setScale( i );

                         if( i < 0 )

                         {

@@ -77,9 +79,9 @@ void Parser::parse()
                         Bu::println( rOut, "Current radix: %1").

                             arg( lex.getRadix() );

                     }

-                    else if( t2.eType == Token::tNumber )

+                    else if( t2.eType == Token::tString )

                     {

-                        int32_t i = t2.nVal->toInt32();

+                        int32_t i = strtol( t2.sVal->getStr(), 0, 10 );

                         if( i < 2 || i > 36 )

                             Bu::println( rOut, "ERROR: Radix must be between "

                                     "2 and 36 inclusive");

@@ -127,13 +129,9 @@ void Parser::parse()
                         "When using a radix greater than 10 all extended digits are lowercase letters\n"

                         "starting with 'a'.  Upper case is not currently supported.\n"

                         "\n"

-                        "All numbers are interpreted in the current radix, this means that you need to\n"

-                        "set the radix using the current radix, even though the current value is aways\n"

-                        "displayed in decimal.  That is, to go to base 8 and back to base 10 you would:\n"

-                        "  \\radix 8\n"

-                        "  Radix changed to: 8\n"

-                        "  \\radix 12\n"

-                        "  Radix changed to: 10\n"

+                        "All numeric command parameters (i.e. \\scale, \\radix) are in base 10 no\n"

+                        "matter what radix is currently set.  These are also displayed in base 10\n"

+                        "at all times.\n"

                         "\n"

                         "Changing the radix always clears all variables.\n"

                         );

@@ -144,6 +142,7 @@ void Parser::parse()
                     Bu::println( rOut, "ERROR: Unknown command '%1'").

                         arg( *t.sVal );

                 }

+                lex.setMode( Lexer::modeNormal );

                 break;

 

             case Token::tNumber:

@@ -292,6 +291,7 @@ void Parser::unwind()
             case Token::tNumber:

             case Token::tVariable:

             case Token::tCommand:

+            case Token::tString:

             case Token::tEndOfLine:

             case Token::tEndOfInput:

                 // These should never show up at all