X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fstring%2Ftokenizer%2FTokenizerMatch.java;h=cd07ec9951c4aabb7bd1f16595b3b954f1da440c;hb=8e658dfab85ad198d4003c7d58c840ba6029e031;hp=2a16733134d39c7f854e5c2e322525fb9bfb326d;hpb=965adace2b47642e2ca84f499cc32683c12059c6;p=svjatoslav_commons.git

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 2a16733..cd07ec9 100755
--- a/src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
+++ b/src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
@@ -1,32 +1,71 @@
 /*
- * Svjatoslav Commons - shared library of common functionality.
- * Copyright ©2012-2019, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public License
- * or later as published by the Free Software Foundation.
+ * Svjatoslav Commons - shared library of common functionality. Author: Svjatoslav Agejenko.
+ * This project is released under Creative Commons Zero (CC0) license.
  */
-
 package eu.svjatoslav.commons.string.tokenizer;
 
+import java.util.regex.Matcher;
+
 public class TokenizerMatch {
 
     public final String token;
-    public final String reminder;
+
+    /**
+     * {@link Terminator} that matched current token
+     */
     public final Terminator terminator;
 
-    public TokenizerMatch(final String token, final String reminder, final Terminator terminator) {
+    public final Matcher matcher;
+
+    private Tokenizer tokenizer;
+
+    public TokenizerMatch(final String token, final Terminator terminator, Matcher matcher, Tokenizer tokenizer) {
         this.token = token;
-        this.reminder = reminder;
         this.terminator = terminator;
+        this.matcher = matcher;
+        this.tokenizer = tokenizer;
+    }
+
+    public boolean isGroup(String group){
+        if (terminator == null){
+            return group == null;
+        }
+
+        if (terminator.group == null){
+            return group == null;
+        }
+
+        return terminator.group.equals(group);
+    }
+
+    public String[] getRegExpGroups(){
+        String[] result = new String[matcher.groupCount()];
+
+        for (int i = 0; i< result.length; i++){
+            result[i] = matcher.group(i+1);
+        }
+
+        return result;
     }
 
     @Override
     public String toString() {
-        return "TokenizerMatch{" +
-                "token='" + token + '\'' +
-                ", reminder='" + reminder + '\'' +
-                ", terminator=" + terminator +
-                '}';
+        StringBuilder result = new StringBuilder();
+        result.append("TokenizerMatch\n" +
+                "  token='" + token + "'\n" +
+                "  terminator=" + terminator + "\n" +
+                "  groups:\n");
+
+        int i = 0;
+        for (String s : getRegExpGroups()) {
+            result.append("    " + i + ": " + s + "\n");
+            i++;
+        }
+
+        return result.toString();
+    }
+
+    public Tokenizer getTokenizer() {
+        return tokenizer;
     }
 }