Mostly connected...

Author: AngledLuffa

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

@@ -166,7 +166,7 @@ private Attribute buildRegexAttribute(String key, String value, boolean negated,
     }
   }
 
-  private boolean checkMatch(Attribute attr, boolean ignoreCase, String nodeValue) {
+  private boolean checkMatch(Attribute attr, boolean ignoreCase, String nodeValue, 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
@@ -185,7 +185,13 @@ private boolean checkMatch(Attribute attr, boolean ignoreCase, String nodeValue)
         matches = nodeValue.equals(toMatch.toString());
       }
     } else if (toMatch instanceof Pattern) {
-      matches = ((Pattern) toMatch).matcher(nodeValue).matches();
+      Matcher matcher = ((Pattern) toMatch).matcher(nodeValue);
+      if (matcher.matches()) {
+        matches = true;
+        // TODO: check the VariableStrings here
+      } else {
+        matches = false;
+      }
     } else {
       throw new IllegalStateException("Unknown matcher type: " + toMatch + " (of class + " + toMatch.getClass() + ")");
     }
@@ -196,7 +202,8 @@ private boolean checkMatch(Attribute attr, boolean ignoreCase, String nodeValue)
   }
 
   @SuppressWarnings("unchecked")
-  public boolean nodeAttrMatch(IndexedWord node, final SemanticGraph sg, boolean ignoreCase) {
+  public boolean nodeAttrMatch(IndexedWord node, final SemanticGraph sg, boolean ignoreCase,
+                               VariableStrings tempVariableStrings) {
     // System.out.println(node.word());
     if (isRoot) {
       // System.out.println("checking root");
@@ -230,8 +237,7 @@ public boolean nodeAttrMatch(IndexedWord node, final SemanticGraph sg, boolean i
       // }
       // System.out.println(nodeValue);
 
-      // TODO: check varGroups here
-      boolean matches = checkMatch(attr, ignoreCase, nodeValue);
+      boolean matches = checkMatch(attr, ignoreCase, nodeValue, tempVariableStrings);
 
       if (!matches) {
         // System.out.println("doesn't match");
@@ -258,7 +264,8 @@ public boolean nodeAttrMatch(IndexedWord node, final SemanticGraph sg, boolean i
         nodeValue = (value == null) ? null : value.toString();
       }
 
-      boolean matches = checkMatch(attr, ignoreCase, nodeValue);
+      // TODO: not connected to varGroups yet
+      boolean matches = checkMatch(attr, ignoreCase, nodeValue, tempVariableStrings);
       if (!matches) {
         return negDesc;
       }
@@ -274,6 +281,7 @@ public boolean nodeAttrMatch(IndexedWord node, final SemanticGraph sg, boolean i
           throw new RuntimeException("Can only use partial attributes with Maps... this should have been checked at creation time!");
         map = (Map) rawmap;
       }
+      // TODO: check varGroups here
       boolean matches = partialAttribute.checkMatches(map, ignoreCase);
       if (!matches) {
         return negDesc;
@@ -509,10 +517,9 @@ private void goToNextNodeMatch() {
               }
             }
           } else {
-            // TODO: pass in all varstrings and local varstrings
             boolean found = myNode.nodeAttrMatch(nextMatch,
                                                  hyp ? sg : sg_aligned,
-                                                 ignoreCase);
+                                                 ignoreCase, tempVariableStrings);
             if (found) {
               // nodeAttrMatch already checks negDesc, so no need to
               // check for that here
@@ -521,10 +528,9 @@ private void goToNextNodeMatch() {
             }
           }
         } else { // try to match the description pattern.
-          // TODO: pass in all varstrings and local varstrings
           boolean found = myNode.nodeAttrMatch(nextMatch,
                                                hyp ? sg : sg_aligned,
-                                               ignoreCase);
+                                               ignoreCase, tempVariableStrings);
           if (found) {
             // nodeAttrMatch already checks negDesc, so no need to
             // check for that here
@@ -556,9 +562,6 @@ private void goToNextNodeMatch() {
             edgeNamedFirst = true;
           namesToEdges.put(myNode.reln.getEdgeName(), nextMatchEdge);
         }
-        // TODO FIXME: this would need to read all of the matchers used
-        // (eg, from the various attributes)
-        // and commit all of them
         commitVariableGroups(tempVariableStrings); // commit my variable groups.
       }
       // finished is false exiting this if and only if nextChild exists