Skip to content

interop: always hand a C++ bind "" for a null daslang string #3921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aleksisch merged 2 commits into from
Sep 2, 2026
Merged

interop: always hand a C++ bind "" for a null daslang string #3921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2dd731
interop: always hand a C++ bind "" for a null daslang string
aleksisch Sep 2, 2026
f11baa3
tests: price the null-string substitution
aleksisch Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions daslib/aot_cpp.das
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3923,7 +3923,7 @@ class public CppAot : AstVisitor {
return argType.isVoidPointer ^^ passType.isVoidPointer;
}
def needStringCast(func : Function?; arg : TypeDeclPtr) {
return func.moreFlags.needStringCast && arg.isString && !arg.flags.ref;
return arg.isString && !arg.flags.ref;
}
def CallFunc_preVisitCallArg(call : ExprCallFunc?; arg : ExpressionPtr; is_last : bool) {
if (call.func.moreFlags.propertyFunction) return ;
Expand Down Expand Up @@ -3962,7 +3962,7 @@ class public CppAot : AstVisitor {
if (isPolicyBasedCallFunc(call) && policyArgNeedCast(call.func.result, argType)) {
write(*ss, "cast<{describeCppType(argType,DescribeConfig(skip_ref=true,skip_const=true,cross_platform=cross_platform))}>::from(");
}
if (needStringCast(call.func, argType)) {
if (needStringCast(call.func, funArgType)) {
write(*ss, "(das_string_cast(");
}
}
Expand Down
1 change: 0 additions & 1 deletion examples/daspkg/packages/daspkg-example-cpp/src/module_counter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion include/daScript/ast/ast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,6 @@ namespace das
union {
struct {
bool macroFunction : 1;
bool needStringCast : 1;
bool aotHashDeppendsOnArguments : 1;
bool lateInit : 1;
bool requestJit : 1;
Expand Down
2 changes: 1 addition & 1 deletion include/daScript/ast/ast_serializer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ namespace das {
AstSerializer & serializeModule ( Module & module, bool already_exists );

static constexpr uint32_t getVersion () {
return 118; // 118: per-record macro file dependencies (module cache re-validates them)
return 199; // 199: MoreFunctionFlags lost needStringCast, so the flag bits shifted
}

void serializeProgram ( ProgramPtr program, ModuleGroup & libGroup ) noexcept;
Expand Down
8 changes: 8 additions & 0 deletions include/daScript/ast/ast_typedecl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,14 @@ namespace das {
}
};

// this binds any unspecified 'callback' thing to 'void *'
template <typename ResT, typename ...Args>
struct typeFactory<ResT (*)(Args...)> {
static TypeDeclPtr make(const ModuleLibrary & library ) {
return typeFactory<void *>::make(library);
};
};

template <typename TT>
struct typeFactory<const TT *> {
static ___noinline TypeDeclPtr make(const ModuleLibrary & lib) {
Expand Down
41 changes: 0 additions & 41 deletions include/daScript/ast/ast_typefactory_bind.h
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions include/daScript/simulate/interop.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,22 @@ namespace das
}
};

template <>
struct cast_arg<char *> {
static __forceinline char * to ( Context & ctx, SimNode * node ) {
char * res = node->evalPtr(ctx);
return res ? res : ((char *)"");
}
};

template <>
struct cast_arg<const char *> {
static __forceinline char * to ( Context & ctx, SimNode * node ) {
char * res = node->evalPtr(ctx);
return res ? res : ((char *)"");
}
};

template <>
struct cast_arg<Context *> {
static __forceinline Context * to ( Context & ctx, SimNode * ) {
Expand Down
1 change: 0 additions & 1 deletion modules/dasAudio/src/dasAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions modules/dasClangBind/cbind/cbind_boost.das
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_10.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_13.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_14.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_15.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_16.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_17.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_18.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_4.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_5.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_6.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_7.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_8.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.func_9.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasClangBind/src/dasClangBind.main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasGlfw/src/dasGLFW.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasGlfw/src/dasGLFW.func_1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasGlfw/src/dasGLFW.func_2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasGlfw/src/dasGLFW.func_3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasGlfw/src/dasGLFW.func_4.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasGlfw/src/dasGLFW.func_5.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/dasGlfw/src/dasGLFW.main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 0 additions & 8 deletions modules/dasImgui/src/cb_dasIMGUI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,20 +159,12 @@ struct imguiTempFn {
}
}

bool anyString = false;
for ( auto &arg : fn->arguments ) {
if ( arg->type->constant && arg->type->ref && !arg->type->isArray() ) {
if ( arg->type->baseType == Type::tFloat2 || arg->type->baseType == Type::tFloat4 ) {
arg->type->ref = false;
}
}
if ( arg->type->isString() && !arg->type->ref ) {
anyString = true;
}
}

if (anyString) {
fn->needStringCast = true;
}

return true;
Expand Down
1 change: 0 additions & 1 deletion modules/dasImgui/src/dasIMGUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Loading