X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibspiderscript.so_src%2Flex.c;h=2d16bcfb9770abb829809fe51857281f21ab47f5;hb=2f9415b7b804073b0365781ad4f05a7306b6c890;hp=610c2f2ba063b958313dcaed7b5e435f484a5911;hpb=0f81e4f273cdf1032e9bca55b4185ca9113596cc;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libspiderscript.so_src/lex.c b/Usermode/Libraries/libspiderscript.so_src/lex.c
index 610c2f2b..2d16bcfb 100644
--- a/Usermode/Libraries/libspiderscript.so_src/lex.c
+++ b/Usermode/Libraries/libspiderscript.so_src/lex.c
@@ -7,10 +7,6 @@
 #include <stdio.h>
 #include <string.h>
 
-// Make the scope character ('.') be a symbol, otherwise it's just
-// a ident character
-#define USE_SCOPE_CHAR	0
-
 #define DEBUG	0
 
 #define ARRAY_SIZE(x)	((sizeof(x))/(sizeof((x)[0])))
@@ -29,6 +25,8 @@ const struct {
 	{TOK_RWD_FUNCTION, "function"},
 	
 	{TOK_RWD_RETURN, "return"},
+	{TOK_RWD_BREAK, "break"},
+	{TOK_RWD_CONTINUE, "continue"},
 	{TOK_RWD_NEW, "new"},
 	
 	{TOK_RWD_IF, "if"},
@@ -37,6 +35,7 @@ const struct {
 	{TOK_RWD_WHILE, "while"},
 	{TOK_RWD_FOR, "for"},
 	
+	{TOK_RWD_NULL, "null"},
 	{TOK_RWD_VOID, "void"},
 	{TOK_RWD_OBJECT, "Object"},
 	{TOK_RWD_OPAQUE, "Opaque"},
@@ -378,7 +377,7 @@ int GetToken(tParser *File)
 			break;
 		}
 		// Syntax Error
-		ret = TOK_INVAL;
+		File->Token = TOK_INVAL;
 		
 		fprintf(stderr, "Syntax Error: Unknown symbol '%c'\n", *File->CurPos);
 		longjmp(File->JmpTarget, 1);