X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibspiderscript.so_src%2Ftokens.h;h=5a529f733c33fd6547ccaac8e2c774c3c385dc8b;hb=ec4d050568da0f3f18a20969bd118b5c67f03ee2;hp=6068295cbc24ed45ea2fca8ed37e500e1bf6ebc4;hpb=8a8a744341df513d00d2e60adf5e88636856e65b;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libspiderscript.so_src/tokens.h b/Usermode/Libraries/libspiderscript.so_src/tokens.h
index 6068295c..5a529f73 100644
--- a/Usermode/Libraries/libspiderscript.so_src/tokens.h
+++ b/Usermode/Libraries/libspiderscript.so_src/tokens.h
@@ -38,23 +38,28 @@ enum eTokens
 	TOK_INVAL,
 	TOK_EOF,
 	
+	// Primitives
 	TOK_STR,
 	TOK_INTEGER,
 	TOK_VARIABLE,
 	TOK_IDENT,
 	
+	// Reserved Words
+	// - Definitions
 	TOK_RWD_FUNCTION,
 	TOK_RWD_NAMESPACE,
-	
+	// - Control Flow
 	TOK_RWD_NEW,
 	TOK_RWD_RETURN,
-	
+	TOK_RWD_BREAK,
+	TOK_RWD_CONTINUE,
+	// - Blocks
 	TOK_RWD_IF,
 	TOK_RWD_ELSE,
 	TOK_RWD_DO,
 	TOK_RWD_WHILE,
 	TOK_RWD_FOR,
-	
+	// - Types
 	TOK_RWD_VOID,
 	TOK_RWD_OBJECT,
 	TOK_RWD_OPAQUE,
@@ -62,28 +67,36 @@ enum eTokens
 	TOK_RWD_INTEGER,
 	TOK_RWD_REAL,
 	
+	// 
 	TOK_ASSIGN,
 	TOK_SEMICOLON,
 	TOK_COMMA,
 	TOK_SCOPE,
 	TOK_ELEMENT,
 	
+	// Comparisons
 	TOK_EQUALS,
 	TOK_LT,	TOK_LTE,
 	TOK_GT,	TOK_GTE,
 	
+	// Operations
 	TOK_DIV,	TOK_MUL,
 	TOK_PLUS,	TOK_MINUS,
 	TOK_SHL,	TOK_SHR,
 	TOK_LOGICAND,	TOK_LOGICOR,	TOK_LOGICXOR,
 	TOK_AND,	TOK_OR,	TOK_XOR,
 	
-	TOK_PAREN_OPEN,
-	TOK_PAREN_CLOSE,
-	TOK_BRACE_OPEN,
-	TOK_BRACE_CLOSE,
-	TOK_SQUARE_OPEN,
-	TOK_SQUARE_CLOSE,
+	// Assignment Operations
+	TOK_INCREMENT,  	TOK_DECREMENT,
+	TOK_ASSIGN_DIV, 	TOK_ASSIGN_MUL,
+	TOK_ASSIGN_PLUS,	TOK_ASSIGN_MINUS,
+	TOK_ASSIGN_SHL, 	TOK_ASSIGN_SHR,
+	TOK_ASSIGN_LOGICAND, 	TOK_ASSIGN_LOGICOR,	TOK_ASSIGN_LOGXICOR,
+	TOK_ASSIGN_AND, 	TOK_ASSIGN_OR,	TOK_ASSIGN_XOR,
+	
+	TOK_PAREN_OPEN, 	TOK_PAREN_CLOSE,
+	TOK_BRACE_OPEN, 	TOK_BRACE_CLOSE,
+	TOK_SQUARE_OPEN,	TOK_SQUARE_CLOSE,
 	
 	TOK_LAST
 };
@@ -123,6 +136,8 @@ const char * const csaTOKEN_NAMES[] = {
 	
 	"TOK_RWD_NEW",
 	"TOK_RWD_RETURN",
+	"TOK_RWD_BREAK",
+	"TOK_RWD_CONTINUE",
 	
 	"TOK_RWD_IF",
 	"TOK_RWD_ELSE",
@@ -153,12 +168,16 @@ const char * const csaTOKEN_NAMES[] = {
 	"TOK_LOGICAND",	"TOK_LOGICOR",	"TOK_LOGICXOR",
 	"TOK_AND",	"TOK_OR",	"TOK_XOR",
 	
-	"TOK_PAREN_OPEN",
-	"TOK_PAREN_CLOSE",
-	"TOK_BRACE_OPEN",
-	"TOK_BRACE_CLOSE",
-	"TOK_SQUARE_OPEN",
-	"TOK_SQUARE_CLOSE",
+	"TOK_INCREMENT",  	"TOK_DECREMENT",
+	"TOK_ASSIGN_DIV",	"TOK_ASSIGN_MUL",
+	"TOK_ASSIGN_PLUS",	"TOK_ASSIGN_MINUS",
+	"TOK_ASSIGN_SHL",	"TOK_ASSIGN_SHR",
+	"TOK_ASSIGN_LOGICAND",	"TOK_ASSIGN_LOGICOR",	"TOK_ASSIGN_LOGICXOR",
+	"TOK_ASSIGN_AND",	"TOK_ASSIGN_OR",	"TOK_ASSIGN_XOR",
+	
+	"TOK_PAREN_OPEN",	"TOK_PAREN_CLOSE",
+	"TOK_BRACE_OPEN",	"TOK_BRACE_CLOSE",
+	"TOK_SQUARE_OPEN",	"TOK_SQUARE_CLOSE",
 	
 	"TOK_LAST"
 };