X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=external%2Fsquirrel%2Fsquirrel%2Fsqlexer.cpp;h=03268258df718681454405d84e02b66751dd1d7f;hb=39f8592e1eb19a3ce9386cb2315cd806dade2032;hp=547835b6cf72ae1b7d93690e2288e099d064350f;hpb=637178962a6fc8ed1f04eaccaea90af2de66ab5f;p=supertux.git

diff --git a/external/squirrel/squirrel/sqlexer.cpp b/external/squirrel/squirrel/sqlexer.cpp
old mode 100644
new mode 100755
index 547835b6c..03268258d
--- a/external/squirrel/squirrel/sqlexer.cpp
+++ b/external/squirrel/squirrel/sqlexer.cpp
@@ -44,7 +44,7 @@ void SQLexer::Init(SQSharedState *ss, SQLEXREADFUNC rg, SQUserPointer up,Compile
 	ADD_KEYWORD(foreach, TK_FOREACH);
 	ADD_KEYWORD(in, TK_IN);
 	ADD_KEYWORD(typeof, TK_TYPEOF);
-	ADD_KEYWORD(base, TK_BASE);
+	ADD_KEYWORD(delegate, TK_DELEGATE);
 	ADD_KEYWORD(delete, TK_DELETE);
 	ADD_KEYWORD(try, TK_TRY);
 	ADD_KEYWORD(catch, TK_CATCH);
@@ -56,10 +56,13 @@ void SQLexer::Init(SQSharedState *ss, SQLEXREADFUNC rg, SQUserPointer up,Compile
 	ADD_KEYWORD(case, TK_CASE);
 	ADD_KEYWORD(default, TK_DEFAULT);
 	ADD_KEYWORD(this, TK_THIS);
+	ADD_KEYWORD(parent,TK_PARENT);
 	ADD_KEYWORD(class,TK_CLASS);
 	ADD_KEYWORD(extends,TK_EXTENDS);
 	ADD_KEYWORD(constructor,TK_CONSTRUCTOR);
 	ADD_KEYWORD(instanceof,TK_INSTANCEOF);
+	ADD_KEYWORD(vargc,TK_VARGC);
+	ADD_KEYWORD(vargv,TK_VARGV);
 	ADD_KEYWORD(true,TK_TRUE);
 	ADD_KEYWORD(false,TK_FALSE);
 	ADD_KEYWORD(static,TK_STATIC);
@@ -71,7 +74,6 @@ void SQLexer::Init(SQSharedState *ss, SQLEXREADFUNC rg, SQUserPointer up,Compile
 	_lasttokenline = _currentline = 1;
 	_currentcolumn = 0;
 	_prevtoken = -1;
-	_reached_eof = SQFalse;
 	Next();
 }
 
@@ -89,7 +91,6 @@ void SQLexer::Next()
 		return;
 	}
 	_currdata = SQUIRREL_EOB;
-	_reached_eof = SQTrue;
 }
 
 const SQChar *SQLexer::Tok2Str(SQInteger tok)
@@ -116,10 +117,6 @@ void SQLexer::LexBlockComment()
 		}
 	}
 }
-void SQLexer::LexLineComment()
-{
-	do { NEXT(); } while (CUR_CHAR != _SC('\n') && (!IS_EOB()));
-}
 
 SQInteger SQLexer::Lex()
 {
@@ -134,7 +131,6 @@ SQInteger SQLexer::Lex()
 			NEXT();
 			_currentcolumn=1;
 			continue;
-		case _SC('#'): LexLineComment(); continue;
 		case _SC('/'):
 			NEXT();
 			switch(CUR_CHAR){
@@ -143,7 +139,7 @@ SQInteger SQLexer::Lex()
 				LexBlockComment();
 				continue;	
 			case _SC('/'):
-				LexLineComment();
+				do { NEXT(); } while (CUR_CHAR != _SC('\n') && (!IS_EOB()));
 				continue;
 			case _SC('='):
 				NEXT();
@@ -162,20 +158,12 @@ SQInteger SQLexer::Lex()
 			else { NEXT(); RETURN_TOKEN(TK_EQ); }
 		case _SC('<'):
 			NEXT();
-			switch(CUR_CHAR) {
-			case _SC('='):
-				NEXT(); 
-				if(CUR_CHAR == _SC('>')) {
-					NEXT();
-					RETURN_TOKEN(TK_3WAYSCMP); 
-				}
-				RETURN_TOKEN(TK_LE) 
-				break;
-			case _SC('-'): NEXT(); RETURN_TOKEN(TK_NEWSLOT); break;
-			case _SC('<'): NEXT(); RETURN_TOKEN(TK_SHIFTL); break;
-			case _SC('/'): NEXT(); RETURN_TOKEN(TK_ATTR_OPEN); break;
-			}
-			RETURN_TOKEN('<');
+			if ( CUR_CHAR == _SC('=') ) { NEXT(); RETURN_TOKEN(TK_LE) }
+			else if ( CUR_CHAR == _SC('-') ) { NEXT(); RETURN_TOKEN(TK_NEWSLOT); }
+			else if ( CUR_CHAR == _SC('<') ) { NEXT(); RETURN_TOKEN(TK_SHIFTL); }
+			else if ( CUR_CHAR == _SC('/') ) { NEXT(); RETURN_TOKEN(TK_ATTR_OPEN); }
+			//else if ( CUR_CHAR == _SC('[') ) { NEXT(); ReadMultilineString(); RETURN_TOKEN(TK_STRING_LITERAL); }
+			else { RETURN_TOKEN('<') }
 		case _SC('>'):
 			NEXT();
 			if (CUR_CHAR == _SC('=')){ NEXT(); RETURN_TOKEN(TK_GE);}
@@ -194,10 +182,9 @@ SQInteger SQLexer::Lex()
 			else { NEXT(); RETURN_TOKEN(TK_NE); }
 		case _SC('@'): {
 			SQInteger stype;
-			NEXT();
-			if(CUR_CHAR != _SC('"')) {
-				RETURN_TOKEN('@');
-			}
+			NEXT(); 
+			if(CUR_CHAR != _SC('"'))
+				Error(_SC("string expected"));
 			if((stype=ReadString('"',true))!=-1) {
 				RETURN_TOKEN(stype);
 			}