This commit is contained in:
vczh
2021-10-23 17:07:48 -07:00
parent f3cc66679f
commit 0700848860
10 changed files with 11 additions and 13 deletions
@@ -30,7 +30,7 @@ int main()
{ {
// prepare Workflow script code // prepare Workflow script code
List<WString> codes; List<WString> codes;
codes.Add(WString(ScriptCode, false)); codes.Add(WString::Unmanaged(ScriptCode));
// compile code and get assemblies // compile code and get assemblies
List<Ptr<ParsingError>> errors; List<Ptr<ParsingError>> errors;
@@ -97,7 +97,7 @@ int main()
{ {
// prepare Workflow script code // prepare Workflow script code
List<WString> codes; List<WString> codes;
codes.Add(WString(ScriptCode, false)); codes.Add(WString::Unmanaged(ScriptCode));
// compile code and get assemblies // compile code and get assemblies
List<Ptr<ParsingError>> errors; List<Ptr<ParsingError>> errors;
@@ -123,7 +123,7 @@ int main()
{ {
// prepare Workflow script code // prepare Workflow script code
List<WString> codes; List<WString> codes;
codes.Add(WString(ScriptCode, false)); codes.Add(WString::Unmanaged(ScriptCode));
// compile code and get assemblies // compile code and get assemblies
List<Ptr<ParsingError>> errors; List<Ptr<ParsingError>> errors;
@@ -162,7 +162,7 @@ int main()
{ {
// prepare Workflow script code // prepare Workflow script code
List<WString> codes; List<WString> codes;
codes.Add(WString(ScriptCode, false)); codes.Add(WString::Unmanaged(ScriptCode));
// compile code and get assemblies // compile code and get assemblies
List<Ptr<ParsingError>> errors; List<Ptr<ParsingError>> errors;
@@ -50,7 +50,7 @@ int wmain(int argc, const wchar_t* argv[])
{ {
// prepare Workflow script code // prepare Workflow script code
List<WString> codes; List<WString> codes;
codes.Add(WString(ScriptCode, false)); codes.Add(WString::Unmanaged(ScriptCode));
// compile code // compile code
// WfLexicalScopeManager is required because we produce assembly and C++ code at the same time // WfLexicalScopeManager is required because we produce assembly and C++ code at the same time
@@ -20,7 +20,6 @@ https://github.com/vczh-libraries
#pragma warning(disable:4250) #pragma warning(disable:4250)
#elif defined(__GNUC__) #elif defined(__GNUC__)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wparentheses-equality"
#elif defined(__clang__) #elif defined(__clang__)
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wparentheses-equality" #pragma clang diagnostic ignored "-Wparentheses-equality"
@@ -64,7 +63,7 @@ Closures
void __vwsnc1_W05Script_myscript_MyApp_CreateScripting__myapi_IScripting::Execute(const ::vl::WString& name) void __vwsnc1_W05Script_myscript_MyApp_CreateScripting__myapi_IScripting::Execute(const ::vl::WString& name)
{ {
::myapi::App::Print(((::vl::WString(L"Hello, ", false) + name) + ::vl::WString(L"!", false))); ::myapi::App::Print(((::vl::WString::Unmanaged(L"Hello, ") + name) + ::vl::WString::Unmanaged(L"!")));
} }
} }
@@ -18,7 +18,6 @@ https://github.com/vczh-libraries
#pragma warning(disable:4250) #pragma warning(disable:4250)
#elif defined(__GNUC__) #elif defined(__GNUC__)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wparentheses-equality"
#elif defined(__clang__) #elif defined(__clang__)
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wparentheses-equality" #pragma clang diagnostic ignored "-Wparentheses-equality"
@@ -36,7 +35,7 @@ namespace myscript
class MyApp : public ::vl::Object, public ::vl::reflection::Description<MyApp> class MyApp : public ::vl::Object, public ::vl::reflection::Description<MyApp>
{ {
friend class ::vl_workflow_global::__vwsnc1_W05Script_myscript_MyApp_CreateScripting__myapi_IScripting; friend class ::vl_workflow_global::__vwsnc1_W05Script_myscript_MyApp_CreateScripting__myapi_IScripting;
#ifndef VCZH_DEBUG_NO_REFLECTION #ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<MyApp>; friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<MyApp>;
#endif #endif
public: public:
@@ -14,7 +14,6 @@ https://github.com/vczh-libraries
#pragma warning(disable:4250) #pragma warning(disable:4250)
#elif defined(__GNUC__) #elif defined(__GNUC__)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wparentheses-equality"
#elif defined(__clang__) #elif defined(__clang__)
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wparentheses-equality" #pragma clang diagnostic ignored "-Wparentheses-equality"
@@ -33,6 +32,7 @@ namespace vl
#ifndef VCZH_DEBUG_NO_REFLECTION #ifndef VCZH_DEBUG_NO_REFLECTION
IMPL_CPP_TYPE_INFO(myscript::MyApp) IMPL_CPP_TYPE_INFO(myscript::MyApp)
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
#define _ , #define _ ,
BEGIN_CLASS_MEMBER(::myscript::MyApp) BEGIN_CLASS_MEMBER(::myscript::MyApp)
CLASS_MEMBER_BASE(::vl::reflection::DescriptableObject) CLASS_MEMBER_BASE(::vl::reflection::DescriptableObject)
@@ -53,11 +53,12 @@ namespace vl
{ {
} }
}; };
#endif
#endif #endif
bool LoadW05ScriptTypes() bool LoadW05ScriptTypes()
{ {
#ifndef VCZH_DEBUG_NO_REFLECTION #ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
if (auto manager = GetGlobalTypeManager()) if (auto manager = GetGlobalTypeManager())
{ {
return manager->AddTypeLoader(MakePtr<W05ScriptTypeLoader>()); return manager->AddTypeLoader(MakePtr<W05ScriptTypeLoader>());
@@ -17,7 +17,6 @@ https://github.com/vczh-libraries
#pragma warning(disable:4250) #pragma warning(disable:4250)
#elif defined(__GNUC__) #elif defined(__GNUC__)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wparentheses-equality"
#elif defined(__clang__) #elif defined(__clang__)
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wparentheses-equality" #pragma clang diagnostic ignored "-Wparentheses-equality"
@@ -118,7 +118,7 @@ int main()
{ {
// prepare Workflow script code // prepare Workflow script code
List<WString> codes; List<WString> codes;
codes.Add(WString(ScriptCode, false)); codes.Add(WString::Unmanaged(ScriptCode));
// compile code and get assemblies // compile code and get assemblies
List<Ptr<ParsingError>> errors; List<Ptr<ParsingError>> errors;