Merge pull request #286 from jrha/fix_ParseException_SourceRange

panc: Fixes for parseException and sourceRange

Author: jrha

panc/src/main/java/org/quattor/pan/parser/ParseException.java

@@ -28,7 +28,7 @@ Centre National de la Recherche Scientifique (CNRS).
  * This exception is thrown when parse errors are encountered. You can
  * explicitly create objects of this exception type by calling the method
  * generateParseException in the generated parser.
- * 
+ *
  * You can modify this class to customize your error reporting mechanisms so
  * long as you retain the public fields.
  */
@@ -129,8 +129,7 @@ public String getMessage() {
 			msg.append("parse error [");
 			msg.append((file != null) ? file.toString() : "?");
 			msg.append(":");
-			msg.append((sourceRange != null) ? sourceRange.toString()
-					: "?");
+			msg.append((sourceRange != null) ? sourceRange.toString() : "?");
 			msg.append("]\n");
 			msg.append(super.getMessage());
 			return msg.toString();
@@ -152,14 +151,10 @@ public String getMessage() {
 		}
 		String retval = "parse error ";
 		retval += (file != null) ? "[" + file + ":" : "[?:";
-		if (sourceRange != null) {
-			retval += sourceRange.toString() + "]\n";
-		} else {
-			retval += currentToken.next.beginLine + "."
-					+ currentToken.next.beginColumn + "-"
-					+ currentToken.next.endLine + "."
-					+ currentToken.next.endLine + "]\n";
-		}
+		if (sourceRange == null) {
+			sourceRange = PanParserUtils.sourceRangeFromTokens(currentToken.next, currentToken.next);
+		};
+		retval += sourceRange.toString() + "]\n";
 		retval += "\nEncountered: ";
 		Token tok = currentToken.next;
 		for (int i = 0; i < maxSize; i++) {

panc/src/main/java/org/quattor/pan/ttemplate/SourceRange.java

@@ -23,9 +23,9 @@ Centre National de la Recherche Scientifique (CNRS).
 /**
  * Defines a range of characters within a source pan template that is used to
  * provide detailed error messages.
- * 
+ *
  * @author loomis
- * 
+ *
  */
 public class SourceRange {
 
@@ -45,13 +45,13 @@ public SourceRange(int beginLine, int beginColumn, int endLine,
 			throw new IllegalArgumentException("beginLine must be positive");
 		}
 		if (beginColumn < 1) {
-			throw new IllegalArgumentException("beginLine must be positive");
+			throw new IllegalArgumentException("beginColumn must be positive");
 		}
 		if (endLine < 1) {
 			throw new IllegalArgumentException("endLine must be positive");
 		}
 		if (endColumn < 1) {
-			throw new IllegalArgumentException("endLine must be positive");
+			throw new IllegalArgumentException("endColumn must be positive");
 		}
 
 		// Check that ending point is after (or the same as) the starting point.