Fix return type

xpenatan · Jul 11, 2023 · 2fb2dd7 · 2fb2dd7
1 parent 0c5d67a
commit 2fb2dd7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/example/example-build/jni/cpp/src/NormalClass.cpp b/example/example-build/jni/cpp/src/NormalClass.cpp
@@ -10,6 +10,5 @@ NormalClass::NormalClass()
 
 int NormalClass::addIntValue(int a, int b)
 {
-//    return (a + b) * hiddenInt * hiddenParentInt;
-    return a + b;
+    return (a + b) * hiddenInt * hiddenParentInt;
 }
diff --git a/example/example-build/jni/cpp/src/ParentClass.cpp b/example/example-build/jni/cpp/src/ParentClass.cpp
@@ -10,12 +10,10 @@ ParentClass::ParentClass()
 
 float ParentClass::addFloatValue(float a, float b)
 {
-//    return (a + b) * hiddenParentInt;
-    return (a + b);
+    return (a + b) * hiddenParentInt;
 }
 
 bool ParentClass::invertBoolean(bool value)
 {
-//    return !(bool)(value * hiddenParentInt);
-    return !value;
+    return !(bool)(value * hiddenParentInt);
 }
diff --git a/jParser/cpp/src/main/java/com/github/xpenatan/jparser/cpp/NativeCPPGeneratorV2.java b/jParser/cpp/src/main/java/com/github/xpenatan/jparser/cpp/NativeCPPGeneratorV2.java
@@ -104,6 +104,8 @@ public void addNativeCode(MethodDeclaration methodDeclaration, String content) {
         String packageName = compilationUnit.getPackageDeclaration().get().getNameAsString();
         String className = classDeclaration.getNameAsString();
         String packageNameCPP = packageName.replace(".", "_");
+        String returnTypeStr = methodDeclaration.getType().toString();
+        JavaMethodParser.ArgumentType returnType = getType(returnTypeStr);
 
         String params = "(JNIEnv* env, jclass clazz";
 
@@ -122,7 +124,7 @@ public void addNativeCode(MethodDeclaration methodDeclaration, String content) {
 
         params += ")";
 
-        print("JNIEXPORT jint JNICALL Java_" + packageNameCPP + "_" + className + "_" + methodName + params + " {");
+        print("JNIEXPORT " + returnType.getJniType() + " JNICALL Java_" + packageNameCPP + "_" + className + "_" + methodName + params + " {");
         content = "\t" + content.replace("\n", "\n\t");
         print(content);
         print("}");
@@ -158,6 +160,10 @@ public void generate(JParser jParser) {
     private JavaMethodParser.ArgumentType getArgumentType(Parameter parameter) {
         String[] typeTokens = parameter.getType().toString().split("\\.");
         String type = typeTokens[typeTokens.length - 1];
+        return getType(type);
+    }
+
+    private JavaMethodParser.ArgumentType getType(String type) {
         int arrayDim = 0;
         for(int i = 0; i < type.length(); i++) {
             if(type.charAt(i) == '[') arrayDim++;