Add lastEvaluatedWord

GoClipse · Dec 16, 2016 · 032ca51 · 032ca51
1 parent f3ed0b1
commit 032ca51
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/plugin_tooling/src-lang/melnorme/lang/tooling/parser/lexer/WordLexerRule.java b/plugin_tooling/src-lang/melnorme/lang/tooling/parser/lexer/WordLexerRule.java
@@ -20,6 +20,8 @@ public class WordLexerRule<TOKEN> implements ILexingRule2<TOKEN> {
 	protected final TOKEN defaultWordToken;
 	protected final HashMap2<String, TOKEN> tokenMap = new HashMap2<>();
 
+	protected String lastEvaluatedWord;
+
 	public WordLexerRule(TOKEN whitespaceToken, TOKEN defaultWordToken) {
 		this.whitespaceToken = whitespaceToken;
 		this.defaultWordToken = defaultWordToken;
@@ -41,12 +43,12 @@ public TOKEN doEvaluateToken(ICharacterReader reader) {
 			return whitespaceToken;
 		}
 
-		String word = LexingUtils.readJavaIdentifier(reader);
-		if(word.isEmpty()) {
+		lastEvaluatedWord = LexingUtils.readJavaIdentifier(reader);
+		if(lastEvaluatedWord.isEmpty()) {
 			return null;
 		}
 
-		TOKEN keywordToken = tokenMap.get(word);
+		TOKEN keywordToken = tokenMap.get(lastEvaluatedWord);
 		return (keywordToken == null) ? defaultWordToken : keywordToken;
 	}