From b155f3fdf89d0b7ed0fcde0961e338650ba98752 Mon Sep 17 00:00:00 2001 From: Churkin Aleksey Date: Wed, 2 Sep 2026 01:03:25 +0300 Subject: [PATCH] interop: honour needStringCast in the interpreter A bind marked needStringCast is handed "" where daslang holds a null string. The AOT backend applies it at the call site (das_string_cast, picked by needStringCast in daslib/aot_cpp.das). The interpreter had no equivalent: it relied on the cast_arg specializations that ast_typefactory_bind.h supplies, so the conversion reached every bind in a translation unit which included that header, and no bind elsewhere. That was survivable while SimNode_ExtFuncCall took the function as a non type template parameter: the node was instantiated once per bound function, in the unit that did the binding, so the choice was at least fixed per bind. Keyed on the signature alone, one node serves every bind of that signature. A game link has 27 objects defining the node for void (*)(char const*) - 10 generated dasImgui units which include the header, 17 engine units which do not - and the definition that survives depends on object order. ImGui::PushID got a nullptr and crashed in ImHashStr. Decide it where the bind is known instead: sv_simulateCall wraps the string arguments of a bind which asked for the conversion, on the same predicate aot_cpp.das uses, and the cast_arg specializations go away. A bind which did not ask still sees null, which is what tests/strings/strings_core_pins holds the string builtins to. tests/handle_types/string_arg_never_null binds one function twice, with the flag and without, and covers both halves. --- CMakeLists.txt | 1 - .../daspkg-example-cpp/src/module_counter.cpp | 1 - include/daScript/ast/ast_typedecl.h | 8 ++++ include/daScript/ast/ast_typefactory_bind.h | 41 ------------------- include/daScript/simulate/interop.h | 8 ++++ include/daScript/simulate/simulate_nodes.h | 12 ++++++ modules/dasAudio/src/dasAudio.cpp | 1 - modules/dasClangBind/cbind/cbind_boost.das | 2 - modules/dasClangBind/src/dasClangBind.cpp | 1 - .../dasClangBind/src/dasClangBind.func_1.cpp | 1 - .../dasClangBind/src/dasClangBind.func_10.cpp | 1 - .../dasClangBind/src/dasClangBind.func_11.cpp | 1 - .../dasClangBind/src/dasClangBind.func_12.cpp | 1 - .../dasClangBind/src/dasClangBind.func_13.cpp | 1 - .../dasClangBind/src/dasClangBind.func_14.cpp | 1 - .../dasClangBind/src/dasClangBind.func_15.cpp | 1 - .../dasClangBind/src/dasClangBind.func_16.cpp | 1 - .../dasClangBind/src/dasClangBind.func_17.cpp | 1 - .../dasClangBind/src/dasClangBind.func_18.cpp | 1 - .../dasClangBind/src/dasClangBind.func_2.cpp | 1 - .../dasClangBind/src/dasClangBind.func_3.cpp | 1 - .../dasClangBind/src/dasClangBind.func_4.cpp | 1 - .../dasClangBind/src/dasClangBind.func_5.cpp | 1 - .../dasClangBind/src/dasClangBind.func_6.cpp | 1 - .../dasClangBind/src/dasClangBind.func_7.cpp | 1 - .../dasClangBind/src/dasClangBind.func_8.cpp | 1 - .../dasClangBind/src/dasClangBind.func_9.cpp | 1 - .../dasClangBind/src/dasClangBind.main.cpp | 1 - modules/dasGlfw/src/dasGLFW.cpp | 1 - modules/dasGlfw/src/dasGLFW.func_1.cpp | 1 - modules/dasGlfw/src/dasGLFW.func_2.cpp | 1 - modules/dasGlfw/src/dasGLFW.func_3.cpp | 1 - modules/dasGlfw/src/dasGLFW.func_4.cpp | 1 - modules/dasGlfw/src/dasGLFW.func_5.cpp | 1 - modules/dasGlfw/src/dasGLFW.main.cpp | 1 - modules/dasImgui/src/dasIMGUI.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_1.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_10.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_11.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_12.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_13.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_14.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_15.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_16.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_17.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_18.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_19.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_2.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_20.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_21.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_22.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_23.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_24.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_25.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_26.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_27.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_28.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_29.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_3.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_30.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_31.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_32.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_33.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_34.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_4.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_5.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_6.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_7.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_8.cpp | 1 - modules/dasImgui/src/dasIMGUI.func_9.cpp | 1 - modules/dasImgui/src/dasIMGUI.main.cpp | 1 - modules/dasMinfft/src/dasMinfft.cpp | 1 - modules/dasOpenGL/src/dasOpenGL.cpp | 1 - modules/dasOpenGL/src/dasOpenGL.func_1.cpp | 1 - modules/dasOpenGL/src/dasOpenGL.func_2.cpp | 1 - modules/dasOpenGL/src/dasOpenGL.func_3.cpp | 1 - modules/dasOpenGL/src/dasOpenGL.func_4.cpp | 1 - modules/dasOpenGL/src/dasOpenGL.func_5.cpp | 1 - modules/dasOpenGL/src/dasOpenGL.func_6.cpp | 1 - modules/dasOpenGL/src/dasOpenGL.main.cpp | 1 - modules/dasPUGIXML/src/dasPUGIXML.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.backup.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.func_1.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.func_10.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.func_11.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.func_12.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.func_2.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.func_3.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.func_4.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.func_5.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.func_6.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.func_7.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.func_8.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.func_9.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.main.cpp | 1 - modules/dasSQLITE/src/dasSQLITE.userfn.cpp | 1 - modules/dasStbImage/src/dasStbImage.cpp | 1 - modules/dasStbImage/src/dasStbTrueType.cpp | 1 - modules/dasUnitTest/test_handles.cpp | 12 ++++++ src/ast/ast_simulate.cpp | 5 +++ src/simulate/simulate_visit.cpp | 7 ++++ tests/handle_types/string_arg_never_null.das | 22 ++++++++++ .../integration/cpp/04_binding_types.cpp | 1 - .../integration/cpp/05_binding_enums.cpp | 1 - tutorials/integration/cpp/06_interop.cpp | 1 - tutorials/integration/cpp/07_callbacks.cpp | 1 - tutorials/integration/cpp/08_methods.cpp | 1 - .../cpp/09_operators_and_properties.cpp | 1 - .../integration/cpp/10_custom_modules.cpp | 1 - .../integration/cpp/11_context_variables.cpp | 1 - .../integration/cpp/12_smart_pointers.cpp | 1 - 112 files changed, 74 insertions(+), 146 deletions(-) delete mode 100644 include/daScript/ast/ast_typefactory_bind.h create mode 100644 tests/handle_types/string_arg_never_null.das diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e41a0bb09..59f5234490 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1655,7 +1655,6 @@ SET(DAS_RELEASE_AST_INCLUDE include/daScript/ast/ast_serializer.h include/daScript/ast/ast_simulate.h include/daScript/ast/ast_typedecl.h - include/daScript/ast/ast_typefactory_bind.h include/daScript/ast/ast_typefactory.h include/daScript/ast/ast_visitor.h include/daScript/ast/ast_aot_cpp.h diff --git a/examples/daspkg/packages/daspkg-example-cpp/src/module_counter.cpp b/examples/daspkg/packages/daspkg-example-cpp/src/module_counter.cpp index 66e226116f..a483dc4e69 100644 --- a/examples/daspkg/packages/daspkg-example-cpp/src/module_counter.cpp +++ b/examples/daspkg/packages/daspkg-example-cpp/src/module_counter.cpp @@ -1,6 +1,5 @@ #include "daScript/daScript.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" using namespace das; diff --git a/include/daScript/ast/ast_typedecl.h b/include/daScript/ast/ast_typedecl.h index a580ad8b63..93eadae28b 100644 --- a/include/daScript/ast/ast_typedecl.h +++ b/include/daScript/ast/ast_typedecl.h @@ -722,6 +722,14 @@ namespace das { } }; + // this binds any unspecified 'callback' thing to 'void *' + template + struct typeFactory { + static TypeDeclPtr make(const ModuleLibrary & library ) { + return typeFactory::make(library); + }; + }; + template struct typeFactory { static ___noinline TypeDeclPtr make(const ModuleLibrary & lib) { diff --git a/include/daScript/ast/ast_typefactory_bind.h b/include/daScript/ast/ast_typefactory_bind.h deleted file mode 100644 index e535921b85..0000000000 --- a/include/daScript/ast/ast_typefactory_bind.h +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once - -#include "ast_typefactory.h" - -namespace das { - // note: - // this binds any unspecified 'callback' thing to 'void *' - // generally this is included with generated headers - template - struct typeFactory { - static TypeDeclPtr make(const ModuleLibrary & library ) { - return typeFactory::make(library); - }; - }; - - // note: - // this is here to pass strings safely - template <> - struct cast_arg { - static __forceinline char * to ( Context & ctx, SimNode * node ) { - char * res = node->evalPtr(ctx); - return res ? res : ((char *)""); - } - }; - - template <> - struct cast_arg { - static __forceinline char * to ( Context & ctx, SimNode * node ) { - char * res = node->evalPtr(ctx); - return res ? res : ((char *)""); - } - }; - - template <> - struct cast_arg { - static __forceinline string to ( Context & ctx, SimNode * node ) { - auto res = (das::string *) node->evalPtr(ctx); - return *res; - } - }; -} diff --git a/include/daScript/simulate/interop.h b/include/daScript/simulate/interop.h index c10a4e143d..596374fe5f 100644 --- a/include/daScript/simulate/interop.h +++ b/include/daScript/simulate/interop.h @@ -12,6 +12,14 @@ namespace das } }; + template <> + struct cast_arg { + static __forceinline string to ( Context & ctx, SimNode * node ) { + auto res = (das::string *) node->evalPtr(ctx); + return *res; + } + }; + template <> struct cast_arg { static __forceinline Context * to ( Context & ctx, SimNode * ) { diff --git a/include/daScript/simulate/simulate_nodes.h b/include/daScript/simulate/simulate_nodes.h index c91a076c9f..e34baeb452 100644 --- a/include/daScript/simulate/simulate_nodes.h +++ b/include/daScript/simulate/simulate_nodes.h @@ -532,6 +532,18 @@ namespace das { #pragma diag_suppress 826 #endif + struct SimNode_StringArgNotNull : SimNode { + DAS_PTR_NODE; + SimNode_StringArgNotNull ( const LineInfo & a, SimNode * se ) : SimNode(a), subexpr(se) {} + __forceinline char * compute ( Context & context ) { + DAS_PROFILE_NODE + char * res = subexpr->evalPtr(context); + return res ? res : ((char *)""); + } + virtual SimNode * visit ( SimVisitor & vis ) override; + SimNode * subexpr; + }; + // New handle, default template struct SimNode_NewHandle; diff --git a/modules/dasAudio/src/dasAudio.cpp b/modules/dasAudio/src/dasAudio.cpp index 59e145d544..fc5dfa5e3c 100644 --- a/modules/dasAudio/src/dasAudio.cpp +++ b/modules/dasAudio/src/dasAudio.cpp @@ -2,7 +2,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" #include "daScript/simulate/bind_enum.h" diff --git a/modules/dasClangBind/cbind/cbind_boost.das b/modules/dasClangBind/cbind/cbind_boost.das index c21ebcdc90..74e4b53713 100644 --- a/modules/dasClangBind/cbind/cbind_boost.das +++ b/modules/dasClangBind/cbind/cbind_boost.das @@ -1711,7 +1711,6 @@ class CppGenBind : AnyGenBind { fwrite(func_file, "#include \"daScript/ast/ast.h\"\n") fwrite(func_file, "#include \"daScript/ast/ast_interop.h\"\n") fwrite(func_file, "#include \"daScript/ast/ast_handle.h\"\n") - fwrite(func_file, "#include \"daScript/ast/ast_typefactory_bind.h\"\n") fwrite(func_file, "#include \"daScript/simulate/bind_enum.h\"\n") fwrite(func_file, "#include \"{bind_module}.h\"\n") fwrite(func_file, "#include \"need_{bind_module}.h\"\n") @@ -1747,7 +1746,6 @@ class CppGenBind : AnyGenBind { module_cpp_file |> fwrite("#include \"daScript/ast/ast.h\"\n") module_cpp_file |> fwrite("#include \"daScript/ast/ast_interop.h\"\n") module_cpp_file |> fwrite("#include \"daScript/ast/ast_handle.h\"\n") - module_cpp_file |> fwrite("#include \"daScript/ast/ast_typefactory_bind.h\"\n") module_cpp_file |> fwrite("#include \"daScript/simulate/bind_enum.h\"\n") module_cpp_file |> fwrite("#include \"{bind_module}.h\"\n") module_cpp_file |> fwrite("#include \"need_{bind_module}.h\"\n") diff --git a/modules/dasClangBind/src/dasClangBind.cpp b/modules/dasClangBind/src/dasClangBind.cpp index 60e7dc4518..252cba8ae8 100644 --- a/modules/dasClangBind/src/dasClangBind.cpp +++ b/modules/dasClangBind/src/dasClangBind.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_1.cpp b/modules/dasClangBind/src/dasClangBind.func_1.cpp index 5075dffeae..1d9eb4a5b8 100644 --- a/modules/dasClangBind/src/dasClangBind.func_1.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_1.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_10.cpp b/modules/dasClangBind/src/dasClangBind.func_10.cpp index 8dff5a78d1..1f62f7f0a4 100644 --- a/modules/dasClangBind/src/dasClangBind.func_10.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_10.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_11.cpp b/modules/dasClangBind/src/dasClangBind.func_11.cpp index 91bda65b32..8f263e9b42 100644 --- a/modules/dasClangBind/src/dasClangBind.func_11.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_11.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_12.cpp b/modules/dasClangBind/src/dasClangBind.func_12.cpp index 51215e30fe..90f0ad258f 100644 --- a/modules/dasClangBind/src/dasClangBind.func_12.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_12.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_13.cpp b/modules/dasClangBind/src/dasClangBind.func_13.cpp index dc571a584b..1330c863d3 100644 --- a/modules/dasClangBind/src/dasClangBind.func_13.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_13.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_14.cpp b/modules/dasClangBind/src/dasClangBind.func_14.cpp index 7b25756725..7e4ee0b255 100644 --- a/modules/dasClangBind/src/dasClangBind.func_14.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_14.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_15.cpp b/modules/dasClangBind/src/dasClangBind.func_15.cpp index 4b954e28bf..a320ace197 100644 --- a/modules/dasClangBind/src/dasClangBind.func_15.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_15.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_16.cpp b/modules/dasClangBind/src/dasClangBind.func_16.cpp index f906592bb3..6b1bb8c5c1 100644 --- a/modules/dasClangBind/src/dasClangBind.func_16.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_16.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_17.cpp b/modules/dasClangBind/src/dasClangBind.func_17.cpp index 3b5793b210..fa822ced00 100644 --- a/modules/dasClangBind/src/dasClangBind.func_17.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_17.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_18.cpp b/modules/dasClangBind/src/dasClangBind.func_18.cpp index 1e339cc1a6..51f7486897 100644 --- a/modules/dasClangBind/src/dasClangBind.func_18.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_18.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_2.cpp b/modules/dasClangBind/src/dasClangBind.func_2.cpp index 325066cb80..db243fa4a1 100644 --- a/modules/dasClangBind/src/dasClangBind.func_2.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_2.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_3.cpp b/modules/dasClangBind/src/dasClangBind.func_3.cpp index 4115d1be0a..cb4fd07404 100644 --- a/modules/dasClangBind/src/dasClangBind.func_3.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_3.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_4.cpp b/modules/dasClangBind/src/dasClangBind.func_4.cpp index ffb50ae32a..8fe322622c 100644 --- a/modules/dasClangBind/src/dasClangBind.func_4.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_4.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_5.cpp b/modules/dasClangBind/src/dasClangBind.func_5.cpp index 8168e887b7..2421b93a06 100644 --- a/modules/dasClangBind/src/dasClangBind.func_5.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_5.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_6.cpp b/modules/dasClangBind/src/dasClangBind.func_6.cpp index 34657f4eaa..74636735b0 100644 --- a/modules/dasClangBind/src/dasClangBind.func_6.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_6.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_7.cpp b/modules/dasClangBind/src/dasClangBind.func_7.cpp index 10e3bceda5..371006e008 100644 --- a/modules/dasClangBind/src/dasClangBind.func_7.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_7.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_8.cpp b/modules/dasClangBind/src/dasClangBind.func_8.cpp index f3c24cfa2c..c0b7a66c87 100644 --- a/modules/dasClangBind/src/dasClangBind.func_8.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_8.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.func_9.cpp b/modules/dasClangBind/src/dasClangBind.func_9.cpp index 14e4e21b52..abf80f60ed 100644 --- a/modules/dasClangBind/src/dasClangBind.func_9.cpp +++ b/modules/dasClangBind/src/dasClangBind.func_9.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasClangBind/src/dasClangBind.main.cpp b/modules/dasClangBind/src/dasClangBind.main.cpp index f9cfa16def..18840bb3dd 100644 --- a/modules/dasClangBind/src/dasClangBind.main.cpp +++ b/modules/dasClangBind/src/dasClangBind.main.cpp @@ -2,7 +2,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasClangBind.h" #include "need_dasClangBind.h" diff --git a/modules/dasGlfw/src/dasGLFW.cpp b/modules/dasGlfw/src/dasGLFW.cpp index 6b8c48b681..b97e7b88dc 100644 --- a/modules/dasGlfw/src/dasGLFW.cpp +++ b/modules/dasGlfw/src/dasGLFW.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasGLFW.h" #include "need_dasGLFW.h" diff --git a/modules/dasGlfw/src/dasGLFW.func_1.cpp b/modules/dasGlfw/src/dasGLFW.func_1.cpp index 708c2206a3..ae6e147c96 100644 --- a/modules/dasGlfw/src/dasGLFW.func_1.cpp +++ b/modules/dasGlfw/src/dasGLFW.func_1.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasGLFW.h" #include "need_dasGLFW.h" diff --git a/modules/dasGlfw/src/dasGLFW.func_2.cpp b/modules/dasGlfw/src/dasGLFW.func_2.cpp index f7afe92174..a9dbba546f 100644 --- a/modules/dasGlfw/src/dasGLFW.func_2.cpp +++ b/modules/dasGlfw/src/dasGLFW.func_2.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasGLFW.h" #include "need_dasGLFW.h" diff --git a/modules/dasGlfw/src/dasGLFW.func_3.cpp b/modules/dasGlfw/src/dasGLFW.func_3.cpp index 50336ac83a..621e31c531 100644 --- a/modules/dasGlfw/src/dasGLFW.func_3.cpp +++ b/modules/dasGlfw/src/dasGLFW.func_3.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasGLFW.h" #include "need_dasGLFW.h" diff --git a/modules/dasGlfw/src/dasGLFW.func_4.cpp b/modules/dasGlfw/src/dasGLFW.func_4.cpp index a5e280ac91..103d507aa0 100644 --- a/modules/dasGlfw/src/dasGLFW.func_4.cpp +++ b/modules/dasGlfw/src/dasGLFW.func_4.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasGLFW.h" #include "need_dasGLFW.h" diff --git a/modules/dasGlfw/src/dasGLFW.func_5.cpp b/modules/dasGlfw/src/dasGLFW.func_5.cpp index d13daa31f4..82e28b6afd 100644 --- a/modules/dasGlfw/src/dasGLFW.func_5.cpp +++ b/modules/dasGlfw/src/dasGLFW.func_5.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasGLFW.h" #include "need_dasGLFW.h" diff --git a/modules/dasGlfw/src/dasGLFW.main.cpp b/modules/dasGlfw/src/dasGLFW.main.cpp index 19f5079528..ca09fa86c3 100644 --- a/modules/dasGlfw/src/dasGLFW.main.cpp +++ b/modules/dasGlfw/src/dasGLFW.main.cpp @@ -2,7 +2,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "dasGLFW.h" #include "need_dasGLFW.h" #include "aot_dasGLFW.h" diff --git a/modules/dasImgui/src/dasIMGUI.cpp b/modules/dasImgui/src/dasIMGUI.cpp index 136bbe520a..479f69efcb 100644 --- a/modules/dasImgui/src/dasIMGUI.cpp +++ b/modules/dasImgui/src/dasIMGUI.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_1.cpp b/modules/dasImgui/src/dasIMGUI.func_1.cpp index e134e7b414..f564624d5a 100644 --- a/modules/dasImgui/src/dasIMGUI.func_1.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_1.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_10.cpp b/modules/dasImgui/src/dasIMGUI.func_10.cpp index cda2968de7..cd6fc99447 100644 --- a/modules/dasImgui/src/dasIMGUI.func_10.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_10.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_11.cpp b/modules/dasImgui/src/dasIMGUI.func_11.cpp index 5888dd7be1..ad50fcb87e 100644 --- a/modules/dasImgui/src/dasIMGUI.func_11.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_11.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_12.cpp b/modules/dasImgui/src/dasIMGUI.func_12.cpp index f511ecfcd8..0076070160 100644 --- a/modules/dasImgui/src/dasIMGUI.func_12.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_12.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_13.cpp b/modules/dasImgui/src/dasIMGUI.func_13.cpp index a13efccacd..f8b10c1b0e 100644 --- a/modules/dasImgui/src/dasIMGUI.func_13.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_13.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_14.cpp b/modules/dasImgui/src/dasIMGUI.func_14.cpp index cd6b81b9a9..0578787063 100644 --- a/modules/dasImgui/src/dasIMGUI.func_14.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_14.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_15.cpp b/modules/dasImgui/src/dasIMGUI.func_15.cpp index 88bb308d86..d51dc24db4 100644 --- a/modules/dasImgui/src/dasIMGUI.func_15.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_15.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_16.cpp b/modules/dasImgui/src/dasIMGUI.func_16.cpp index 0e46a8688c..c88cce325a 100644 --- a/modules/dasImgui/src/dasIMGUI.func_16.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_16.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_17.cpp b/modules/dasImgui/src/dasIMGUI.func_17.cpp index 3ff2f3b359..eb872c7312 100644 --- a/modules/dasImgui/src/dasIMGUI.func_17.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_17.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_18.cpp b/modules/dasImgui/src/dasIMGUI.func_18.cpp index a9f7c425b1..a4e15cec0a 100644 --- a/modules/dasImgui/src/dasIMGUI.func_18.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_18.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_19.cpp b/modules/dasImgui/src/dasIMGUI.func_19.cpp index ff345701e2..75767661ab 100644 --- a/modules/dasImgui/src/dasIMGUI.func_19.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_19.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_2.cpp b/modules/dasImgui/src/dasIMGUI.func_2.cpp index 56a934d1c5..2c5df50dcc 100644 --- a/modules/dasImgui/src/dasIMGUI.func_2.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_2.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_20.cpp b/modules/dasImgui/src/dasIMGUI.func_20.cpp index d70d825550..864064e96e 100644 --- a/modules/dasImgui/src/dasIMGUI.func_20.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_20.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_21.cpp b/modules/dasImgui/src/dasIMGUI.func_21.cpp index ab61e8b7b6..7ddfd6050b 100644 --- a/modules/dasImgui/src/dasIMGUI.func_21.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_21.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_22.cpp b/modules/dasImgui/src/dasIMGUI.func_22.cpp index 0e3f04dce5..58842d3ceb 100644 --- a/modules/dasImgui/src/dasIMGUI.func_22.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_22.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_23.cpp b/modules/dasImgui/src/dasIMGUI.func_23.cpp index d2bed45d51..e9b950f08c 100644 --- a/modules/dasImgui/src/dasIMGUI.func_23.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_23.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_24.cpp b/modules/dasImgui/src/dasIMGUI.func_24.cpp index 677c3e5685..c148f7db21 100644 --- a/modules/dasImgui/src/dasIMGUI.func_24.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_24.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_25.cpp b/modules/dasImgui/src/dasIMGUI.func_25.cpp index 54effd20aa..1fd94fa60f 100644 --- a/modules/dasImgui/src/dasIMGUI.func_25.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_25.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_26.cpp b/modules/dasImgui/src/dasIMGUI.func_26.cpp index 2b363d5874..a7a224cd28 100644 --- a/modules/dasImgui/src/dasIMGUI.func_26.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_26.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_27.cpp b/modules/dasImgui/src/dasIMGUI.func_27.cpp index ba18bd6010..677b733513 100644 --- a/modules/dasImgui/src/dasIMGUI.func_27.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_27.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_28.cpp b/modules/dasImgui/src/dasIMGUI.func_28.cpp index b8e079cf14..f7cc6024ff 100644 --- a/modules/dasImgui/src/dasIMGUI.func_28.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_28.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_29.cpp b/modules/dasImgui/src/dasIMGUI.func_29.cpp index a2bf4e6f4a..5ab99f803c 100644 --- a/modules/dasImgui/src/dasIMGUI.func_29.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_29.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_3.cpp b/modules/dasImgui/src/dasIMGUI.func_3.cpp index bdc8e0c0e7..b85f8c7b7a 100644 --- a/modules/dasImgui/src/dasIMGUI.func_3.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_3.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_30.cpp b/modules/dasImgui/src/dasIMGUI.func_30.cpp index fcc65cfcd7..cde3994f9d 100644 --- a/modules/dasImgui/src/dasIMGUI.func_30.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_30.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_31.cpp b/modules/dasImgui/src/dasIMGUI.func_31.cpp index 05884a6749..d070ab3a21 100644 --- a/modules/dasImgui/src/dasIMGUI.func_31.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_31.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_32.cpp b/modules/dasImgui/src/dasIMGUI.func_32.cpp index d45e5b84a6..b284abc380 100644 --- a/modules/dasImgui/src/dasIMGUI.func_32.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_32.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_33.cpp b/modules/dasImgui/src/dasIMGUI.func_33.cpp index 7f30e94f33..07c15ced21 100644 --- a/modules/dasImgui/src/dasIMGUI.func_33.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_33.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_34.cpp b/modules/dasImgui/src/dasIMGUI.func_34.cpp index 30318dbddf..d49155f4da 100644 --- a/modules/dasImgui/src/dasIMGUI.func_34.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_34.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_4.cpp b/modules/dasImgui/src/dasIMGUI.func_4.cpp index b0bf260c7f..4082888025 100644 --- a/modules/dasImgui/src/dasIMGUI.func_4.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_4.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_5.cpp b/modules/dasImgui/src/dasIMGUI.func_5.cpp index cded989dd4..b24e63a93c 100644 --- a/modules/dasImgui/src/dasIMGUI.func_5.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_5.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_6.cpp b/modules/dasImgui/src/dasIMGUI.func_6.cpp index ae71c8939a..fd1cce9d9f 100644 --- a/modules/dasImgui/src/dasIMGUI.func_6.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_6.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_7.cpp b/modules/dasImgui/src/dasIMGUI.func_7.cpp index 5a1bc83111..507ec6ccce 100644 --- a/modules/dasImgui/src/dasIMGUI.func_7.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_7.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_8.cpp b/modules/dasImgui/src/dasIMGUI.func_8.cpp index 31a7954663..e7e088018a 100644 --- a/modules/dasImgui/src/dasIMGUI.func_8.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_8.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.func_9.cpp b/modules/dasImgui/src/dasIMGUI.func_9.cpp index c4249e02fe..2a70a0f2f2 100644 --- a/modules/dasImgui/src/dasIMGUI.func_9.cpp +++ b/modules/dasImgui/src/dasIMGUI.func_9.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasIMGUI.h" #include "need_dasIMGUI.h" diff --git a/modules/dasImgui/src/dasIMGUI.main.cpp b/modules/dasImgui/src/dasIMGUI.main.cpp index cbce03a74d..190d37ee41 100644 --- a/modules/dasImgui/src/dasIMGUI.main.cpp +++ b/modules/dasImgui/src/dasIMGUI.main.cpp @@ -2,7 +2,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "aot_builtin_clipboard.h" #include "dasIMGUI.h" diff --git a/modules/dasMinfft/src/dasMinfft.cpp b/modules/dasMinfft/src/dasMinfft.cpp index a4a954b40d..547cfe0750 100644 --- a/modules/dasMinfft/src/dasMinfft.cpp +++ b/modules/dasMinfft/src/dasMinfft.cpp @@ -2,7 +2,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" #include "dasMinfft.h" diff --git a/modules/dasOpenGL/src/dasOpenGL.cpp b/modules/dasOpenGL/src/dasOpenGL.cpp index 9e548b1376..465589a4be 100644 --- a/modules/dasOpenGL/src/dasOpenGL.cpp +++ b/modules/dasOpenGL/src/dasOpenGL.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasOpenGL.h" #include "need_dasOpenGL.h" diff --git a/modules/dasOpenGL/src/dasOpenGL.func_1.cpp b/modules/dasOpenGL/src/dasOpenGL.func_1.cpp index 099c38dd1a..3d451a2afc 100644 --- a/modules/dasOpenGL/src/dasOpenGL.func_1.cpp +++ b/modules/dasOpenGL/src/dasOpenGL.func_1.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasOpenGL.h" #include "need_dasOpenGL.h" diff --git a/modules/dasOpenGL/src/dasOpenGL.func_2.cpp b/modules/dasOpenGL/src/dasOpenGL.func_2.cpp index bf61341d94..44b27ca79a 100644 --- a/modules/dasOpenGL/src/dasOpenGL.func_2.cpp +++ b/modules/dasOpenGL/src/dasOpenGL.func_2.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasOpenGL.h" #include "need_dasOpenGL.h" diff --git a/modules/dasOpenGL/src/dasOpenGL.func_3.cpp b/modules/dasOpenGL/src/dasOpenGL.func_3.cpp index e3a39f5fdb..0d2ae02849 100644 --- a/modules/dasOpenGL/src/dasOpenGL.func_3.cpp +++ b/modules/dasOpenGL/src/dasOpenGL.func_3.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasOpenGL.h" #include "need_dasOpenGL.h" diff --git a/modules/dasOpenGL/src/dasOpenGL.func_4.cpp b/modules/dasOpenGL/src/dasOpenGL.func_4.cpp index e0aefc5aba..65e9c2bb25 100644 --- a/modules/dasOpenGL/src/dasOpenGL.func_4.cpp +++ b/modules/dasOpenGL/src/dasOpenGL.func_4.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasOpenGL.h" #include "need_dasOpenGL.h" diff --git a/modules/dasOpenGL/src/dasOpenGL.func_5.cpp b/modules/dasOpenGL/src/dasOpenGL.func_5.cpp index a4c7f50fd1..d6048439ee 100644 --- a/modules/dasOpenGL/src/dasOpenGL.func_5.cpp +++ b/modules/dasOpenGL/src/dasOpenGL.func_5.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasOpenGL.h" #include "need_dasOpenGL.h" diff --git a/modules/dasOpenGL/src/dasOpenGL.func_6.cpp b/modules/dasOpenGL/src/dasOpenGL.func_6.cpp index b4990fe562..43f8d43117 100644 --- a/modules/dasOpenGL/src/dasOpenGL.func_6.cpp +++ b/modules/dasOpenGL/src/dasOpenGL.func_6.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasOpenGL.h" #include "need_dasOpenGL.h" diff --git a/modules/dasOpenGL/src/dasOpenGL.main.cpp b/modules/dasOpenGL/src/dasOpenGL.main.cpp index c81691fc98..b8da62f94b 100644 --- a/modules/dasOpenGL/src/dasOpenGL.main.cpp +++ b/modules/dasOpenGL/src/dasOpenGL.main.cpp @@ -16,7 +16,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "dasOpenGL.h" #include "need_dasOpenGL.h" diff --git a/modules/dasPUGIXML/src/dasPUGIXML.cpp b/modules/dasPUGIXML/src/dasPUGIXML.cpp index 04f4452997..8ea2b9f4eb 100644 --- a/modules/dasPUGIXML/src/dasPUGIXML.cpp +++ b/modules/dasPUGIXML/src/dasPUGIXML.cpp @@ -2,7 +2,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" #include "daScript/simulate/bind_enum.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.backup.cpp b/modules/dasSQLITE/src/dasSQLITE.backup.cpp index 1011992dbe..9ffa3df4ad 100644 --- a/modules/dasSQLITE/src/dasSQLITE.backup.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.backup.cpp @@ -2,7 +2,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" #include "dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.cpp b/modules/dasSQLITE/src/dasSQLITE.cpp index f72ad03df9..fe884de42f 100644 --- a/modules/dasSQLITE/src/dasSQLITE.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasSQLITE.h" #include "need_dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.func_1.cpp b/modules/dasSQLITE/src/dasSQLITE.func_1.cpp index 55514b7ee8..5710519c0c 100644 --- a/modules/dasSQLITE/src/dasSQLITE.func_1.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.func_1.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasSQLITE.h" #include "need_dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.func_10.cpp b/modules/dasSQLITE/src/dasSQLITE.func_10.cpp index 30ce62cedf..5f3f25409a 100644 --- a/modules/dasSQLITE/src/dasSQLITE.func_10.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.func_10.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasSQLITE.h" #include "need_dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.func_11.cpp b/modules/dasSQLITE/src/dasSQLITE.func_11.cpp index 8410b921ad..4709437439 100644 --- a/modules/dasSQLITE/src/dasSQLITE.func_11.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.func_11.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasSQLITE.h" #include "need_dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.func_12.cpp b/modules/dasSQLITE/src/dasSQLITE.func_12.cpp index ac5eb86876..4b6c6797d5 100644 --- a/modules/dasSQLITE/src/dasSQLITE.func_12.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.func_12.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasSQLITE.h" #include "need_dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.func_2.cpp b/modules/dasSQLITE/src/dasSQLITE.func_2.cpp index a60e049bcb..f8ea4ac138 100644 --- a/modules/dasSQLITE/src/dasSQLITE.func_2.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.func_2.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasSQLITE.h" #include "need_dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.func_3.cpp b/modules/dasSQLITE/src/dasSQLITE.func_3.cpp index 3c899a3ecb..1a7b7d4510 100644 --- a/modules/dasSQLITE/src/dasSQLITE.func_3.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.func_3.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasSQLITE.h" #include "need_dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.func_4.cpp b/modules/dasSQLITE/src/dasSQLITE.func_4.cpp index 81d109c2e3..22d9131ef9 100644 --- a/modules/dasSQLITE/src/dasSQLITE.func_4.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.func_4.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasSQLITE.h" #include "need_dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.func_5.cpp b/modules/dasSQLITE/src/dasSQLITE.func_5.cpp index 4efd42e74c..b792a68267 100644 --- a/modules/dasSQLITE/src/dasSQLITE.func_5.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.func_5.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasSQLITE.h" #include "need_dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.func_6.cpp b/modules/dasSQLITE/src/dasSQLITE.func_6.cpp index 318cf7c336..efea210cb7 100644 --- a/modules/dasSQLITE/src/dasSQLITE.func_6.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.func_6.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasSQLITE.h" #include "need_dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.func_7.cpp b/modules/dasSQLITE/src/dasSQLITE.func_7.cpp index f37e79035a..e42706ae64 100644 --- a/modules/dasSQLITE/src/dasSQLITE.func_7.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.func_7.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasSQLITE.h" #include "need_dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.func_8.cpp b/modules/dasSQLITE/src/dasSQLITE.func_8.cpp index edc00e4a62..0986fde001 100644 --- a/modules/dasSQLITE/src/dasSQLITE.func_8.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.func_8.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasSQLITE.h" #include "need_dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.func_9.cpp b/modules/dasSQLITE/src/dasSQLITE.func_9.cpp index c611de94ad..074031d4e8 100644 --- a/modules/dasSQLITE/src/dasSQLITE.func_9.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.func_9.cpp @@ -5,7 +5,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" #include "daScript/ast/ast_handle.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "dasSQLITE.h" #include "need_dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.main.cpp b/modules/dasSQLITE/src/dasSQLITE.main.cpp index a2bc689f8a..12021a1857 100644 --- a/modules/dasSQLITE/src/dasSQLITE.main.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.main.cpp @@ -2,7 +2,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" #include "dasSQLITE.h" diff --git a/modules/dasSQLITE/src/dasSQLITE.userfn.cpp b/modules/dasSQLITE/src/dasSQLITE.userfn.cpp index 1435fd1c3f..b9af7f37ed 100644 --- a/modules/dasSQLITE/src/dasSQLITE.userfn.cpp +++ b/modules/dasSQLITE/src/dasSQLITE.userfn.cpp @@ -2,7 +2,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" #include "daScript/simulate/aot.h" diff --git a/modules/dasStbImage/src/dasStbImage.cpp b/modules/dasStbImage/src/dasStbImage.cpp index 27e6d9aeb1..30cce3c548 100644 --- a/modules/dasStbImage/src/dasStbImage.cpp +++ b/modules/dasStbImage/src/dasStbImage.cpp @@ -2,7 +2,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include "stb_image.h" diff --git a/modules/dasStbImage/src/dasStbTrueType.cpp b/modules/dasStbImage/src/dasStbTrueType.cpp index 46225b7372..bb00338eb7 100644 --- a/modules/dasStbImage/src/dasStbTrueType.cpp +++ b/modules/dasStbImage/src/dasStbTrueType.cpp @@ -2,7 +2,6 @@ #include "daScript/ast/ast.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" #include "stb_truetype.h" diff --git a/modules/dasUnitTest/test_handles.cpp b/modules/dasUnitTest/test_handles.cpp index 2351a980f6..45ca0c9694 100644 --- a/modules/dasUnitTest/test_handles.cpp +++ b/modules/dasUnitTest/test_handles.cpp @@ -569,6 +569,10 @@ int32_t test_escape_retained_first_int () { return g_escape_test_retained ? *(int32_t *)g_escape_test_retained : -1; } +int64_t testStringArgLength ( const char * str ) { + return str ? int64_t(strlen(str)) : -1; +} + Module_UnitTest::Module_UnitTest() : Module("UnitTest") { ModuleLibrary lib(this); lib.addBuiltInModule(); @@ -603,6 +607,14 @@ Module_UnitTest::Module_UnitTest() : Module("UnitTest") { addAlias(typeFactory::make(lib)); addVectorAnnotation(this,lib,new Point3ArrayAnnotation(lib)); addCtorAndUsing(*this, lib, "Point3Array", "Point3Array"); + addExtern(*this, lib, "test_string_arg_length", + SideEffects::none, "testStringArgLength")->arg("str"); + { + auto pfn = addExtern(*this, lib, "test_string_arg_length_cast", + SideEffects::none, "testStringArgLength"); + pfn->arg("str"); + pfn->needStringCast = true; + } addExtern(*this, lib, "testPoint3Array", SideEffects::modifyExternal, "testPoint3Array"); addExtern(*this, lib, "testNotLocalObject", diff --git a/src/ast/ast_simulate.cpp b/src/ast/ast_simulate.cpp index d131a14f74..a59ff2565c 100644 --- a/src/ast/ast_simulate.cpp +++ b/src/ast/ast_simulate.cpp @@ -3483,6 +3483,11 @@ namespace das pCall->nArguments = nArg; for ( int a=0; a!=nArg; ++a ) { pCall->arguments[a] = getE(expr->arguments[a]); + if ( func->needStringCast && a < int(func->arguments.size()) + && func->arguments[a]->type->isString() && !func->arguments[a]->type->ref ) { + pCall->arguments[a] = context.code->makeNode( + expr->arguments[a]->at, pCall->arguments[a]); + } if ( pCall->types ) { if ( func->arguments[a]->type->baseType==Type::anyArgument ) { pCall->types[a] = context.thisHelper->makeTypeInfo(nullptr, expr->arguments[a]->type); diff --git a/src/simulate/simulate_visit.cpp b/src/simulate/simulate_visit.cpp index cf3c5c69a9..a27617abe2 100644 --- a/src/simulate/simulate_visit.cpp +++ b/src/simulate/simulate_visit.cpp @@ -225,6 +225,13 @@ namespace das { V_END(); } + SimNode * SimNode_StringArgNotNull::visit ( SimVisitor & vis ) { + V_BEGIN(); + V_OP(StringArgNotNull); + V_SUB(subexpr); + V_END(); + } + SimNode * SimNode_DeleteClassPtr::visit ( SimVisitor & vis ) { V_BEGIN(); V_OP(DeleteClassPtr); diff --git a/tests/handle_types/string_arg_never_null.das b/tests/handle_types/string_arg_never_null.das new file mode 100644 index 0000000000..c8cf5d1346 --- /dev/null +++ b/tests/handle_types/string_arg_never_null.das @@ -0,0 +1,22 @@ +options gen2 +require dastest/testing_boost + +require UnitTest + +[test] +def test_string_arg_cast(t : T?) { + t |> run("null string reaches a needStringCast bind as empty") @(t : T?) { + var nul_str : string + assert(test_string_arg_length_cast(nul_str) == 0l) + let empty_literal = "" + assert(test_string_arg_length_cast(empty_literal) == 0l) + } + t |> run("a plain bind still sees the null") @(t : T?) { + var nul_str : string + assert(test_string_arg_length(nul_str) == -1l) + } + t |> run("a non-empty string is untouched either way") @(t : T?) { + assert(test_string_arg_length_cast("abc") == 3l) + assert(test_string_arg_length("abc") == 3l) + } +} diff --git a/tutorials/integration/cpp/04_binding_types.cpp b/tutorials/integration/cpp/04_binding_types.cpp index 3f4324b9da..23a1cc9c0e 100644 --- a/tutorials/integration/cpp/04_binding_types.cpp +++ b/tutorials/integration/cpp/04_binding_types.cpp @@ -11,7 +11,6 @@ // and pass these types to/from C++ functions seamlessly. #include "daScript/daScript.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" #include diff --git a/tutorials/integration/cpp/05_binding_enums.cpp b/tutorials/integration/cpp/05_binding_enums.cpp index 8665c9b063..54f77b0d19 100644 --- a/tutorials/integration/cpp/05_binding_enums.cpp +++ b/tutorials/integration/cpp/05_binding_enums.cpp @@ -11,7 +11,6 @@ #include "daScript/daScript.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/bind_enum.h" #include diff --git a/tutorials/integration/cpp/06_interop.cpp b/tutorials/integration/cpp/06_interop.cpp index 4237d04ab6..1dbb179969 100644 --- a/tutorials/integration/cpp/06_interop.cpp +++ b/tutorials/integration/cpp/06_interop.cpp @@ -12,7 +12,6 @@ #include "daScript/daScript.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" #include diff --git a/tutorials/integration/cpp/07_callbacks.cpp b/tutorials/integration/cpp/07_callbacks.cpp index 36c633ae7f..4c3f78f404 100644 --- a/tutorials/integration/cpp/07_callbacks.cpp +++ b/tutorials/integration/cpp/07_callbacks.cpp @@ -9,7 +9,6 @@ #include "daScript/daScript.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/simulate/aot.h" #include diff --git a/tutorials/integration/cpp/08_methods.cpp b/tutorials/integration/cpp/08_methods.cpp index 2a24d9b359..d550ec26c7 100644 --- a/tutorials/integration/cpp/08_methods.cpp +++ b/tutorials/integration/cpp/08_methods.cpp @@ -12,7 +12,6 @@ #include "daScript/daScript.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" #include diff --git a/tutorials/integration/cpp/09_operators_and_properties.cpp b/tutorials/integration/cpp/09_operators_and_properties.cpp index ce9e240abc..56d4f1db6d 100644 --- a/tutorials/integration/cpp/09_operators_and_properties.cpp +++ b/tutorials/integration/cpp/09_operators_and_properties.cpp @@ -8,7 +8,6 @@ #include "daScript/daScript.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" #include diff --git a/tutorials/integration/cpp/10_custom_modules.cpp b/tutorials/integration/cpp/10_custom_modules.cpp index 0923fa8078..36a4dc7cba 100644 --- a/tutorials/integration/cpp/10_custom_modules.cpp +++ b/tutorials/integration/cpp/10_custom_modules.cpp @@ -10,7 +10,6 @@ #include "daScript/daScript.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" #include diff --git a/tutorials/integration/cpp/11_context_variables.cpp b/tutorials/integration/cpp/11_context_variables.cpp index 7634c79ac5..4bca67cfd5 100644 --- a/tutorials/integration/cpp/11_context_variables.cpp +++ b/tutorials/integration/cpp/11_context_variables.cpp @@ -8,7 +8,6 @@ #include "daScript/daScript.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" #include diff --git a/tutorials/integration/cpp/12_smart_pointers.cpp b/tutorials/integration/cpp/12_smart_pointers.cpp index c4b9ac492e..a6e2bdf01b 100644 --- a/tutorials/integration/cpp/12_smart_pointers.cpp +++ b/tutorials/integration/cpp/12_smart_pointers.cpp @@ -9,7 +9,6 @@ #include "daScript/daScript.h" #include "daScript/ast/ast_interop.h" -#include "daScript/ast/ast_typefactory_bind.h" #include "daScript/ast/ast_handle.h" #include