Mercurial > botc / file diff

--- a/src/lexerScanner.cpp	Sun Jul 20 17:25:36 2014 +0300
+++ b/src/lexerScanner.cpp	Mon Jul 21 17:14:42 2014 +0300
@@ -48,8 +48,8 @@
 	">>",
 	">=",
 	"<=",
-	"and",
-	"or",
+	"&&",
+	"||",
 	"++",
 	"--",
 	"'",
@@ -111,7 +111,7 @@
 	"return",
 };
 
-static_assert (countof (gTokenStrings) == (int)gLastNamedToken + 1,
+static_assert (countof (gTokenStrings) == (int) Token::LastNamedToken + 1,
 	"Count of gTokenStrings is not the same as the amount of named token identifiers.");
 
 // =============================================================================
@@ -192,7 +192,7 @@
 	{
 		int flags = 0;
 
-		if (i >= gFirstNamedToken)
+		if (i >= int (Token::FirstNamedToken))
 			flags |= FCheckWord;
 
 		if (checkString (gTokenStrings[i], flags))
@@ -290,8 +290,8 @@
 //
 String LexerScanner::GetTokenString (Token a)
 {
-	ASSERT_LT_EQ (a, gLastNamedToken);
-	return gTokenStrings[a];
+	ASSERT_LT_EQ (a, Token::LastNamedToken);
+	return gTokenStrings[int (a)];
 }
 
 // =============================================================================