IndexReader: add an optional stream label

kmader · ctrueden · commit 729838efa210 · 2015-01-21T17:28:15.000+01:00
This label can help facilitate debugging problems with the annotation
processor more easily.
diff --git a/src/main/java/org/scijava/annotations/IndexReader.java b/src/main/java/org/scijava/annotations/IndexReader.java
@@ -64,11 +64,17 @@
 class IndexReader {
 
 	private final PushbackInputStream in;
+	private final String originalISName;
 
 	IndexReader(final InputStream in) {
+		this(in, "");
+	}
+
+	IndexReader(final InputStream in, final String isName) {
 		this.in =
 			in instanceof PushbackInputStream ? (PushbackInputStream) in
 				: new PushbackInputStream(new BufferedInputStream(in));
+		this.originalISName = isName;
 	}
 
 	public Object next() throws IOException {
@@ -155,7 +161,8 @@ else if (c < '0' || c > '9') {
 		if (c == '"') {
 			return readString();
 		}
-		throw new IOException("Unexpected char: '" + (char) c + "'");
+		throw new IOException("Unexpected char: '" + (char) c + "'"+
+				((originalISName.length()>0) ? " from "+originalISName : ""));
 	}
 
 	public void close() throws IOException {
@@ -206,7 +213,7 @@ private int expect(char a, char b) throws IOException {
 			return 1;
 		}
 		throw new IOException("Expected '" + a + "' or '" + b + "', got '" +
-			(char) c + "'");
+			(char) c + "'"+((originalISName.length()>0) ? " from "+originalISName : ""));
 	}
 
 	private void expect(String match) throws IOException {
@@ -217,6 +224,7 @@ private void expect(String match) throws IOException {
 
 	private IndexReader() {
 		this.in = null;
+		this.originalISName="";
 	}
 
 	static IndexReader getLegacyReader(final InputStream in) throws IOException {
