Emit filenames for error messages.

• Extended grammar to let TypeDecl and Relation have filename
• Extended error message to display and order first by filename
• Added testcase with multiple inputs having errors

src/main/jastadd/Errors.jrag

@@ -50,17 +50,33 @@ aspect HelpAttributes {
   eq OptionalRelationComponent.multiplicityOpt() = true;
   syn boolean RelationComponent.multiplicityMany() = false;
   eq ManyRelationComponent.multiplicityMany() = true;
+
+  inh ContainedInFile Component.enclosingFileContainer();
+  eq TypeDecl.getComponent().enclosingFileContainer() = this;
+  eq Relation.getChild().enclosingFileContainer() = this;
+  inh ContainedInFile TypeUse.enclosingFileContainer();
+  eq SimpleTypeComponent.getTypeUse().enclosingFileContainer() = enclosingFileContainer();
+  eq TokenComponent.getTypeUse().enclosingFileContainer() = enclosingFileContainer();
+  eq TypeDecl.getSuper().enclosingFileContainer() = this;
+
+  syn String ASTNode.containedFile() = "Unknown";
+  eq Component.containedFile() = enclosingFileContainer() == null ? "Unknown2" : enclosingFileContainer().containedFile();
+  eq TypeUse.containedFile() = enclosingFileContainer() == null ? "Unknown3" : enclosingFileContainer().containedFile();
+  eq TypeDecl.containedFile() = getFileName();
+  eq Relation.containedFile() = getFileName();
 }
 
 aspect ErrorMessage {
   public class ErrorMessage implements Comparable<ErrorMessage> {
     private final ASTNode node;
+    private final String filename;
     private final int line;
     private final int col;
     private final String message;
 
     public ErrorMessage(ASTNode node, String message) {
       this.node = node;
+      this.filename = node.containedFile();
       this.line = node.getStartLine();
       this.col = node.getStartColumn();
       this.message = message;
@@ -80,12 +96,17 @@ aspect ErrorMessage {
     }
 
     public String toString() {
-      return "Line " + line + ", column " + col + ": " + message;
+      return filename + " Line " + line + ", column " + col + ": " + message;
     }
 
     @Override
     public int compareTo(ErrorMessage err) {
-      int n = line - err.line;
+      int n = filename.compareTo(err.filename);
+      if (n != 0) {
+        return n;
+      }
+
+      n = line - err.line;
       if (n != 0) {
         return n;
       }
@@ -102,4 +123,4 @@ aspect ErrorMessage {
   protected ErrorMessage ASTNode.error(String message) {
     return new ErrorMessage(this, message);
   }
-}
\ No newline at end of file
+}