re-introduce intermediate object for haxe generated callables

Aidan Lee · Aidan Lee · commit 915a1512131c · 2025-03-15T19:33:07.000Z
diff --git a/include/Array.h b/include/Array.h
@@ -1407,7 +1407,7 @@ namespace hx
     template<class ELEM_> \
     ::hx::Callable<value(args_list)> Array_obj<ELEM_>::name##_dyn() \
     { \
-        struct _hx_array_##name : public ::hx::Callable_obj<value(args_list)> \
+        struct _hx_array_##name : public ::hx::AutoCallable_obj<value(args_list)> \
         { \
             Array<ELEM_> mThis; \
             _hx_array_##name(Array<ELEM_> inThis) : mThis(inThis) \
@@ -1456,7 +1456,7 @@ template<class ELEM_>
 template<class TO>
 ::hx::Callable<Array<TO>(::hx::Callable<TO(ELEM_)>)> Array_obj<ELEM_>::map_dyn()
 {
-    struct _hx_array_map : public ::hx::Callable_obj<Array<TO>(::hx::Callable<TO(ELEM_)>)>
+    struct _hx_array_map : public ::hx::AutoCallable_obj<Array<TO>(::hx::Callable<TO(ELEM_)>)>
     {
         Array<ELEM_> mThis;
         _hx_array_map(Array<ELEM_> inThis) : mThis(inThis)
diff --git a/include/cpp/VirtualArray.h b/include/cpp/VirtualArray.h
@@ -574,7 +574,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES VirtualArray_obj : public hx::ArrayCommon
    template<typename T>
    ::hx::Callable<int(T)> push_dyn()
    {
-       struct _hx_virtualarray_push : public ::hx::Callable_obj<int(T)>
+       struct _hx_virtualarray_push : public ::hx::AutoCallable_obj<int(T)>
        {
            ::cpp::VirtualArray mThis;
 
diff --git a/include/hx/Functions.h b/include/hx/Functions.h
@@ -47,11 +47,22 @@ namespace hx
             return sizeof...(TArgs);
         }
 
-        Dynamic __Run(const Array<Dynamic>& inArgs) override final;
+        Dynamic __Run(const Array<Dynamic>& inArgs) = 0;
 
         virtual TReturn _hx_run(TArgs... args) = 0;
     };
 
+    template<class TReturn, class... TArgs>
+    class HXCPP_EXTERN_CLASS_ATTRIBUTES AutoCallable_obj;
+
+    template<class TReturn, class... TArgs>
+    class HXCPP_EXTERN_CLASS_ATTRIBUTES AutoCallable_obj<TReturn(TArgs...)> : public ::hx::Callable_obj<TReturn(TArgs...)>
+    {
+        Dynamic __Run(const Array<Dynamic>& inArgs) override final;
+    };
+
+    // ::hx::ObjectPtr overloads
+
     template<class TReturn, class... TArgs>
     class HXCPP_EXTERN_CLASS_ATTRIBUTES Callable;
 
@@ -83,7 +94,7 @@ namespace hx
         Callable(::cpp::Function<TReturn(TArgs...)> inFunction)
             : super(nullptr)
         {
-            struct FunctionCallable final : public Callable_obj<TReturn(TArgs...)>
+            struct FunctionCallable final : public AutoCallable_obj<TReturn(TArgs...)>
             {
                 ::cpp::Function<TReturn(TArgs...)> func;
 
@@ -105,7 +116,7 @@ namespace hx
         Callable(const Callable<TOtherReturn(TOtherArgs...)>& inCallable)
             : super(nullptr)
         {
-            struct AdapterCallable final : public Callable_obj<TReturn(TArgs...)>
+            struct AdapterCallable final : public AutoCallable_obj<TReturn(TArgs...)>
             {
                 Callable<TOtherReturn(TOtherArgs...)> wrapped;
 
@@ -138,7 +149,7 @@ namespace hx
         Callable(const Callable<void(TOtherArgs...)>& inCallable)
             : super(nullptr)
         {
-            struct AdapterCallable final : public Callable_obj<TReturn(TArgs...)>
+            struct AdapterCallable final : public AutoCallable_obj<TReturn(TArgs...)>
             {
                 Callable<void(TOtherArgs...)> wrapped;
 
@@ -181,7 +192,7 @@ namespace hx
             {
                 if (::hx::IsNotNull(inDynamic) && inDynamic->__GetType() == vtFunction)
                 {
-                    struct DynamicCallable final : public Callable_obj<TReturn(TArgs...)>
+                    struct DynamicCallable final : public AutoCallable_obj<TReturn(TArgs...)>
                     {
                         Dynamic wrapped;
 
@@ -223,8 +234,6 @@ namespace hx
         }
     };
 
-    //
-
     template<class... TArgs>
     class Callable<void(TArgs...)> : public ObjectPtr<Callable_obj<void(TArgs...)>>
     {
@@ -253,7 +262,7 @@ namespace hx
         Callable(::cpp::Function<void(TArgs...)> inFunction)
             : super(nullptr)
         {
-            struct FunctionCallable final : public Callable_obj<void(TArgs... )>
+            struct FunctionCallable final : public AutoCallable_obj<void(TArgs... )>
             {
                 ::cpp::Function<void(TArgs...)> func;
 
@@ -272,7 +281,7 @@ namespace hx
         Callable(const Callable<TOtherReturn(TOtherArgs...)>& inCallable)
             : super(nullptr)
         {
-            struct AdapterCallable final : public Callable_obj<void(TArgs...)>
+            struct AdapterCallable final : public AutoCallable_obj<void(TArgs...)>
             {
                 Callable<TOtherReturn(TOtherArgs...)> wrapped;
 
@@ -313,7 +322,7 @@ namespace hx
             {
                 if (::hx::IsNotNull(inDynamic) && inDynamic->__GetType() == vtFunction)
                 {
-                    struct DynamicCallable final : public Callable_obj<void(TArgs...)>
+                    struct DynamicCallable final : public AutoCallable_obj<void(TArgs...)>
                     {
                         Dynamic wrapped;
 
diff --git a/include/hx/Invoker.h b/include/hx/Invoker.h
@@ -208,7 +208,7 @@ ::Dynamic cpp::Variant::operator()(const TArgs & ...args)
 }
 
 template<class TReturn, class... TArgs>
-::Dynamic hx::Callable_obj<TReturn(TArgs...)>::__Run(const Array<Dynamic>& inArgs)
+::Dynamic hx::AutoCallable_obj<TReturn(TArgs...)>::__Run(const Array<Dynamic>& inArgs)
 {
     return invoker::Invoker<std::is_void<TReturn>::value, TReturn, TArgs...>::call(this, inArgs, invoker::index::Helper::index_sequence_for<TArgs...>());
 }
diff --git a/src/Array.cpp b/src/Array.cpp
@@ -690,7 +690,7 @@ namespace cpp
 #if (HXCPP_API_LEVEL>=500)
     ::hx::Callable<bool()> IteratorBase::hasNext_dyn()
     {
-        struct _hx_iterator_hasNext : public ::hx::Callable_obj<bool()>
+        struct _hx_iterator_hasNext : public ::hx::AutoCallable_obj<bool()>
         {
             ::hx::ObjectPtr<IteratorBase> __this;
 
@@ -722,7 +722,7 @@ namespace cpp
 
     ::hx::Callable<::Dynamic()> IteratorBase::next_dyn()
     {
-        struct _hx_iterator_next : public ::hx::Callable_obj<::Dynamic()>
+        struct _hx_iterator_next : public ::hx::AutoCallable_obj<::Dynamic()>
         {
             ::hx::ObjectPtr<IteratorBase> __this;
 
@@ -800,7 +800,7 @@ namespace cpp
 #define HX_VARRAY_FUNC(ret, value, name, args_list, func_list, args_call) \
     ::hx::Callable<value(args_list)> VirtualArray_obj::name##_dyn() \
     { \
-        struct _hx_virtualarray_##name : public ::hx::Callable_obj<value(args_list)> \
+        struct _hx_virtualarray_##name : public ::hx::AutoCallable_obj<value(args_list)> \
         { \
             VirtualArray mThis; \
             _hx_virtualarray_##name(::cpp::VirtualArray inThis) : mThis(inThis) \
diff --git a/src/Math.cpp b/src/Math.cpp
@@ -57,7 +57,7 @@ double Math_obj::POSITIVE_INFINITY = std::numeric_limits<double>::infinity();
 	#define HX_MATHS_FUNC(value, name, args_list, func_list, args_call) \
 		::hx::Callable<value(args_list)> Math_obj::name##_dyn() \
 		{ \
-			struct _hx_maths_##name : public ::hx::Callable_obj<value(args_list)> \
+			struct _hx_maths_##name : public ::hx::AutoCallable_obj<value(args_list)> \
 			{ \
 				value HX_LOCAL_RUN(func_list) override \
 				{ \
diff --git a/src/String.cpp b/src/String.cpp
@@ -2126,7 +2126,7 @@ String &String::operator+=(const String &inRHS)
     #define HX_STRING_FUNC(value, name, args_list, func_list, args_call) \
         ::hx::Callable<value(args_list)> String::name##_dyn() \
         { \
-            struct _hx_string_##name : public ::hx::Callable_obj<value(args_list)> \
+            struct _hx_string_##name : public ::hx::AutoCallable_obj<value(args_list)> \
             { \
                 ::String mThis; \
                 _hx_string_##name(const ::String& inThis) : mThis(inThis) \
@@ -2167,7 +2167,7 @@ String &String::operator+=(const String &inRHS)
 
     ::hx::Callable<::String(int)> String::fromCharCode_dyn()
     {
-        struct _hx_string_fromCharCode : public ::hx::Callable_obj<::String(HX_STRING_ARG_LIST1(int))>
+        struct _hx_string_fromCharCode : public ::hx::AutoCallable_obj<::String(HX_STRING_ARG_LIST1(int))>
         {
             ::String HX_LOCAL_RUN(HX_STRING_FUNC_LIST1(int)) override
             {

Original file line number	Diff line number	Diff line change
`@@ -574,7 +574,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES VirtualArray_obj : public hx::ArrayCommon`
`574`	`574`	`template<typename T>`
`575`	`575`	`::hx::Callable<int(T)> push_dyn()`
`576`	`576`	`{`
`577`		`- struct _hx_virtualarray_push : public ::hx::Callable_obj<int(T)>`
	`577`	`+ struct _hx_virtualarray_push : public ::hx::AutoCallable_obj<int(T)>`
`578`	`578`	`{`
`579`	`579`	`::cpp::VirtualArray mThis;`
`580`	`580`
Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,22 @@ namespace hx`
`47`	`47`	`return sizeof...(TArgs);`
`48`	`48`	`}`
`49`	`49`
`50`		`- Dynamic __Run(const Array<Dynamic>& inArgs) override final;`
	`50`	`+ Dynamic __Run(const Array<Dynamic>& inArgs) = 0;`
`51`	`51`
`52`	`52`	`virtual TReturn _hx_run(TArgs... args) = 0;`
`53`	`53`	`};`
`54`	`54`
	`55`	`+ template<class TReturn, class... TArgs>`
	`56`	`+ class HXCPP_EXTERN_CLASS_ATTRIBUTES AutoCallable_obj;`
	`57`	`+`
	`58`	`+ template<class TReturn, class... TArgs>`
	`59`	`+ class HXCPP_EXTERN_CLASS_ATTRIBUTES AutoCallable_obj<TReturn(TArgs...)> : public ::hx::Callable_obj<TReturn(TArgs...)>`
	`60`	`+ {`
	`61`	`+ Dynamic __Run(const Array<Dynamic>& inArgs) override final;`
	`62`	`+ };`
	`63`	`+`
	`64`	`+ // ::hx::ObjectPtr overloads`
	`65`	`+`
`55`	`66`	`template<class TReturn, class... TArgs>`
`56`	`67`	`class HXCPP_EXTERN_CLASS_ATTRIBUTES Callable;`
`57`	`68`
`@@ -83,7 +94,7 @@ namespace hx`
`83`	`94`	`Callable(::cpp::Function<TReturn(TArgs...)> inFunction)`
`84`	`95`	`: super(nullptr)`
`85`	`96`	`{`
`86`		`- struct FunctionCallable final : public Callable_obj<TReturn(TArgs...)>`
	`97`	`+ struct FunctionCallable final : public AutoCallable_obj<TReturn(TArgs...)>`
`87`	`98`	`{`
`88`	`99`	`::cpp::Function<TReturn(TArgs...)> func;`
`89`	`100`
`@@ -105,7 +116,7 @@ namespace hx`
`105`	`116`	`Callable(const Callable<TOtherReturn(TOtherArgs...)>& inCallable)`
`106`	`117`	`: super(nullptr)`
`107`	`118`	`{`
`108`		`- struct AdapterCallable final : public Callable_obj<TReturn(TArgs...)>`
	`119`	`+ struct AdapterCallable final : public AutoCallable_obj<TReturn(TArgs...)>`
`109`	`120`	`{`
`110`	`121`	`Callable<TOtherReturn(TOtherArgs...)> wrapped;`
`111`	`122`
`@@ -138,7 +149,7 @@ namespace hx`
`138`	`149`	`Callable(const Callable<void(TOtherArgs...)>& inCallable)`
`139`	`150`	`: super(nullptr)`
`140`	`151`	`{`
`141`		`- struct AdapterCallable final : public Callable_obj<TReturn(TArgs...)>`
	`152`	`+ struct AdapterCallable final : public AutoCallable_obj<TReturn(TArgs...)>`
`142`	`153`	`{`
`143`	`154`	`Callable<void(TOtherArgs...)> wrapped;`
`144`	`155`
`@@ -181,7 +192,7 @@ namespace hx`
`181`	`192`	`{`
`182`	`193`	`if (::hx::IsNotNull(inDynamic) && inDynamic->__GetType() == vtFunction)`
`183`	`194`	`{`
`184`		`- struct DynamicCallable final : public Callable_obj<TReturn(TArgs...)>`
	`195`	`+ struct DynamicCallable final : public AutoCallable_obj<TReturn(TArgs...)>`
`185`	`196`	`{`
`186`	`197`	`Dynamic wrapped;`
`187`	`198`
`@@ -223,8 +234,6 @@ namespace hx`
`223`	`234`	`}`
`224`	`235`	`};`
`225`	`236`
`226`		`- //`
`227`		`-`
`228`	`237`	`template<class... TArgs>`
`229`	`238`	`class Callable<void(TArgs...)> : public ObjectPtr<Callable_obj<void(TArgs...)>>`
`230`	`239`	`{`
`@@ -253,7 +262,7 @@ namespace hx`
`253`	`262`	`Callable(::cpp::Function<void(TArgs...)> inFunction)`
`254`	`263`	`: super(nullptr)`
`255`	`264`	`{`
`256`		`- struct FunctionCallable final : public Callable_obj<void(TArgs... )>`
	`265`	`+ struct FunctionCallable final : public AutoCallable_obj<void(TArgs... )>`
`257`	`266`	`{`
`258`	`267`	`::cpp::Function<void(TArgs...)> func;`
`259`	`268`
`@@ -272,7 +281,7 @@ namespace hx`
`272`	`281`	`Callable(const Callable<TOtherReturn(TOtherArgs...)>& inCallable)`
`273`	`282`	`: super(nullptr)`
`274`	`283`	`{`
`275`		`- struct AdapterCallable final : public Callable_obj<void(TArgs...)>`
	`284`	`+ struct AdapterCallable final : public AutoCallable_obj<void(TArgs...)>`
`276`	`285`	`{`
`277`	`286`	`Callable<TOtherReturn(TOtherArgs...)> wrapped;`
`278`	`287`
`@@ -313,7 +322,7 @@ namespace hx`
`313`	`322`	`{`
`314`	`323`	`if (::hx::IsNotNull(inDynamic) && inDynamic->__GetType() == vtFunction)`
`315`	`324`	`{`
`316`		`- struct DynamicCallable final : public Callable_obj<void(TArgs...)>`
	`325`	`+ struct DynamicCallable final : public AutoCallable_obj<void(TArgs...)>`
`317`	`326`	`{`
`318`	`327`	`Dynamic wrapped;`
`319`	`328`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ ::Dynamic cpp::Variant::operator()(const TArgs & ...args)`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`template<class TReturn, class... TArgs>`
`211`		`-::Dynamic hx::Callable_obj<TReturn(TArgs...)>::__Run(const Array<Dynamic>& inArgs)`
	`211`	`+::Dynamic hx::AutoCallable_obj<TReturn(TArgs...)>::__Run(const Array<Dynamic>& inArgs)`
`212`	`212`	`{`
`213`	`213`	`return invoker::Invoker<std::is_void<TReturn>::value, TReturn, TArgs...>::call(this, inArgs, invoker::index::Helper::index_sequence_for<TArgs...>());`
`214`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -690,7 +690,7 @@ namespace cpp`
`690`	`690`	`#if (HXCPP_API_LEVEL>=500)`
`691`	`691`	`::hx::Callable<bool()> IteratorBase::hasNext_dyn()`
`692`	`692`	`{`
`693`		`- struct _hx_iterator_hasNext : public ::hx::Callable_obj<bool()>`
	`693`	`+ struct _hx_iterator_hasNext : public ::hx::AutoCallable_obj<bool()>`
`694`	`694`	`{`
`695`	`695`	`::hx::ObjectPtr<IteratorBase> __this;`
`696`	`696`
`@@ -722,7 +722,7 @@ namespace cpp`
`722`	`722`
`723`	`723`	`::hx::Callable<::Dynamic()> IteratorBase::next_dyn()`
`724`	`724`	`{`
`725`		`- struct _hx_iterator_next : public ::hx::Callable_obj<::Dynamic()>`
	`725`	`+ struct _hx_iterator_next : public ::hx::AutoCallable_obj<::Dynamic()>`
`726`	`726`	`{`
`727`	`727`	`::hx::ObjectPtr<IteratorBase> __this;`
`728`	`728`
`@@ -800,7 +800,7 @@ namespace cpp`
`800`	`800`	`#define HX_VARRAY_FUNC(ret, value, name, args_list, func_list, args_call) \`
`801`	`801`	`::hx::Callable<value(args_list)> VirtualArray_obj::name##_dyn() \`
`802`	`802`	`{ \`
`803`		`- struct _hx_virtualarray_##name : public ::hx::Callable_obj<value(args_list)> \`
	`803`	`+ struct _hx_virtualarray_##name : public ::hx::AutoCallable_obj<value(args_list)> \`
`804`	`804`	`{ \`
`805`	`805`	`VirtualArray mThis; \`
`806`	`806`	`_hx_virtualarray_##name(::cpp::VirtualArray inThis) : mThis(inThis) \`
Original file line number	Diff line number	Diff line change
`@@ -2126,7 +2126,7 @@ String &String::operator+=(const String &inRHS)`
`2126`	`2126`	`#define HX_STRING_FUNC(value, name, args_list, func_list, args_call) \`
`2127`	`2127`	`::hx::Callable<value(args_list)> String::name##_dyn() \`
`2128`	`2128`	`{ \`
`2129`		`- struct _hx_string_##name : public ::hx::Callable_obj<value(args_list)> \`
	`2129`	`+ struct _hx_string_##name : public ::hx::AutoCallable_obj<value(args_list)> \`
`2130`	`2130`	`{ \`
`2131`	`2131`	`::String mThis; \`
`2132`	`2132`	`_hx_string_##name(const ::String& inThis) : mThis(inThis) \`
`@@ -2167,7 +2167,7 @@ String &String::operator+=(const String &inRHS)`
`2167`	`2167`
`2168`	`2168`	`::hx::Callable<::String(int)> String::fromCharCode_dyn()`
`2169`	`2169`	`{`
`2170`		`- struct _hx_string_fromCharCode : public ::hx::Callable_obj<::String(HX_STRING_ARG_LIST1(int))>`
	`2170`	`+ struct _hx_string_fromCharCode : public ::hx::AutoCallable_obj<::String(HX_STRING_ARG_LIST1(int))>`
`2171`	`2171`	`{`
`2172`	`2172`	`::String HX_LOCAL_RUN(HX_STRING_FUNC_LIST1(int)) override`
`2173`	`2173`	`{`