1 files changed, 19 insertions, 4 deletions
diff --git a/src/runtime/java/org/grammaticalframework/pgf/ParseError.java b/src/runtime/java/org/grammaticalframework/pgf/ParseError.java
index 7fd332708..8b3f51ae2 100644
--- a/src/runtime/java/org/grammaticalframework/pgf/ParseError.java
+++ b/src/runtime/java/org/grammaticalframework/pgf/ParseError.java
@@ -4,11 +4,26 @@ package org.grammaticalframework.pgf;
 public class ParseError extends Exception {
 	private static final long serialVersionUID = -6086991674218306569L;
 
-	public ParseError(String token) {
-		super(token);
+	private String  token;
+	private int     offset;
+	private boolean incomplete;
+
+	public ParseError(String token, int offset, boolean incomplete) {
+		super(incomplete ? "The sentence is incomplete" : "Unexpected token: \""+token+"\"");
+		this.token      = token;
+		this.offset     = offset;
+		this.incomplete = incomplete;
 	}
-	
+
 	public String getToken() {
-		return getMessage();
+		return token;
+	}
+
+	public int getOffset() {
+		return offset;
+	}
+	
+	public boolean isIncomplete() {
+		return incomplete;
 	}
 }