projects
/
svjatoslav_commons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use regular expressions as terminators
[svjatoslav_commons.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
commons
/
string
/
tokenizer
/
TokenizerMatch.java
diff --git
a/src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
b/src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
index
a620010
..
2b9b1f8
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
+++ b/
src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
@@
-4,23
+4,42
@@
*/
package eu.svjatoslav.commons.string.tokenizer;
*/
package eu.svjatoslav.commons.string.tokenizer;
+import java.util.regex.Matcher;
+
public class TokenizerMatch {
public final String token;
public class TokenizerMatch {
public final String token;
- public final String reminder;
+
+ /**
+ * {@link Terminator} that matched current token
+ */
public final Terminator terminator;
public final Terminator terminator;
- public TokenizerMatch(final String token, final String reminder, final Terminator terminator) {
+ public final Matcher matcher;
+
+
+ public TokenizerMatch(final String token, final Terminator terminator, Matcher matcher) {
this.token = token;
this.token = token;
- this.reminder = reminder;
this.terminator = terminator;
this.terminator = terminator;
+ this.matcher = matcher;
+ }
+
+ public boolean isGroup(String group){
+ if (terminator == null){
+ return group == null;
+ }
+
+ if (terminator.group == null){
+ return group == null;
+ }
+
+ return terminator.group.equals(group);
}
@Override
public String toString() {
return "TokenizerMatch{" +
"token='" + token + '\'' +
}
@Override
public String toString() {
return "TokenizerMatch{" +
"token='" + token + '\'' +
- ", reminder='" + reminder + '\'' +
", terminator=" + terminator +
'}';
}
", terminator=" + terminator +
'}';
}