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, 1 deletions

diff --git a/src/token.h b/src/token.h
index 5bede41..4d738ec 100644
--- a/src/token.h
+++ b/src/token.h
@@ -15,7 +15,7 @@ public:
     {

         tNumber         = 0x1001,

         tVariable       = 0x2002,

-        tCommand        = 0x2003,

+        //tCommand        = 0x2003,

         tPlus           = 0x4004,

         tMinus          = 0x4005,

         tDivide         = 0x4006,

@@ -34,12 +34,20 @@ public:
         tUninitialized  = 0x0110,

         tComputedValue  = 0x0111,

 

+        tCmdExit        = 0x0201,

+        tCmdScale       = 0x0202,

+        tCmdRadix       = 0x0203,

+        tCmdExtended    = 0x02f0,

+        tCmdParam       = 0x02f1,

+        tCmdEndParams   = 0x02f2,

+

 

         mMetaNumber     = 0x1000,

         mMetaString     = 0x2000,

         mMetaOperator   = 0x4000,

         mMetaAltOp      = 0x8000,

         mMetaMeta       = 0x0100,

+        mMetaCmd        = 0x0200

     };

 

     Token();