LANG: minor ILexingRule change

GoClipse · Sep 24, 2015 · 52db8bb · 52db8bb
1 parent 5d598d0
commit 52db8bb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/plugin_tooling/src-lang/melnorme/lang/tooling/parser/lexer/ILexingRule2.java b/plugin_tooling/src-lang/melnorme/lang/tooling/parser/lexer/ILexingRule2.java
@@ -14,12 +14,12 @@
 
 import melnorme.lang.utils.parse.ICharacterReader;
 
-public interface ILexingRule2<TOKEN> {
+public interface ILexingRule2<TOKEN> extends ILexingRule {
 
 	default TOKEN evaluateToken(ICharacterReader reader) {
 		CharacterReader_SubReader subReader = new CharacterReader_SubReader(reader);
 
-		TOKEN result = doEvaluate(subReader);
+		TOKEN result = doEvaluateToken(subReader);
 		if(subReader.getReadOffset() == 0) {
 			assertTrue(result == null);
 		}
@@ -29,6 +29,11 @@ default TOKEN evaluateToken(ICharacterReader reader) {
 		return result;
 	}
 
-	TOKEN doEvaluate(ICharacterReader subReader);
+	TOKEN doEvaluateToken(ICharacterReader subReader);
+
+	@Override
+	default boolean doEvaluate(ICharacterReader reader) {
+		return evaluateToken(reader) != null;
+	}
 
 }
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
@@ -35,7 +35,7 @@ public void addWord(String keyword, TOKEN token) {
 	}
 
 	@Override
-	public TOKEN doEvaluate(ICharacterReader reader) {
+	public TOKEN doEvaluateToken(ICharacterReader reader) {
 		if(LexingUtils.skipWhitespace(reader) > 0) {
 			return whitespaceToken;
 		}