Fixed lookahead.

[svjatoslav_commons.git] / src / main / java / eu / svjatoslav / commons / string / tokenizer / Tokenizer.java

diff --git a/src/main/java/eu/svjatoslav/commons/string/tokenizer/Tokenizer.java b/src/main/java/eu/svjatoslav/commons/string/tokenizer/Tokenizer.java
index cd5e5c0..01216d8 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/string/tokenizer/Tokenizer.java
+++ b/src/main/java/eu/svjatoslav/commons/string/tokenizer/Tokenizer.java
@@ -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))
@@ -110,20 +110,20 @@ public class Tokenizer {
         return result;
     }
 
-    public boolean peekIsOneOf(String [] ... possibilities){
-        TokenizerMatch nextToken = peekNextToken();
+    public boolean peekIsOneOf(String ... possibilities){
+        String nextToken = peekNextToken().token;
 
-        for (String[] possibility : possibilities)
+        for (String possibility : possibilities)
             if (possibility.equals(nextToken))
                 return true;
 
         return false;
     }
 
-    public void peekExpectNoneOf(String [] ... possibilities) throws InvalidSyntaxException {
+    public void peekExpectNoneOf(String ... possibilities) throws InvalidSyntaxException {
         TokenizerMatch nextToken = peekNextToken();
 
-        for (String[] possibility : possibilities)
+        for (String possibility : possibilities)
             if (possibility.equals(nextToken))
                 throw new InvalidSyntaxException("Not expected \"" + nextToken + "\" here.");
     }