Skip to content

Commit 10511d2

Browse files
committed
parser/ParseException: Re-use sourceRange helper
Instead of seperately generating our own error prone text.
1 parent 737ed40 commit 10511d2

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,10 @@ public String getMessage() {
151151
}
152152
String retval = "parse error ";
153153
retval += (file != null) ? "[" + file + ":" : "[?:";
154-
if (sourceRange != null) {
155-
retval += sourceRange.toString() + "]\n";
156-
} else {
157-
retval += currentToken.next.beginLine + "."
158-
+ currentToken.next.beginColumn + "-"
159-
+ currentToken.next.endLine + "."
160-
+ currentToken.next.endColumn + "]\n";
161-
}
154+
if (sourceRange == null) {
155+
sourceRange = PanParserUtils.sourceRangeFromTokens(currentToken.next, currentToken.next);
156+
};
157+
retval += sourceRange.toString() + "]\n";
162158
retval += "\nEncountered: ";
163159
Token tok = currentToken.next;
164160
for (int i = 0; i < maxSize; i++) {

0 commit comments

Comments
 (0)