summaryrefslogtreecommitdiff
path: root/src/runtime/java
diff options
context:
space:
mode:
authorInari Listenmaa <inari.listenmaa@gmail.com>2017-08-29 15:44:54 +0200
committerInari Listenmaa <inari.listenmaa@gmail.com>2017-08-29 15:44:54 +0200
commitb5f2380821884367ea0e977fb47fd733f790103a (patch)
tree8ade421d13e51fa9866f7523aef7a02cd81572c5 /src/runtime/java
parent85417da2e35f1a5b9fcd768171b4e984df607b25 (diff)
parentadcc6a53fef7e56b93c8574c4822f9c7b4d1ea82 (diff)
Merge branch 'master' of https://github.com/GrammaticalFramework/GF
Diffstat (limited to 'src/runtime/java')
-rw-r--r--src/runtime/java/jpgf.c2
-rw-r--r--src/runtime/java/org/grammaticalframework/pgf/Expr.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/java/jpgf.c b/src/runtime/java/jpgf.c
index 6e3d07d72..7e0c9b39e 100644
--- a/src/runtime/java/jpgf.c
+++ b/src/runtime/java/jpgf.c
@@ -1371,7 +1371,7 @@ Java_org_grammaticalframework_pgf_Expr_initApp__Ljava_lang_String_2_3Lorg_gramma
}
JNIEXPORT jobject JNICALL
-Java_org_grammaticalframework_pgf_Expr_unApply(JNIEnv* env, jobject self)
+Java_org_grammaticalframework_pgf_Expr_unApp(JNIEnv* env, jobject self)
{
jclass expr_class = (*env)->FindClass(env, "org/grammaticalframework/pgf/Expr");
if (!expr_class)
diff --git a/src/runtime/java/org/grammaticalframework/pgf/Expr.java b/src/runtime/java/org/grammaticalframework/pgf/Expr.java
index 0b52e02ef..8462cb30f 100644
--- a/src/runtime/java/org/grammaticalframework/pgf/Expr.java
+++ b/src/runtime/java/org/grammaticalframework/pgf/Expr.java
@@ -87,7 +87,7 @@ public class Expr implements Serializable {
* a function application, then it is decomposed into
* a function name and a list of arguments. If this is not
* an application then the result is null. */
- public native ExprApplication unApply();
+ public native ExprApplication unApp();
/** If the method is called on an expression which is
* a meta variable, then it will return the variable's id.