Reverting type resolution in C++ to Java types, e.g. byte and char instead of just...

[iot2.git] / iotjava / iotpolicy / IoTCompiler.java

diff --git a/iotjava/iotpolicy/IoTCompiler.java b/iotjava/iotpolicy/IoTCompiler.java
index 028373b77b8883a43f9b70ee16089ec01bfa7fd1..ee3d287ee396d2b898ad0e45afa8ef77fab8a79d 100644 (file)
--- a/iotjava/iotpolicy/IoTCompiler.java
+++ b/iotjava/iotpolicy/IoTCompiler.java
@@ -2560,8 +2560,9 @@ public class IoTCompiler {
                println("int numParam = " + methParams.size() + ";");
                println("int methodId = " + intDecl.getMethodNumId(method) + ";");
                String retType = intDecl.getMethodType(method);
-               String retTypeC = checkAndGetCplusType(retType);
-               println("string retType = \"" + checkAndGetCplusArrayType(retTypeC) + "\";");
+               //String retTypeC = checkAndGetCplusType(retType);
+               //println("string retType = \"" + checkAndGetCplusArrayType(retTypeC) + "\";");
+               println("string retType = \"" + retType + "\";");
                // Generate array of parameter types
                print("string paramCls[] = { ");
                for (int i = 0; i < methParams.size(); i++) {
@@ -2569,8 +2570,10 @@ public class IoTCompiler {
                        if (checkCallbackType(paramType, callbackType)) { // Check if this has callback object
                                print("\"int\"");
                        } else { // Generate normal classes if it's not a callback object
-                               String paramTypeC = checkAndGetCplusType(methPrmTypes.get(i));
-                               String prmType = checkAndGetCplusArrayType(paramTypeC, methParams.get(i));
+                               //String paramTypeC = checkAndGetCplusType(methPrmTypes.get(i));
+                               //String prmType = checkAndGetCplusArrayType(paramTypeC, methParams.get(i));
+                               String paramTypeC = checkAndGetArray(methPrmTypes.get(i), methParams.get(i));
+                               String prmType = getSimpleType(getEnumType(paramTypeC));
                                print("\"" + prmType + "\"");
                        }
                        if (i != methParams.size() - 1) // Check if this is the last element
@@ -2891,8 +2894,9 @@ public class IoTCompiler {
                checkAndWriteStructSetupCplusStub(methParams, methPrmTypes, intDecl, method);
                println("int methodId = " + intDecl.getMethodNumId(method) + ";");
                String retType = intDecl.getMethodType(method);
-               String retTypeC = checkAndGetCplusType(retType);
-               println("string retType = \"" + checkAndGetCplusArrayType(getStructType(getEnumType(retTypeC))) + "\";");
+               //String retTypeC = checkAndGetCplusType(retType);
+               //println("string retType = \"" + checkAndGetCplusArrayType(getStructType(getEnumType(retTypeC))) + "\";");
+               println("string retType = \"" + retType + "\";");
                // Generate array of parameter types
                if (isStructPresent(methParams, methPrmTypes)) {
                        writeStructParamClassCplusStub(methParams, methPrmTypes);
@@ -2900,9 +2904,12 @@ public class IoTCompiler {
                        println("int numParam = " + methParams.size() + ";");
                        print("string paramCls[] = { ");
                        for (int i = 0; i < methParams.size(); i++) {
-                               String paramTypeC = checkAndGetCplusType(methPrmTypes.get(i));
-                               String paramType = checkAndGetCplusArrayType(paramTypeC, methParams.get(i));
-                               print("\"" + getEnumType(paramType) + "\"");
+                               //String paramTypeC = checkAndGetCplusType(methPrmTypes.get(i));
+                               //String paramType = checkAndGetCplusArrayType(paramTypeC, methParams.get(i));
+                               //print("\"" + getEnumType(paramType) + "\"");
+                               String paramTypeC = checkAndGetArray(methPrmTypes.get(i), methParams.get(i));
+                               String prmType = getSimpleType(getEnumType(paramTypeC));
+                               print("\"" + prmType + "\"");
                                // Check if this is the last element (don't print a comma)
                                if (i != methParams.size() - 1) {
                                        print(", ");
@@ -3596,7 +3603,8 @@ public class IoTCompiler {
                        if (isStructClass(getSimpleArrayType(getSimpleType(retType)))) // Struct type
                                println("rmiObj->sendReturnObj(retObj, retCls, numRetObj);");
                        else
-                               println("rmiObj->sendReturnObj(retObj, \"" + getEnumType(checkAndGetCplusArrayType(retTypeC)) + "\");");
+                               //println("rmiObj->sendReturnObj(retObj, \"" + getEnumType(checkAndGetCplusArrayType(retTypeC)) + "\");");
+                               println("rmiObj->sendReturnObj(retObj, \"" + getEnumType(retType) + "\");");
                }
        }
 
@@ -3618,9 +3626,12 @@ public class IoTCompiler {
                                callbackType = paramType;
                                print("\"int\"");
                        } else {        // Generate normal classes if it's not a callback object
-                               String paramTypeC = checkAndGetCplusType(methPrmTypes.get(i));
-                               String prmType = checkAndGetCplusArrayType(paramTypeC, methParams.get(i));
-                               print("\"" + getEnumType(prmType) + "\"");
+                               //String paramTypeC = checkAndGetCplusType(methPrmTypes.get(i));
+                               //String prmType = checkAndGetCplusArrayType(paramTypeC, methParams.get(i));
+                               //print("\"" + getEnumType(prmType) + "\"");
+                               String paramTypeC = checkAndGetArray(methPrmTypes.get(i), methParams.get(i));
+                               String prmType = getSimpleType(getEnumType(paramTypeC));
+                               print("\"" + prmType + "\"");
                        }
                        if (i != methParams.size() - 1) {
                                print(", ");