Issue #36 - Added end line and column determination to parser.

Author: seidewitz

org.modeldriven.alf/dist/alf-base.jar

@@ -126,12 +126,21 @@ protected void printConstraintViolation(String line, ConstraintViolation violati
         this.println("");
         if (line != null) {
             this.println(line);
-            StringBuffer indent = new StringBuffer();
-            for (int n = violation.getBeginColumn(); n > 1; n--) {
-                indent.append(" ");
+            StringBuffer marker = new StringBuffer();
+            int beginColumn = violation.getBeginColumn();
+            int endColumn = violation.getEndColumn();
+            for (int n = beginColumn; n > 1; n--) {
+                marker.append(" ");
             }
-            this.println(indent + "^");
-        }
+            marker.append("^");
+            if (violation.getBeginLine() == violation.getEndLine() && endColumn > beginColumn) {
+                for (int n = beginColumn+1; n < endColumn; n++ ) {
+                    marker.append("-");
+                }
+                marker.append("^");
+            }
+            this.println(marker.toString());
+       }
         this.println(violation.getErrorMessage());
     }
 

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

@@ -44,6 +44,11 @@ public ParseException(Token currentTokenVal,
     currentToken = currentTokenVal;
     expectedTokenSequences = expectedTokenSequencesVal;
     tokenImage = tokenImageVal;
+    
+    beginLine = currentToken.next.beginLine;
+    beginColumn = currentToken.next.beginColumn;
+    endLine = currentToken.next.endLine;
+    endColumn = currentToken.next.endColumn;
   }
 
   /**
@@ -69,7 +74,7 @@ public ParseException(String message) {
   /**
    * This is the last token that has been consumed successfully.  If
    * this object has been created due to a parse error, the token
-   * followng this token will (therefore) be the first error token.
+   * following this token will (therefore) be the first error token.
    */
   public Token currentToken;
 
@@ -87,20 +92,25 @@ public ParseException(String message) {
    */
   public String[] tokenImage;
 
+  private int beginLine = 0;
+  private int beginColumn = 0;
+  private int endLine = 0;
+  private int endColumn = 0;
+  
   public int getBeginLine() {
-      return this.currentToken.next.beginLine;
+      return this.beginLine;
   }
 
   public int getBeginColumn() {
-      return this.currentToken.next.beginColumn;
+      return this.beginColumn;
   }
 
   public int getEndLine() {
-      return this.currentToken.next.endLine;
+      return this.endLine;
   }
 
   public int getEndColumn() {
-      return this.currentToken.next.endColumn;
+      return this.endColumn;
   }
 
   /**