When creating a NodePattern from NodeAttributes in Semgrex, pass around the NodeAttributes as a single object instead of passing individual pieces

Author: AngledLuffa

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

@@ -1,6 +1,7 @@
 package edu.stanford.nlp.semgraph.semgrex;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -60,6 +61,6 @@ public void setAttribute(String key, String value, boolean negated) {
   }
 
   public List<Triple<String, String, Boolean>> attributes() {
-    return attributes;
+    return Collections.unmodifiableList(attributes);
   }
 }

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

@@ -43,25 +43,23 @@ public class NodePattern extends SemgrexPattern  {
   private List<Pair<Integer, String>> variableGroups;
 
   public NodePattern(GraphRelation r, boolean negDesc,
-                     List<Triple<String, String, Boolean>> attrs,
-                     boolean root, boolean empty, boolean isLink, String name) {
-    this(r, negDesc, attrs, root, empty, isLink, name,
+                     NodeAttributes attrs, boolean isLink, String name) {
+    this(r, negDesc, attrs, isLink, name,
             new ArrayList<>(0));
   }
 
   // TODO: there is no capacity for named variable groups in the parser right now
   public NodePattern(GraphRelation r, boolean negDesc,
-                     List<Triple<String, String, Boolean>> attrs,
-                     boolean root, boolean empty, boolean isLink, String name,
+                     NodeAttributes attrs, boolean isLink, String name,
                      List<Pair<Integer, String>> variableGroups) {
     this.reln = r;
     this.negDesc = negDesc;
     this.isLink = isLink;
     // order the attributes so that the pattern stays the same when
     // printing a compiled pattern
-    attributes = new ArrayList<>();
+    this.attributes = new ArrayList<>();
     descString = "{";
-    for (Triple<String, String, Boolean> entry : attrs) {
+    for (Triple<String, String, Boolean> entry : attrs.attributes()) {
       if (!descString.equals("{"))
         descString += ";";
       String key = entry.first();
@@ -100,12 +98,12 @@ public NodePattern(GraphRelation r, boolean negDesc,
       }
     }
 
-    if (root) {
+    if (attrs.root()) {
       if (!descString.equals("{"))
         descString += ";";
       descString += "$";
     }
-    if (empty) {
+    if (attrs.empty()) {
       if (!descString.equals("{"))
         descString += ";";
       descString += "#";
@@ -114,8 +112,8 @@ public NodePattern(GraphRelation r, boolean negDesc,
 
     this.name = name;
     this.child = null;
-    this.isRoot = root;
-    this.isEmpty = empty;
+    this.isRoot = attrs.root();
+    this.isEmpty = attrs.empty();
 
     this.variableGroups = Collections.unmodifiableList(variableGroups);
   }

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

@@ -632,7 +632,7 @@ final public SemgrexPattern Root() throws ParseException {// Root pattern for th
       jj_la1[28] = jj_gen;
       ;
     }
-pat = new NodePattern(r, underNodeNegation, attributes.attributes(), attributes.root(), attributes.empty(), link, name != null ? name.image : null);
+pat = new NodePattern(r, underNodeNegation, attributes, link, name != null ? name.image : null);
           {if ("" != null) return pat;}
     throw new Error("Missing return statement in function");
 }

src/edu/stanford/nlp/semgraph/semgrex/SemgrexParser.jj

@@ -310,7 +310,7 @@ NodePattern Description(GraphRelation r) : {
             }
 	  )?
 	)
-  	{ pat = new NodePattern(r, underNodeNegation, attributes.attributes(), attributes.root(), attributes.empty(), link, name != null ? name.image : null);
+  	{ pat = new NodePattern(r, underNodeNegation, attributes, link, name != null ? name.image : null);
 	  return pat;
 	}
 }