1 files changed, 28 insertions, 20 deletions
diff --git a/src/token.h b/src/token.h
index 072a96b..4ad1136 100644
--- a/src/token.h
+++ b/src/token.h
@@ -13,26 +13,34 @@ class Token
 public:
    enum Type
    {
-        tNumber,
+        tNumber         = 0x1001,
-        tVariable,
+        tVariable       = 0x2002,
-        tCommand,
+        tCommand        = 0x2003,
-        tPlus,
+        tPlus           = 0x4004,
-        tMinus,
+        tMinus          = 0x4005,
-        tDivide,
+        tDivide         = 0x4006,
-        tMultiply,
+        tMultiply       = 0x4007,
-        tModulus,
+        tModulus        = 0x4008,
-        tOpenParen,
+        tOpenParen      = 0x8009,
-        tCloseParen,
+        tCloseParen     = 0x800a,
-        tEquals,
+        tEquals         = 0x400b,
-        tString,
+        tString         = 0x200c,
-        tNegate,
+        tNegate         = 0x800d,
-        tEndOfLine,
+        tEndOfLine      = 0x010e,
-        tEndOfInput,
+        tEndOfInput     = 0x010f,
-        tUninitialized,
+        tUninitialized  = 0x0110,
-        tComputedValue
+        tComputedValue  = 0x0111,
+        mMetaNumber     = 0x1000,
+        mMetaString     = 0x2000,
+        mMetaOperator   = 0x4000,
+        mMetaAltOp      = 0x8000,
+        mMetaMeta       = 0x0100,
    };
    Token();

diff --git a/src/token.h b/src/token.h index 072a96b..4ad1136 100644 --- a/src/token.h +++ b/src/token.h
@@ -13,26 +13,34 @@ class Token
13	public:	13	public:
14	enum Type	14	enum Type
15	{	15	{
16	tNumber,	16	tNumber = 0x1001,
17	tVariable,	17	tVariable = 0x2002,
18	tCommand,	18	tCommand = 0x2003,
19	tPlus,	19	tPlus = 0x4004,
20	tMinus,	20	tMinus = 0x4005,
21	tDivide,	21	tDivide = 0x4006,
22	tMultiply,	22	tMultiply = 0x4007,
23	tModulus,	23	tModulus = 0x4008,
24	tOpenParen,	24	tOpenParen = 0x8009,
25	tCloseParen,	25	tCloseParen = 0x800a,
26	tEquals,	26	tEquals = 0x400b,
27	tString,	27	tString = 0x200c,
28		28
29	tNegate,	29	tNegate = 0x800d,
30	tEndOfLine,	30	tEndOfLine = 0x010e,
31		31
32	tEndOfInput,	32	tEndOfInput = 0x010f,
33		33
34	tUninitialized,	34	tUninitialized = 0x0110,
35	tComputedValue	35	tComputedValue = 0x0111,
		36
		37
		38	mMetaNumber = 0x1000,
		39	mMetaString = 0x2000,
		40	mMetaOperator = 0x4000,
		41	mMetaAltOp = 0x8000,
		42	mMetaMeta = 0x0100,
		43
36	};	44	};
37		45
38	Token();	46	Token();