Issue #36 - Added end line and column fields to ParsedElement classes.

- Added appropriate line and column methods to exception classes.
- Also made ParsedElement an abstract class instead of an interface.

Author: seidewitz

org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/fuml/mapping/FumlMapper.java

@@ -99,7 +99,7 @@ public void printConstraintViolations(Collection<ConstraintViolation> violations
                 this.println("\n" + (fileName == null? "": fileName) + ":");
             }
             int prevLineNum = lineNum;
-            lineNum = violation.getLine();
+            lineNum = violation.getBeginLine();
             line = this.getLine(reader, line, prevLineNum, lineNum);
             this.printConstraintViolation(line, violation);
         }
@@ -127,7 +127,7 @@ protected void printConstraintViolation(String line, ConstraintViolation violati
         if (line != null) {
             this.println(line);
             StringBuffer indent = new StringBuffer();
-            for (int n = violation.getColumn(); n > 1; n--) {
+            for (int n = violation.getBeginColumn(); n > 1; n--) {
                 indent.append(" ");
             }
             this.println(indent + "^");

org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/mapping/FumlMapper.java

@@ -86,6 +86,22 @@ public ParseException(String message) {
    * defined in the generated ...Constants interface.
    */
   public String[] tokenImage;
+  
+  public int getBeginLine() {
+      return this.currentToken.next.beginLine;
+  }
+
+  public int getBeginColumn() {
+      return this.currentToken.next.beginColumn;
+  }
+
+  public int getEndLine() {
+      return this.currentToken.next.endLine;
+  }
+
+  public int getEndColumn() {
+      return this.currentToken.next.endColumn;
+  }
 
   /**
    * It uses "currentToken" and "expectedTokenSequences" to generate a parse

org.modeldriven.alf/src/org/modeldriven/alf/execution/AlfBase.java

@@ -118,6 +118,17 @@ protected static String LexicalError(boolean EOFSeen, int lexState, int errorLin
           (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") +
           "after: \"" + addEscapes(errorAfter) + "\"");
   }
+  
+  private int errorLine = 0;
+  private int errorColumn = 0;
+  
+  public int getLine() {
+      return this.errorLine;
+  }
+  
+  public int getColumn() {
+      return this.errorColumn;
+  }
 
   /**
    * You can also modify the body of this method to customize your error messages.
@@ -149,6 +160,8 @@ public TokenMgrError(String message, int reason) {
   /** Full Constructor. */
   public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
     this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
+    this.errorLine = errorLine;
+    this.errorColumn = errorColumn;
   }
 }
 /* JavaCC - OriginalChecksum=c1c6b3ec56ed5d0a4c0efc01fb23151e (do not edit this line) */

org.modeldriven.alf/src/org/modeldriven/alf/parser/ParseException.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2011, 2016 Data Access Technologies, Inc. (Model Driven Solutions)
+ * Copyright 2011, 2017 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
  * are made available for use under the terms of the GNU General Public License 
  * (GPL) version 3 that accompanies this distribution and is available at 
@@ -10,7 +10,6 @@
 package org.modeldriven.alf.syntax.common;
 
 import org.modeldriven.alf.parser.Parser;
-import org.modeldriven.alf.parser.Token;
 
 import java.util.Collection;
 import java.util.TreeSet;
@@ -22,58 +21,29 @@
  * input parameter, along with a record of the defined type (if any) and
  * multiplicity of the name.
  **/
-
-public class AssignedSource implements ParsedElement {
+public class AssignedSource extends ParsedElement {
 
 	protected AssignedSourceImpl impl;
 
-	private String fileName = "";
-	private int line = 0;
-	private int column = 0;
-
 	public AssignedSource() {
 		this.impl = new AssignedSourceImpl(this);
 	}
 
 	public AssignedSource(Parser parser) {
 		this();
-		Token token = parser.getToken(0);
-		if (token.next != null) {
-			token = token.next;
-		}
-		this.setParserInfo(parser.getFileName(), token.beginLine,
-				token.beginColumn);
+		this.init(parser);
 	}
 
 	public AssignedSource(ParsedElement element) {
 		this();
-		this.setParserInfo(element.getFileName(), element.getLine(), element
-				.getColumn());
+        this.init(element);
 	}
 
 	public AssignedSourceImpl getImpl() {
 		return (AssignedSourceImpl) this.impl;
 	}
 
-	public String getFileName() {
-		return this.fileName;
-	}
-
-	public int getLine() {
-		return this.line;
-	}
-
-	public int getColumn() {
-		return this.column;
-	}
-
-	public void setParserInfo(String fileName, int line, int column) {
-		this.fileName = fileName;
-		this.line = line;
-		this.column = column;
-	}
-
-	public String getName() {
+ 	public String getName() {
 		return this.getImpl().getName();
 	}
 

org.modeldriven.alf/src/org/modeldriven/alf/parser/TokenMgrError.java

@@ -89,7 +89,7 @@ public String getConstraintName() {
     }
 
     public String getErrorMessage() {
-        return "[" + this.getLine() + ":" + this.getColumn() + "] " + 
+        return "[" + this.getBeginLine() + ":" + this.getBeginColumn() + "] " + 
                 getErrorMessage(this.constraintName);
     }
 
@@ -101,12 +101,20 @@ public String getFileName() {
         return this.getViolatingElement().getFileName();
     }
 
-    public int getLine() {
-        return this.getViolatingElement().getLine();
+    public int getBeginLine() {
+        return this.getViolatingElement().getBeginLine();
     }
 
-    public int getColumn() {
-        return this.getViolatingElement().getColumn();
+    public int getBeginColumn() {
+        return this.getViolatingElement().getBeginColumn();
+    }
+    
+    public int getEndLine() {
+        return this.getViolatingElement().getEndLine();
+    }
+    
+    public int getEndColumn() {
+        return this.getViolatingElement().getEndColumn();
     }
 
     @Override
@@ -139,13 +147,13 @@ public int hashCode() {
     public int compareTo(ConstraintViolation other) {
         ParsedElement element = this.getViolatingElement();
         String fileName = element.getFileName();
-        int line = element.getLine();
-        int column = element.getColumn();
+        int line = element.getBeginLine();
+        int column = element.getBeginColumn();
 
         element = other.getViolatingElement();
         String otherFileName = element.getFileName();
-        int otherLine = element.getLine();
-        int otherColumn = element.getColumn();
+        int otherLine = element.getBeginLine();
+        int otherColumn = element.getBeginColumn();
 
         int compare = fileName.compareTo(otherFileName);
         return compare != 0? compare:

org.modeldriven.alf/src/org/modeldriven/alf/syntax/common/AssignedSource.java

@@ -1,6 +1,5 @@
-
 /*******************************************************************************
- * Copyright 2011, 2016 Data Access Technologies, Inc. (Model Driven Solutions)
+ * Copyright 2011, 2017 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
  * are made available for use under the terms of the GNU General Public License 
  * (GPL) version 3 that accompanies this distribution and is available at 
@@ -10,41 +9,20 @@
 
 package org.modeldriven.alf.syntax.common;
 
-import org.modeldriven.alf.parser.Parser;
-import org.modeldriven.alf.parser.Token;
-
 import java.util.Collection;
+
 import org.modeldriven.alf.syntax.common.impl.DocumentedElementImpl;
 
 /**
  * A syntax element that has documentation comments associated with it.
  **/
 
 public abstract class DocumentedElement extends SyntaxElement {
-
-	public DocumentedElement() {
-	}
-
-	public DocumentedElement(Parser parser) {
-		this();
-		Token token = parser.getToken(0);
-		if (token.next != null) {
-			token = token.next;
-		}
-		this.setParserInfo(parser.getFileName(), token.beginLine,
-				token.beginColumn);
-	}
-
-	public DocumentedElement(ParsedElement element) {
-		this();
-		this.setParserInfo(element.getFileName(), element.getLine(), element
-				.getColumn());
-	}
-
+    
 	public DocumentedElementImpl getImpl() {
 		return (DocumentedElementImpl) this.impl;
 	}
-
+	
 	public Collection<String> getDocumentation() {
 		return this.getImpl().getDocumentation();
 	}