changes to parameter handling as discussed

Monte Goulding · Monte Goulding · commit 93a62781677b · 2013-08-14T17:19:17.000+10:00
diff --git a/lcidlc/src/InterfaceGenerate.cpp b/lcidlc/src/InterfaceGenerate.cpp
@@ -496,7 +496,7 @@ class JavaStringTypeMapper: public TypeMapper
 	
 	virtual void Default(CoderRef p_coder, ParameterType p_mode, const char *p_name, ValueRef p_value)
 	{
-		CoderWriteStatement(p_coder, "success = java_from__cstring(__java_env, \"%s\", %s) == kLCErrorNone", StringGetCStringPtr(p_value), p_name);
+		CoderWriteStatement(p_coder, "success = default__java_string(__java_env, \"%s\", %s)", StringGetCStringPtr(p_value), p_name);
 	}
 	
 	virtual void Store(CoderRef p_coder, ParameterType p_mode, const char *p_name, const char *p_target)
@@ -1249,17 +1249,11 @@ static bool InterfaceGenerateVariant(InterfaceRef self, CoderRef p_coder, Handle
 		}
 		else
 			CoderWrite(p_coder, "%s(", NameGetCString(t_variant -> binding));
+        
+        for(uint32_t k = 0; k < p_variant -> parameter_count; k++)
+            CoderWrite(p_coder, ", %s", t_mapped_params[k] . var_name);
 			
-		for(uint32_t k = 0; k < t_variant -> parameter_count; k++)
-		{
-			HandlerParameter *t_parameter;
-			t_parameter = &t_variant -> parameters[k];
-			if (k > 0 || t_variant -> return_type_indirect)
-				CoderWrite(p_coder, ", ");
-			CoderWrite(p_coder, "%sparam__%s", t_parameter -> mode == kParameterTypeInOut || t_parameter -> mode == kParameterTypeOut ? t_ref_char : "", NameGetCString(t_parameter -> name));
-		}
-
-		CoderWrite(p_coder, ")");
+        CoderWrite(p_coder, ")");
 		
 		CoderEndStatement(p_coder);
 		
diff --git a/lcidlc/src/Support.mm b/lcidlc/src/Support.mm
@@ -2913,6 +2913,7 @@ static jobject java__get_engine(void)
 }
 
 //////////
+    
 
 static LCError java_from__cstring(JNIEnv *env, const char* p_value, jobject& r_value)
 {
@@ -2955,7 +2956,13 @@ static LCError java_from__cstring(JNIEnv *env, const char* p_value, jobject& r_v
     return err;
 }
 
-
+static bool default__java_string(JNIEnv *env, const char *p_value, jobject& r_java_value)
+{
+    if (java_from__cstring(env, p_value, r_java_value))
+        return true;
+    return error__out_of_memory();
+}
+    
 static bool fetch__java_string(JNIEnv *env, const char *arg, MCVariableRef var, jobject& r_value)
 {
 	LCError err;

Original file line number	Diff line number	Diff line change
`@@ -2913,6 +2913,7 @@ static jobject java__get_engine(void)`
`2913`	`2913`	`}`
`2914`	`2914`
`2915`	`2915`	`//////////`
	`2916`	`+`
`2916`	`2917`
`2917`	`2918`	`static LCError java_from__cstring(JNIEnv env, const char p_value, jobject& r_value)`
`2918`	`2919`	`{`
`@@ -2955,7 +2956,13 @@ static LCError java_from__cstring(JNIEnv env, const char p_value, jobject& r_v`
`2955`	`2956`	`return err;`
`2956`	`2957`	`}`
`2957`	`2958`
`2958`		`-`
	`2959`	`+static bool default__java_string(JNIEnv env, const char p_value, jobject& r_java_value)`
	`2960`	`+{`
	`2961`	`+ if (java_from__cstring(env, p_value, r_java_value))`
	`2962`	`+ return true;`
	`2963`	`+ return error__out_of_memory();`
	`2964`	`+}`
	`2965`	`+`
`2959`	`2966`	`static bool fetch__java_string(JNIEnv env, const char arg, MCVariableRef var, jobject& r_value)`
`2960`	`2967`	`{`
`2961`	`2968`	`LCError err;`