X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibspiderscript.so_src%2Ftokens.h;h=44176b0b392c681255c935c0b3639fb0f5337bec;hb=c967d91a4794ec9c0ec7dab438c033f4c0b49952;hp=33128cfb555f2a73a72370c99ef42548dcc7c1f1;hpb=9b714e5ea3767470ab5c35f14da67bcb97275021;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libspiderscript.so_src/tokens.h b/Usermode/Libraries/libspiderscript.so_src/tokens.h
index 33128cfb..44176b0b 100644
--- a/Usermode/Libraries/libspiderscript.so_src/tokens.h
+++ b/Usermode/Libraries/libspiderscript.so_src/tokens.h
@@ -5,26 +5,33 @@
 
 #include <setjmp.h>
 
+// Make the scope character ('.') be a symbol, otherwise it's just
+// a ident character
+#define USE_SCOPE_CHAR	1
+
 // === TYPES ===
 typedef struct
 {	
 	// Lexer State
-	char	*BufStart;
-	char	*CurPos;
+	const char	*BufStart;
+	const char	*CurPos;
+	
+	char	*Filename;
 	
 	 int	LastLine;
 	 int	LastToken, LastTokenLen;
-	char	*LastTokenStr;
+	const char	*LastTokenStr;
 	
 	 int	NextLine;
 	 int	NextToken, NextTokenLen;
-	char	*NextTokenStr;
+	const char	*NextTokenStr;
 	
 	 int	CurLine;
 	 int	Token, TokenLen;
-	char	*TokenStr;
+	const char	*TokenStr;
 	
 	jmp_buf	JmpTarget;
+	 int	ErrorHit;
 }	tParser;
 
 // === FUNCTIONS ===
@@ -60,6 +67,8 @@ enum eTokens
 	TOK_RWD_DO,
 	TOK_RWD_WHILE,
 	TOK_RWD_FOR,
+	// - Value
+	TOK_RWD_NULL,
 	// - Types
 	TOK_RWD_VOID,
 	TOK_RWD_OBJECT,
@@ -148,6 +157,7 @@ const char * const csaTOKEN_NAMES[] = {
 	"TOK_RWD_WHILE",
 	"TOK_RWD_FOR",
 	
+	"TOK_RWD_NULL",
 	"TOK_RWD_VOID",
 	"TOK_RWD_OBJECT",
 	"TOK_RWD_OPAUQE",