diff options
| author | kr.angelov <kr.angelov@gmail.com> | 2013-09-05 11:20:39 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@gmail.com> | 2013-09-05 11:20:39 +0000 |
| commit | 7c0bad50921365746ea362710015853a4879c0a7 (patch) | |
| tree | ead13c32a5b2d8ed2968bcdc5b58e5e7eed79720 /src/runtime/java | |
| parent | 504341dfbafdcd858704350162bb7e233cf6daf2 (diff) | |
remove the read and write modules from libgu. this simplifies the i/o layer
Diffstat (limited to 'src/runtime/java')
| -rw-r--r-- | src/runtime/java/jpgf.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/runtime/java/jpgf.c b/src/runtime/java/jpgf.c index 3154e1261..dbb8266ef 100644 --- a/src/runtime/java/jpgf.c +++ b/src/runtime/java/jpgf.c @@ -1,6 +1,7 @@ #include <pgf/pgf.h> #include <gu/mem.h> #include <gu/exn.h> +#include <gu/utf8.h> #include <alloca.h> #include <jni.h> @@ -206,8 +207,8 @@ Java_org_grammaticalframework_pgf_Parser_parse GuString startCat = j2gu_string(env, jstartCat, pool); GuString s = j2gu_string(env, js, pool); - GuReader* rdr = gu_string_reader(s, pool); - PgfLexer *lexer = pgf_new_simple_lexer(rdr, pool); + GuIn* in = gu_string_in(s, pool); + PgfLexer *lexer = pgf_new_simple_lexer(in, pool); GuEnum* res = pgf_parse(get_ref(env, concr), startCat, lexer, pool, out_pool); @@ -261,9 +262,9 @@ Java_org_grammaticalframework_pgf_Concr_linearize(JNIEnv* env, jobject self, job GuPool* tmp_pool = gu_local_pool(); GuExn* err = gu_new_exn(NULL, gu_kind(type), tmp_pool); GuStringBuf* sbuf = gu_string_buf(tmp_pool); - GuWriter* wtr = gu_string_buf_writer(sbuf); + GuOut* out = gu_string_buf_out(sbuf); - pgf_linearize(get_ref(env, self), gu_variant_from_ptr((void*) get_ref(env, jexpr)), wtr, err); + pgf_linearize(get_ref(env, self), gu_variant_from_ptr((void*) get_ref(env, jexpr)), out, err); if (!gu_ok(err)) { // return NULL; @@ -290,9 +291,9 @@ Java_org_grammaticalframework_pgf_Expr_showExpr(JNIEnv* env, jclass clazz, jlong GuExn* err = gu_new_exn(NULL, gu_kind(type), tmp_pool); GuStringBuf* sbuf = gu_string_buf(tmp_pool); - GuWriter* wtr = gu_string_buf_writer(sbuf); + GuOut* out = gu_string_buf_out(sbuf); - pgf_print_expr(gu_variant_from_ptr(l2p(ref)), NULL, 0, wtr, err); + pgf_print_expr(gu_variant_from_ptr(l2p(ref)), NULL, 0, out, err); GuString str = gu_string_buf_freeze(sbuf, tmp_pool); jstring jstr = gu2j_string(env, str); |