Push the Ssurgeon exception handling into the individual operation. Check for unreadable attributes at the same time as checking for illegal attributes - this will make EditNode also support checking those attributes

Author: AngledLuffa

src/edu/stanford/nlp/semgraph/semgrex/ssurgeon/AddDep.java

@@ -47,19 +47,17 @@ public AddDep(String govNodeName, GrammaticalRelation relation, Map<String, Stri
   }
 
   public AddDep(String govNodeName, GrammaticalRelation relation, Map<String, String> attributes, String position, double weight) {
-    // if there's an exception, we'll barf here rather than at runtime
-    try {
-      CoreLabel newNodeObj = fromCheapStrings(attributes);
-    } catch (UnsupportedOperationException e) {
-      throw new SsurgeonParseException("Unable to process keys for AddDep operation", e);
-    }
-
     if (position != null) {
       if (!position.startsWith("-") && !position.startsWith("+")) {
         throw new SsurgeonParseException("Unknown position " + position + " in AddDep operation");
       }
     }
-
+    if (govNodeName == null) {
+      throw new SsurgeonParseException("No governor given for an AddDep");
+    }
+    if (relation == null) {
+      throw new SsurgeonParseException("No relation given for an AddDep");
+    }
     checkIllegalAttributes(attributes);
 
     this.attributes = new TreeMap<>(attributes);
@@ -220,6 +218,13 @@ public static void checkIllegalAttributes(Map<String, String> attributes) {
     if (attributes.containsKey("docID")) {
       throw new SsurgeonParseException("Cannot manually change a document ID.  If you need an operation to change an entire sentence's document ID, please file an issue on github.");
     }
+
+    // if there's an exception, we'll barf when creating the pattern rather than at runtime
+    try {
+      CoreLabel newNodeObj = fromCheapStrings(attributes);
+    } catch (UnsupportedOperationException e) {
+      throw new SsurgeonParseException("Unable to process node attribute keys for Ssurgeon operation", e);
+    }
   }
 
   /**

src/edu/stanford/nlp/semgraph/semgrex/ssurgeon/Ssurgeon.java

@@ -375,19 +375,11 @@ public static SsurgeonEdit parseEditLine(String editLine) {
       return new KillNonRootedNodes();
     }
 
+    // Parse the arguments based upon the type of command to execute.
     final SsurgeonArgs argsBox = parseArgsBox(tuples1.length == 1 ? "" : tuples1[1]);
 
-    // Parse the arguments based upon the type of command to execute.
-    // TODO: this logic really should be moved into the individual classes.  The string-->class
-    // mappings should also be stored in more appropriate data structure.
     SsurgeonEdit retEdit;
     if (command.equalsIgnoreCase(AddDep.LABEL)) {
-      if (argsBox.govNodeName == null) {
-        throw new SsurgeonParseException("No governor given for an AddDep edit: " + editLine);
-      }
-      if (argsBox.reln == null) {
-        throw new SsurgeonParseException("No relation given for an AddDep edit: " + editLine);
-      }
       retEdit = AddDep.createEngAddDep(argsBox.govNodeName, argsBox.reln, argsBox.annotations, argsBox.position);
     } else if (command.equalsIgnoreCase(AddNode.LABEL)) {
       retEdit = AddNode.createAddNode(argsBox.nodeString, argsBox.name);