improved return values management

rdeioris · Feb 1, 2019 · a2499e5 · a2499e5
1 parent ceba6e1
commit a2499e5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Content/Code/TestProxyCall.uasset b/Content/Code/TestProxyCall.uasset
diff --git a/Content/LuaMachine_Tests.umap b/Content/LuaMachine_Tests.umap
diff --git a/Content/LuaTestActor.uasset b/Content/LuaTestActor.uasset
diff --git a/Content/Tests/TestMultiArgs.uasset b/Content/Tests/TestMultiArgs.uasset
diff --git a/Source/LuaMachine/Private/LuaState.cpp b/Source/LuaMachine/Private/LuaState.cpp
@@ -687,13 +687,11 @@ int ULuaState::MetaTableFunction__call(lua_State *L)
 					FLuaValue LuaValue = LuaState->ToLuaValue(i);
 					*LuaProp->ContainerPtrToValuePtr<FLuaValue>(ArrayHelper.GetRawPtr(i - StackPointer)) = LuaValue;
 				}
-
-				break;
 			}
-			continue;
+			break;
 		}
 		if (LuaProp->Struct != FLuaValue::StaticStruct())
-			continue;
+			break;
 
 		FLuaValue LuaValue = LuaState->ToLuaValue(StackPointer++);
 		*LuaProp->ContainerPtrToValuePtr<FLuaValue>(Parameters) = LuaValue;
@@ -738,6 +736,10 @@ int ULuaState::MetaTableFunction__call(lua_State *L)
 		if (!Prop->HasAnyPropertyFlags(CPF_ReturnParm | CPF_OutParm))
 			continue;
 
+		// avoid input args (at all costs !)
+		if (Prop->HasAnyPropertyFlags(CPF_ConstParm | CPF_ReferenceParm))
+			continue;
+
 		UStructProperty* LuaProp = Cast<UStructProperty>(Prop);
 		if (!LuaProp)
 		{
@@ -758,13 +760,13 @@ int ULuaState::MetaTableFunction__call(lua_State *L)
 					LuaState->FromLuaValue(*LuaValue);
 				}
 
-				break;
+
 			}
-			continue;
+			break;
 		}
 
 		if (LuaProp->Struct != FLuaValue::StaticStruct())
-			continue;
+			break;
 
 		FLuaValue* LuaValue = LuaProp->ContainerPtrToValuePtr<FLuaValue>(Parameters);
 		if (LuaValue)