projects
/
svjatoslav_commons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
4855c18
..
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;
}
return this;
}
- public void expectNextToken(final String value)
+ public void expect
AndConsume
NextToken(final String value)
throws InvalidSyntaxException {
final TokenizerMatch match = getNextToken();
if (!value.equals(match.token))
throws InvalidSyntaxException {
final TokenizerMatch match = getNextToken();
if (!value.equals(match.token))
@@
-111,7
+111,7
@@
public class Tokenizer {
}
public boolean peekIsOneOf(String ... possibilities){
}
public boolean peekIsOneOf(String ... possibilities){
-
TokenizerMatch nextToken = peekNextToken()
;
+
String nextToken = peekNextToken().token
;
for (String possibility : possibilities)
if (possibility.equals(nextToken))
for (String possibility : possibilities)
if (possibility.equals(nextToken))