Skip to content

interop: keep interop traits next to the templates they specialize #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

Open
aleksisch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

interop: keep interop traits next to the templates they specialize #3921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
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
9 changes: 9 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,15 @@ namespace das {
}
};

// any unspecified 'callback' thing binds as void *. it goes after typeFactory<TT *>,
// whose make() it reaches through a non-dependent name
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.

27 changes: 27 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,33 @@ namespace das
}
};

// a null daslang string is the empty string. every cast_arg lives beside the
// generic: the call node is keyed on the signature, so one shared instantiation
// serves binds from many TUs and they must all see the same conversion
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<das::string> {
static __forceinline string to ( Context & ctx, SimNode * node ) {
auto res = (das::string *) node->evalPtr(ctx);
return *res;
}
};

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
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
1 change: 0 additions & 1 deletion modules/dasImgui/src/dasIMGUI.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 "dasIMGUI.h"
#include "need_dasIMGUI.h"
Expand Down
1 change: 0 additions & 1 deletion modules/dasImgui/src/dasIMGUI.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 "dasIMGUI.h"
#include "need_dasIMGUI.h"
Expand Down
1 change: 0 additions & 1 deletion modules/dasImgui/src/dasIMGUI.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 "dasIMGUI.h"
#include "need_dasIMGUI.h"
Expand Down
1 change: 0 additions & 1 deletion modules/dasImgui/src/dasIMGUI.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 "dasIMGUI.h"
#include "need_dasIMGUI.h"
Expand Down
1 change: 0 additions & 1 deletion modules/dasImgui/src/dasIMGUI.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 "dasIMGUI.h"
#include "need_dasIMGUI.h"
Expand Down
Loading
Loading