Author: Jazzepi

src/lexer/TextFile.java

@@ -143,7 +143,7 @@ public Token getToken()
 
 		String returnTokText = null;
 		TokenType returnTokType = null;
-		StringTokenizer st = new StringTokenizer(rVal," \t;(){}=!<>+-/*%",true);
+		StringTokenizer st = new StringTokenizer(rVal," \t;(){}=!<>+-,/*%",true);
 		String temp = st.nextToken();
 		String lookAhead = null;
 
@@ -180,17 +180,17 @@ else if(TokenType.matchesToken(TokenType.GAMEORDER, temp))
 		}
 		else if(TokenType.matchesToken(TokenType.SYMBOL, temp))
 		{
-			if(temp.matches("=") && lookAhead == null) //This is the last token, so it must just be the = symbol
+			if(temp.equals("=") && lookAhead == null) //This is the last token, so it must just be the = symbol
 			{
 				returnTokText = temp;
 				returnTokType = TokenType.SYMBOL;
 			}
-			else if(temp.matches("=") && lookAhead != null) //This is not the last token, so something must come after it
+			else if(temp.equals("=") && lookAhead != null) //This is not the last token, so something must come after it
 			{
-				if(lookAhead.matches("="))//Check to see if you actually found == instead of just =
+				if(lookAhead.equals("="))//Check to see if you actually found == instead of just =
 				{
 					returnTokText = temp.concat(lookAhead);
-					returnTokType = TokenType.SYMBOL;
+					returnTokType = TokenType.CONDITION;
 				}
 				else //Wasn't ==, so it must just be the symbol operator for assignment
 				{
@@ -205,11 +205,11 @@ else if(temp.matches("=") && lookAhead != null) //This is not the last token, so
 			}
 
 		}
-		else if(temp.matches("!") ||temp.matches("<") ||temp.matches(">")) //Must be a condition
+		else if(temp.equals("!") ||temp.equals("<") ||temp.equals(">")) //Must be a condition
 		{
-			if(temp.matches("!"))//Must have = after it, or it's an error
+			if(temp.equals("!"))//Must have = after it, or it's an error
 			{
-				if(lookAhead.matches("="))
+				if(lookAhead != null && lookAhead.equals("="))
 				{
 					returnTokText = temp + lookAhead;
 					returnTokType = TokenType.CONDITION;
@@ -221,9 +221,9 @@ else if(temp.matches("!") ||temp.matches("<") ||temp.matches(">")) //Must be a c
 				}
 			}
 
-			if(temp.matches("<") || temp.matches(">"))
+			if(temp.equals("<") || temp.equals(">"))
 			{
-				if(lookAhead == null || !lookAhead.matches("="))
+				if(lookAhead == null || !lookAhead.equals("="))
 				{
 					returnTokText = temp;
 					returnTokType = TokenType.CONDITION;

src/lexer/Token.java

@@ -6,14 +6,14 @@
 public class Token {
 
 	private static String[] WS1 = {"\t"," "};
-	private static String[] IDENTIFIER1 = {"0","1","2","3","4","5","6","7","8","9","10",
+	private static String[] IDENTIFIER1 = {"0","1","2","3","4","5","6","7","8","9",
 		"a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z",
 		"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","_"};
 	private static String[] DIGITS1 = {"0","1","2","3","4","5","6","7","8","9"};
 	private static String[] OPERATOR1 = {"+","-","/","*","%"};
-	private static String[] SYMBOL1 = {";",")","(","}","{","="};
+	private static String[] SYMBOL1 = {";",")","(","}","{","=",","};
 	private static String[] CONDITION1 = {"!=", "==", "<", ">", "<=", ">="};
-	private static String[] KEYWORD1 = {"IF", "IFELSE", "VAR", "SUBROUTINE", "RETURN", "MAIN", "WHILE"};
+	private static String[] KEYWORD1 = {"IF", "IFELSE","ELSE", "VAR", "SUBROUTINE", "RETURN", "MAIN", "WHILE"};
 	private static String[] GAMEFUNCTION1 = {"isEnemyInRange","isHealth","directionOfClosestEnemy"};
 	private static String[] GAMEORDER1 = {"move","turn","skip","selfDestruct","attackWithWeapon","useItem"};
 
@@ -61,7 +61,7 @@ else if(type == TokenType.IDENTIFIER)
 			{
 				for(String element : type.collection)
 				{
-					if(element.startsWith(text))
+					if(element.equals(text))
 					{
 						flag = true;
 					}