the parser in the C runtime can now detect incomplete sentences just like the parser in the Haskell runtime. This is also reflected in all bindings.

4 files changed, 54 insertions, 11 deletions

diff --git a/src/runtime/java/jni_utils.c b/src/runtime/java/jni_utils.c
index 59c4a7e54..f897b8372 100644
--- a/src/runtime/java/jni_utils.c
+++ b/src/runtime/java/jni_utils.c
@@ -34,10 +34,8 @@ gu2j_string(JNIEnv *env, GuString s) {
 }
 
 JPGF_INTERNAL jstring
-gu2j_string_buf(JNIEnv *env, GuStringBuf* sbuf) {
-	const char* s    = gu_string_buf_data(sbuf);
+gu2j_string_len(JNIEnv *env, const char* s, size_t len) {
 	const char* utf8 = s;
-	size_t len = gu_string_buf_length(sbuf);
 
 	jchar* utf16 = alloca(len*sizeof(jchar));
 	jchar* dst   = utf16;
@@ -56,6 +54,11 @@ gu2j_string_buf(JNIEnv *env, GuStringBuf* sbuf) {
 	return (*env)->NewString(env, utf16, dst-utf16);
 }
 
+JPGF_INTERNAL jstring
+gu2j_string_buf(JNIEnv *env, GuStringBuf* sbuf) {
+	return gu2j_string_len(env, gu_string_buf_data(sbuf), gu_string_buf_length(sbuf));
+}
+
 JPGF_INTERNAL GuString
 j2gu_string(JNIEnv *env, jstring s, GuPool* pool) {
 	GuString str = (*env)->GetStringUTFChars(env, s, 0);
diff --git a/src/runtime/java/jni_utils.h b/src/runtime/java/jni_utils.h
index f2d050092..e45f5b7bd 100644
--- a/src/runtime/java/jni_utils.h
+++ b/src/runtime/java/jni_utils.h
@@ -21,6 +21,9 @@ JPGF_INTERNAL_DECL jstring
 gu2j_string(JNIEnv *env, GuString s);
 
 JPGF_INTERNAL_DECL jstring
+gu2j_string_len(JNIEnv *env, const char* s, size_t len);
+
+JPGF_INTERNAL_DECL jstring
 gu2j_string_buf(JNIEnv *env, GuStringBuf* sbuf);
 
 JPGF_INTERNAL_DECL GuString
diff --git a/src/runtime/java/jpgf.c b/src/runtime/java/jpgf.c
index db662f5c2..9f5a1a417 100644
--- a/src/runtime/java/jpgf.c
+++ b/src/runtime/java/jpgf.c
@@ -591,6 +591,30 @@ JNIEXPORT void JNICALL Java_org_grammaticalframework_pgf_Parser_addLiteralCallba
                                   j2gu_string(env, jcat, pool), &callback->callback);
 }
 
+static void
+throw_parse_error(JNIEnv *env, PgfParseError* err)
+{
+	jstring jtoken;
+	if (err->incomplete)
+		jtoken = NULL;
+	else {
+		jtoken = gu2j_string_len(env, err->token_ptr, err->token_len);
+		if (!jtoken)
+			return;
+	}
+
+	jclass exception_class = (*env)->FindClass(env, "org/grammaticalframework/pgf/ParseError");
+	if (!exception_class)
+		return;
+	jmethodID constrId = (*env)->GetMethodID(env, exception_class, "<init>", "(Ljava/lang/String;IZ)V");
+	if (!constrId)
+		return;
+	jobject exception = (*env)->NewObject(env, exception_class, constrId, jtoken, err->offset, err->incomplete);
+	if (!exception)
+		return;
+	(*env)->Throw(env, exception);
+}
+
 JNIEXPORT jobject JNICALL 
 Java_org_grammaticalframework_pgf_Parser_parseWithHeuristics
   (JNIEnv* env, jclass clazz, jobject jconcr, jstring jstartCat, jstring js, jdouble heuristics, jlong callbacksRef, jobject jpool)
@@ -615,8 +639,7 @@ Java_org_grammaticalframework_pgf_Parser_parseWithHeuristics
 			GuString msg = (GuString) gu_exn_caught_data(parse_err);
 			throw_string_exception(env, "org/grammaticalframework/pgf/PGFError", msg);
 		} else if (gu_exn_caught(parse_err, PgfParseError)) {
-			GuString tok = (GuString) gu_exn_caught_data(parse_err);
-			throw_string_exception(env, "org/grammaticalframework/pgf/ParseError", tok);
+			throw_parse_error(env, (PgfParseError*) gu_exn_caught_data(parse_err));
 		}
 
 		gu_pool_free(out_pool);
@@ -656,8 +679,7 @@ Java_org_grammaticalframework_pgf_Completer_complete(JNIEnv* env, jclass clazz,
 			GuString msg = (GuString) gu_exn_caught_data(parse_err);
 			throw_string_exception(env, "org/grammaticalframework/pgf/PGFError", msg);
 		} else if (gu_exn_caught(parse_err, PgfParseError)) {
-			GuString tok = (GuString) gu_exn_caught_data(parse_err);
-			throw_string_exception(env, "org/grammaticalframework/pgf/ParseError", tok);
+			throw_parse_error(env, (PgfParseError*) gu_exn_caught_data(parse_err));
 		}
 
 		gu_pool_free(pool);
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;
 	}
 }