Fixed lookahead.
[svjatoslav_commons.git] / src / main / java / eu / svjatoslav / commons / string / tokenizer / Tokenizer.java
index 4855c18..01216d8 100755 (executable)
@@ -46,7 +46,7 @@ public class Tokenizer {
         return this;
     }
 
-    public void expectNextToken(final String value)
+    public void expectAndConsumeNextToken(final String value)
             throws InvalidSyntaxException {
         final TokenizerMatch match = getNextToken();
         if (!value.equals(match.token))
@@ -111,7 +111,7 @@ public class Tokenizer {
     }
 
     public boolean peekIsOneOf(String ... possibilities){
-        TokenizerMatch nextToken = peekNextToken();
+        String nextToken = peekNextToken().token;
 
         for (String possibility : possibilities)
             if (possibility.equals(nextToken))