X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibspiderscript.so_src%2Ftokens.h;h=6068295cbc24ed45ea2fca8ed37e500e1bf6ebc4;hb=c8e606164e7bb405295b2f14e6949d0812cfa342;hp=9ecb720fe7864e8492f654b64259d88532c6a9fb;hpb=1529dadb6c2170bf9899fbde46d06a3d9a392b52;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libspiderscript.so_src/tokens.h b/Usermode/Libraries/libspiderscript.so_src/tokens.h
index 9ecb720f..6068295c 100644
--- a/Usermode/Libraries/libspiderscript.so_src/tokens.h
+++ b/Usermode/Libraries/libspiderscript.so_src/tokens.h
@@ -45,10 +45,19 @@ enum eTokens
 	
 	TOK_RWD_FUNCTION,
 	TOK_RWD_NAMESPACE,
+	
+	TOK_RWD_NEW,
 	TOK_RWD_RETURN,
 	
+	TOK_RWD_IF,
+	TOK_RWD_ELSE,
+	TOK_RWD_DO,
+	TOK_RWD_WHILE,
+	TOK_RWD_FOR,
+	
 	TOK_RWD_VOID,
 	TOK_RWD_OBJECT,
+	TOK_RWD_OPAQUE,
 	TOK_RWD_STRING,
 	TOK_RWD_INTEGER,
 	TOK_RWD_REAL,
@@ -81,14 +90,16 @@ enum eTokens
 
 #define TOKEN_GROUP_TYPES	TOK_RWD_VOID:\
 	case TOK_RWD_OBJECT:\
+	case TOK_RWD_OPAQUE:\
 	case TOK_RWD_INTEGER:\
 	case TOK_RWD_STRING:\
 	case TOK_RWD_REAL
-#define TOKEN_GROUP_TYPES_STR	"TOK_RWD_VOID, TOK_RWD_OBJECT, TOK_RWD_INTEGER, TOK_RWD_STRING or TOK_RWD_REAL"
+#define TOKEN_GROUP_TYPES_STR	"TOK_RWD_VOID, TOK_RWD_OBJECT, TOK_RWD_OPAQUE, TOK_RWD_INTEGER, TOK_RWD_STRING or TOK_RWD_REAL"
 
 #define TOKEN_GET_DATATYPE(_type, _tok) do { switch(_tok) {\
 	case TOK_RWD_VOID:  _type = SS_DATATYPE_UNDEF;	break;\
 	case TOK_RWD_INTEGER:_type = SS_DATATYPE_INTEGER;	break;\
+	case TOK_RWD_OPAQUE: _type = SS_DATATYPE_OPAQUE;	break;\
 	case TOK_RWD_OBJECT: _type = SS_DATATYPE_OBJECT;	break;\
 	case TOK_RWD_REAL:   _type = SS_DATATYPE_REAL;	break;\
 	case TOK_RWD_STRING: _type = SS_DATATYPE_STRING;	break;\
@@ -109,10 +120,19 @@ const char * const csaTOKEN_NAMES[] = {
 	
 	"TOK_RWD_FUNCTION",
 	"TOK_RWD_NAMESPACE",
+	
+	"TOK_RWD_NEW",
 	"TOK_RWD_RETURN",
 	
+	"TOK_RWD_IF",
+	"TOK_RWD_ELSE",
+	"TOK_RWD_DO",
+	"TOK_RWD_WHILE",
+	"TOK_RWD_FOR",
+	
 	"TOK_RWD_VOID",
 	"TOK_RWD_OBJECT",
+	"TOK_RWD_OPAUQE",
 	"TOK_RWD_STRING",
 	"TOK_RWD_INTEGER",
 	"TOK_RWD_REAL",