Most basic connection of saving the values, not testing checking the values yet

Author: AngledLuffa

src/edu/stanford/nlp/semgraph/semgrex/NodePattern.java

@@ -166,7 +166,8 @@ private Attribute buildRegexAttribute(String key, String value, boolean negated,
     }
   }
 
-  private boolean checkMatch(Attribute attr, boolean ignoreCase, String nodeValue, VariableStrings tempVariableStrings) {
+  private boolean checkMatch(Attribute attr, boolean ignoreCase, String nodeValue,
+                             VariableStrings variableStrings, VariableStrings tempVariableStrings) {
     if (nodeValue == null) {
       // treat non-existent attributes has having matched a negated expression
       // so for example, `cpos!:NUM` matches not having a cpos at all
@@ -188,7 +189,20 @@ private boolean checkMatch(Attribute attr, boolean ignoreCase, String nodeValue,
       Matcher matcher = ((Pattern) toMatch).matcher(nodeValue);
       if (matcher.matches()) {
         matches = true;
-        // TODO: check the VariableStrings here
+        for (Pair<Integer, String> varGroup : attr.variableGroups) {
+          String existingString = variableStrings.getString(varGroup.second());
+          if (existingString == null) {
+            existingString = tempVariableStrings.getString(varGroup.second());
+          }
+          String matchedString = matcher.group(varGroup.first());
+          if (existingString != null && !existingString.equals(matchedString)) {
+            matches = false;
+            break;
+          }
+          if (matchedString != null) {
+            tempVariableStrings.setVar(varGroup.second(), matchedString);
+          }
+        }
       } else {
         matches = false;
       }
@@ -203,7 +217,7 @@ private boolean checkMatch(Attribute attr, boolean ignoreCase, String nodeValue,
 
   @SuppressWarnings("unchecked")
   public boolean nodeAttrMatch(IndexedWord node, final SemanticGraph sg, boolean ignoreCase,
-                               VariableStrings tempVariableStrings) {
+                               VariableStrings variableStrings, VariableStrings tempVariableStrings) {
     // System.out.println(node.word());
     if (isRoot) {
       // System.out.println("checking root");
@@ -237,7 +251,7 @@ public boolean nodeAttrMatch(IndexedWord node, final SemanticGraph sg, boolean i
       // }
       // System.out.println(nodeValue);
 
-      boolean matches = checkMatch(attr, ignoreCase, nodeValue, tempVariableStrings);
+      boolean matches = checkMatch(attr, ignoreCase, nodeValue, variableStrings, tempVariableStrings);
 
       if (!matches) {
         // System.out.println("doesn't match");
@@ -265,7 +279,7 @@ public boolean nodeAttrMatch(IndexedWord node, final SemanticGraph sg, boolean i
       }
 
       // TODO: not connected to varGroups yet
-      boolean matches = checkMatch(attr, ignoreCase, nodeValue, tempVariableStrings);
+      boolean matches = checkMatch(attr, ignoreCase, nodeValue, variableStrings, tempVariableStrings);
       if (!matches) {
         return negDesc;
       }
@@ -519,7 +533,7 @@ private void goToNextNodeMatch() {
           } else {
             boolean found = myNode.nodeAttrMatch(nextMatch,
                                                  hyp ? sg : sg_aligned,
-                                                 ignoreCase, tempVariableStrings);
+                                                 ignoreCase, variableStrings, tempVariableStrings);
             if (found) {
               // nodeAttrMatch already checks negDesc, so no need to
               // check for that here
@@ -530,7 +544,7 @@ private void goToNextNodeMatch() {
         } else { // try to match the description pattern.
           boolean found = myNode.nodeAttrMatch(nextMatch,
                                                hyp ? sg : sg_aligned,
-                                               ignoreCase, tempVariableStrings);
+                                               ignoreCase, variableStrings, tempVariableStrings);
           if (found) {
             // nodeAttrMatch already checks negDesc, so no need to
             // check for that here

test/src/edu/stanford/nlp/semgraph/semgrex/SemgrexTest.java

@@ -5,9 +5,12 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import edu.stanford.nlp.ling.CoreAnnotations;
 import edu.stanford.nlp.ling.IndexedWord;
@@ -1570,9 +1573,16 @@ public void testBatchUniq() {
   }
 
   public void testVariableGroups() {
-    outputResults("{word:/(ate)/#1%name}",
-                  "[ate subj>Bill obj>[muffins compound>blueberry]]",
-                  "ate");
+    SemgrexPattern pattern = SemgrexPattern.compile("{word:/(.*ill.*)/#1%name}");
+    SemanticGraph graph = SemanticGraph.valueOf("[ate-2 subj> Bill-1 obj>[muffins-5 compound> Blueberry-3 compound> filled-4]]");
+    Set<String> matches = new HashSet<>();
+    SemgrexMatcher matcher = pattern.matcher(graph);
+    while (matcher.find()) {
+      assertNotNull(matcher.variableStrings.getString("name"));
+      matches.add(matcher.variableStrings.getString("name"));
+    }
+    Set<String> expectedMatches = Stream.of("Bill", "filled").collect(Collectors.toCollection(HashSet::new));
+    assertEquals(expectedMatches, matches);
   }
 
   public static void outputBatchResults(SemgrexPattern pattern, List<CoreMap> sentences) {