Merge pull request #16302 from inky03/yippee-2

ShadowMario · web-flow · commit cf674627b40f · 2025-03-16T20:49:20.000-03:00
support passing Object to lua
diff --git a/source/psychlua/HScript.hx b/source/psychlua/HScript.hx
@@ -356,7 +356,7 @@ class HScript extends Iris
 				final retVal:IrisCall = funk.hscript.call(funcToRun, funcArgs);
 				if (retVal != null)
 				{
-					return (retVal.returnValue == null || LuaUtils.isOfTypes(retVal.returnValue, [Bool, Int, Float, String, Array])) ? retVal.returnValue : null;
+					return (LuaUtils.isLuaSupported(retVal.returnValue)) ? retVal.returnValue : null;
 				}
 				else if (funk.hscript.returnValue != null)
 				{
@@ -372,7 +372,7 @@ class HScript extends Iris
 				final retVal:IrisCall = funk.hscript.call(funcToRun, funcArgs);
 				if (retVal != null)
 				{
-					return (retVal.returnValue == null || LuaUtils.isOfTypes(retVal.returnValue, [Bool, Int, Float, String, Array])) ? retVal.returnValue : null;
+					return (LuaUtils.isLuaSupported(retVal.returnValue)) ? retVal.returnValue : null;
 				}
 			}
 			else
diff --git a/source/psychlua/LuaUtils.hx b/source/psychlua/LuaUtils.hx
@@ -264,6 +264,9 @@ class LuaUtils
 		}
 		return false;
 	}
+	public static function isLuaSupported(value:Any):Bool {
+		return (value == null || isOfTypes(value, [Bool, Int, Float, String, Array]) || Type.typeof(value) == ValueType.TObject);
+	}
 	
 	public static function getTargetInstance()
 	{

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ class HScript extends Iris`
`356`	`356`	`final retVal:IrisCall = funk.hscript.call(funcToRun, funcArgs);`
`357`	`357`	`if (retVal != null)`
`358`	`358`	`{`
`359`		`- return (retVal.returnValue == null \|\| LuaUtils.isOfTypes(retVal.returnValue, [Bool, Int, Float, String, Array])) ? retVal.returnValue : null;`
	`359`	`+ return (LuaUtils.isLuaSupported(retVal.returnValue)) ? retVal.returnValue : null;`
`360`	`360`	`}`
`361`	`361`	`else if (funk.hscript.returnValue != null)`
`362`	`362`	`{`
`@@ -372,7 +372,7 @@ class HScript extends Iris`
`372`	`372`	`final retVal:IrisCall = funk.hscript.call(funcToRun, funcArgs);`
`373`	`373`	`if (retVal != null)`
`374`	`374`	`{`
`375`		`- return (retVal.returnValue == null \|\| LuaUtils.isOfTypes(retVal.returnValue, [Bool, Int, Float, String, Array])) ? retVal.returnValue : null;`
	`375`	`+ return (LuaUtils.isLuaSupported(retVal.returnValue)) ? retVal.returnValue : null;`
`376`	`376`	`}`
`377`	`377`	`}`
`378`	`378`	`else`
Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,9 @@ class LuaUtils`
`264`	`264`	`}`
`265`	`265`	`return false;`
`266`	`266`	`}`
	`267`	`+ public static function isLuaSupported(value:Any):Bool {`
	`268`	`+ return (value == null \|\| isOfTypes(value, [Bool, Int, Float, String, Array]) \|\| Type.typeof(value) == ValueType.TObject);`
	`269`	`+ }`
`267`	`270`
`268`	`271`	`public static function getTargetInstance()`
`269`	`272`	`{`