Mirrors_UI_SDK/GacUI
1
0
Fork 0
mirror of https://github.com/vczh-libraries/Release.git synced 2026-05-23 07:45:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update release

Browse Source
This commit is contained in:
vczh
2022-12-09 16:33:25 -08:00
parent d31e9a5d4c
commit 03a5ee8544
123 changed files with 6883 additions and 6272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Import/GacUI.Windows.cpp
+80 -80
View File
File diff suppressed because it is too large Load Diff
Import/GacUI.cpp
+305 -309
View File
File diff suppressed because it is too large Load Diff
Import/GacUI.h
+13 -13
View File
@@ -3274,7 +3274,7 @@ Event
currentHandler = &(*currentHandler)->next;
}
}
(*currentHandler) = new HandlerNode;
(*currentHandler) = Ptr(new HandlerNode);
(*currentHandler)->handler = handler;
return true;
}
@@ -3301,21 +3301,21 @@ Event
template<typename TClass, typename TMethod>
Ptr<IGuiGraphicsEventHandler> AttachMethod(TClass* receiver, TMethod TClass::* method)
{
auto handler=MakePtr<FunctionHandler>(FunctionType(receiver, method));
auto handler=Ptr(new FunctionHandler(FunctionType(receiver, method)));
Attach(handler);
return handler;
}
Ptr<IGuiGraphicsEventHandler> AttachFunction(RawFunctionType* function)
{
auto handler = MakePtr<FunctionHandler>(FunctionType(function));
auto handler = Ptr(new FunctionHandler(FunctionType(function)));
Attach(handler);
return handler;
}
Ptr<IGuiGraphicsEventHandler> AttachFunction(const FunctionType& function)
{
auto handler = MakePtr<FunctionHandler>(function);
auto handler = Ptr(new FunctionHandler(function));
Attach(handler);
return handler;
}
@@ -3323,7 +3323,7 @@ Event
template<typename TLambda>
Ptr<IGuiGraphicsEventHandler> AttachLambda(const TLambda& lambda)
{
auto handler = MakePtr<FunctionHandler>(FunctionType(lambda));
auto handler = Ptr(new FunctionHandler(FunctionType(lambda)));
Attach(handler);
return handler;
}
@@ -3720,10 +3720,10 @@ Workflow to C++ Codegen Helpers
static Ptr<reflection::description::IEventHandler> Attach(Event& e, Handler handler)
{
return MakePtr<EventHandlerImpl>(e.AttachLambda([=](Sender* sender, T& args)
return Ptr(new EventHandlerImpl(e.AttachLambda([=](Sender* sender, T& args)
{
handler(sender, &args);
}));
})));
}
static bool Detach(Event& e, Ptr<reflection::description::IEventHandler> handler)
@@ -5609,7 +5609,7 @@ Helpers
CHECK_ERROR(rendererFactory != nullptr, L"This element is not supported by the selected renderer.");
auto element = new TElement;
element->renderer = rendererFactory->Create();
element->renderer = Ptr(rendererFactory->Create());
element->renderer->Initialize(element);
return element;
}
@@ -5657,8 +5657,8 @@ Helpers
{\
TRENDERER* renderer=new TRENDERER;\
renderer->factory=this;\
renderer->element=0;\
renderer->renderTarget=0;\
renderer->element=nullptr;\
renderer->renderTarget=nullptr;\
return renderer;\
}\
};\
@@ -5672,7 +5672,7 @@ Helpers
{\
auto manager = GetGuiGraphicsResourceManager();\
CHECK_ERROR(manager != nullptr, L"SetGuiGraphicsResourceManager must be called before registering element renderers.");\
manager->RegisterRendererFactory(TELEMENT::GetElementType(), new TRENDERER::Factory);\
manager->RegisterRendererFactory(TELEMENT::GetElementType(), Ptr(new TRENDERER::Factory));\
}\
IGuiGraphicsRendererFactory* GetFactory()override\
{\
@@ -11850,7 +11850,7 @@ extern void GuiApplicationMain();
public:\
GuiRegisterPluginClass_##TYPE()\
{\
vl::presentation::controls::GetPluginManager()->AddPlugin(new TYPE);\
vl::presentation::controls::GetPluginManager()->AddPlugin(Ptr(new TYPE));\
}\
} instance_GuiRegisterPluginClass_##TYPE;\
@@ -19762,7 +19762,7 @@ External Functions
template<typename T>
Ptr<T> Element_Constructor()
{
return T::Create();
return Ptr(T::Create());
}
extern presentation::elements::text::TextLines* GuiColorizedTextElement_GetLines(presentation::elements::GuiColorizedTextElement* thisObject);
Import/GacUICompiler.cpp
+799 -799
View File
File diff suppressed because it is too large Load Diff
Import/GacUICompiler.h
+7 -7
View File
@@ -1281,7 +1281,7 @@ GuiVrtualTypeInstanceLoader
public:
static Ptr<WfExpression> CreateThemeName(theme::ThemeName themeName)
{
auto refExpr = MakePtr<WfChildExpression>();
auto refExpr = Ptr(new WfChildExpression);
refExpr->parent = GetExpressionFromTypeDescriptor(description::GetTypeDescriptor<ThemeName>());
switch (themeName)
{
@@ -1315,7 +1315,7 @@ GuiVrtualTypeInstanceLoader
Ptr<workflow::WfBaseConstructorCall> CreateRootInstance(GuiResourcePrecompileContext& precompileContext, types::ResolvingResult& resolvingResult, const TypeInfo& typeInfo, ArgumentMap& arguments, GuiResourceError::List& errors)override
{
auto createControl = MakePtr<WfBaseConstructorCall>();
auto createControl = Ptr(new WfBaseConstructorCall);
createControl->type = GetTypeFromTypeInfo(TypeInfoRetriver<TControl>::CreateTypeInfo().Obj());
createControl->arguments.Add(CreateThemeName(themeName));
return createControl;
@@ -1325,11 +1325,11 @@ GuiVrtualTypeInstanceLoader
{
CHECK_ERROR(CanCreate(typeInfo), L"GuiTemplateControlInstanceLoader::CreateInstance()#Wrong type info is provided.");
auto block = MakePtr<WfBlockStatement>();
auto block = Ptr(new WfBlockStatement);
{
auto controlType = TypeInfoRetriver<TControl*>::CreateTypeInfo();
auto createControl = MakePtr<WfNewClassExpression>();
auto createControl = Ptr(new WfNewClassExpression);
createControl->type = GetTypeFromTypeInfo(controlType.Obj());
createControl->arguments.Add(CreateThemeName(themeName));
@@ -1339,15 +1339,15 @@ GuiVrtualTypeInstanceLoader
}
AddAdditionalArguments(resolvingResult, typeInfo, variableName, arguments, errors, createControl);
auto refVariable = MakePtr<WfReferenceExpression>();
auto refVariable = Ptr(new WfReferenceExpression);
refVariable->name.value = variableName.ToString();
auto assignExpr = MakePtr<WfBinaryExpression>();
auto assignExpr = Ptr(new WfBinaryExpression);
assignExpr->op = WfBinaryOperator::Assign;
assignExpr->first = refVariable;
assignExpr->second = createControl;
auto assignStat = MakePtr<WfExpressionStatement>();
auto assignStat = Ptr(new WfExpressionStatement);
assignStat->expression = assignExpr;
block->statements.Add(assignStat);
}
Import/GacUIReflection.cpp
+16 -16
View File
@@ -49,7 +49,7 @@ GuiInstanceSharedScript
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
if (initializeContext && !context)
{
context = new WfRuntimeGlobalContext(assembly);
context = Ptr(new WfRuntimeGlobalContext(assembly));
LoadFunction<void()>(context, L"<initialize>")();
}
#else
@@ -188,11 +188,11 @@ Compiled Workflow Type Resolver (Workflow)
vint type;
reader << type;
auto obj = MakePtr<GuiInstanceCompiledWorkflow>();
auto obj = Ptr(new GuiInstanceCompiledWorkflow);
obj->type = (GuiInstanceCompiledWorkflow::AssemblyType)type;
if (obj->type == GuiInstanceCompiledWorkflow::InstanceClass)
{
auto memoryStream = MakePtr<stream::MemoryStream>();
auto memoryStream = Ptr(new stream::MemoryStream);
reader << (stream::IStream&)*memoryStream.Obj();
obj->binaryToLoad = memoryStream;
}
@@ -216,7 +216,7 @@ Plugin
void Load()override
{
IGuiResourceResolverManager* manager = GetResourceResolverManager();
manager->SetTypeResolver(new GuiResourceCompiledWorkflowTypeResolver);
manager->SetTypeResolver(Ptr(new GuiResourceCompiledWorkflowTypeResolver));
}
void Unload()override
@@ -260,8 +260,8 @@ Type Declaration
END_STRUCT_MEMBER(SiteValue)
BEGIN_STRUCT_MEMBER(Color)
valueType = new SerializableValueType<Color>();
serializableType = new SerializableType<Color>();
valueType = Ptr(new SerializableValueType<Color>);
serializableType = Ptr(new SerializableType<Color>);
STRUCT_MEMBER(r)
STRUCT_MEMBER(g)
STRUCT_MEMBER(b)
@@ -369,8 +369,8 @@ Type Declaration
#undef GUI_DEFINE_KEYBOARD_CODE_ENUM_ITEM
BEGIN_STRUCT_MEMBER_FLAG(GlobalStringKey, TypeDescriptorFlags::Primitive)
valueType = new SerializableValueType<GlobalStringKey>();
serializableType = new SerializableType<GlobalStringKey>();
valueType = Ptr(new SerializableValueType<GlobalStringKey>);
serializableType = Ptr(new SerializableType<GlobalStringKey>);
END_STRUCT_MEMBER(GlobalStringKey)
BEGIN_INTERFACE_MEMBER_NOPROXY(INativeImageFrame)
@@ -671,8 +671,8 @@ Type Declaration
END_CLASS_MEMBER(GuiTextData)
BEGIN_STRUCT_MEMBER(DocumentFontSize)
valueType = new SerializableValueType<DocumentFontSize>();
serializableType = new SerializableType<DocumentFontSize>();
valueType = Ptr(new SerializableValueType<DocumentFontSize>);
serializableType = Ptr(new SerializableType<DocumentFontSize>);
STRUCT_MEMBER(size)
STRUCT_MEMBER(relative)
END_STRUCT_MEMBER(DocumentFontSize)
@@ -928,7 +928,7 @@ Type Loader
ITypeManager* manager=GetGlobalTypeManager();
if(manager)
{
Ptr<ITypeLoader> loader=new GuiBasicTypeLoader;
auto loader=Ptr(new GuiBasicTypeLoader);
return manager->AddTypeLoader(loader);
}
#endif
@@ -1447,7 +1447,7 @@ Type Loader
ITypeManager* manager=GetGlobalTypeManager();
if(manager)
{
Ptr<ITypeLoader> loader=new GuiCompositionTypeLoader;
auto loader=Ptr(new GuiCompositionTypeLoader);
return manager->AddTypeLoader(loader);
}
#endif
@@ -2938,7 +2938,7 @@ Type Loader
ITypeManager* manager=GetGlobalTypeManager();
if(manager)
{
Ptr<ITypeLoader> loader=new GuiControlsTypeLoader;
auto loader=Ptr(new GuiControlsTypeLoader);
return manager->AddTypeLoader(loader);
}
#endif
@@ -3245,7 +3245,7 @@ Type Loader
ITypeManager* manager=GetGlobalTypeManager();
if(manager)
{
Ptr<ITypeLoader> loader=new GuiElementTypeLoader;
auto loader=Ptr(new GuiElementTypeLoader);
return manager->AddTypeLoader(loader);
}
#endif
@@ -3400,7 +3400,7 @@ Type Loader
ITypeManager* manager=GetGlobalTypeManager();
if(manager)
{
Ptr<ITypeLoader> loader=new GuiEventTypeLoader;
auto loader=Ptr(new GuiEventTypeLoader);
return manager->AddTypeLoader(loader);
}
#endif
@@ -3737,7 +3737,7 @@ Type Loader
ITypeManager* manager=GetGlobalTypeManager();
if(manager)
{
Ptr<ITypeLoader> loader=new GuiTemplateTypeLoader;
auto loader=Ptr(new GuiTemplateTypeLoader);
return manager->AddTypeLoader(loader);
}
#endif
Import/GacUIReflection.h
+4 -4
View File
@@ -631,19 +631,19 @@ Macros
#define CLASS_MEMBER_GUIEVENT(EVENTNAME)\
AddEvent(\
new GuiEventInfoImpl<GuiEventArgumentTypeRetriver<decltype(&ClassType::EVENTNAME)>::Type>(\
Ptr(new GuiEventInfoImpl<GuiEventArgumentTypeRetriver<decltype(&ClassType::EVENTNAME)>::Type>(\
this,\
L ## #EVENTNAME,\
[](DescriptableObject* thisObject, bool addEventHandler){\
return &thisObject->SafeAggregationCast<ClassType>()->EVENTNAME;\
},\
false\
)\
))\
);\
#define CLASS_MEMBER_GUIEVENT_COMPOSITION(EVENTNAME)\
AddEvent(\
new GuiEventInfoImpl<GuiEventArgumentTypeRetriver<decltype(&GuiGraphicsEventReceiver::EVENTNAME)>::Type>(\
Ptr(new GuiEventInfoImpl<GuiEventArgumentTypeRetriver<decltype(&GuiGraphicsEventReceiver::EVENTNAME)>::Type>(\
this,\
L ## #EVENTNAME,\
[](DescriptableObject* thisObject, bool addEventHandler){\
@@ -655,7 +655,7 @@ Macros
return &composition->GetEventReceiver()->EVENTNAME;\
},\
true\
)\
))\
);\
#define CLASS_MEMBER_PROPERTY_GUIEVENT_FAST(PROPERTYNAME)\
Import/Skins/DarkSkin/DarkSkin.cpp
+376 -376
View File
File diff suppressed because it is too large Load Diff
Import/Skins/DarkSkin/DarkSkinReflection.cpp
+1 -1
View File
@@ -1686,7 +1686,7 @@ namespace vl
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
if (auto manager = GetGlobalTypeManager())
{
return manager->AddTypeLoader(MakePtr<DarkSkinTypeLoader>());
return manager->AddTypeLoader(Ptr(new DarkSkinTypeLoader));
}
#endif
return false;
Import/Vlpp.cpp
+1 -1
View File
@@ -182,7 +182,7 @@ Helper Functions
{
if (!GetGlobalStorageManager().storages)
{
GetGlobalStorageManager().storages = new Dictionary<WString, GlobalStorage*>;
GetGlobalStorageManager().storages = Ptr(new Dictionary<WString, GlobalStorage*>);
}
}
Import/Vlpp.h
+193 -300
View File
File diff suppressed because it is too large Load Diff
Import/VlppGlrParser.cpp
+436 -411
View File
File diff suppressed because it is too large Load Diff
Import/VlppGlrParser.h
+34 -24
View File
@@ -211,7 +211,7 @@ AST (Builder)
class ParsingAstBuilder
{
protected:
Ptr<TAst> node = MakePtr<TAst>();
Ptr<TAst> node{ new TAst };
ParsingAstBuilder() {}
public:
@@ -275,7 +275,6 @@ Instructions
Token, // Token() : Push the current token as a value.
EnumItem, // EnumItem(Value) : Push an enum item.
BeginObject, // BeginObject(Type) : Begin creating an AST node.
BeginObjectLeftRecursive, // BeginObjectLeftRecursive(Type) : Begin creating an AST node, taking the ownership of the last pushed object.
DelayFieldAssignment, // DelayFieldAssignment() : An object will be created later by ReopenObject, delay future field assignments to this object before ReopenObject.
ReopenObject, // ReopenObject() : Move the last pushed object back to creating status.
EndObject, // EndObject() : Finish creating an AST node, all objects pushed after BeginObject are supposed to be its fields.
@@ -327,8 +326,6 @@ Instructions
NoRootObject, // NoRootObject() : There is no created objects.
NoRootObjectAfterDfa, // NoRootObjectAfterDfa() : There is no created objects after DelayFieldAssignment.
MissingLeftRecursiveValue, // MissingLeftRecursiveValue() : There is no pushed value to create left recursive object.
LeftRecursiveValueIsNotObject, // LeftRecursiveValueIsNotObject() : The pushed value to create left recursive object is not an object.
TooManyUnassignedValues, // LeavingUnassignedValues() : The value to reopen is not the only unassigned value.
MissingDfaBeforeReopen, // MissingDfaBeforeReopen() : DelayFieldAssignment is not submitted before ReopenObject.
MissingValueToReopen, // MissingValueToReopen() : There is no pushed value to reopen.
@@ -562,7 +559,7 @@ IAstInsReceiver (Code Generation Templates)
template<typename TElement, typename TAmbiguity>
Ptr<ParsingAstBase> AssemblerResolveAmbiguity(vint32_t type, collections::Array<Ptr<ParsingAstBase>>& candidates, const wchar_t* cppTypeName)
{
Ptr<TAmbiguity> ast = new TAmbiguity();
auto ast = Ptr(new TAmbiguity());
for (auto candidate : candidates)
{
if (auto typedAst = candidate.Cast<TElement>())
@@ -1015,13 +1012,13 @@ ParserBase<TTokens, TStates, TReceiver, TStateTypes>
stream::MemoryStream data;
_lexerData(data);
data.SeekFromBegin(0);
lexer = new regex::RegexLexer(data);
lexer = Ptr(new regex::RegexLexer(data));
}
{
stream::MemoryStream data;
_parserData(data);
data.SeekFromBegin(0);
executable = new automaton::Executable(data);
executable = Ptr(new automaton::Executable(data));
}
}
@@ -1039,7 +1036,7 @@ ParserBase<TTokens, TStates, TReceiver, TStateTypes>
{
input.Buffer();
auto enumerable = lexer->Parse(input, {}, codeIndex);
Ptr<collections::IEnumerator<regex::RegexToken>> enumerator = enumerable.CreateEnumerator();
auto enumerator = Ptr(enumerable.CreateEnumerator());
while (enumerator->Next())
{
auto&& token = enumerator->Current();
@@ -1896,7 +1893,7 @@ AllocateOnly<T>
{
if (remains == 0)
{
buffers.Add(new collections::Array<T>(blockSize));
buffers.Add(Ptr(new collections::Array<T>(blockSize)));
remains = blockSize;
}
vint index = blockSize * (buffers.Count() - 1) + (blockSize - remains);
@@ -2059,15 +2056,26 @@ TraceManager (Data Structures -- PrepareTraceRoute/ResolveAmbiguity)
struct InsExec_Object : Allocatable<InsExec_Object>, WithMagicCounter
{
// lrObjectIds are objects it takes while being created by BOLR
Ref<InsExec_ObjRefLink> lrObjectIds;
// previous allocated object
Ref<InsExec_Object> previous;
// injectObjectIds are objects it injects into by LriFetch
Ref<InsExec_ObjRefLink> injectObjectIds;
// instruction that creates this object
Ref<Trace> bo_bolr_Trace;
vint32_t bo_bolr_Ins = -1;
Ref<Trace> createTrace;
vint32_t createIns = -1;
// DelayFieldAssignment instructions that associates to the current object
Ref<InsExec_InsRefLink> dfaInsRefs;
// first instruction that creates this object
Ref<Trace> topLocalTrace;
vint32_t topLocalIns = -1;
// first instruction that creates this object or its fields
Ref<Trace> topTrace;
vint32_t topIns = -1;
};
struct InsExec_ObjectStack : Allocatable<InsExec_ObjectStack>, WithMagicCounter
@@ -2087,6 +2095,9 @@ TraceManager (Data Structures -- PrepareTraceRoute/ResolveAmbiguity)
// InsExec_ObjRefLink assigned by BO/BOLA/RO
Ref<InsExec_ObjRefLink> objectIds;
// objectIds will be added to reverseInjectObjectIds::injectObjectIds
Ref<InsExec_ObjRefLink> reverseInjectObjectIds;
};
struct InsExec_Context
@@ -2098,7 +2109,7 @@ TraceManager (Data Structures -- PrepareTraceRoute/ResolveAmbiguity)
struct InsExec : WithMagicCounter
{
// BO/BOLR:
// BO:
// the created object
Ref<InsExec_Object> createdObjectId;
@@ -2109,7 +2120,7 @@ TraceManager (Data Structures -- PrepareTraceRoute/ResolveAmbiguity)
Ref<InsExec_ObjRefLink> objRefs;
// InsExec_InsRefLink
// BO/BOLR/DFA:
// BO/DFA:
// EndingObject instructions that close objects or create stack created by the current instruction
Ref<InsExec_InsRefLink> eoInsRefs;
@@ -2373,6 +2384,8 @@ TraceManager
void PushObjRefLink(Ref<InsExec_ObjRefLink>& link, Ref<InsExec_Object> id);
Ref<InsExec_InsRefLink> JoinInsRefLink(Ref<InsExec_InsRefLink> first, Ref<InsExec_InsRefLink> second);
Ref<InsExec_ObjRefLink> JoinObjRefLink(Ref<InsExec_ObjRefLink> first, Ref<InsExec_ObjRefLink> second);
void PushInjectObjectIdsSingleWithMagic(Ref<InsExec_ObjRefLink> container, Ref<InsExec_Object> element);
void PushInjectObjectIdsMultipleWithMagic(Ref<InsExec_ObjRefLink> container, Ref<InsExec_ObjRefLink> elements);
InsExec_ObjectStack* PushObjectStackSingle(InsExec_Context& context, Ref<InsExec_Object> objectId);
InsExec_ObjectStack* PushObjectStackMultiple(InsExec_Context& context, Ref<InsExec_ObjRefLink> linkId);
InsExec_CreateStack* PushCreateStack(InsExec_Context& context);
@@ -2388,6 +2401,11 @@ TraceManager
Ref<T> MergeStack(Trace* mergeTrace, AllocateOnly<T>& allocator, TMerge&& merge);
void MergeInsExecContext(Trace* mergeTrace);
// phase: PartialExecuteTraces - CalculateObjectFirstInstruction
bool UpdateTopTrace(Ref<Trace>& topTrace, vint32_t& topIns, Ref<Trace> newTrace, vint32_t newIns);
void InjectFirstInstruction(Ref<Trace> trace, vint32_t ins, Ref<InsExec_ObjRefLink> injectTargets, vuint64_t magicInjection);
void CalculateObjectFirstInstruction();
// phase: PartialExecuteTraces
void PartialExecuteTraces();
@@ -2404,6 +2422,7 @@ TraceManager
// ResolveAmbiguity
Ref<Trace> firstBranchTrace;
Ref<Trace> firstMergeTrace;
Ref<InsExec_Object> firstObject;
Ref<ExecutionStep> firstStep;
AllocateOnly<TraceAmbiguity> traceAmbiguities;
AllocateOnly<TraceAmbiguityLink> traceAmbiguityLinks;
@@ -2413,15 +2432,6 @@ TraceManager
template<typename TCallback>
bool SearchForObjects(Ref<InsExec_ObjRefLink> objRefLinkStartSet, bool withCounter, TCallback&& callback);
template<typename TCallback>
bool SearchForAllLevelObjectsWithCounter(InsExec_Object* startObject, collections::List<Ref<InsExec_ObjRefLink>>& visitingIds, TCallback&& callback);
#if defined VCZH_MSVC && defined _DEBUG
void EnsureSameForwardTrace(Ref<Trace> currentTraceId, Ref<Trace> forwardTraceId);
#endif
template<typename TCallback>
bool SearchForTopCreateInstructions(InsExec_Object* ieObject, TCallback&& callback);
template<typename TCallback>
bool SearchForTopCreateInstructionsInAllLevelsWithCounter(InsExec_Object* startObject, collections::List<Ref<InsExec_ObjRefLink>>& visitingIds, TCallback&& callback);
template<typename TCallback>
bool SearchForEndObjectInstructions(Trace* createTrace, vint32_t createIns, TCallback&& callback);
bool ComparePrefix(TraceExec* baselineTraceExec, TraceExec* commingTraceExec, vint32_t prefix);
bool ComparePostfix(TraceExec* baselineTraceExec, TraceExec* commingTraceExec, vint32_t postfix);
Import/VlppGlrParserCompiler.cpp
+1389 -774
View File
File diff suppressed because it is too large Load Diff
Import/VlppGlrParserCompiler.h
+118 -98
View File
@@ -38,7 +38,7 @@ namespace vl
bool Add(const WString& name, T* item)
{
items.Add(item);
items.Add(Ptr(item));
if (map.Keys().Contains(name)) return false;
order.Add(name);
map.Add(name, item);
@@ -78,99 +78,102 @@ ParserSymbolManager
#define GLR_PARSER_ERROR_LIST(ERROR_ITEM)\
/* AstSymbolManager */\
ERROR_ITEM(DuplicatedFile, fileName)\
ERROR_ITEM(FileDependencyNotExists, fileName, dependency)\
ERROR_ITEM(FileCyclicDependency, fileName, dependency)\
ERROR_ITEM(DuplicatedSymbol, fileName, symbolName)\
ERROR_ITEM(DuplicatedSymbolGlobally, fileName, symbolName, anotherFileName)\
ERROR_ITEM(DuplicatedClassProp, fileName, className, propName)\
ERROR_ITEM(DuplicatedEnumItem, fileName, enumName, propName)\
ERROR_ITEM(BaseClassNotExists, fileName, className, typeName)\
ERROR_ITEM(BaseClassNotClass, fileName, className, typeName)\
ERROR_ITEM(BaseClassCyclicDependency, fileName, className)\
ERROR_ITEM(FieldTypeNotExists, fileName, className, propName)\
ERROR_ITEM(FieldTypeNotClass, fileName, className, propName)\
ERROR_ITEM(DuplicatedFile, fileName)\
ERROR_ITEM(FileDependencyNotExists, fileName, dependency)\
ERROR_ITEM(FileCyclicDependency, fileName, dependency)\
ERROR_ITEM(DuplicatedSymbol, fileName, symbolName)\
ERROR_ITEM(DuplicatedSymbolGlobally, fileName, symbolName, anotherFileName)\
ERROR_ITEM(DuplicatedClassProp, fileName, className, propName)\
ERROR_ITEM(DuplicatedEnumItem, fileName, enumName, propName)\
ERROR_ITEM(BaseClassNotExists, fileName, className, typeName)\
ERROR_ITEM(BaseClassNotClass, fileName, className, typeName)\
ERROR_ITEM(BaseClassCyclicDependency, fileName, className)\
ERROR_ITEM(FieldTypeNotExists, fileName, className, propName)\
ERROR_ITEM(FieldTypeNotClass, fileName, className, propName)\
/* LexerSymbolManager */\
ERROR_ITEM(InvalidTokenDefinition, code)\
ERROR_ITEM(DuplicatedToken, tokenName)\
ERROR_ITEM(DuplicatedTokenByDisplayText, tokenName)\
ERROR_ITEM(InvalidTokenRegex, tokenName, errorMessage)\
ERROR_ITEM(TokenRegexNotPure, tokenName)\
ERROR_ITEM(DuplicatedTokenFragment, fragmentName)\
ERROR_ITEM(TokenFragmentNotExists, fragmentName)\
ERROR_ITEM(InvalidTokenDefinition, code)\
ERROR_ITEM(DuplicatedToken, tokenName)\
ERROR_ITEM(DuplicatedTokenByDisplayText, tokenName)\
ERROR_ITEM(InvalidTokenRegex, tokenName, errorMessage)\
ERROR_ITEM(TokenRegexNotPure, tokenName)\
ERROR_ITEM(DuplicatedTokenFragment, fragmentName)\
ERROR_ITEM(TokenFragmentNotExists, fragmentName)\
/* SyntaxSymbolManager */\
ERROR_ITEM(DuplicatedRule, ruleName)\
ERROR_ITEM(RuleIsIndirectlyLeftRecursive, ruleName) /* Indirect left recursion must be resolved before */\
ERROR_ITEM(LeftRecursionPlaceholderMixedWithSwitches, ruleName, placeholder, targetRuleName)\
ERROR_ITEM(LeftRecursionInjectHasNoContinuation, ruleName, placeholder, targetRuleName)\
ERROR_ITEM(DuplicatedRule, ruleName)\
ERROR_ITEM(RuleIsIndirectlyLeftRecursive, ruleName) /* Indirect left recursion must be resolved before */\
ERROR_ITEM(LeftRecursionPlaceholderMixedWithSwitches, ruleName, placeholder, targetRuleName)\
ERROR_ITEM(LeftRecursionInjectHasNoContinuation, ruleName, placeholder, targetRuleName)\
/* SyntaxAst(ResolveName) */\
ERROR_ITEM(RuleNameConflictedWithToken, ruleName)\
ERROR_ITEM(TypeNotExistsInRule, ruleName, name)\
ERROR_ITEM(TypeNotClassInRule, ruleName, name)\
ERROR_ITEM(TokenOrRuleNotExistsInRule, ruleName, name)\
ERROR_ITEM(LiteralNotValidToken, ruleName, name)\
ERROR_ITEM(LiteralIsDiscardedToken, ruleName, name)\
ERROR_ITEM(ConditionalLiteralNotValidToken, ruleName, name)\
ERROR_ITEM(ConditionalLiteralIsDiscardedToken, ruleName, name)\
ERROR_ITEM(ConditionalLiteralIsDisplayText, ruleName, name)\
ERROR_ITEM(DuplicatedSwitch, switchName)\
ERROR_ITEM(UnusedSwitch, switchName)\
ERROR_ITEM(SwitchNotExists, ruleName, switchName)\
ERROR_ITEM(SyntaxInvolvesSwitchWithIllegalRuleName, ruleName) /* A syntax uses switch should not use rule name that has _SWITCH/SWITCH_ */\
ERROR_ITEM(SyntaxInvolvesPrefixMergeWithIllegalRuleName, ruleName) /* A syntax uses prefix_merge should not use rule name that has _LRI/_LRIP/LRI_/LRIP_ */\
ERROR_ITEM(SyntaxInvolvesPrefixMergeWithIllegalPlaceholderName, ruleName, placeholderName) /* A syntax uses prefix_merge should not use placeholder name that has _LRI/_LRIP/LRI_/LRIP_ */\
ERROR_ITEM(RuleNameConflictedWithToken, ruleName)\
ERROR_ITEM(TypeNotExistsInRule, ruleName, name)\
ERROR_ITEM(TypeNotClassInRule, ruleName, name)\
ERROR_ITEM(TokenOrRuleNotExistsInRule, ruleName, name)\
ERROR_ITEM(LiteralNotValidToken, ruleName, name)\
ERROR_ITEM(LiteralIsDiscardedToken, ruleName, name)\
ERROR_ITEM(ConditionalLiteralNotValidToken, ruleName, name)\
ERROR_ITEM(ConditionalLiteralIsDiscardedToken, ruleName, name)\
ERROR_ITEM(ConditionalLiteralIsDisplayText, ruleName, name)\
ERROR_ITEM(DuplicatedSwitch, switchName)\
ERROR_ITEM(UnusedSwitch, switchName)\
ERROR_ITEM(SwitchNotExists, ruleName, switchName)\
ERROR_ITEM(SyntaxInvolvesSwitchWithIllegalRuleName, ruleName) /* A syntax uses switch should not use rule name that has _SWITCH/SWITCH_ */\
ERROR_ITEM(SyntaxInvolvesPrefixMergeWithIllegalRuleName, ruleName) /* A syntax uses prefix_merge should not use rule name that has _LRI/_LRIP/LRI_/LRIP_ */\
ERROR_ITEM(SyntaxInvolvesPrefixMergeWithIllegalPlaceholderName, ruleName, placeholderName) /* A syntax uses prefix_merge should not use placeholder name that has _LRI/_LRIP/LRI_/LRIP_ */\
/* SyntaxAst(CalculateTypes) */\
ERROR_ITEM(RuleMixedPartialClauseWithOtherClause, ruleName)\
ERROR_ITEM(RuleWithDifferentPartialTypes, ruleName, ruleType, newType)\
ERROR_ITEM(RuleExplicitTypeIsNotCompatibleWithClauseType, ruleName, ruleType, newType) /* The type of the rule is explicitly specified, but it is incompatible with its clauses */\
ERROR_ITEM(RuleCannotResolveToDeterministicType, ruleName, ruleType, newType) /* Unable to resolve to one type from clauses (token, type) or (create, partial) */\
ERROR_ITEM(CyclicDependedRuleTypeIncompatible, ruleName, ruleTypes) /* Types of rules are not compatible to each other when they build cyclic dependency by reuse clauses */\
ERROR_ITEM(ReuseClauseCannotResolveToDeterministicType, ruleName, ruleTypes) /* A reuse clause contains multiple use rule but their types are not compatible to each other */\
ERROR_ITEM(ReuseClauseContainsNoUseRule, ruleName) /* A reuse clause contains no use rule therefore the type cannot be determined */\
ERROR_ITEM(RuleMixedPartialClauseWithOtherClause, ruleName)\
ERROR_ITEM(RuleWithDifferentPartialTypes, ruleName, ruleType, newType)\
ERROR_ITEM(RuleExplicitTypeIsNotCompatibleWithClauseType, ruleName, ruleType, newType) /* The type of the rule is explicitly specified, but it is incompatible with its clauses */\
ERROR_ITEM(RuleCannotResolveToDeterministicType, ruleName, ruleType, newType) /* Unable to resolve to one type from clauses (token, type) or (create, partial) */\
ERROR_ITEM(CyclicDependedRuleTypeIncompatible, ruleName, ruleTypes) /* Types of rules are not compatible to each other when they build cyclic dependency by reuse clauses */\
ERROR_ITEM(ReuseClauseCannotResolveToDeterministicType, ruleName, ruleTypes) /* A reuse clause contains multiple use rule but their types are not compatible to each other */\
ERROR_ITEM(ReuseClauseContainsNoUseRule, ruleName) /* A reuse clause contains no use rule therefore the type cannot be determined */\
/* SyntaxAst(ValidateSwitchesAndConditions, condition) */\
ERROR_ITEM(PushedSwitchIsNotTested, ruleName, switchName)\
ERROR_ITEM(PrefixMergeAffectedBySwitches, ruleName, prefixMergeRule, switchName)\
ERROR_ITEM(PushedSwitchIsNotTested, ruleName, switchName)\
ERROR_ITEM(PrefixMergeAffectedBySwitches, ruleName, prefixMergeRule, switchName)\
/* SyntaxAst(RewriteSyntax_Switch, condition) */\
ERROR_ITEM(NoSwitchUnaffectedRule)\
ERROR_ITEM(SwitchUnaffectedRuleExpandedToNoClause, ruleName)\
ERROR_ITEM(SwitchAffectedRuleExpandedToNoClause, ruleName, expandedRuleName)\
ERROR_ITEM(SwitchUnaffectedRuleExpandedToNoClause, ruleName)\
ERROR_ITEM(SwitchAffectedRuleExpandedToNoClause, ruleName, expandedRuleName)\
/* SyntaxAst(ValidateTypes) */\
ERROR_ITEM(FieldNotExistsInClause, ruleName, clauseType, fieldName) /* The field does not exist in the type of the clause */\
ERROR_ITEM(RuleTypeMismatchedToField, ruleName, clauseType, fieldName, fieldRuleType) /* The rule type is not compatible to the assigning field */\
ERROR_ITEM(AssignmentToNonEnumField, ruleName, clauseType, fieldName) /* Assignment can only assign fields in enum types */\
ERROR_ITEM(EnumItemMismatchedToField, ruleName, clauseType, fieldName, enumItem) /* Try to assign an unexisting or mismatched enum item to a field in an enum type */\
ERROR_ITEM(UseRuleWithPartialRule, ruleName, useRuleName) /* A use rule should not be used with a partial rule */\
ERROR_ITEM(UseRuleInNonReuseClause, ruleName, useRuleName) /* A use rule should only appear in reuse clause */\
ERROR_ITEM(PartialRuleUsedOnField, ruleName, clauseType, partialRuleName, fieldName) /* A partial rule does not create object, it cannot be assigned to a field */\
ERROR_ITEM(ClauseTypeMismatchedToPartialRule, ruleName, clauseType, partialRuleName, partialRuleType) /* A clause uses a partial rule of an incompatible type */\
ERROR_ITEM(LeftRecursionPlaceholderNotFoundInRule, ruleName, placeholder, targetRuleName) /* left_recursion_inject injects to a rule which doesn't accept the specified placeholder */\
ERROR_ITEM(LeftRecursionPlaceholderNotUnique, ruleName, placeholder, targetRuleName) /* left_recursion_inject injects to a rule which has multiple places accepting the specified placeholder */\
ERROR_ITEM(LeftRecursionInjectTargetIsPrefixOfAnotherSameEnding, ruleName, placeholder, targetPrefixName, targetRuleName) /* left_recursion_inject injects into two targets, A is a prefix of B, and both injection could end with the same target C, C could be B */\
ERROR_ITEM(LeftRecursionPlaceholderTypeMismatched, ruleName, placeholder, targetRuleName, placeholderRuleName)\
ERROR_ITEM(PartialRuleInLeftRecursionInject, ruleName, partialRuleName)\
ERROR_ITEM(PartialRuleInPrefixMerge, ruleName, partialRuleName)\
ERROR_ITEM(FieldNotExistsInClause, ruleName, clauseType, fieldName) /* The field does not exist in the type of the clause */\
ERROR_ITEM(RuleTypeMismatchedToField, ruleName, clauseType, fieldName, fieldRuleType) /* The rule type is not compatible to the assigning field */\
ERROR_ITEM(AssignmentToNonEnumField, ruleName, clauseType, fieldName) /* Assignment can only assign fields in enum types */\
ERROR_ITEM(EnumItemMismatchedToField, ruleName, clauseType, fieldName, enumItem) /* Try to assign an unexisting or mismatched enum item to a field in an enum type */\
ERROR_ITEM(UseRuleWithPartialRule, ruleName, useRuleName) /* A use rule should not be used with a partial rule */\
ERROR_ITEM(UseRuleInNonReuseClause, ruleName, useRuleName) /* A use rule should only appear in reuse clause */\
ERROR_ITEM(PartialRuleUsedOnField, ruleName, clauseType, partialRuleName, fieldName) /* A partial rule does not create object, it cannot be assigned to a field */\
ERROR_ITEM(ClauseTypeMismatchedToPartialRule, ruleName, clauseType, partialRuleName, partialRuleType) /* A clause uses a partial rule of an incompatible type */\
ERROR_ITEM(LeftRecursionPlaceholderNotFoundInRule, ruleName, placeholder, targetRuleName) /* left_recursion_inject injects to a rule which doesn't accept the specified placeholder */\
ERROR_ITEM(LeftRecursionPlaceholderNotUnique, ruleName, placeholder, targetRuleName) /* left_recursion_inject injects to a rule which has multiple places accepting the specified placeholder */\
ERROR_ITEM(LeftRecursionInjectTargetIsPrefixOfAnotherSameEnding, ruleName, placeholder, targetPrefixName, targetRuleName) /* left_recursion_inject injects into two targets, A is a prefix of B, and both injection could end with the same target C, C could be B */\
ERROR_ITEM(LeftRecursionPlaceholderTypeMismatched, ruleName, placeholder, targetRuleName, placeholderRuleName)\
ERROR_ITEM(PartialRuleInLeftRecursionInject, ruleName, partialRuleName)\
ERROR_ITEM(PartialRuleInPrefixMerge, ruleName, partialRuleName)\
/* SyntaxAst(ValidateStructure, counting) */\
ERROR_ITEM(ClauseNotCreateObject, ruleName) /* A reuse clause does not contain use rule in some potential sequences */\
ERROR_ITEM(UseRuleUsedInOptionalBody, ruleName, useRuleName)\
ERROR_ITEM(UseRuleUsedInLoopBody, ruleName, useRuleName)\
ERROR_ITEM(ClauseTooManyUseRule, ruleName) /* Multiple use rules in a potential sequence in a clause */\
ERROR_ITEM(NonArrayFieldAssignedInLoop, ruleName, clauseType, fieldName)\
ERROR_ITEM(NonLoopablePartialRuleUsedInLoop, ruleName, clauseType, partialRuleName)\
ERROR_ITEM(ClauseCouldExpandToEmptySequence, ruleName)\
ERROR_ITEM(LoopBodyCouldExpandToEmptySequence, ruleName)\
ERROR_ITEM(OptionalBodyCouldExpandToEmptySequence, ruleName)\
ERROR_ITEM(NegativeOptionalEndsAClause, ruleName) /* Negative optional syntax cannot ends a clause */\
ERROR_ITEM(MultiplePrioritySyntaxInAClause, ruleName)\
ERROR_ITEM(TooManyLeftRecursionPlaceholderClauses, ruleName)\
ERROR_ITEM(ClauseNotCreateObject, ruleName) /* A reuse clause does not contain use rule in some potential sequences */\
ERROR_ITEM(UseRuleUsedInOptionalBody, ruleName, useRuleName)\
ERROR_ITEM(UseRuleUsedInLoopBody, ruleName, useRuleName)\
ERROR_ITEM(ClauseTooManyUseRule, ruleName) /* Multiple use rules in a potential sequence in a clause */\
ERROR_ITEM(NonArrayFieldAssignedInLoop, ruleName, clauseType, fieldName)\
ERROR_ITEM(NonLoopablePartialRuleUsedInLoop, ruleName, clauseType, partialRuleName)\
ERROR_ITEM(ClauseCouldExpandToEmptySequence, ruleName)\
ERROR_ITEM(LoopBodyCouldExpandToEmptySequence, ruleName)\
ERROR_ITEM(OptionalBodyCouldExpandToEmptySequence, ruleName)\
ERROR_ITEM(NegativeOptionalEndsAClause, ruleName) /* Negative optional syntax cannot ends a clause */\
ERROR_ITEM(MultiplePrioritySyntaxInAClause, ruleName)\
ERROR_ITEM(TooManyLeftRecursionPlaceholderClauses, ruleName)\
/* SyntaxAst(ValidateStructure, relationship) */\
ERROR_ITEM(FieldAssignedMoreThanOnce, ruleName, clauseType, fieldName)\
/* SyntaxAst(ValidateStructure, prefix_merge) */\
ERROR_ITEM(RuleMixedPrefixMergeWithClauseNotSyntacticallyBeginWithARule, ruleName) /* If a rule has prefix_merge clause, than all other clause must syntactically begins with a rule */\
ERROR_ITEM(RuleMixedPrefixMergeWithClauseNotBeginWithIndirectPrefixMerge, ruleName, startRule) /* If a rule has prefix_merge clause, than all other clause must directly or indirectly starts with prefix_merge */\
ERROR_ITEM(RuleIndirectlyBeginsWithPrefixMergeMixedLeftRecursionMarkers, ruleName, prefixMergeRule, leftRecursionMarkerRule)\
ERROR_ITEM(RuleIndirectlyBeginsWithPrefixMergeMixedNonSimpleUseClause, ruleName, prefixMergeRule) /* If a rule indirectly begins with prefix_merge, then all clause must be, either a simple use clause begins with prefix_merge, or a clause not begins with prefix_merge */\
ERROR_ITEM(FieldAssignedMoreThanOnce, ruleName, clauseType, fieldName)\
/* SyntaxAst(ValidatePrefixMerge, prefix_merge) */\
ERROR_ITEM(RuleMixedPrefixMergeWithClauseNotSyntacticallyBeginWithARule, ruleName) /* If a rule has prefix_merge clause, than all other clause must syntactically begins with a rule */\
ERROR_ITEM(RuleMixedPrefixMergeWithClauseNotBeginWithIndirectPrefixMerge, ruleName, startRule) /* If a rule has prefix_merge clause, than all other clause must directly or indirectly starts with prefix_merge */\
ERROR_ITEM(RuleIndirectlyBeginsWithPrefixMergeMixedLeftRecursionMarkers, ruleName, prefixMergeRule, leftRecursionMarkerRule)\
ERROR_ITEM(PartialRuleIndirectlyBeginsWithPrefixMerge, ruleName, prefixMergeRule)\
ERROR_ITEM(ClausePartiallyIndirectlyBeginsWithPrefixMergeAndLiteral, ruleName, prefixMergeRule, literal)\
ERROR_ITEM(ClausePartiallyIndirectlyBeginsWithPrefixMergeAndRule, ruleName, prefixMergeRule, literal)\
ERROR_ITEM(RuleDeductToPrefixMergeInNonSimpleUseClause, ruleName, prefixMergeRule, byRule)\
/* SyntaxAst(RewriteSyntax_PrefixMerge, prefix_merge) */\
ERROR_ITEM(PrefixExtractionAffectedRuleReferencedAnother, ruleName, conflictedRule, prefixRule) /* During left_recursion_inject clause generation, if prefix extracted affected the process, all !prefixRule clauses where prefixRule is the prefix of conflictedRule in any !conflictedRule clauses, prefixRule should not be affected */\
ERROR_ITEM(PrefixExtractionAffectedRuleReferencedAnother, ruleName, conflictedRule, prefixRule) /* During left_recursion_inject clause generation, if prefix extracted affected the process, all !prefixRule clauses where prefixRule is the prefix of conflictedRule in any !conflictedRule clauses, prefixRule should not be affected */\
enum class ParserErrorType
{
@@ -994,7 +997,7 @@ namespace vl
class GlrLeftRecursionInjectContinuation : public vl::glr::ParsingAstBase, vl::reflection::Description<GlrLeftRecursionInjectContinuation>
{
public:
vl::Ptr<GlrLeftRecursionPlaceholder> flag;
vl::collections::List<vl::Ptr<GlrLeftRecursionPlaceholder>> flags;
GlrLeftRecursionConfiguration configuration = GlrLeftRecursionConfiguration::UNDEFINED_ENUM_ITEM_VALUE;
GlrLeftRecursionInjectContinuationType type = GlrLeftRecursionInjectContinuationType::UNDEFINED_ENUM_ITEM_VALUE;
vl::collections::List<vl::Ptr<GlrLeftRecursionInjectClause>> injectionTargets;
@@ -1252,7 +1255,7 @@ namespace vl
{
public:
MakeLeftRecursionInjectContinuation& configuration(GlrLeftRecursionConfiguration value);
MakeLeftRecursionInjectContinuation& flag(const vl::Ptr<GlrLeftRecursionPlaceholder>& value);
MakeLeftRecursionInjectContinuation& flags(const vl::Ptr<GlrLeftRecursionPlaceholder>& value);
MakeLeftRecursionInjectContinuation& injectionTargets(const vl::Ptr<GlrLeftRecursionInjectClause>& value);
MakeLeftRecursionInjectContinuation& type(GlrLeftRecursionInjectContinuationType value);
};
@@ -2320,7 +2323,7 @@ namespace vl
LeftRecursionInjectClause_continuation = 19,
LeftRecursionInjectClause_rule = 20,
LeftRecursionInjectContinuation_configuration = 21,
LeftRecursionInjectContinuation_flag = 22,
LeftRecursionInjectContinuation_flags = 22,
LeftRecursionInjectContinuation_injectionTargets = 23,
LeftRecursionInjectContinuation_type = 24,
LeftRecursionPlaceholder_flag = 25,
@@ -2491,10 +2494,10 @@ namespace vl
RuleName = 143,
LriConfig = 146,
LriContinuationBody = 150,
LriContinuation = 159,
LriTarget = 165,
Rule = 172,
File = 180,
LriContinuation = 161,
LriTarget = 167,
Rule = 174,
File = 182,
};
const wchar_t* RuleParserRuleName(vl::vint index);
@@ -2644,12 +2647,25 @@ EdgeSymbol
struct EdgeInput
{
EdgeInputType type = EdgeInputType::Epsilon;
vint32_t token = -1; // useful when type == Token or LrPlaceholder or LrInject
Nullable<WString> condition;
EdgeInputType type = EdgeInputType::Epsilon;
vint32_t token = -1; // useful when type == Token
Nullable<WString> condition; // useful when type == Token
automaton::ReturnRuleType ruleType = automaton::ReturnRuleType::Field; // useful when type == Rule or LrInject
RuleSymbol* rule = nullptr; // useful when type == Rule or LrInject
collections::SortedList<vint32_t> flags; // usefule when type == LrPlaceholder or LrInject
automaton::ReturnRuleType ruleType = automaton::ReturnRuleType::Field; // useful when type == Rule or LrInject
RuleSymbol* rule = nullptr; // useful when type == Rule or LrInject
EdgeInput& operator=(EdgeInput& input)
{
type = input.type;
token = input.token;
condition = input.condition;
CopyFrom(flags, input.flags);
ruleType = input.ruleType;
rule = input.rule;
return *this;
}
};
enum class EdgeImportancy
@@ -2856,6 +2872,8 @@ namespace vl
using PrefixMergeClauseMap = collections::Group<RuleSymbol*, GlrPrefixMergeClause*>;
using ClauseToRuleMap = collections::Dictionary<GlrClause*, RuleSymbol*>;
using ClauseToRuleGroup = collections::Group<GlrClause*, RuleSymbol*>;
using RuleToLiteralMap = collections::Group<RuleSymbol*, ParsingToken>;
using ClauseToLiteralMap = collections::Group<GlrClause*, ParsingToken>;
using RulePathDependencies = collections::Group<RuleSymbol*, RuleClausePath>;
using PathToLastRuleMap = collections::Group<RuleSymbolPair, RuleClausePath>;
@@ -2888,6 +2906,8 @@ namespace vl
ClauseToRuleMap simpleUseClauseToReferencedRules; // GlrClause -> RuleSymbol when this clause is !RuleSymbol
ClauseToRuleGroup clauseToStartRules; // GlrClause -> RuleSymbol when this clause begins with RuleSymbol
RuleToLiteralMap ruleBeginsWithLiteral; // RuleSymbol that begins with any literal
ClauseToLiteralMap clauseBeginsWithLiteral; // GlrClause that begins with any literal
RulePathDependencies directStartRules, indirectStartRules; // RuleSymbol -> {rule, clause begins with the rule}
// RuleSymbol -> {rule, reachable clause begins with the rule}
@@ -2917,7 +2937,7 @@ namespace vl
{
auto tokens = From(lexerManager.TokenOrder())
.Select([&](const WString& name) { return lexerManager.Tokens()[name]->regex; });
cachedLexer = new regex::RegexLexer(tokens);
cachedLexer = Ptr(new regex::RegexLexer(tokens));
}
return *cachedLexer.Obj();
}
@@ -3051,8 +3071,8 @@ AutomatonBuilder
StatePair BuildPartialClause(const StateBuilder& compileSyntax);
StatePair BuildReuseClause(const StateBuilder& compileSyntax);
StatePair BuildLrpClause(collections::List<vint32_t>& flags, const Func<WString(vint32_t)>& flagName);
StatePair BuildLriSyntax(vint32_t flag, RuleSymbol* rule);
StatePair BuildLrpClause(collections::SortedList<vint32_t>& flags, const Func<WString(vint32_t)>& flagName);
StatePair BuildLriSyntax(collections::SortedList<vint32_t>& flags, RuleSymbol* rule, const Func<WString(vint32_t)>& flagName);
StatePair BuildLriSkip();
StatePair BuildLriClauseSyntax(StateBuilder useOrLriSyntax, bool optional, collections::List<StateBuilder>&& continuations);
};
Import/VlppOS.Linux.cpp
+1 -1
View File
@@ -1269,7 +1269,7 @@ ThreadPoolLite
return false;
}
auto task = MakePtr<ThreadPoolTask>();
auto task = Ptr(new ThreadPoolTask);
task->task = proc;
*threadPoolData->taskEnd = task;
threadPoolData->taskEnd = &task->next;
Import/VlppOS.Windows.cpp
+2 -35
View File
@@ -1482,31 +1482,9 @@ EventObject
ThreadPoolLite
***********************************************************************/
struct ThreadPoolQueueProcArgument
{
void(*proc)(void*);
void* argument;
};
DWORD WINAPI ThreadPoolQueueProc(void* argument)
{
Ptr<ThreadPoolQueueProcArgument> proc=(ThreadPoolQueueProcArgument*)argument;
ThreadLocalStorage::FixStorages();
try
{
proc->proc(proc->argument);
ThreadLocalStorage::ClearStorages();
}
catch (...)
{
ThreadLocalStorage::ClearStorages();
}
return 0;
}
DWORD WINAPI ThreadPoolQueueFunc(void* argument)
{
Ptr<Func<void()>> proc=(Func<void()>*)argument;
auto proc=Ptr((Func<void()>*)argument);
ThreadLocalStorage::FixStorages();
try
{
@@ -1530,18 +1508,7 @@ ThreadPoolLite
bool ThreadPoolLite::Queue(void(*proc)(void*), void* argument)
{
ThreadPoolQueueProcArgument* p=new ThreadPoolQueueProcArgument;
p->proc=proc;
p->argument=argument;
if(QueueUserWorkItem(&ThreadPoolQueueProc, p, WT_EXECUTEDEFAULT))
{
return true;
}
else
{
delete p;
return false;
}
return Queue([=]() {proc(argument); });
}
bool ThreadPoolLite::Queue(const Func<void()>& proc)
Import/VlppOS.h
+1 -1
View File
@@ -3128,7 +3128,7 @@ Serialization (generic types)
reader << notNull;
if (notNull)
{
value = new T;
value = Ptr(new T);
Serialization<T>::IO(reader, *value.Obj());
}
else
Import/VlppParser.cpp
+229 -229
View File
File diff suppressed because it is too large Load Diff
Import/VlppParser.h
+1 -1
View File
@@ -2378,7 +2378,7 @@ Syntax Analyzer
range.reduceToken=reduceToken;
if(!shiftReduceRanges)
{
shiftReduceRanges=new collections::List<ShiftReduceRange>();
shiftReduceRanges = Ptr(new collections::List<ShiftReduceRange>());
}
shiftReduceRanges->Add(range);
}
Import/VlppReflection.cpp
+45 -45
View File
@@ -802,12 +802,12 @@ MetaonlyTypeInfo
{
if (auto et = typeInfo->GetElementType())
{
elementType = new MetaonlyTypeInfo(_context, et);
elementType = Ptr(new MetaonlyTypeInfo(_context, et));
}
for (vint i = 0; i < typeInfo->GetGenericArgumentCount(); i++)
{
auto ga = typeInfo->GetGenericArgument(i);
genericArguments.Add(new MetaonlyTypeInfo(_context, ga));
genericArguments.Add(Ptr(new MetaonlyTypeInfo(_context, ga)));
}
}
@@ -1109,7 +1109,7 @@ IMethodInfo
{
for (vint i = 0; i < metadata->parameters.Count(); i++)
{
parameters.Add(new MetaonlyParameterInfo(context, metadata->parameters[i], metadata->ownerTypeDescriptor, this));
parameters.Add(Ptr(new MetaonlyParameterInfo(context, metadata->parameters[i], metadata->ownerTypeDescriptor, this)));
}
}
@@ -1445,11 +1445,11 @@ ITypeDescriptor
for (vint i = 0; i < metadata->methodGroups.Count(); i++)
{
methodGroups.Add(new MetaonlyMethodGroupInfo(context, metadata, metadata->methodGroups[i]));
methodGroups.Add(Ptr(new MetaonlyMethodGroupInfo(context, metadata, metadata->methodGroups[i])));
}
if (metadata->constructorGroup.start != -1)
{
constructorGroup = new MetaonlyMethodGroupInfo(context, metadata, metadata->constructorGroup);
constructorGroup = Ptr(new MetaonlyMethodGroupInfo(context, metadata, metadata->constructorGroup));
}
}
@@ -1697,7 +1697,7 @@ GenerateMetaonlyTypes
void GenerateMetaonlyTypeDescriptor(Writer& writer, ITypeDescriptor* td)
{
auto metadata = MakePtr<TypeDescriptorMetadata>();
auto metadata = Ptr(new TypeDescriptorMetadata);
if (auto cpp = td->GetCpp())
{
metadata->fullName = cpp->GetFullName();
@@ -1761,7 +1761,7 @@ GenerateMetaonlyTypes
void GenerateMetaonlyMethodInfo(Writer& writer, IMethodInfo* mi)
{
auto metadata = MakePtr<MethodInfoMetadata>();
auto metadata = Ptr(new MethodInfoMetadata);
if (auto cpp = mi->GetCpp())
{
metadata->invokeTemplate = cpp->GetInvokeTemplate();
@@ -1776,19 +1776,19 @@ GenerateMetaonlyTypes
for (vint i = 0; i < mi->GetParameterCount(); i++)
{
auto pi = mi->GetParameter(i);
auto piMetadata = MakePtr<ParameterInfoMetadata>();
auto piMetadata = Ptr(new ParameterInfoMetadata);
piMetadata->name = pi->GetName();
piMetadata->type = new MetaonlyTypeInfo(*writer.context.Obj(), pi->GetType());
piMetadata->type = Ptr(new MetaonlyTypeInfo(*writer.context.Obj(), pi->GetType()));
metadata->parameters.Add(piMetadata);
}
metadata->returnType = new MetaonlyTypeInfo(*writer.context.Obj(), mi->GetReturn());
metadata->returnType = Ptr(new MetaonlyTypeInfo(*writer.context.Obj(), mi->GetReturn()));
metadata->isStatic = mi->IsStatic();
writer << metadata;
}
void GenerateMetaonlyPropertyInfo(Writer& writer, IPropertyInfo* pi)
{
auto metadata = MakePtr<PropertyInfoMetadata>();;
auto metadata = Ptr(new PropertyInfoMetadata);;
if (auto cpp = pi->GetCpp())
{
metadata->referenceTemplate = cpp->GetReferenceTemplate();
@@ -1797,7 +1797,7 @@ GenerateMetaonlyTypes
metadata->ownerTypeDescriptor = writer.context->tdIndex[pi->GetOwnerTypeDescriptor()];
metadata->isReadable = pi->IsReadable();
metadata->isWritable = pi->IsWritable();
metadata->returnType = new MetaonlyTypeInfo(*writer.context.Obj(), pi->GetReturn());
metadata->returnType = Ptr(new MetaonlyTypeInfo(*writer.context.Obj(), pi->GetReturn()));
if (auto mi = pi->GetGetter())
{
metadata->getter = writer.context->miIndex[mi];
@@ -1815,7 +1815,7 @@ GenerateMetaonlyTypes
void GenerateMetaonlyEventInfo(Writer& writer, IEventInfo* ei)
{
auto metadata = MakePtr<EventInfoMetadata>();;
auto metadata = Ptr(new EventInfoMetadata);;
if (auto cpp = ei->GetCpp())
{
metadata->attachTemplate = cpp->GetAttachTemplate();
@@ -1824,7 +1824,7 @@ GenerateMetaonlyTypes
}
metadata->name = ei->GetName();
metadata->ownerTypeDescriptor = writer.context->tdIndex[ei->GetOwnerTypeDescriptor()];
metadata->handlerType = new MetaonlyTypeInfo(*writer.context.Obj(), ei->GetHandlerType());
metadata->handlerType = Ptr(new MetaonlyTypeInfo(*writer.context.Obj(), ei->GetHandlerType()));
for (vint i = 0; i < ei->GetObservingPropertyCount(); i++)
{
metadata->observingProperties.Add(writer.context->piIndex[ei->GetObservingProperty(i)]);
@@ -1835,7 +1835,7 @@ GenerateMetaonlyTypes
void GenerateMetaonlyTypes(stream::IStream& outputStream)
{
Writer writer(outputStream);
writer.context = MakePtr<MetaonlyWriterContext>();
writer.context = Ptr(new MetaonlyWriterContext);
Dictionary<WString, ITypeDescriptor*> tds;
List<IMethodInfo*> mis;
@@ -1951,9 +1951,9 @@ LoadMetaonlyTypes
Ptr<ITypeLoader> LoadMetaonlyTypes(stream::IStream& inputStream, const collections::Dictionary<WString, Ptr<ISerializableType>>& serializableTypes)
{
auto context = MakePtr<MetaonlyReaderContext>();
auto context = Ptr(new MetaonlyReaderContext);
CopyFrom(context->serializableTypes, serializableTypes);
auto loader = MakePtr<MetaonlyTypeLoader>();
auto loader = Ptr(new MetaonlyTypeLoader);
loader->context = context;
Reader reader(inputStream);
reader.context = context;
@@ -1969,25 +1969,25 @@ LoadMetaonlyTypes
{
Ptr<TypeDescriptorMetadata> metadata;
reader << metadata;
context->tds.Add(new MetaonlyTypeDescriptor(context.Obj(), metadata));
context->tds.Add(Ptr(new MetaonlyTypeDescriptor(context.Obj(), metadata)));
}
for (vint i = 0; i < miCount; i++)
{
Ptr<MethodInfoMetadata> metadata;
reader << metadata;
context->mis.Add(new MetaonlyMethodInfo(context.Obj(), metadata));
context->mis.Add(Ptr(new MetaonlyMethodInfo(context.Obj(), metadata)));
}
for (vint i = 0; i < piCount; i++)
{
Ptr<PropertyInfoMetadata> metadata;
reader << metadata;
context->pis.Add(new MetaonlyPropertyInfo(context.Obj(), metadata));
context->pis.Add(Ptr(new MetaonlyPropertyInfo(context.Obj(), metadata)));
}
for (vint i = 0; i < eiCount; i++)
{
Ptr<EventInfoMetadata> metadata;
reader << metadata;
context->eis.Add(new MetaonlyEventInfo(context.Obj(), metadata));
context->eis.Add(Ptr(new MetaonlyEventInfo(context.Obj(), metadata)));
}
}
@@ -2229,7 +2229,7 @@ DescriptableObject
{
if (value)
{
internalProperties = new InternalPropertyMap;
internalProperties = Ptr(new InternalPropertyMap);
internalProperties->Add(name, value);
}
}
@@ -2332,7 +2332,7 @@ description::Value
if (value)
{
rawPtr = value->SafeGetAggregationRoot();
sharedPtr = rawPtr;
sharedPtr = Ptr(rawPtr);
}
#else
rawPtr = value.Obj();
@@ -3803,7 +3803,7 @@ TypeDescriptorImpl
vint index=methodGroups.Keys().IndexOf(name);
if(index==-1)
{
Ptr<MethodGroupInfoImpl> methodGroup=new MethodGroupInfoImpl(this, name);
auto methodGroup=Ptr(new MethodGroupInfoImpl(this, name));
methodGroups.Add(name, methodGroup);
return methodGroup.Obj();
}
@@ -3817,7 +3817,7 @@ TypeDescriptorImpl
{
if(!constructorGroup)
{
constructorGroup=new MethodGroupInfoImpl(this, L"");
constructorGroup=Ptr(new MethodGroupInfoImpl(this, L""));
}
return constructorGroup.Obj();
}
@@ -4141,8 +4141,8 @@ IValueEnumerable
Ptr<IValueEnumerable> IValueEnumerable::Create(collections::LazyList<Value> values)
{
Ptr<IEnumerable<Value>> enumerable = new LazyList<Value>(values);
return new ValueEnumerableWrapper<Ptr<IEnumerable<Value>>>(enumerable);
Ptr<IEnumerable<Value>> enumerable(new LazyList<Value>(values));
return Ptr(new ValueEnumerableWrapper<Ptr<IEnumerable<Value>>>(enumerable));
}
/***********************************************************************
@@ -4161,9 +4161,9 @@ IValueArray
Ptr<IValueArray> IValueArray::Create(collections::LazyList<Value> values)
{
Ptr<Array<Value>> list = new Array<Value>;
auto list = Ptr(new Array<Value>);
CopyFrom(*list.Obj(), values);
return new ValueArrayWrapper<Ptr<Array<Value>>>(list);
return Ptr(new ValueArrayWrapper<Ptr<Array<Value>>>(list));
}
/***********************************************************************
@@ -4182,9 +4182,9 @@ IValueList
Ptr<IValueList> IValueList::Create(collections::LazyList<Value> values)
{
Ptr<List<Value>> list = new List<Value>;
auto list = Ptr(new List<Value>);
CopyFrom(*list.Obj(), values);
return new ValueListWrapper<Ptr<List<Value>>>(list);
return Ptr(new ValueListWrapper<Ptr<List<Value>>>(list));
}
/***********************************************************************
@@ -4218,9 +4218,9 @@ IObservableList
Ptr<IValueObservableList> IValueObservableList::Create(collections::LazyList<Value> values)
{
auto list = MakePtr<ReversedObservableList>();
auto list = Ptr(new ReversedObservableList);
CopyFrom(*list.Obj(), values);
auto wrapper = MakePtr<ValueObservableListWrapper<Ptr<ReversedObservableList>>>(list);
auto wrapper = Ptr(new ValueObservableListWrapper<Ptr<ReversedObservableList>>(list));
list->observableList = wrapper.Obj();
return wrapper;
}
@@ -4231,22 +4231,22 @@ IValueDictionary
Ptr<IValueDictionary> IValueDictionary::Create()
{
Ptr<Dictionary<Value, Value>> dictionary = new Dictionary<Value, Value>;
return new ValueDictionaryWrapper<Ptr<Dictionary<Value, Value>>>(dictionary);
auto dictionary = Ptr(new Dictionary<Value, Value>);
return Ptr(new ValueDictionaryWrapper<Ptr<Dictionary<Value, Value>>>(dictionary));
}
Ptr<IValueDictionary> IValueDictionary::Create(Ptr<IValueReadonlyDictionary> values)
{
Ptr<Dictionary<Value, Value>> dictionary = new Dictionary<Value, Value>;
auto dictionary = Ptr(new Dictionary<Value, Value>);
CopyFrom(*dictionary.Obj(), GetLazyList<Value, Value>(values));
return new ValueDictionaryWrapper<Ptr<Dictionary<Value, Value>>>(dictionary);
return Ptr(new ValueDictionaryWrapper<Ptr<Dictionary<Value, Value>>>(dictionary));
}
Ptr<IValueDictionary> IValueDictionary::Create(collections::LazyList<collections::Pair<Value, Value>> values)
{
Ptr<Dictionary<Value, Value>> dictionary = new Dictionary<Value, Value>;
auto dictionary = Ptr(new Dictionary<Value, Value>);
CopyFrom(*dictionary.Obj(), values);
return new ValueDictionaryWrapper<Ptr<Dictionary<Value, Value>>>(dictionary);
return Ptr(new ValueDictionaryWrapper<Ptr<Dictionary<Value, Value>>>(dictionary));
}
/***********************************************************************
@@ -4287,7 +4287,7 @@ IValueException
Ptr<IValueException> IValueException::Create(const WString& message)
{
return new DefaultValueException(message);
return Ptr(new DefaultValueException(message));
}
}
}
@@ -4866,8 +4866,8 @@ LoadPredefinedTypes
END_INTERFACE_MEMBER(IDescriptable)
BEGIN_STRUCT_MEMBER(DateTime)
valueType = new SerializableValueType<DateTime>();
serializableType = new SerializableType<DateTime>();
valueType = Ptr(new SerializableValueType<DateTime>());
serializableType = Ptr(new SerializableType<DateTime>());
STRUCT_MEMBER(year)
STRUCT_MEMBER(month)
STRUCT_MEMBER(dayOfWeek)
@@ -5146,8 +5146,8 @@ LoadPredefinedTypes
public:
void Load(ITypeManager* manager)override
{
manager->SetTypeDescriptor(TypeInfo<Value>::content.typeName, new TypedValueTypeDescriptorBase<Value, TypeDescriptorFlags::Object>);
#define ADD_PRIMITIVE_TYPE(TYPE) manager->SetTypeDescriptor(TypeInfo<TYPE>::content.typeName, new PrimitiveTypeDescriptor<TYPE>());
manager->SetTypeDescriptor(TypeInfo<Value>::content.typeName, Ptr(new TypedValueTypeDescriptorBase<Value, TypeDescriptorFlags::Object>));
#define ADD_PRIMITIVE_TYPE(TYPE) manager->SetTypeDescriptor(TypeInfo<TYPE>::content.typeName, Ptr(new PrimitiveTypeDescriptor<TYPE>()));
REFLECTION_PREDEFINED_PRIMITIVE_TYPES(ADD_PRIMITIVE_TYPE)
#undef ADD_PRIMITIVE_TYPE
REFLECTION_PREDEFINED_COMPLEX_TYPES(ADD_TYPE_INFO, VoidValue)
@@ -5166,7 +5166,7 @@ LoadPredefinedTypes
ITypeManager* manager = GetGlobalTypeManager();
if (manager)
{
Ptr<ITypeLoader> loader = new PredefinedTypeLoader;
auto loader = Ptr(new PredefinedTypeLoader);
return manager->AddTypeLoader(loader);
}
#endif
Import/VlppReflection.h
+83 -86
View File
@@ -83,7 +83,7 @@ DescriptableObject
///
/// int main()
/// {
/// auto myClass = MakePtr<MyClass>();
/// auto myClass = Ptr(new MyClass);
/// myClass->data = L"Hello, world!";
///
/// Ptr<DescriptableObject> obj = myClass;
@@ -1947,7 +1947,7 @@ ValueType
Ptr<IBoxedValue> Copy()override
{
return new TypedBox<T>(value);
return Ptr(new TypedBox<T>(value));
}
CompareResult ComparePrimitive(Ptr<IBoxedValue> boxedValue)override
@@ -2542,7 +2542,6 @@ namespace vl
{
/// <summary>Base type of observable container which triggers callbacks whenever items are changed.</summary>
/// <typeparam name="T">Type of elements.</typeparam>
/// <typeparam name="K">Type of the key type of elements. It is recommended to use the default value.</typeparam>
/// <remarks>
/// <p>Methods are the same to <see cref="List`2"/>, except that operator[] is readonly.</p>
/// <p>
@@ -2565,11 +2564,12 @@ namespace vl
/// Arguments is exactly the same as <see cref="reflection::description::IValueObservableList::ItemChanged"/>.
/// </p>
/// </remarks>
template<typename T, typename K = typename KeyType<T>::Type>
template<typename T>
class ObservableListBase : public collections::EnumerableBase<T>
{
using K = typename KeyType<T>::Type;
protected:
collections::List<T, K> items;
collections::List<T> items;
virtual void NotifyUpdateInternal(vint start, vint count, vint newCount)
{
@@ -2768,7 +2768,6 @@ namespace vl
/// <summary>An observable container that maintain an implementation of <see cref="reflection::description::IValueObservableList"/>.</summary>
/// <typeparam name="T">Type of elements.</typeparam>
/// <typeparam name="K">Type of the key type of elements. It is recommended to use the default value.</typeparam>
template<typename T>
class ObservableList : public ObservableListBase<T>
{
@@ -2926,7 +2925,7 @@ Collections
/// LazyList<Ptr<MyClass>> cs = Range<vint>(1, 10)
/// .Select([](vint i)
/// {
/// return MakePtr<MyClass>(i);
/// return Ptr(new MyClass(i));
/// });
///
/// Value boxed = BoxParameter(cs);
@@ -3125,7 +3124,7 @@ Collections
/// CopyFrom(cs, Range<vint>(1, 10)
/// .Select([](vint i)
/// {
/// return MakePtr<MyClass>(i);
/// return Ptr(new MyClass(i));
/// })
/// );
///
@@ -3289,7 +3288,7 @@ Collections
/// CopyFrom(cs, Range<vint>(1, 10)
/// .Select([](vint i)
/// {
/// return MakePtr<MyClass>(i);
/// return Ptr(new MyClass(i));
/// })
/// );
///
@@ -3477,7 +3476,7 @@ Collections
/// CopyFrom(cs, Range<vint>(1, 10)
/// .Select([](vint i) -> Pair<vint, Ptr<MyClass>>
/// {
/// return { i, MakePtr<MyClass>(i * i) };
/// return { i, Ptr(new MyClass(i * i)) };
/// })
/// );
///
@@ -4308,8 +4307,8 @@ PrimitiveTypeDescriptor
protected:
void LoadInternal()override
{
this->valueType = new SerializableValueType<T>();
this->serializableType = new SerializableType<T>();
this->valueType = Ptr(new SerializableValueType<T>());
this->serializableType = Ptr(new SerializableType<T>());
}
};
@@ -4401,8 +4400,8 @@ EnumTypeDescriptor
void LoadInternal()override
{
this->enumType = new TEnumType;
this->valueType = new EnumValueType<T>();
this->enumType = Ptr(new TEnumType);
this->valueType = Ptr(new EnumValueType<T>());
TypedValueTypeDescriptorBase<T, TDFlags>::enumType = enumType;
}
};
@@ -4474,7 +4473,7 @@ StructTypeDescriptor
public:
StructTypeDescriptor()
{
this->valueType = new StructValueType<T>();
this->valueType = Ptr(new StructValueType<T>());
}
vint GetPropertyCount()override
@@ -4595,14 +4594,14 @@ TypeFlagTester
template<typename TDerived>
struct TypeFlagTester<TDerived, TypeFlags::ReadonlyListType>
{
template<typename T, typename K>
static void* Inherit(const collections::Array<T, K>* source){ return {}; }
template<typename T, typename K>
static void* Inherit(const collections::List<T, K>* source) { return {}; }
template<typename T, typename K>
static void* Inherit(const collections::SortedList<T, K>* source) { return {}; }
template<typename T, typename K>
static void* Inherit(const collections::ObservableListBase<T, K>* source) { return {}; }
template<typename T>
static void* Inherit(const collections::Array<T>* source){ return {}; }
template<typename T>
static void* Inherit(const collections::List<T>* source) { return {}; }
template<typename T>
static void* Inherit(const collections::SortedList<T>* source) { return {}; }
template<typename T>
static void* Inherit(const collections::ObservableListBase<T>* source) { return {}; }
static char Inherit(void* source){ return {}; }
static char Inherit(const void* source){ return {}; }
@@ -4612,8 +4611,8 @@ TypeFlagTester
template<typename TDerived>
struct TypeFlagTester<TDerived, TypeFlags::ArrayType>
{
template<typename T, typename K>
static void* Inherit(collections::Array<T, K>* source) { return {}; }
template<typename T>
static void* Inherit(collections::Array<T>* source) { return {}; }
static char Inherit(void* source) { return {}; }
static char Inherit(const void* source) { return {}; }
@@ -4623,10 +4622,10 @@ TypeFlagTester
template<typename TDerived>
struct TypeFlagTester<TDerived, TypeFlags::ListType>
{
template<typename T, typename K>
static void* Inherit(collections::List<T, K>* source) { return {}; }
template<typename T, typename K>
static void* Inherit(collections::ObservableListBase<T, K>* source) { return {}; }
template<typename T>
static void* Inherit(collections::List<T>* source) { return {}; }
template<typename T>
static void* Inherit(collections::ObservableListBase<T>* source) { return {}; }
static char Inherit(void* source){ return {}; }
static char Inherit(const void* source){ return {}; }
@@ -4847,7 +4846,7 @@ Basic Types
#ifndef VCZH_DEBUG_NO_REFLECTION
static Ptr<ITypeInfo> CreateTypeInfo(TypeInfoHint hint)
{
return MakePtr<TypeDescriptorTypeInfo>(GetTypeDescriptor<T>(), hint);
return Ptr(new TypeDescriptorTypeInfo(GetTypeDescriptor<T>(), hint));
}
#endif
};
@@ -4866,7 +4865,7 @@ Decorated Types
#ifndef VCZH_DEBUG_NO_REFLECTION
static Ptr<ITypeInfo> CreateTypeInfo(TypeInfoHint hint)
{
return MakePtr<RawPtrTypeInfo>(TypeInfoRetriver<T>::CreateTypeInfo());
return Ptr(new RawPtrTypeInfo(TypeInfoRetriver<T>::CreateTypeInfo()));
}
#endif
};
@@ -4881,7 +4880,7 @@ Decorated Types
#ifndef VCZH_DEBUG_NO_REFLECTION
static Ptr<ITypeInfo> CreateTypeInfo(TypeInfoHint hint)
{
return MakePtr<SharedPtrTypeInfo>(TypeInfoRetriver<T>::CreateTypeInfo());
return Ptr(new SharedPtrTypeInfo(TypeInfoRetriver<T>::CreateTypeInfo()));
}
#endif
};
@@ -4896,7 +4895,7 @@ Decorated Types
#ifndef VCZH_DEBUG_NO_REFLECTION
static Ptr<ITypeInfo> CreateTypeInfo(TypeInfoHint hint)
{
return MakePtr<NullableTypeInfo>(TypeInfoRetriver<T>::CreateTypeInfo());
return Ptr(new NullableTypeInfo(TypeInfoRetriver<T>::CreateTypeInfo()));
}
#endif
};
@@ -4915,12 +4914,12 @@ Containers
#ifndef VCZH_DEBUG_NO_REFLECTION
static Ptr<ITypeInfo> CreateTypeInfo(TypeInfoHint hint)
{
auto arrayType = MakePtr<TypeDescriptorTypeInfo>(GetTypeDescriptor<TCollectionType>(), hint);
auto arrayType = Ptr(new TypeDescriptorTypeInfo(GetTypeDescriptor<TCollectionType>(), hint));
auto genericType = MakePtr<GenericTypeInfo>(arrayType);
auto genericType = Ptr(new GenericTypeInfo(arrayType));
genericType->AddGenericArgument(TypeInfoRetriver<typename T::ElementType>::CreateTypeInfo());
auto type = MakePtr<SharedPtrTypeInfo>(genericType);
auto type = Ptr(new SharedPtrTypeInfo(genericType));
return type;
}
#endif
@@ -4936,13 +4935,13 @@ Containers
#ifndef VCZH_DEBUG_NO_REFLECTION
static Ptr<ITypeInfo> CreateTypeInfo(TypeInfoHint hint)
{
auto arrayType = MakePtr<TypeDescriptorTypeInfo>(GetTypeDescriptor<TCollectionType>(), hint);
auto arrayType = Ptr(new TypeDescriptorTypeInfo(GetTypeDescriptor<TCollectionType>(), hint));
auto genericType = MakePtr<GenericTypeInfo>(arrayType);
auto genericType = Ptr(new GenericTypeInfo(arrayType));
genericType->AddGenericArgument(TypeInfoRetriver<typename T::KeyContainer::ElementType>::CreateTypeInfo());
genericType->AddGenericArgument(TypeInfoRetriver<typename T::ValueContainer::ElementType>::CreateTypeInfo());
auto type = MakePtr<SharedPtrTypeInfo>(genericType);
auto type = Ptr(new SharedPtrTypeInfo(genericType));
return type;
}
#endif
@@ -5020,13 +5019,13 @@ Functions
#ifndef VCZH_DEBUG_NO_REFLECTION
static Ptr<ITypeInfo> CreateTypeInfo(TypeInfoHint hint)
{
auto functionType = MakePtr<TypeDescriptorTypeInfo>(GetTypeDescriptor<IValueFunctionProxy>(), hint);
auto functionType = Ptr(new TypeDescriptorTypeInfo(GetTypeDescriptor<IValueFunctionProxy>(), hint));
auto genericType = MakePtr<GenericTypeInfo>(functionType);
auto genericType = Ptr(new GenericTypeInfo(functionType));
genericType->AddGenericArgument(TypeInfoRetriver<R>::CreateTypeInfo());
internal_helper::GenericArgumentAdder<TypeTuple<TArgs...>>::Add(genericType);
auto type = MakePtr<SharedPtrTypeInfo>(genericType);
auto type = Ptr(new SharedPtrTypeInfo(genericType));
return type;
}
#endif
@@ -5165,7 +5164,7 @@ Basic Types
Ptr<T> result;
if(value.GetValueType()==Value::RawPtr || value.GetValueType()==Value::SharedPtr)
{
result = value.GetRawPtr()->SafeAggregationCast<T>();
result = Ptr(value.GetRawPtr()->SafeAggregationCast<T>());
}
if(!result)
{
@@ -5216,7 +5215,7 @@ Basic Types
typeDescriptor = GetTypeDescriptor<Type>();
}
#endif
return Value::From(new IValueType::TypedBox<Type>(object), typeDescriptor);
return Value::From(Ptr(new IValueType::TypedBox<Type>(object)), typeDescriptor);
}
static T UnboxValue(const Value& value, ITypeDescriptor* typeDescriptor, const WString& valueName)
@@ -5851,13 +5850,13 @@ Collection Wrappers
Ptr<IValueEnumerator> CreateEnumerator()override
{
ENSURE_WRAPPER_POINTER;
return new ValueEnumeratorWrapper<
return Ptr(new ValueEnumeratorWrapper<
ValueEnumerableWrapper<T>,
Ptr<collections::IEnumerator<ElementType>>
>(
this,
wrapperPointer->CreateEnumerator()
);
Ptr(this),
Ptr(wrapperPointer->CreateEnumerator())
));
}
const Object* GetCollectionObject()override
@@ -6181,7 +6180,7 @@ Containers
{
auto colref = collection->template TryGetCollectionReference<TValueImpl<T*>>();
if (colref) return colref;
colref = MakePtr<TValueImpl<T*>>(collection);
colref = Ptr(new TValueImpl<T*>(collection));
collection->SetCollectionReference(colref);
return colref;
}
@@ -6517,7 +6516,7 @@ Functions
static Value BoxParameter(const Func<R(TArgs...)>& object, ITypeDescriptor* typeDescriptor)
{
typedef R(RawFunctionType)(TArgs...);
Ptr<IValueFunctionProxy> result=new ValueFunctionProxyWrapper<RawFunctionType>(object);
Ptr<IValueFunctionProxy> result=Ptr(new ValueFunctionProxyWrapper<RawFunctionType>(object));
ITypeDescriptor* td = nullptr;
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
@@ -6628,7 +6627,7 @@ ConstructorArgumentAdder
{
static void Add(MethodInfoImpl* methodInfo, const wchar_t* parameterNames[], vint index)
{
methodInfo->AddParameter(new ParameterInfoImpl(methodInfo, parameterNames[index], TypeInfoRetriver<T0>::CreateTypeInfo()));
methodInfo->AddParameter(Ptr(new ParameterInfoImpl(methodInfo, parameterNames[index], TypeInfoRetriver<T0>::CreateTypeInfo())));
ConstructorArgumentAdder<TypeTuple<TNextArgs...>>::Add(methodInfo, parameterNames, index + 1);
}
};
@@ -6702,7 +6701,7 @@ namespace vl
static Ptr<reflection::description::IEventHandler> Attach(Event<void(TArgs...)>& e, Handler handler)
{
return MakePtr<EventHandlerImpl>(e.Add(handler));
return Ptr(new EventHandlerImpl(e.Add(handler)));
}
static bool Detach(Event<void(TArgs...)>& e, Ptr<reflection::description::IEventHandler> handler)
@@ -6834,13 +6833,11 @@ CustomConstructorInfoImpl<R(TArgs...)>
Value CreateFunctionProxyInternal(const Value& thisObject)override
{
Func<R(TArgs...)> proxy(
LAMBDA([](TArgs ...args)->R
{
R result = new TClass(args...);
return result;
})
);
auto proxy = Func([](TArgs ...args)->R
{
R result = R(new TClass(args...));
return result;
});
return BoxParameter(proxy);
}
public:
@@ -6939,7 +6936,7 @@ CustomExternalMethodInfoImpl<TClass, R(TArgs...)>
Value CreateFunctionProxyInternal(const Value& thisObject)override
{
TClass* object = UnboxValue<TClass*>(thisObject, GetOwnerTypeDescriptor(), L"thisObject");
Func<R(TArgs...)> proxy = Curry(Func<R(TClass*, TArgs...)>(method))(object);
auto proxy = Func([object, this](TArgs... args)->decltype(auto) { return method(object, args...); });
return BoxParameter(proxy);
}
public:
@@ -7111,7 +7108,7 @@ Type
#define END_TYPE_INFO_NAMESPACE }}}
#define ADD_TYPE_INFO(TYPENAME)\
{\
Ptr<ITypeDescriptor> type=new CustomTypeDescriptorSelector<TYPENAME>::CustomTypeDescriptorImpl();\
auto type = Ptr(new CustomTypeDescriptorSelector<TYPENAME>::CustomTypeDescriptorImpl());\
manager->SetTypeDescriptor(TypeInfo<TYPENAME>::content.typeName, type);\
}
@@ -7130,7 +7127,7 @@ InterfaceProxy
#define INTERFACE_PROXY_CTOR_SHAREDPTR(INTERFACE)\
static Ptr<INTERFACE> Create(Ptr<IValueInterfaceProxy> proxy)\
{\
auto obj = new ValueInterfaceProxy<INTERFACE>();\
auto obj = Ptr(new ValueInterfaceProxy<INTERFACE>());\
obj->SetProxy(proxy);\
return obj;\
}\
@@ -7265,7 +7262,7 @@ Struct
};
#define STRUCT_MEMBER(FIELDNAME)\
fields.Add(L ## #FIELDNAME, new StructFieldInfo<decltype(((StructType*)0)->FIELDNAME)>(this, &StructType::FIELDNAME, L ## #FIELDNAME));
fields.Add(L ## #FIELDNAME, Ptr(new StructFieldInfo<decltype(((StructType*)0)->FIELDNAME)>(this, &StructType::FIELDNAME, L ## #FIELDNAME)));
/***********************************************************************
Class
@@ -7363,11 +7360,11 @@ Field
#define CLASS_MEMBER_FIELD(FIELDNAME)\
AddProperty(\
new CustomFieldInfoImpl<\
Ptr(new CustomFieldInfoImpl<\
ClassType,\
decltype(((ClassType*)0)->FIELDNAME)\
>(this, L ## #FIELDNAME, &ClassType::FIELDNAME)\
);
));
/***********************************************************************
Constructor
@@ -7379,14 +7376,14 @@ Constructor
#define CLASS_MEMBER_CONSTRUCTOR(FUNCTIONTYPE, PARAMETERNAMES)\
{\
const wchar_t* parameterNames[]=PARAMETERNAMES;\
AddConstructor(new CustomConstructorInfoImpl<FUNCTIONTYPE>(parameterNames));\
AddConstructor(Ptr(new CustomConstructorInfoImpl<FUNCTIONTYPE>(parameterNames)));\
}
#define CLASS_MEMBER_EXTERNALCTOR_TEMPLATE(FUNCTIONTYPE, PARAMETERNAMES, SOURCE, INVOKETEMPLATE, CLOSURETEMPLATE)\
{\
const wchar_t* parameterNames[]=PARAMETERNAMES;\
AddConstructor(\
new CustomStaticMethodInfoImpl<FUNCTIONTYPE>(parameterNames, SOURCE, INVOKETEMPLATE, CLOSURETEMPLATE)\
Ptr(new CustomStaticMethodInfoImpl<FUNCTIONTYPE>(parameterNames, SOURCE, INVOKETEMPLATE, CLOSURETEMPLATE))\
);\
}
@@ -7402,10 +7399,10 @@ Method
const wchar_t* parameterNames[]=PARAMETERNAMES;\
AddMethod(\
L ## #FUNCTIONNAME,\
new CustomExternalMethodInfoImpl<\
Ptr(new CustomExternalMethodInfoImpl<\
ClassType,\
vl::function_lambda::LambdaRetriveType<FUNCTIONTYPE>::FunctionType\
>(parameterNames, SOURCE, INVOKETEMPLATE, CLOSURETEMPLATE)\
>(parameterNames, SOURCE, INVOKETEMPLATE, CLOSURETEMPLATE))\
);\
}
@@ -7415,17 +7412,17 @@ Method
#define CLASS_MEMBER_METHOD_OVERLOAD_RENAME_TEMPLATE(EXPECTEDNAME, FUNCTIONNAME, PARAMETERNAMES, FUNCTIONTYPE, INVOKETEMPLATE, CLOSURETEMPLATE)\
{\
const wchar_t* parameterNames[]=PARAMETERNAMES;\
auto methodInfo = new CustomMethodInfoImpl<\
auto methodInfo = Ptr(new CustomMethodInfoImpl<\
ClassType,\
vl::function_lambda::LambdaRetriveType<FUNCTIONTYPE>::FunctionType\
>\
(parameterNames, (FUNCTIONTYPE)&ClassType::FUNCTIONNAME, INVOKETEMPLATE, CLOSURETEMPLATE);\
(parameterNames, (FUNCTIONTYPE)&ClassType::FUNCTIONNAME, INVOKETEMPLATE, CLOSURETEMPLATE));\
AddMethod(\
L ## #EXPECTEDNAME,\
methodInfo\
);\
MethodPointerBinaryDataRetriver<FUNCTIONTYPE> binaryDataRetriver(&ClassType::FUNCTIONNAME);\
MethodPointerBinaryDataRecorder<ClassType, TDFlags>::RecordMethod(binaryDataRetriver.GetBinaryData(), this, methodInfo);\
MethodPointerBinaryDataRecorder<ClassType, TDFlags>::RecordMethod(binaryDataRetriver.GetBinaryData(), this, methodInfo.Obj());\
}
#define CLASS_MEMBER_METHOD_OVERLOAD_RENAME(EXPECTEDNAME, FUNCTIONNAME, PARAMETERNAMES, FUNCTIONTYPE)\
@@ -7449,9 +7446,9 @@ Static Method
const wchar_t* parameterNames[]=PARAMETERNAMES;\
AddMethod(\
L ## #FUNCTIONNAME,\
new CustomStaticMethodInfoImpl<\
Ptr(new CustomStaticMethodInfoImpl<\
std::remove_pointer_t<FUNCTIONTYPE>\
>(parameterNames, (FUNCTIONTYPE)SOURCE, INVOKETEMPLATE, CLOSURETEMPLATE)\
>(parameterNames, (FUNCTIONTYPE)SOURCE, INVOKETEMPLATE, CLOSURETEMPLATE))\
);\
}
@@ -7470,10 +7467,10 @@ Event
#define CLASS_MEMBER_EVENT(EVENTNAME)\
AddEvent(\
new CustomEventInfoImpl<\
Ptr(new CustomEventInfoImpl<\
ClassType,\
CustomEventFunctionTypeRetriver<decltype(&ClassType::EVENTNAME)>::Type\
>(this, L ## #EVENTNAME, &ClassType::EVENTNAME)\
>(this, L ## #EVENTNAME, &ClassType::EVENTNAME))\
);
/***********************************************************************
@@ -7482,58 +7479,58 @@ Property
#define CLASS_MEMBER_PROPERTY_READONLY(PROPERTYNAME, GETTER)\
AddProperty(\
new PropertyInfoImpl(\
Ptr(new PropertyInfoImpl(\
this,\
L ## #PROPERTYNAME,\
dynamic_cast<MethodInfoImpl*>(GetMethodGroupByName(L ## #GETTER, true)->GetMethod(0)),\
nullptr,\
nullptr\
)\
))\
);
#define CLASS_MEMBER_PROPERTY(PROPERTYNAME, GETTER, SETTER)\
AddProperty(\
new PropertyInfoImpl(\
Ptr(new PropertyInfoImpl(\
this,\
L ## #PROPERTYNAME,\
dynamic_cast<MethodInfoImpl*>(GetMethodGroupByName(L ## #GETTER, true)->GetMethod(0)),\
dynamic_cast<MethodInfoImpl*>(GetMethodGroupByName(L ## #SETTER, true)->GetMethod(0)),\
nullptr\
)\
))\
);
#define CLASS_MEMBER_PROPERTY_EVENT(PROPERTYNAME, GETTER, SETTER, EVENT)\
AddProperty(\
new PropertyInfoImpl(\
Ptr(new PropertyInfoImpl(\
this,\
L ## #PROPERTYNAME,\
dynamic_cast<MethodInfoImpl*>(GetMethodGroupByName(L ## #GETTER, true)->GetMethod(0)),\
dynamic_cast<MethodInfoImpl*>(GetMethodGroupByName(L ## #SETTER, true)->GetMethod(0)),\
dynamic_cast<EventInfoImpl*>(GetEventByName(L ## #EVENT, true))\
)\
))\
);
#define CLASS_MEMBER_PROPERTY_EVENT_READONLY(PROPERTYNAME, GETTER, EVENT)\
AddProperty(\
new PropertyInfoImpl(\
Ptr(new PropertyInfoImpl(\
this,\
L ## #PROPERTYNAME,\
dynamic_cast<MethodInfoImpl*>(GetMethodGroupByName(L ## #GETTER, true)->GetMethod(0)),\
nullptr,\
dynamic_cast<EventInfoImpl*>(GetEventByName(L ## #EVENT, true))\
)\
))\
);
#define CLASS_MEMBER_PROPERTY_REFERENCETEMPLATE(PROPERTYNAME, GETTER, SETTER, REFERENCETEMPLATE)\
AddProperty(\
new PropertyInfoImpl_StaticCpp(\
Ptr(new PropertyInfoImpl_StaticCpp(\
this,\
L ## #PROPERTYNAME,\
dynamic_cast<MethodInfoImpl*>(GetMethodGroupByName(L ## #GETTER, true)->GetMethod(0)),\
dynamic_cast<MethodInfoImpl*>(GetMethodGroupByName(L ## #SETTER, true)->GetMethod(0)),\
nullptr,\
WString::Unmanaged(REFERENCETEMPLATE)\
)\
))\
);
#define CLASS_MEMBER_PROPERTY_READONLY_FAST(PROPERTYNAME)\
Import/VlppRegex.cpp
+187 -188
View File
File diff suppressed because it is too large Load Diff
Import/VlppRegex.h
+22 -25
View File
@@ -1499,8 +1499,6 @@ namespace vl
class Automaton
{
public:
typedef Ptr<Automaton> Ref;
collections::List<Ptr<State>> states;
collections::List<Ptr<Transition>> transitions;
collections::List<U32String> captureNames;
@@ -1526,8 +1524,8 @@ namespace vl
extern bool PureEpsilonChecker(Transition* transition);
extern bool RichEpsilonChecker(Transition* transition);
extern bool AreEqual(Transition* transA, Transition* transB);
extern Automaton::Ref EpsilonNfaToNfa(Automaton::Ref source, bool(*epsilonChecker)(Transition*), collections::Dictionary<State*, State*>& nfaStateMap);
extern Automaton::Ref NfaToDfa(Automaton::Ref source, collections::Group<State*, State*>& dfaStateMap);
extern Ptr<Automaton> EpsilonNfaToNfa(Ptr<Automaton> source, bool(*epsilonChecker)(Transition*), collections::Dictionary<State*, State*>& nfaStateMap);
extern Ptr<Automaton> NfaToDfa(Ptr<Automaton> source, collections::Group<State*, State*>& dfaStateMap);
}
}
@@ -1580,8 +1578,7 @@ Regex Expression AST
NOT_COPYABLE(Expression);
Expression() = default;
typedef Ptr<Expression> Ref;
typedef collections::Dictionary<U32String, Expression::Ref> Map;
typedef collections::Dictionary<U32String, Ptr<Expression>> Map;
virtual void Apply(IRegexExpressionAlgorithm& algorithm)=0;
bool IsEqual(Expression* expression);
@@ -1590,7 +1587,7 @@ Regex Expression AST
void NormalizeCharSet(CharRange::List& subsets);
void CollectCharSet(CharRange::List& subsets);
void ApplyCharSet(CharRange::List& subsets);
Automaton::Ref GenerateEpsilonNfa();
Ptr<Automaton> GenerateEpsilonNfa();
};
class CharSetExpression : public Expression
@@ -1606,7 +1603,7 @@ Regex Expression AST
class LoopExpression : public Expression
{
public:
Expression::Ref expression; // The regex to loop
Ptr<Expression> expression; // The regex to loop
vint min; // Minimum count of looping
vint max; // Maximum count of looping, -1 for infinite
bool preferLong; // Prefer longer matching
@@ -1617,8 +1614,8 @@ Regex Expression AST
class SequenceExpression : public Expression
{
public:
Expression::Ref left; // First regex to match
Expression::Ref right; // Last regex to match
Ptr<Expression> left; // First regex to match
Ptr<Expression> right; // Last regex to match
void Apply(IRegexExpressionAlgorithm& algorithm);
};
@@ -1626,8 +1623,8 @@ Regex Expression AST
class AlternateExpression : public Expression
{
public:
Expression::Ref left; // First regex to match
Expression::Ref right; // Last regex to match
Ptr<Expression> left; // First regex to match
Ptr<Expression> right; // Last regex to match
void Apply(IRegexExpressionAlgorithm& algorithm);
};
@@ -1650,7 +1647,7 @@ Regex Expression AST
{
public:
U32String name; // Capture name, empty for anonymous capture
Expression::Ref expression; // Regex to match
Ptr<Expression> expression; // Regex to match
void Apply(IRegexExpressionAlgorithm& algorithm);
};
@@ -1667,7 +1664,7 @@ Regex Expression AST
class PositiveExpression : public Expression
{
public:
Expression::Ref expression; // Regex to match
Ptr<Expression> expression; // Regex to match
void Apply(IRegexExpressionAlgorithm& algorithm);
};
@@ -1675,7 +1672,7 @@ Regex Expression AST
class NegativeExpression : public Expression
{
public:
Expression::Ref expression; // Regex to match
Ptr<Expression> expression; // Regex to match
void Apply(IRegexExpressionAlgorithm& algorithm);
};
@@ -1694,12 +1691,12 @@ Regex Expression AST
typedef Ptr<RegexExpression> Ref;
Expression::Map definitions; // Named regex to be referred
Expression::Ref expression; // Regex to match
Ptr<Expression> expression; // Regex to match
NOT_COPYABLE(RegexExpression);
RegexExpression() = default;
Expression::Ref Merge();
Ptr<Expression> Merge();
};
/***********************************************************************
@@ -1737,7 +1734,7 @@ Visitor
return returnValue;
}
ReturnType Invoke(Expression::Ref expression, ParameterType parameter)
ReturnType Invoke(Ptr<Expression> expression, ParameterType parameter)
{
parameterValue=&parameter;
expression->Apply(*this);
@@ -1825,7 +1822,7 @@ Visitor
expression->Apply(*this);
}
void Invoke(Expression::Ref expression, ParameterType parameter)
void Invoke(Ptr<Expression> expression, ParameterType parameter)
{
parameterValue=&parameter;
expression->Apply(*this);
@@ -1910,7 +1907,7 @@ Helper Functions
extern Ptr<Expression> ParseJoin(const char32_t*& input);
extern Ptr<Expression> ParseAlt(const char32_t*& input);
extern Ptr<Expression> ParseExpression(const char32_t*& input);
extern RegexExpression::Ref ParseRegexExpression(const U32String& code);
extern Ptr<RegexExpression> ParseRegexExpression(const U32String& code);
extern U32String EscapeTextForRegex(const U32String& literalString);
extern U32String UnescapeTextForRegex(const U32String& escapedText);
@@ -1958,9 +1955,9 @@ namespace vl
class RegexNode : public Object
{
public:
vl::regex_internal::Expression::Ref expression;
Ptr<vl::regex_internal::Expression> expression;
RegexNode(vl::regex_internal::Expression::Ref _expression);
RegexNode(Ptr<vl::regex_internal::Expression> _expression);
RegexNode Some()const;
RegexNode Any()const;
@@ -2038,7 +2035,7 @@ namespace vl
void ExpandCharRanges();
public:
PureInterpretor(Automaton::Ref dfa, CharRange::List& subsets);
PureInterpretor(Ptr<Automaton> dfa, CharRange::List& subsets);
PureInterpretor(stream::IStream& inputStream);
~PureInterpretor();
@@ -2120,10 +2117,10 @@ namespace vl
bool NeedKeepState;
};
Automaton::Ref dfa;
Ptr<Automaton> dfa;
UserData* datas;
public:
RichInterpretor(Automaton::Ref _dfa);
RichInterpretor(Ptr<Automaton> _dfa);
~RichInterpretor();
template<typename TChar>
Import/VlppWorkflowCompiler.cpp
+1727 -1647
View File
File diff suppressed because it is too large Load Diff
Import/VlppWorkflowCompiler.h
+18 -6
View File
@@ -5204,7 +5204,9 @@ Type Analyzing
extern Ptr<reflection::description::ITypeInfo> CreateTypeInfoFromMethodInfo(reflection::description::IMethodInfo* info);
extern bool IsExpressionDependOnExpectedType(WfLexicalScopeManager* manager, Ptr<WfExpression> expression, bool hasExpectedType);
extern WString GetExpressionName(WfExpression* expression);
extern WString GetExpressionName(Ptr<WfExpression> expression);
extern void SearchOrderedName(WfLexicalScope* scope, WfExpression* expression, collections::SortedList<vint>& names);
extern void SearchOrderedName(WfLexicalScope* scope, Ptr<WfExpression> expression, collections::SortedList<vint>& names);
/***********************************************************************
@@ -5254,7 +5256,7 @@ Global Name
***********************************************************************/
extern void BuildGlobalNameFromTypeDescriptors(WfLexicalScopeManager* manager);
extern void BuildNameForDeclaration(WfLexicalScopeManager* manager, Ptr<WfLexicalScopeName> name, WfDeclaration* decl);
extern void BuildNameForDeclaration(WfLexicalScopeManager* manager, Ptr<WfLexicalScopeName> name, Ptr<WfDeclaration> decl);
extern void BuildGlobalNameFromModules(WfLexicalScopeManager* manager);
extern void ValidateScopeName(WfLexicalScopeManager* manager, Ptr<WfLexicalScopeName> name);
@@ -5262,8 +5264,8 @@ Global Name
Scope Analyzing
***********************************************************************/
extern void CompleteScopeForClassMember(WfLexicalScopeManager* manager, Ptr<typeimpl::WfCustomType> td, Ptr<WfClassDeclaration> classDecl, Ptr<WfDeclaration> memberDecl);
extern void CompleteScopeForDeclaration(WfLexicalScopeManager* manager, Ptr<WfDeclaration> declaration);
extern void CompleteScopeForClassMember(WfLexicalScopeManager* manager, Ptr<typeimpl::WfCustomType> td, Ptr<WfDeclaration> memberDecl);
extern void CompleteScopeForDeclaration(WfLexicalScopeManager* manager, WfDeclaration* declaration);
extern void CompleteScopeForModule(WfLexicalScopeManager* manager, Ptr<WfModule> module);
extern void BuildScopeForModule(WfLexicalScopeManager* manager, Ptr<WfModule> module);
@@ -5282,17 +5284,27 @@ Semantic Analyzing
extern Ptr<reflection::description::ITypeInfo> SelectFunction(WfLexicalScopeManager* manager, glr::ParsingAstBase* node, Ptr<WfExpression> functionExpression, collections::List<ResolveExpressionResult>& functions, collections::List<Ptr<WfExpression>>& arguments, vint& selectedFunctionIndex);
extern void ValidateModuleSemantic(WfLexicalScopeManager* manager, Ptr<WfModule> module);
extern void ValidateClassMemberSemantic(WfLexicalScopeManager* manager, Ptr<typeimpl::WfCustomType> td, Ptr<WfClassDeclaration> classDecl, Ptr<WfDeclaration> memberDecl);
extern void ValidateClassMemberSemantic(WfLexicalScopeManager* manager, Ptr<typeimpl::WfCustomType> td, WfClassDeclaration* classDecl, Ptr<WfDeclaration> memberDecl);
extern void ValidateDeclarationSemantic(WfLexicalScopeManager* manager, WfDeclaration* declaration);
extern void ValidateDeclarationSemantic(WfLexicalScopeManager* manager, Ptr<WfDeclaration> declaration);
extern void ValidateStatementSemantic(WfLexicalScopeManager* manager, WfStatement* statement);
extern void ValidateStatementSemantic(WfLexicalScopeManager* manager, Ptr<WfStatement> statement);
extern void ValidateExpressionSemantic(WfLexicalScopeManager* manager, WfExpression* expression, Ptr<reflection::description::ITypeInfo> expectedType, collections::List<ResolveExpressionResult>& results);
extern void ValidateExpressionSemantic(WfLexicalScopeManager* manager, Ptr<WfExpression> expression, Ptr<reflection::description::ITypeInfo> expectedType, collections::List<ResolveExpressionResult>& results);
extern void ValidateConstantExpression(WfLexicalScopeManager* manager, WfExpression* expression, Ptr<reflection::description::ITypeInfo> expectedType);
extern void ValidateConstantExpression(WfLexicalScopeManager* manager, Ptr<WfExpression> expression, Ptr<reflection::description::ITypeInfo> expectedType);
extern Ptr<WfLexicalScopeName> GetExpressionScopeName(WfLexicalScopeManager* manager, WfExpression* expression);
extern Ptr<WfLexicalScopeName> GetExpressionScopeName(WfLexicalScopeManager* manager, Ptr<WfExpression> expression);
extern reflection::description::IEventInfo* GetExpressionEventInfo(WfLexicalScopeManager* manager, WfExpression* expression);
extern reflection::description::IEventInfo* GetExpressionEventInfo(WfLexicalScopeManager* manager, Ptr<WfExpression> expression);
extern void GetExpressionTypes(WfLexicalScopeManager* manager, WfExpression* expression, Ptr<reflection::description::ITypeInfo> expectedType, bool allowEvent, collections::List<ResolveExpressionResult>& results);
extern void GetExpressionTypes(WfLexicalScopeManager* manager, Ptr<WfExpression> expression, Ptr<reflection::description::ITypeInfo> expectedType, bool allowEvent, collections::List<ResolveExpressionResult>& results);
extern Ptr<reflection::description::ITypeInfo> GetExpressionType(WfLexicalScopeManager* manager, WfExpression* expression, Ptr<reflection::description::ITypeInfo> expectedType);
extern Ptr<reflection::description::ITypeInfo> GetExpressionType(WfLexicalScopeManager* manager, Ptr<WfExpression> expression, Ptr<reflection::description::ITypeInfo> expectedType);
extern Ptr<reflection::description::ITypeInfo> GetLeftValueExpressionType(WfLexicalScopeManager* manager, WfExpression* expression);
extern Ptr<reflection::description::ITypeInfo> GetLeftValueExpressionType(WfLexicalScopeManager* manager, Ptr<WfExpression> expression);
extern Ptr<reflection::description::ITypeInfo> GetEnumerableExpressionItemType(WfLexicalScopeManager* manager, WfExpression* expression, Ptr<reflection::description::ITypeInfo> expectedType);
extern Ptr<reflection::description::ITypeInfo> GetEnumerableExpressionItemType(WfLexicalScopeManager* manager, Ptr<WfExpression> expression, Ptr<reflection::description::ITypeInfo> expectedType);
/***********************************************************************
@@ -5657,10 +5669,10 @@ Code Generation
};
extern void GenerateFunctionDeclarationMetadata(WfCodegenContext& context, WfFunctionDeclaration* node, Ptr<runtime::WfAssemblyFunction> meta);
extern void GenerateGlobalDeclarationMetadata(WfCodegenContext& context, Ptr<WfDeclaration> declaration, const WString& namePrefix = L"");
extern void GenerateGlobalDeclarationMetadata(WfCodegenContext& context, WfDeclaration* declaration, const WString& namePrefix = L"");
extern void GenerateClosureInstructions(WfCodegenContext& context, Ptr<WfCodegenFunctionContext> functionContext);
extern void GenerateInitializeInstructions(WfCodegenContext& context, Ptr<WfDeclaration> declaration);
extern void GenerateDeclarationInstructions(WfCodegenContext& context, Ptr<WfDeclaration> declaration);
extern void GenerateDeclarationInstructions(WfCodegenContext& context, WfDeclaration* declaration);
extern void GenerateStatementInstructions(WfCodegenContext& context, Ptr<WfStatement> statement);
extern Ptr<reflection::description::ITypeInfo> GenerateExpressionInstructions(WfCodegenContext& context, Ptr<WfExpression> expression, Ptr<reflection::description::ITypeInfo> expectedType = 0);
extern void GenerateTypeCastInstructions(WfCodegenContext& context, Ptr<reflection::description::ITypeInfo> expectedType, bool strongCast, WfExpression* node);
Import/VlppWorkflowLibrary.cpp
+20 -20
View File
@@ -205,7 +205,7 @@ EnumerableCoroutine
Ptr<IValueEnumerator> CreateEnumerator()override
{
return new CoroutineEnumerator(creator);
return Ptr(new CoroutineEnumerator(creator));
}
};
@@ -225,7 +225,7 @@ EnumerableCoroutine
Ptr<IValueEnumerable> EnumerableCoroutine::Create(const Creator& creator)
{
return new CoroutineEnumerable(creator);
return Ptr(new CoroutineEnumerable(creator));
}
/***********************************************************************
@@ -320,7 +320,7 @@ DelayAsync
Ptr<IAsync> IAsync::Delay(vint milliseconds)
{
return new DelayAsync(milliseconds);
return Ptr(new DelayAsync(milliseconds));
}
/***********************************************************************
@@ -352,7 +352,7 @@ FutureAndPromiseAsync
SPIN_LOCK(lock)
{
if (status == AsyncStatus::Stopped || cr) return false;
cr = MakePtr<CoroutineResult>();
cr = Ptr(new CoroutineResult);
f();
if (status == AsyncStatus::Executing)
{
@@ -387,7 +387,7 @@ FutureAndPromiseAsync
Ptr<IPromise> GetPromise()override
{
return this;
return Ptr(this);
}
bool SendResult(const Value& result)override
@@ -409,7 +409,7 @@ FutureAndPromiseAsync
Ptr<IFuture> IFuture::Create()
{
return new FutureAndPromiseAsync();
return Ptr(new FutureAndPromiseAsync);
}
/***********************************************************************
@@ -572,7 +572,7 @@ AsyncCoroutine
{
if (!context)
{
context = new AsyncContext;
context = Ptr(new AsyncContext);
}
return context;
}
@@ -584,7 +584,7 @@ AsyncCoroutine
async->coroutine->Resume(false, output);
if (async->coroutine->GetStatus() == CoroutineStatus::Stopped && async->callback)
{
auto result = MakePtr<CoroutineResult>();
auto result = Ptr(new CoroutineResult);
if (async->coroutine->GetFailure())
{
result->SetFailure(async->coroutine->GetFailure());
@@ -624,11 +624,11 @@ AsyncCoroutine
Ptr<IAsync> AsyncCoroutine::Create(const Creator& creator)
{
return new CoroutineAsync(creator);
return Ptr(new CoroutineAsync(creator));
}
void AsyncCoroutine::CreateAndRun(const Creator& creator)
{
MakePtr<CoroutineAsync>(creator)->Execute(
Ptr(new CoroutineAsync(creator))->Execute(
[](Ptr<CoroutineResult> cr)
{
if (cr->GetFailure())
@@ -685,7 +685,7 @@ StateMachine
else if (currentCoroutine->GetStatus() == CoroutineStatus::Stopped)
{
// leave a state machine
previousResult = MakePtr<CoroutineResult>();
previousResult = Ptr(new CoroutineResult);
if (auto failure = currentCoroutine->GetFailure())
{
previousResult->SetFailure(failure);
@@ -780,7 +780,7 @@ Sys
Ptr<IValueEnumerator> CreateEnumerator()override
{
return MakePtr<Enumerator>(list);
return Ptr(new Enumerator(list));
}
};
}
@@ -837,7 +837,7 @@ Sys
{
list = IValueList::Create(GetLazyList<Value>(value));
}
return new system_sys::ReverseEnumerable(list);
return Ptr(new system_sys::ReverseEnumerable(list));
}
#define DEFINE_COMPARE(TYPE)\
@@ -897,42 +897,42 @@ Localization
collections::LazyList<Locale> Localization::Locales()
{
auto result = MakePtr<List<Locale>>();
auto result = Ptr(new List<Locale>);
Locale::Enumerate(*result.Obj());
return result;
}
collections::LazyList<WString> Localization::GetShortDateFormats(Locale locale)
{
auto result = MakePtr<List<WString>>();
auto result = Ptr(new List<WString>);
locale.GetShortDateFormats(*result.Obj());
return result;
}
collections::LazyList<WString> Localization::GetLongDateFormats(Locale locale)
{
auto result = MakePtr<List<WString>>();
auto result = Ptr(new List<WString>);
locale.GetLongDateFormats(*result.Obj());
return result;
}
collections::LazyList<WString> Localization::GetYearMonthDateFormats(Locale locale)
{
auto result = MakePtr<List<WString>>();
auto result = Ptr(new List<WString>);
locale.GetYearMonthDateFormats(*result.Obj());
return result;
}
collections::LazyList<WString> Localization::GetLongTimeFormats(Locale locale)
{
auto result = MakePtr<List<WString>>();
auto result = Ptr(new List<WString>);
locale.GetLongTimeFormats(*result.Obj());
return result;
}
collections::LazyList<WString> Localization::GetShortTimeFormats(Locale locale)
{
auto result = MakePtr<List<WString>>();
auto result = Ptr(new List<WString>);
locale.GetShortTimeFormats(*result.Obj());
return result;
}
@@ -1248,7 +1248,7 @@ WfLoadLibraryTypes
ITypeManager* manager = GetGlobalTypeManager();
if (manager)
{
Ptr<ITypeLoader> loader = new WfLibraryTypeLoader;
auto loader = Ptr(new WfLibraryTypeLoader);
return manager->AddTypeLoader(loader);
}
#endif
Import/VlppWorkflowLibrary.h
+3 -3
View File
@@ -145,7 +145,7 @@ namespace vl
Ptr<TTo> SharedPtrCast(TFrom* pointer)
{
if (!pointer) return nullptr;
return pointer->template SafeAggregationCast<TTo>();
return Ptr(pointer->template SafeAggregationCast<TTo>());
}
template<typename T>
@@ -186,7 +186,7 @@ namespace vl
static Ptr<T> Unbox(const reflection::description::Value& value)
{
if (value.IsNull()) return nullptr;
return value.GetRawPtr()->SafeAggregationCast<T>();
return Ptr(value.GetRawPtr()->SafeAggregationCast<T>());
}
};
@@ -360,7 +360,7 @@ namespace vl
static Ptr<reflection::description::IEventHandler> Attach(Event<void(TArgs...)>& e, Handler handler)
{
return MakePtr<EventHandlerImpl>(e.Add(handler));
return Ptr(new EventHandlerImpl(e.Add(handler)));
}
static bool Detach(Event<void(TArgs...)>& e, Ptr<reflection::description::IEventHandler> handler)
Import/VlppWorkflowRuntime.cpp
+56 -56
View File
@@ -29,7 +29,7 @@ WfRuntimeGlobalContext
WfRuntimeGlobalContext::WfRuntimeGlobalContext(Ptr<WfAssembly> _assembly)
:assembly(_assembly)
{
globalVariables = new WfRuntimeVariableContext;
globalVariables = Ptr(new WfRuntimeVariableContext);
globalVariables->variables.Resize(assembly->variableNames.Count());
if (assembly->typeImpl)
{
@@ -97,7 +97,7 @@ WfRuntimeCallStackInfo
if (function->argumentNames.Count() > 0)
{
arguments = new WfRuntimeVariableContext;
arguments = Ptr(new WfRuntimeVariableContext);
arguments->variables.Resize(function->argumentNames.Count());
for (vint i = 0; i < arguments->variables.Count(); i++)
{
@@ -107,7 +107,7 @@ WfRuntimeCallStackInfo
if (function->localVariableNames.Count()>0)
{
localVariables = new WfRuntimeVariableContext;
localVariables = Ptr(new WfRuntimeVariableContext);
localVariables->variables.Resize(function->localVariableNames.Count());
for (vint i = 0; i < localVariables->variables.Count(); i++)
{
@@ -452,7 +452,7 @@ WfRuntimeThreadContext
WfRuntimeThreadContextError WfRuntimeThreadContext::RaiseException(const WString& exception, bool fatalError, bool skipDebugger)
{
auto info = MakePtr<WfRuntimeExceptionInfo>(exception, fatalError);
auto info = Ptr(new WfRuntimeExceptionInfo(exception, fatalError));
return RaiseException(info, skipDebugger);
}
@@ -473,12 +473,12 @@ WfRuntimeThreadContext
for (vint j = stackCount - 1; j >= 0; j--)
{
const auto& stackFrame = context->stackFrames[j];
info->callStack.Add(new WfRuntimeCallStackInfo(context, stackFrame));
info->callStack.Add(Ptr(new WfRuntimeCallStackInfo(context, stackFrame)));
}
if (i > 0)
{
info->callStack.Add(new WfRuntimeCallStackInfo);
info->callStack.Add(Ptr(new WfRuntimeCallStackInfo));
}
}
@@ -975,28 +975,28 @@ Serizliation (ITypeInfo)
{
Ptr<ITypeInfo> elementType;
IOType(reader, elementType);
typeInfo = MakePtr<RawPtrTypeInfo>(elementType);
typeInfo = Ptr(new RawPtrTypeInfo(elementType));
}
break;
case ITypeInfo::SharedPtr:
{
Ptr<ITypeInfo> elementType;
IOType(reader, elementType);
typeInfo = MakePtr<SharedPtrTypeInfo>(elementType);
typeInfo = Ptr(new SharedPtrTypeInfo(elementType));
}
break;
case ITypeInfo::Nullable:
{
Ptr<ITypeInfo> elementType;
IOType(reader, elementType);
typeInfo = MakePtr<NullableTypeInfo>(elementType);
typeInfo = Ptr(new NullableTypeInfo(elementType));
}
break;
case ITypeInfo::Generic:
{
Ptr<ITypeInfo> elementType;
IOType(reader, elementType);
auto genericType = MakePtr<GenericTypeInfo>(elementType);
auto genericType = Ptr(new GenericTypeInfo(elementType));
typeInfo = genericType;
vint count = 0;
@@ -1016,7 +1016,7 @@ Serizliation (ITypeInfo)
vint index;
reader << index;
typeInfo = MakePtr<TypeDescriptorTypeInfo>(reader.context->tdIndex[index], static_cast<TypeInfoHint>(hint));
typeInfo = Ptr(new TypeDescriptorTypeInfo(reader.context->tdIndex[index], static_cast<TypeInfoHint>(hint)));
}
break;
}
@@ -1433,7 +1433,7 @@ Serialization (TypeImpl)
WString name;
IOType(reader, type);
reader << name;
info->AddParameter(new ParameterInfoImpl(info, name, type));
info->AddParameter(Ptr(new ParameterInfoImpl(info, name, type)));
}
}
@@ -1485,7 +1485,7 @@ Serialization (TypeImpl)
static void IOClassConstructor(WfReader& reader, Ptr<WfClassConstructor>& info)
{
info = new WfClassConstructor(nullptr);
info = Ptr(new WfClassConstructor(nullptr));
reader << info->functionIndex;
IOMethodBase(reader, info.Obj());
}
@@ -1502,7 +1502,7 @@ Serialization (TypeImpl)
{
Ptr<ITypeInfo> type;
IOType(reader, type);
info = new WfInterfaceConstructor(type);
info = Ptr(new WfInterfaceConstructor(type));
}
static void IOInterfaceConstructor(WfWriter& writer, WfInterfaceConstructor* info)
@@ -1574,19 +1574,19 @@ Serialization (TypeImpl)
if (isStaticMethod)
{
auto info = MakePtr<WfStaticMethod>();
auto info = Ptr(new WfStaticMethod);
td->AddMember(methodName, info);
IOStaticMethod(reader, info.Obj());
}
else if (isClass)
{
auto info = MakePtr<WfClassMethod>();
auto info = Ptr(new WfClassMethod);
td->AddMember(methodName, info);
IOClassMethod(reader, info.Obj());
}
else
{
auto info = MakePtr<WfInterfaceMethod>();
auto info = Ptr(new WfInterfaceMethod);
td->AddMember(methodName, info);
IOInterfaceMethod(reader, info.Obj());
}
@@ -1604,7 +1604,7 @@ Serialization (TypeImpl)
Ptr<ITypeInfo> eventType;
IOType(reader, eventType);
auto info = MakePtr<WfEvent>(td, eventName);
auto info = Ptr(new WfEvent(td, eventName));
info->SetHandlerType(eventType);
td->AddMember(info);
}
@@ -1620,7 +1620,7 @@ Serialization (TypeImpl)
if (isProperty)
{
auto info = MakePtr<WfProperty>(td, propName);
auto info = Ptr(new WfProperty(td, propName));
WString getterName, setterName, eventName;
reader << getterName << setterName << eventName;
@@ -1645,7 +1645,7 @@ Serialization (TypeImpl)
Ptr<ITypeInfo> fieldType;
IOType(reader, fieldType);
auto info = MakePtr<WfField>(td, propName);
auto info = Ptr(new WfField(td, propName));
info->SetReturn(fieldType);
td->AddMember(info);
}
@@ -1807,7 +1807,7 @@ Serialization (TypeImpl)
Ptr<ITypeInfo> typeInfo;
IOType(reader, typeInfo);
auto field = MakePtr<WfStructField>(td, name);
auto field = Ptr(new WfStructField(td, name));
field->SetReturn(typeInfo);
td->AddMember(field);
}
@@ -2059,7 +2059,7 @@ Serialization (Assembly)
reader.context->errors.duplicatedTypes.Add(typeName);
}
reader << isFlags << typeName;
type = MakePtr<WfEnum>(isFlags, typeName);
type = Ptr(new WfEnum(isFlags, typeName));
}
static void IOCustomType(WfWriter& writer, Ptr<WfEnum>& type)
@@ -2078,7 +2078,7 @@ Serialization (Assembly)
{
reader.context->errors.duplicatedTypes.Add(typeName);
}
type = MakePtr<TType>(typeName);
type = Ptr(new TType(typeName));
}
template<typename TType>
@@ -2131,12 +2131,12 @@ Serialization (Assembly)
static void IOPrepare(WfReader& reader, WfAssembly& value, WfAssemblyLoadErrors& errors)
{
reader.context = new WfReaderContext(errors);
reader.context = Ptr(new WfReaderContext(errors));
bool hasTypeImpl = false;
reader << hasTypeImpl;
if (hasTypeImpl)
{
value.typeImpl = new WfTypeImpl;
value.typeImpl = Ptr(new WfTypeImpl);
IOCustomTypeList(reader, value.typeImpl->classes);
IOCustomTypeList(reader, value.typeImpl->interfaces);
IOCustomTypeList(reader, value.typeImpl->structs);
@@ -2193,7 +2193,7 @@ Serialization (Assembly)
static void IOPrepare(WfWriter& writer, WfAssembly& value, WfAssemblyLoadErrors&)
{
writer.context = new WfWriterContext;
writer.context = Ptr(new WfWriterContext);
bool hasTypeImpl = value.typeImpl != nullptr;
writer << hasTypeImpl;
if (hasTypeImpl)
@@ -2310,7 +2310,7 @@ WfAssembly
{
try
{
auto assembly = MakePtr<WfAssembly>();
auto assembly = Ptr(new WfAssembly);
stream::internal::WfReader reader(input);
stream::internal::Serialization<WfAssembly>::IO(reader, *assembly.Obj(), errors);
assembly->Initialize();
@@ -3459,7 +3459,7 @@ WfRuntimeThreadContext (Range)
CONTEXT_ACTION(PopValue(first), L"failed to pop a value from the stack.");
T firstValue = UnboxValue<T>(first);
T secondValue = UnboxValue<T>(second);
auto enumerable = MakePtr<WfRuntimeRange<T>>(firstValue, secondValue);
auto enumerable = Ptr(new WfRuntimeRange<T>(firstValue, secondValue));
CONTEXT_ACTION(PushValue(Value::From(enumerable)), L"failed to push a value to the stack.");
return WfRuntimeExecutionAction::ExecuteInstruction;
}
@@ -3478,7 +3478,7 @@ Helper Functions
const auto& names = context->assembly->functionByName[name];
CHECK_ERROR(names.Count() == 1, L"vl::workflow::runtime::LoadFunction(Ptr<WfRUntimeGlobalContext>, const WString&)#Multiple functions are found.");
vint functionIndex = names[0];
auto lambda = MakePtr<WfRuntimeLambda>(context, nullptr, functionIndex);
auto lambda = Ptr(new WfRuntimeLambda(context, nullptr, functionIndex));
return lambda;
}
@@ -3694,7 +3694,7 @@ WfRuntimeThreadContext
Ptr<WfRuntimeVariableContext> capturedVariables;
if (ins.countParameter > 0)
{
capturedVariables = new WfRuntimeVariableContext;
capturedVariables = Ptr(new WfRuntimeVariableContext);
capturedVariables->variables.Resize(ins.countParameter);
Value operand;
for (vint i = 0; i < ins.countParameter; i++)
@@ -3715,13 +3715,13 @@ WfRuntimeThreadContext
auto capturedVariables = context.GetSharedPtr().Cast<WfRuntimeVariableContext>();
auto functionIndex = UnboxValue<vint>(function);
auto lambda = MakePtr<WfRuntimeLambda>(globalContext, capturedVariables, functionIndex);
auto lambda = Ptr(new WfRuntimeLambda(globalContext, capturedVariables, functionIndex));
CONTEXT_ACTION(PushValue(Value::From(lambda)), L"failed to push a value to the stack.");
return WfRuntimeExecutionAction::ExecuteInstruction;
}
case WfInsCode::CreateInterface:
{
auto proxy = MakePtr<WfRuntimeInterfaceInstance>();
auto proxy = Ptr(new WfRuntimeInterfaceInstance);
Value key, value, operand;
for (vint i = 0; i < ins.countParameter; i+=2)
{
@@ -3922,7 +3922,7 @@ WfRuntimeThreadContext
arguments.Insert(0, argument);
}
Ptr<IValueList> list = new ValueListWrapper<List<Value>*>(&arguments);
Ptr<IValueList> list = Ptr(new ValueListWrapper<List<Value>*>(&arguments));
Value result = proxy->Invoke(list);
CONTEXT_ACTION(PushValue(result), L"failed to push a value to the stack.");
return WfRuntimeExecutionAction::ExecuteInstruction;
@@ -3946,7 +3946,7 @@ WfRuntimeThreadContext
{
if (classMethod->GetGlobalContext() == globalContext.Obj())
{
auto capturedVariable = MakePtr<WfRuntimeVariableContext>();
auto capturedVariable = Ptr(new WfRuntimeVariableContext);
capturedVariable->variables.Resize(1);
capturedVariable->variables[0] = Value::From(thisValue.GetRawPtr());
@@ -3995,7 +3995,7 @@ WfRuntimeThreadContext
{
if (ctor->GetGlobalContext() == globalContext.Obj())
{
auto capturedVariable = MakePtr<WfRuntimeVariableContext>();
auto capturedVariable = Ptr(new WfRuntimeVariableContext);
capturedVariable->variables.Resize(1);
capturedVariable->variables[0] = Value::From(thisValue.GetRawPtr());
@@ -4704,7 +4704,7 @@ WfMethodBase
Value WfMethodBase::CreateFunctionProxyInternal(const Value& thisObject)
{
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
return Value::From(MakePtr<WfMethodProxy>(thisObject, this));
return Value::From(Ptr(new WfMethodProxy(thisObject, this)));
#else
CHECK_FAIL(L"Not Implemented under VCZH_DEBUG_METAONLY_REFLECTION!");
#endif
@@ -4747,7 +4747,7 @@ WfStaticMethod
{
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
auto argumentArray = IValueList::Create(arguments);
return WfRuntimeLambda::Invoke(globalContext, nullptr, functionIndex, argumentArray);
return WfRuntimeLambda::Invoke(Ptr(globalContext), nullptr, functionIndex, argumentArray);
#else
CHECK_FAIL(L"Not Implemented under VCZH_DEBUG_METAONLY_REFLECTION!");
#endif
@@ -4765,7 +4765,7 @@ WfClassConstructor
Value WfClassConstructor::InvokeInternal(const Value& thisObject, collections::Array<Value>& arguments)
{
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
auto instance = MakePtr<WfClassInstance>(GetOwnerTypeDescriptor());
auto instance = Ptr(new WfClassInstance(GetOwnerTypeDescriptor()));
{
InvokeBaseCtor(Value::From(instance.Obj()), arguments);
}
@@ -4792,12 +4792,12 @@ WfClassConstructor
void WfClassConstructor::InvokeBaseCtor(const Value& thisObject, collections::Array<Value>& arguments)
{
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
auto capturedVariables = MakePtr<WfRuntimeVariableContext>();
auto capturedVariables = Ptr(new WfRuntimeVariableContext);
capturedVariables->variables.Resize(1);
capturedVariables->variables[0] = Value::From(thisObject.GetRawPtr());
auto argumentArray = IValueList::Create(arguments);
WfRuntimeLambda::Invoke(globalContext, capturedVariables, functionIndex, argumentArray);
WfRuntimeLambda::Invoke(Ptr(globalContext), capturedVariables, functionIndex, argumentArray);
#else
CHECK_FAIL(L"Not Implemented under VCZH_DEBUG_METAONLY_REFLECTION!");
#endif
@@ -4810,12 +4810,12 @@ WfClassMethod
Value WfClassMethod::InvokeInternal(const Value& thisObject, collections::Array<Value>& arguments)
{
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
auto capturedVariables = MakePtr<WfRuntimeVariableContext>();
auto capturedVariables = Ptr(new WfRuntimeVariableContext);
capturedVariables->variables.Resize(1);
capturedVariables->variables[0] = Value::From(thisObject.GetRawPtr());
auto argumentArray = IValueList::Create(arguments);
return WfRuntimeLambda::Invoke(globalContext, capturedVariables, functionIndex, argumentArray);
return WfRuntimeLambda::Invoke(Ptr(globalContext), capturedVariables, functionIndex, argumentArray);
#else
CHECK_FAIL(L"Not Implemented under VCZH_DEBUG_METAONLY_REFLECTION!");
#endif
@@ -4884,7 +4884,7 @@ WfInterfaceConstructor
}
}
Ptr<WfInterfaceInstance> instance = new WfInterfaceInstance(GetOwnerTypeDescriptor(), proxy, baseCtors);
auto instance = Ptr(new WfInterfaceInstance(GetOwnerTypeDescriptor(), proxy, baseCtors));
if (returnInfo->GetDecorator() == ITypeInfo::SharedPtr)
{
@@ -4903,7 +4903,7 @@ WfInterfaceConstructor
:WfMethodBase(true)
{
auto argumentType = TypeInfoRetriver<Ptr<IValueInterfaceProxy>>::CreateTypeInfo();
auto parameter = MakePtr<ParameterInfoImpl>(this, L"proxy", argumentType);
auto parameter = Ptr(new ParameterInfoImpl(this, L"proxy", argumentType));
AddParameter(parameter);
SetReturn(type);
}
@@ -4950,7 +4950,7 @@ GetInfoRecord
}
else if(createIfNotExist)
{
typedValue = new TRecord;
typedValue = Ptr(new TRecord);
thisObject->SetInternalProperty(key, typedValue);
}
return typedValue;
@@ -4976,7 +4976,7 @@ WfEvent
{
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
auto record = GetEventRecord(thisObject, true);
auto result = MakePtr<EventHandlerImpl>(handler);
auto result = Ptr(new EventHandlerImpl(handler));
record->handlers.Add(this, result);
return result;
#else
@@ -5353,7 +5353,7 @@ WfStruct
Value WfStruct::WfValueType::CreateDefault()
{
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
return Value::From(new IValueType::TypedBox<WfStructInstance>, owner);
return Value::From(Ptr(new IValueType::TypedBox<WfStructInstance>), owner);
#else
CHECK_FAIL(L"Not Implemented under VCZH_DEBUG_METAONLY_REFLECTION!");
#endif
@@ -5367,7 +5367,7 @@ WfStruct
WfStruct::WfStruct(const WString& typeName)
:WfCustomTypeBase<reflection::description::ValueTypeDescriptorBase>(TypeDescriptorFlags::Struct, typeName)
{
this->valueType = new WfValueType(this);
this->valueType = Ptr(new WfValueType(this));
}
WfStruct::~WfStruct()
@@ -5454,7 +5454,7 @@ WfEnum::WfEnumType
Value WfEnum::WfEnumType::ToEnum(vuint64_t value)
{
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
auto boxedValue = MakePtr<IValueType::TypedBox<WfEnumInstance>>();
auto boxedValue = Ptr(new IValueType::TypedBox<WfEnumInstance>);
boxedValue->value.value = value;
return Value::From(boxedValue, owner);
#else
@@ -5488,7 +5488,7 @@ WfEnum
Value WfEnum::WfValueType::CreateDefault()
{
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
return Value::From(new IValueType::TypedBox<WfEnumInstance>, owner);
return Value::From(Ptr(new IValueType::TypedBox<WfEnumInstance>), owner);
#else
CHECK_FAIL(L"Not Implemented under VCZH_DEBUG_METAONLY_REFLECTION!");
#endif
@@ -5520,8 +5520,8 @@ WfEnum
WfEnum::WfEnum(bool isFlags, const WString& typeName)
:WfCustomTypeBase<reflection::description::ValueTypeDescriptorBase>((isFlags ? TypeDescriptorFlags::FlagEnum : TypeDescriptorFlags::NormalEnum), typeName)
{
this->valueType = new WfValueType(this);
this->enumType = new WfEnumType(this);
this->valueType = Ptr(new WfValueType(this));
this->enumType = Ptr(new WfEnumType(this));
}
WfEnum::~WfEnum()
@@ -5553,12 +5553,12 @@ WfClassInstance
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
if (classType->destructorFunctionIndex != -1)
{
auto capturedVariables = MakePtr<WfRuntimeVariableContext>();
auto capturedVariables = Ptr(new WfRuntimeVariableContext);
capturedVariables->variables.Resize(1);
capturedVariables->variables[0] = Value::From(this);
auto argumentArray = IValueList::Create();
WfRuntimeLambda::Invoke(classType->GetGlobalContext(), capturedVariables, classType->destructorFunctionIndex, argumentArray);
WfRuntimeLambda::Invoke(Ptr(classType->GetGlobalContext()), capturedVariables, classType->destructorFunctionIndex, argumentArray);
}
#endif
}
@@ -5569,7 +5569,7 @@ WfClassInstance
{
if (!(ptr = value.GetSharedPtr()))
{
ptr = value.GetRawPtr();
ptr = Ptr(value.GetRawPtr());
}
value = Value();
}
@@ -5600,7 +5600,7 @@ WfInterfaceInstance
auto value = ctor->Invoke(Value(), arguments);
if (!(ptr = value.GetSharedPtr()))
{
ptr = value.GetRawPtr();
ptr = Ptr(value.GetRawPtr());
}
}
Import/VlppWorkflowRuntime.h
+1 -1
View File
@@ -1048,7 +1048,7 @@ Range
Ptr<reflection::description::IValueEnumerator> CreateEnumerator()override
{
return MakePtr<Enumerator>(begin, end);
return Ptr(new Enumerator(begin, end));
}
};
Tools/CppMerge.exe
BIN
View File
Binary file not shown.
Tools/GacGen32.exe
BIN
View File
Binary file not shown.
Tools/GacGen64.exe
BIN
View File
Binary file not shown.
Tools/GlrParserGen.exe
BIN
View File
Binary file not shown.
Tools/ParserGen.exe
BIN
View File
Binary file not shown.
Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.cpp
+240 -240
View File
File diff suppressed because it is too large Load Diff
Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoReflection.cpp
+1 -1
View File
@@ -1863,7 +1863,7 @@ namespace vl
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
if (auto manager = GetGlobalTypeManager())
{
return manager->AddTypeLoader(MakePtr<DemoTypeLoader>());
return manager->AddTypeLoader(Ptr(new DemoTypeLoader));
}
#endif
return false;
Tutorial/GacUI_ControlTemplate/WindowSkin/UI/Source/DemoPartialClasses.cpp
+7 -7
View File
@@ -687,36 +687,36 @@ namespace demo
::vl::__vwsn::This(::vl::__vwsn::This(this->self)->GetContainerComposition())->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_0));
}
{
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->checkFrame)->SelectedChanged, LAMBDA(::vl_workflow_global::__vwsno1_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(__vwsn_this_, this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->checkFrame)->SelectedChanged, vl::Func(::vl_workflow_global::__vwsno1_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(__vwsn_this_, this)));
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc1_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf2_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf2_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc2_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf7_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf7_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
}
Tutorial/GacUI_ControlTemplate/WindowSkin/UI/Source/DemoReflection.cpp
+1 -1
View File
@@ -105,7 +105,7 @@ namespace vl
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
if (auto manager = GetGlobalTypeManager())
{
return manager->AddTypeLoader(MakePtr<DemoTypeLoader>());
return manager->AddTypeLoader(Ptr(new DemoTypeLoader));
}
#endif
return false;
Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.cpp
+37 -37
View File
@@ -81,7 +81,7 @@ Closures
void __vwsnf11_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_::operator()(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments) const
{
::vl::reflection::description::AsyncCoroutine::CreateAndRun(LAMBDA(::vl_workflow_global::__vwsnf12_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__(__vwsnthis_0)));
::vl::reflection::description::AsyncCoroutine::CreateAndRun(vl::Func(::vl_workflow_global::__vwsnf12_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__(__vwsnthis_0)));
}
//-------------------------------------------------------------------
@@ -153,7 +153,7 @@ Closures
void __vwsnf16_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_::operator()(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments) const
{
::vl::reflection::description::AsyncCoroutine::CreateAndRun(LAMBDA(::vl_workflow_global::__vwsnf17_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__(__vwsnthis_0)));
::vl::reflection::description::AsyncCoroutine::CreateAndRun(vl::Func(::vl_workflow_global::__vwsnf17_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__(__vwsnthis_0)));
}
//-------------------------------------------------------------------
@@ -195,7 +195,7 @@ Closures
void __vwsnf19_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_::operator()(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments) const
{
::vl::reflection::description::AsyncCoroutine::CreateAndRun(LAMBDA(::vl_workflow_global::__vwsnf20_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__(__vwsnthis_0)));
::vl::reflection::description::AsyncCoroutine::CreateAndRun(vl::Func(::vl_workflow_global::__vwsnf20_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__(__vwsnthis_0)));
}
//-------------------------------------------------------------------
@@ -1707,13 +1707,13 @@ Class (::demo::MainWindowConstructor)
(this->treeViewFolders = new ::vl::presentation::controls::GuiBindableTreeView(::vl::presentation::theme::ThemeName::TreeView));
}
{
::vl::__vwsn::This(this->treeViewFolders)->SetChildrenProperty(LAMBDA(::vl_workflow_global::__vwsnf1_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->treeViewFolders)->SetChildrenProperty(vl::Func(::vl_workflow_global::__vwsnf1_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->treeViewFolders)->SetImageProperty(LAMBDA(::vl_workflow_global::__vwsnf2_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->treeViewFolders)->SetImageProperty(vl::Func(::vl_workflow_global::__vwsnf2_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->treeViewFolders)->SetTextProperty(LAMBDA(::vl_workflow_global::__vwsnf3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->treeViewFolders)->SetTextProperty(vl::Func(::vl_workflow_global::__vwsnf3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->treeViewFolders)->SetVerticalAlwaysVisible(false);
@@ -1867,10 +1867,10 @@ Class (::demo::MainWindowConstructor)
::vl::__vwsn::This(__vwsn_collection_.Obj())->Add(::vl::__vwsn::Box(static_cast<::vl::vint>(2)));
}
{
::vl::__vwsn::This(this->listViewContacts)->SetSmallImageProperty(LAMBDA(::vl_workflow_global::__vwsnf4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->listViewContacts)->SetSmallImageProperty(vl::Func(::vl_workflow_global::__vwsnf4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->listViewContacts)->SetLargeImageProperty(LAMBDA(::vl_workflow_global::__vwsnf5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->listViewContacts)->SetLargeImageProperty(vl::Func(::vl_workflow_global::__vwsnf5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->listViewContacts)->SetView(::vl::presentation::controls::ListViewView::Detail);
@@ -1890,7 +1890,7 @@ Class (::demo::MainWindowConstructor)
::vl::__vwsn::This(this->__vwsn_precompile_31.Obj())->SetSize(static_cast<::vl::vint>(120));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_31.Obj())->SetTextProperty(LAMBDA(::vl_workflow_global::__vwsnf6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_31.Obj())->SetTextProperty(vl::Func(::vl_workflow_global::__vwsnf6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_31.Obj())->SetText(::vl::WString::Unmanaged(L"Name"));
@@ -1904,7 +1904,7 @@ Class (::demo::MainWindowConstructor)
::vl::__vwsn::This(this->__vwsn_precompile_32.Obj())->SetSize(static_cast<::vl::vint>(120));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_32.Obj())->SetTextProperty(LAMBDA(::vl_workflow_global::__vwsnf7_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_32.Obj())->SetTextProperty(vl::Func(::vl_workflow_global::__vwsnf7_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_32.Obj())->SetText(::vl::WString::Unmanaged(L"Birthday"));
@@ -1918,7 +1918,7 @@ Class (::demo::MainWindowConstructor)
::vl::__vwsn::This(this->__vwsn_precompile_33.Obj())->SetSize(static_cast<::vl::vint>(120));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_33.Obj())->SetTextProperty(LAMBDA(::vl_workflow_global::__vwsnf8_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_33.Obj())->SetTextProperty(vl::Func(::vl_workflow_global::__vwsnf8_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_33.Obj())->SetText(::vl::WString::Unmanaged(L"Phone"));
@@ -1932,7 +1932,7 @@ Class (::demo::MainWindowConstructor)
::vl::__vwsn::This(this->__vwsn_precompile_34.Obj())->SetSize(static_cast<::vl::vint>(120));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_34.Obj())->SetTextProperty(LAMBDA(::vl_workflow_global::__vwsnf9_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_34.Obj())->SetTextProperty(vl::Func(::vl_workflow_global::__vwsnf9_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_34.Obj())->SetText(::vl::WString::Unmanaged(L"Address"));
@@ -1964,11 +1964,11 @@ Class (::demo::MainWindowConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc1_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf10_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf10_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf11_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf11_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->commandNewFolder)->Executed, __vwsn_event_handler_);
}
{
@@ -1976,11 +1976,11 @@ Class (::demo::MainWindowConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf13_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf13_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf14_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf14_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->commandDeleteFolder)->Executed, __vwsn_event_handler_);
}
{
@@ -1988,11 +1988,11 @@ Class (::demo::MainWindowConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf15_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf15_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf16_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf16_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->commandNewContact)->Executed, __vwsn_event_handler_);
}
{
@@ -2000,11 +2000,11 @@ Class (::demo::MainWindowConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf18_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf18_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf19_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf19_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->commandEditContact)->Executed, __vwsn_event_handler_);
}
{
@@ -2012,53 +2012,53 @@ Class (::demo::MainWindowConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc8_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf21_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf21_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf22_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf22_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->commandDeleteContact)->Executed, __vwsn_event_handler_);
}
{
::vl::__vwsn::This(this->commandBigIcon)->SetImage(::vl::__vwsn::Ensure(::vl::__vwsn::SharedPtrCast<::vl::presentation::GuiImageData>(::vl::__vwsn::This(__vwsn_this_)->ResolveResource(::vl::WString::Unmanaged(L"res"), ::vl::WString::Unmanaged(L"Images/BigIcon"), true).Obj())));
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf23_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf23_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->commandBigIcon)->Executed, __vwsn_event_handler_);
}
{
::vl::__vwsn::This(this->commandSmallIcon)->SetImage(::vl::__vwsn::Ensure(::vl::__vwsn::SharedPtrCast<::vl::presentation::GuiImageData>(::vl::__vwsn::This(__vwsn_this_)->ResolveResource(::vl::WString::Unmanaged(L"res"), ::vl::WString::Unmanaged(L"Images/SmallIcon"), true).Obj())));
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf24_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf24_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->commandSmallIcon)->Executed, __vwsn_event_handler_);
}
{
::vl::__vwsn::This(this->commandList)->SetImage(::vl::__vwsn::Ensure(::vl::__vwsn::SharedPtrCast<::vl::presentation::GuiImageData>(::vl::__vwsn::This(__vwsn_this_)->ResolveResource(::vl::WString::Unmanaged(L"res"), ::vl::WString::Unmanaged(L"Images/List"), true).Obj())));
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf25_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf25_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->commandList)->Executed, __vwsn_event_handler_);
}
{
::vl::__vwsn::This(this->commandDetail)->SetImage(::vl::__vwsn::Ensure(::vl::__vwsn::SharedPtrCast<::vl::presentation::GuiImageData>(::vl::__vwsn::This(__vwsn_this_)->ResolveResource(::vl::WString::Unmanaged(L"res"), ::vl::WString::Unmanaged(L"Images/Detail"), true).Obj())));
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf26_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf26_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->commandDetail)->Executed, __vwsn_event_handler_);
}
{
::vl::__vwsn::This(this->commandTile)->SetImage(::vl::__vwsn::Ensure(::vl::__vwsn::SharedPtrCast<::vl::presentation::GuiImageData>(::vl::__vwsn::This(__vwsn_this_)->ResolveResource(::vl::WString::Unmanaged(L"res"), ::vl::WString::Unmanaged(L"Images/Tile"), true).Obj())));
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf27_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf27_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->commandTile)->Executed, __vwsn_event_handler_);
}
{
::vl::__vwsn::This(this->commandInformation)->SetImage(::vl::__vwsn::Ensure(::vl::__vwsn::SharedPtrCast<::vl::presentation::GuiImageData>(::vl::__vwsn::This(__vwsn_this_)->ResolveResource(::vl::WString::Unmanaged(L"res"), ::vl::WString::Unmanaged(L"Images/Information"), true).Obj())));
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf28_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf28_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->commandInformation)->Executed, __vwsn_event_handler_);
}
{
@@ -2099,17 +2099,17 @@ Class (::demo::MainWindowConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc9_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf29_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf29_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc10_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf30_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf30_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc11_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf31_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf31_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
}
@@ -2419,16 +2419,16 @@ Class (::demo::NewContactWindowConstructor)
::vl::__vwsn::This(::vl::__vwsn::This(this->self)->GetContainerComposition())->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_0));
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf32_Demo_demo_NewContactWindowConstructor___vwsn_demo_NewContactWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf32_Demo_demo_NewContactWindowConstructor___vwsn_demo_NewContactWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_18)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf33_Demo_demo_NewContactWindowConstructor___vwsn_demo_NewContactWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf33_Demo_demo_NewContactWindowConstructor___vwsn_demo_NewContactWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_21)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc12_Demo_demo_NewContactWindowConstructor___vwsn_demo_NewContactWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf34_Demo_demo_NewContactWindowConstructor___vwsn_demo_NewContactWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf34_Demo_demo_NewContactWindowConstructor___vwsn_demo_NewContactWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
}
@@ -2644,16 +2644,16 @@ Class (::demo::NewFolderWindowConstructor)
::vl::__vwsn::This(::vl::__vwsn::This(this->self)->GetContainerComposition())->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_0));
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf35_Demo_demo_NewFolderWindowConstructor___vwsn_demo_NewFolderWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf35_Demo_demo_NewFolderWindowConstructor___vwsn_demo_NewFolderWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_6)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf36_Demo_demo_NewFolderWindowConstructor___vwsn_demo_NewFolderWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf36_Demo_demo_NewFolderWindowConstructor___vwsn_demo_NewFolderWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_9)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc13_Demo_demo_NewFolderWindowConstructor___vwsn_demo_NewFolderWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf37_Demo_demo_NewFolderWindowConstructor___vwsn_demo_NewFolderWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf37_Demo_demo_NewFolderWindowConstructor___vwsn_demo_NewFolderWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
}
Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoReflection.cpp
+1 -1
View File
@@ -274,7 +274,7 @@ namespace vl
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
if (auto manager = GetGlobalTypeManager())
{
return manager->AddTypeLoader(MakePtr<DemoTypeLoader>());
return manager->AddTypeLoader(Ptr(new DemoTypeLoader));
}
#endif
return false;
Tutorial/GacUI_Controls/Animation/UI/Source/DemoPartialClasses.cpp
+12 -12
View File
@@ -1083,7 +1083,7 @@ namespace demo
::vl::__vwsn::This(this->GetBegin().Obj())->SetShadow(::vl::__vwsn::This(this->GetCurrent().Obj())->GetShadow());
::vl::__vwsn::This(this->GetBegin().Obj())->SetThickness(::vl::__vwsn::This(this->GetCurrent().Obj())->GetThickness());
this->SetEnd(__vwsn_ani_target);
return ::vl::presentation::controls::IGuiAnimation::CreateAnimation(LAMBDA(::vl_workflow_global::__vwsnf2_Demo_demo_ColorAnimation_CreateAnimation_(__vwsn_ani_time, this)), __vwsn_ani_time);
return ::vl::presentation::controls::IGuiAnimation::CreateAnimation(vl::Func(::vl_workflow_global::__vwsnf2_Demo_demo_ColorAnimation_CreateAnimation_(__vwsn_ani_time, this)), __vwsn_ani_time);
}
ColorAnimation::ColorAnimation(::vl::Ptr<::demo::ColorDef> __vwsn_ani_current)
@@ -1091,7 +1091,7 @@ namespace demo
, __vwsn_prop_End(::vl::Ptr<::demo::ColorDef>())
, __vwsn_prop_Current(::vl::Ptr<::demo::ColorDef>())
, __vwsn_ani_int_(::vl::Func<double(double)>(GLOBAL_OBJ, &GLOBAL_SYMBOL G))
, __vwsn_ani_int_Thickness(LAMBDA(::vl_workflow_global::__vwsno1_Demo_demo_ColorAnimation_()))
, __vwsn_ani_int_Thickness(vl::Func(::vl_workflow_global::__vwsno1_Demo_demo_ColorAnimation_()))
{
this->SetBegin(::vl::Ptr<::demo::ColorDef>(new ::demo::ColorDef()));
::vl::__vwsn::This(this->GetBegin().Obj())->SetTop(::vl::__vwsn::This(__vwsn_ani_current.Obj())->GetTop());
@@ -1383,34 +1383,34 @@ Class (::demo::MainWindowConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc1_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc2_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf7_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf7_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_10)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf8_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf8_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_13)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf9_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf9_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_16)->Clicked, __vwsn_event_handler_);
}
}
@@ -1448,17 +1448,17 @@ Class (::demo::MainWindow)
::vl::Ptr<::vl::presentation::controls::IGuiAnimation> MainWindow::BallAnimation(::vl::presentation::compositions::GuiBoundsComposition* container, ::vl::presentation::compositions::GuiBoundsComposition* ball)
{
return ::vl::presentation::controls::IGuiAnimation::CreateAnimation(LAMBDA(::vl_workflow_global::__vwsnf10_Demo_demo_MainWindow_BallAnimation_(ball, container)), static_cast<::vl::vuint64_t>(static_cast<::vl::vint>(2000)));
return ::vl::presentation::controls::IGuiAnimation::CreateAnimation(vl::Func(::vl_workflow_global::__vwsnf10_Demo_demo_MainWindow_BallAnimation_(ball, container)), static_cast<::vl::vuint64_t>(static_cast<::vl::vint>(2000)));
}
::vl::Ptr<::vl::presentation::controls::IGuiAnimation> MainWindow::BallAnimationWithDelay(::vl::presentation::compositions::GuiBoundsComposition* container, ::vl::presentation::compositions::GuiBoundsComposition* ball, ::vl::vint delay)
{
return ::vl::presentation::controls::IGuiAnimationCoroutine::Create(LAMBDA(::vl_workflow_global::__vwsnf11_Demo_demo_MainWindow_BallAnimationWithDelay_(ball, container, delay)));
return ::vl::presentation::controls::IGuiAnimationCoroutine::Create(vl::Func(::vl_workflow_global::__vwsnf11_Demo_demo_MainWindow_BallAnimationWithDelay_(ball, container, delay)));
}
::vl::Ptr<::vl::presentation::controls::IGuiAnimation> MainWindow::WaitingAnimation(::vl::presentation::compositions::GuiBoundsComposition* container)
{
return ::vl::presentation::controls::IGuiAnimationCoroutine::Create(LAMBDA(::vl_workflow_global::__vwsnf12_Demo_demo_MainWindow_WaitingAnimation_(container)));
return ::vl::presentation::controls::IGuiAnimationCoroutine::Create(vl::Func(::vl_workflow_global::__vwsnf12_Demo_demo_MainWindow_WaitingAnimation_(container)));
}
void MainWindow::PerformGradientAnimation(::vl::Ptr<::demo::ColorDef> target)
Tutorial/GacUI_Controls/Animation/UI/Source/DemoReflection.cpp
+1 -1
View File
@@ -158,7 +158,7 @@ namespace vl
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
if (auto manager = GetGlobalTypeManager())
{
return manager->AddTypeLoader(MakePtr<DemoTypeLoader>());
return manager->AddTypeLoader(Ptr(new DemoTypeLoader));
}
#endif
return false;
Tutorial/GacUI_Controls/CalculatorAndStateMachine/UI/Source/DemoPartialClasses.cpp
+16 -16
View File
@@ -1272,67 +1272,67 @@ Class (::demo::MainWindowConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc1_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf1_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf1_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf2_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf2_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_5)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_8)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_11)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_14)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_17)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf7_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf7_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_20)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf8_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf8_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_23)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf9_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf9_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_26)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf10_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf10_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_29)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf11_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf11_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_32)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf12_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf12_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_35)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf13_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf13_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_38)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf14_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf14_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_41)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf15_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf15_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_44)->Clicked, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf16_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf16_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_47)->Clicked, __vwsn_event_handler_);
}
}
Tutorial/GacUI_Controls/CalculatorAndStateMachine/UI/Source/DemoReflection.cpp
+1 -1
View File
@@ -148,7 +148,7 @@ namespace vl
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
if (auto manager = GetGlobalTypeManager())
{
return manager->AddTypeLoader(MakePtr<DemoTypeLoader>());
return manager->AddTypeLoader(Ptr(new DemoTypeLoader));
}
#endif
return false;
Tutorial/GacUI_Controls/ColorPicker/UI/Source/DemoPartialClasses.cpp
+6 -6
View File
@@ -410,12 +410,12 @@ namespace demo
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc1_Demo_demo_ColorBomboItemTemplateConstructor___vwsn_demo_ColorBomboItemTemplate_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf1_Demo_demo_ColorBomboItemTemplateConstructor___vwsn_demo_ColorBomboItemTemplate_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf1_Demo_demo_ColorBomboItemTemplateConstructor___vwsn_demo_ColorBomboItemTemplate_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc2_Demo_demo_ColorBomboItemTemplateConstructor___vwsn_demo_ColorBomboItemTemplate_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf2_Demo_demo_ColorBomboItemTemplateConstructor___vwsn_demo_ColorBomboItemTemplate_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf2_Demo_demo_ColorBomboItemTemplateConstructor___vwsn_demo_ColorBomboItemTemplate_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
}
@@ -489,7 +489,7 @@ Class (::demo::ColorListItemTemplateConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc3_Demo_demo_ColorListItemTemplateConstructor___vwsn_demo_ColorListItemTemplate_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf3_Demo_demo_ColorListItemTemplateConstructor___vwsn_demo_ColorListItemTemplate_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf3_Demo_demo_ColorListItemTemplateConstructor___vwsn_demo_ColorListItemTemplate_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
}
@@ -590,7 +590,7 @@ Class (::demo::MainWindowConstructor)
(this->__vwsn_precompile_6 = new ::vl::presentation::controls::GuiBindableTextList(::vl::presentation::theme::ThemeName::TextList));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_6)->SetTextProperty(LAMBDA(::vl_workflow_global::__vwsnf4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_6)->SetTextProperty(vl::Func(::vl_workflow_global::__vwsnf4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_6)->SetVerticalAlwaysVisible(false);
@@ -599,7 +599,7 @@ Class (::demo::MainWindowConstructor)
::vl::__vwsn::This(this->__vwsn_precompile_6)->SetHorizontalAlwaysVisible(false);
}
{
::vl::__vwsn::This(this->__vwsn_precompile_6)->SetItemTemplate(LAMBDA(::vl_workflow_global::__vwsnf5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_6)->SetItemTemplate(vl::Func(::vl_workflow_global::__vwsnf5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
(this->__vwsn_precompile_5 = new ::vl::presentation::controls::GuiComboBoxListControl(::vl::presentation::theme::ThemeName::ComboBox, static_cast<::vl::presentation::controls::GuiSelectableListControl*>(this->__vwsn_precompile_6)));
@@ -609,7 +609,7 @@ Class (::demo::MainWindowConstructor)
::vl::__vwsn::This(this->__vwsn_precompile_7)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }());
}
{
::vl::__vwsn::This(this->__vwsn_precompile_5)->SetItemTemplate(LAMBDA(::vl_workflow_global::__vwsnf6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_5)->SetItemTemplate(vl::Func(::vl_workflow_global::__vwsnf6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_4)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(::vl::__vwsn::This(this->__vwsn_precompile_5)->GetBoundsComposition()));
Tutorial/GacUI_Controls/ColorPicker/UI/Source/DemoReflection.cpp
+1 -1
View File
@@ -153,7 +153,7 @@ namespace vl
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
if (auto manager = GetGlobalTypeManager())
{
return manager->AddTypeLoader(MakePtr<DemoTypeLoader>());
return manager->AddTypeLoader(Ptr(new DemoTypeLoader));
}
#endif
return false;
Tutorial/GacUI_Controls/ContainersAndButtons/UI/Source/DemoReflection.cpp
+1 -1
View File
@@ -146,7 +146,7 @@ namespace vl
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
if (auto manager = GetGlobalTypeManager())
{
return manager->AddTypeLoader(MakePtr<DemoTypeLoader>());
return manager->AddTypeLoader(Ptr(new DemoTypeLoader));
}
#endif
return false;
Tutorial/GacUI_Controls/DataGrid/UI/Source/DemoPartialClasses.cpp
+52 -52
View File
@@ -1622,7 +1622,7 @@ Closures
::vl::vint __vwsnc1_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_presentation_controls_list_IDataSorter::Compare(const ::vl::reflection::description::Value& __vwsn_row1_, const ::vl::reflection::description::Value& __vwsn_row2_)
{
return LAMBDA(::vl_workflow_global::__vwsno3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_Compare_(this, __vwsnthis_0))(::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row1_), ::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row2_));
return vl::Func(::vl_workflow_global::__vwsno3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_Compare_(this, __vwsnthis_0))(::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row1_), ::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row2_));
}
//-------------------------------------------------------------------
@@ -1943,7 +1943,7 @@ Closures
::vl::vint __vwsnc2_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_presentation_controls_list_IDataSorter::Compare(const ::vl::reflection::description::Value& __vwsn_row1_, const ::vl::reflection::description::Value& __vwsn_row2_)
{
return LAMBDA(::vl_workflow_global::__vwsno9_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_Compare_(this, __vwsnthis_0))(::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row1_), ::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row2_));
return vl::Func(::vl_workflow_global::__vwsno9_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_Compare_(this, __vwsnthis_0))(::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row1_), ::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row2_));
}
//-------------------------------------------------------------------
@@ -1959,7 +1959,7 @@ Closures
::vl::vint __vwsnc3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_presentation_controls_list_IDataSorter::Compare(const ::vl::reflection::description::Value& __vwsn_row1_, const ::vl::reflection::description::Value& __vwsn_row2_)
{
return LAMBDA(::vl_workflow_global::__vwsno15_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_Compare_(this, __vwsnthis_0))(::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row1_), ::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row2_));
return vl::Func(::vl_workflow_global::__vwsno15_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_Compare_(this, __vwsnthis_0))(::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row1_), ::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row2_));
}
//-------------------------------------------------------------------
@@ -1975,7 +1975,7 @@ Closures
::vl::vint __vwsnc4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_presentation_controls_list_IDataSorter::Compare(const ::vl::reflection::description::Value& __vwsn_row1_, const ::vl::reflection::description::Value& __vwsn_row2_)
{
return LAMBDA(::vl_workflow_global::__vwsno19_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_Compare_(this, __vwsnthis_0))(::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row1_), ::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row2_));
return vl::Func(::vl_workflow_global::__vwsno19_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_Compare_(this, __vwsnthis_0))(::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row1_), ::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row2_));
}
//-------------------------------------------------------------------
@@ -1991,7 +1991,7 @@ Closures
::vl::vint __vwsnc5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_presentation_controls_list_IDataSorter::Compare(const ::vl::reflection::description::Value& __vwsn_row1_, const ::vl::reflection::description::Value& __vwsn_row2_)
{
return LAMBDA(::vl_workflow_global::__vwsno25_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_Compare_(this, __vwsnthis_0))(::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row1_), ::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row2_));
return vl::Func(::vl_workflow_global::__vwsno25_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_Compare_(this, __vwsnthis_0))(::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row1_), ::vl::__vwsn::Unbox<::vl::Ptr<::demo::MyDataItem>>(__vwsn_row2_));
}
//-------------------------------------------------------------------
@@ -2319,17 +2319,17 @@ namespace demo
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc13_Demo_demo_CategoryDisplayerConstructor___vwsn_demo_CategoryDisplayer_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf40_Demo_demo_CategoryDisplayerConstructor___vwsn_demo_CategoryDisplayer_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf40_Demo_demo_CategoryDisplayerConstructor___vwsn_demo_CategoryDisplayer_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc14_Demo_demo_CategoryDisplayerConstructor___vwsn_demo_CategoryDisplayer_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf41_Demo_demo_CategoryDisplayerConstructor___vwsn_demo_CategoryDisplayer_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf41_Demo_demo_CategoryDisplayerConstructor___vwsn_demo_CategoryDisplayer_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc15_Demo_demo_CategoryDisplayerConstructor___vwsn_demo_CategoryDisplayer_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf42_Demo_demo_CategoryDisplayerConstructor___vwsn_demo_CategoryDisplayer_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf42_Demo_demo_CategoryDisplayerConstructor___vwsn_demo_CategoryDisplayer_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
}
@@ -2389,7 +2389,7 @@ Class (::demo::CategoryEditorConstructor)
(this->__vwsn_precompile_0 = new ::vl::presentation::controls::GuiBindableTextList(::vl::presentation::theme::ThemeName::TextList));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetItemTemplate(LAMBDA(::vl_workflow_global::__vwsnf43_Demo_demo_CategoryEditorConstructor___vwsn_demo_CategoryEditor_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetItemTemplate(vl::Func(::vl_workflow_global::__vwsnf43_Demo_demo_CategoryEditorConstructor___vwsn_demo_CategoryEditor_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetVerticalAlwaysVisible(false);
@@ -2401,7 +2401,7 @@ Class (::demo::CategoryEditorConstructor)
(this->comboBox = new ::vl::presentation::controls::GuiComboBoxListControl(::vl::presentation::theme::ThemeName::ComboBox, static_cast<::vl::presentation::controls::GuiSelectableListControl*>(this->__vwsn_precompile_0)));
}
{
::vl::__vwsn::This(this->comboBox)->SetItemTemplate(LAMBDA(::vl_workflow_global::__vwsnf44_Demo_demo_CategoryEditorConstructor___vwsn_demo_CategoryEditor_Initialize_(this)));
::vl::__vwsn::This(this->comboBox)->SetItemTemplate(vl::Func(::vl_workflow_global::__vwsnf44_Demo_demo_CategoryEditorConstructor___vwsn_demo_CategoryEditor_Initialize_(this)));
}
(this->__vwsn_precompile_1 = ::vl::__vwsn::This(this->comboBox)->GetBoundsComposition());
{
@@ -2415,12 +2415,12 @@ Class (::demo::CategoryEditorConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc16_Demo_demo_CategoryEditorConstructor___vwsn_demo_CategoryEditor_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf45_Demo_demo_CategoryEditorConstructor___vwsn_demo_CategoryEditor_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf45_Demo_demo_CategoryEditorConstructor___vwsn_demo_CategoryEditor_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc17_Demo_demo_CategoryEditorConstructor___vwsn_demo_CategoryEditor_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf46_Demo_demo_CategoryEditorConstructor___vwsn_demo_CategoryEditor_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf46_Demo_demo_CategoryEditorConstructor___vwsn_demo_CategoryEditor_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
}
@@ -2472,7 +2472,7 @@ Class (::demo::CategoryItemTemplateConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc18_Demo_demo_CategoryItemTemplateConstructor___vwsn_demo_CategoryItemTemplate_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf47_Demo_demo_CategoryItemTemplateConstructor___vwsn_demo_CategoryItemTemplate_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf47_Demo_demo_CategoryItemTemplateConstructor___vwsn_demo_CategoryItemTemplate_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
@@ -2529,12 +2529,12 @@ Class (::demo::CategoryVisualizerConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc19_Demo_demo_CategoryVisualizerConstructor___vwsn_demo_CategoryVisualizer_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf48_Demo_demo_CategoryVisualizerConstructor___vwsn_demo_CategoryVisualizer_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf48_Demo_demo_CategoryVisualizerConstructor___vwsn_demo_CategoryVisualizer_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc20_Demo_demo_CategoryVisualizerConstructor___vwsn_demo_CategoryVisualizer_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf49_Demo_demo_CategoryVisualizerConstructor___vwsn_demo_CategoryVisualizer_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf49_Demo_demo_CategoryVisualizerConstructor___vwsn_demo_CategoryVisualizer_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
}
@@ -2582,12 +2582,12 @@ Class (::demo::DateEditorConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc6_Demo_demo_DateEditorConstructor___vwsn_demo_DateEditor_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf30_Demo_demo_DateEditorConstructor___vwsn_demo_DateEditor_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf30_Demo_demo_DateEditorConstructor___vwsn_demo_DateEditor_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc7_Demo_demo_DateEditorConstructor___vwsn_demo_DateEditor_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf31_Demo_demo_DateEditorConstructor___vwsn_demo_DateEditor_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf31_Demo_demo_DateEditorConstructor___vwsn_demo_DateEditor_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
@@ -2719,29 +2719,29 @@ Class (::demo::DateFilterConstructor)
::vl::__vwsn::This(::vl::__vwsn::This(this->self)->GetContainerComposition())->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_0));
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf32_Demo_demo_DateFilterConstructor___vwsn_demo_DateFilter_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf32_Demo_demo_DateFilterConstructor___vwsn_demo_DateFilter_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->checkFrom)->SelectedChanged, __vwsn_event_handler_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc8_Demo_demo_DateFilterConstructor___vwsn_demo_DateFilter_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf33_Demo_demo_DateFilterConstructor___vwsn_demo_DateFilter_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf33_Demo_demo_DateFilterConstructor___vwsn_demo_DateFilter_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf34_Demo_demo_DateFilterConstructor___vwsn_demo_DateFilter_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf34_Demo_demo_DateFilterConstructor___vwsn_demo_DateFilter_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->dateFrom)->SelectedDateChanged, __vwsn_event_handler_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf35_Demo_demo_DateFilterConstructor___vwsn_demo_DateFilter_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf35_Demo_demo_DateFilterConstructor___vwsn_demo_DateFilter_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->checkTo)->SelectedChanged, __vwsn_event_handler_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc9_Demo_demo_DateFilterConstructor___vwsn_demo_DateFilter_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf36_Demo_demo_DateFilterConstructor___vwsn_demo_DateFilter_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf36_Demo_demo_DateFilterConstructor___vwsn_demo_DateFilter_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf37_Demo_demo_DateFilterConstructor___vwsn_demo_DateFilter_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf37_Demo_demo_DateFilterConstructor___vwsn_demo_DateFilter_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->dateTo)->SelectedDateChanged, __vwsn_event_handler_);
}
}
@@ -2834,7 +2834,7 @@ Class (::demo::GenderDisplayerConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc21_Demo_demo_GenderDisplayerConstructor___vwsn_demo_GenderDisplayer_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf50_Demo_demo_GenderDisplayerConstructor___vwsn_demo_GenderDisplayer_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf50_Demo_demo_GenderDisplayerConstructor___vwsn_demo_GenderDisplayer_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
}
@@ -2889,7 +2889,7 @@ Class (::demo::GenderEditorConstructor)
(this->__vwsn_precompile_0 = new ::vl::presentation::controls::GuiBindableTextList(::vl::presentation::theme::ThemeName::TextList));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetItemTemplate(LAMBDA(::vl_workflow_global::__vwsnf51_Demo_demo_GenderEditorConstructor___vwsn_demo_GenderEditor_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetItemTemplate(vl::Func(::vl_workflow_global::__vwsnf51_Demo_demo_GenderEditorConstructor___vwsn_demo_GenderEditor_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetVerticalAlwaysVisible(false);
@@ -2901,7 +2901,7 @@ Class (::demo::GenderEditorConstructor)
(this->comboBox = new ::vl::presentation::controls::GuiComboBoxListControl(::vl::presentation::theme::ThemeName::ComboBox, static_cast<::vl::presentation::controls::GuiSelectableListControl*>(this->__vwsn_precompile_0)));
}
{
::vl::__vwsn::This(this->comboBox)->SetItemTemplate(LAMBDA(::vl_workflow_global::__vwsnf52_Demo_demo_GenderEditorConstructor___vwsn_demo_GenderEditor_Initialize_(this)));
::vl::__vwsn::This(this->comboBox)->SetItemTemplate(vl::Func(::vl_workflow_global::__vwsnf52_Demo_demo_GenderEditorConstructor___vwsn_demo_GenderEditor_Initialize_(this)));
}
(this->__vwsn_precompile_1 = ::vl::__vwsn::This(this->comboBox)->GetBoundsComposition());
{
@@ -2915,12 +2915,12 @@ Class (::demo::GenderEditorConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc22_Demo_demo_GenderEditorConstructor___vwsn_demo_GenderEditor_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf53_Demo_demo_GenderEditorConstructor___vwsn_demo_GenderEditor_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf53_Demo_demo_GenderEditorConstructor___vwsn_demo_GenderEditor_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc23_Demo_demo_GenderEditorConstructor___vwsn_demo_GenderEditor_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf54_Demo_demo_GenderEditorConstructor___vwsn_demo_GenderEditor_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf54_Demo_demo_GenderEditorConstructor___vwsn_demo_GenderEditor_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
}
@@ -3024,7 +3024,7 @@ Class (::demo::GenderVisualizerConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc24_Demo_demo_GenderVisualizerConstructor___vwsn_demo_GenderVisualizer_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf55_Demo_demo_GenderVisualizerConstructor___vwsn_demo_GenderVisualizer_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf55_Demo_demo_GenderVisualizerConstructor___vwsn_demo_GenderVisualizer_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
}
@@ -3183,10 +3183,10 @@ Class (::demo::MainWindowConstructor)
::vl::__vwsn::This(__vwsn_collection_.Obj())->Add(::vl::__vwsn::Box(static_cast<::vl::vint>(0)));
}
{
::vl::__vwsn::This(this->dataGrid)->SetSmallImageProperty(LAMBDA(::vl_workflow_global::__vwsnf1_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->dataGrid)->SetSmallImageProperty(vl::Func(::vl_workflow_global::__vwsnf1_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->dataGrid)->SetLargeImageProperty(LAMBDA(::vl_workflow_global::__vwsnf2_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->dataGrid)->SetLargeImageProperty(vl::Func(::vl_workflow_global::__vwsnf2_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->dataGrid)->SetVerticalAlwaysVisible(false);
@@ -3206,13 +3206,13 @@ Class (::demo::MainWindowConstructor)
::vl::__vwsn::This(this->__vwsn_precompile_12.Obj())->SetSorter(::vl::Ptr<::vl::presentation::controls::list::IDataSorter>(new ::vl_workflow_global::__vwsnc1_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_presentation_controls_list_IDataSorter(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_12.Obj())->SetEditorFactory(::vl::Ptr<::vl::presentation::controls::list::IDataEditorFactory>(::vl::Ptr<::vl::presentation::controls::list::DataEditorFactory>(new ::vl::presentation::controls::list::DataEditorFactory(LAMBDA(::vl_workflow_global::__vwsnf4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this))))));
::vl::__vwsn::This(this->__vwsn_precompile_12.Obj())->SetEditorFactory(::vl::Ptr<::vl::presentation::controls::list::IDataEditorFactory>(::vl::Ptr<::vl::presentation::controls::list::DataEditorFactory>(new ::vl::presentation::controls::list::DataEditorFactory(vl::Func(::vl_workflow_global::__vwsnf4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this))))));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_12.Obj())->SetValueProperty(LAMBDA(::vl_workflow_global::__vwsnf5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_12.Obj())->SetValueProperty(vl::Func(::vl_workflow_global::__vwsnf5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_12.Obj())->SetTextProperty(LAMBDA(::vl_workflow_global::__vwsnf6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_12.Obj())->SetTextProperty(vl::Func(::vl_workflow_global::__vwsnf6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_12.Obj())->SetSize(static_cast<::vl::vint>(120));
@@ -3226,19 +3226,19 @@ Class (::demo::MainWindowConstructor)
}
(this->__vwsn_precompile_13 = ::vl::Ptr<::vl::presentation::controls::list::DataColumn>(new ::vl::presentation::controls::list::DataColumn()));
{
::vl::__vwsn::This(this->__vwsn_precompile_13.Obj())->SetVisualizerFactory(::vl::Ptr<::vl::presentation::controls::list::IDataVisualizerFactory>(::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>(new ::vl::presentation::controls::list::DataVisualizerFactory(LAMBDA(::vl_workflow_global::__vwsnf7_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)), ::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>(new ::vl::presentation::controls::list::DataVisualizerFactory(LAMBDA(::vl_workflow_global::__vwsnf8_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)), ::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>()))))));
::vl::__vwsn::This(this->__vwsn_precompile_13.Obj())->SetVisualizerFactory(::vl::Ptr<::vl::presentation::controls::list::IDataVisualizerFactory>(::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>(new ::vl::presentation::controls::list::DataVisualizerFactory(vl::Func(::vl_workflow_global::__vwsnf7_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)), ::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>(new ::vl::presentation::controls::list::DataVisualizerFactory(vl::Func(::vl_workflow_global::__vwsnf8_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)), ::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>()))))));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_13.Obj())->SetSorter(::vl::Ptr<::vl::presentation::controls::list::IDataSorter>(new ::vl_workflow_global::__vwsnc2_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_presentation_controls_list_IDataSorter(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_13.Obj())->SetEditorFactory(::vl::Ptr<::vl::presentation::controls::list::IDataEditorFactory>(::vl::Ptr<::vl::presentation::controls::list::DataEditorFactory>(new ::vl::presentation::controls::list::DataEditorFactory(LAMBDA(::vl_workflow_global::__vwsnf10_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this))))));
::vl::__vwsn::This(this->__vwsn_precompile_13.Obj())->SetEditorFactory(::vl::Ptr<::vl::presentation::controls::list::IDataEditorFactory>(::vl::Ptr<::vl::presentation::controls::list::DataEditorFactory>(new ::vl::presentation::controls::list::DataEditorFactory(vl::Func(::vl_workflow_global::__vwsnf10_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this))))));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_13.Obj())->SetValueProperty(LAMBDA(::vl_workflow_global::__vwsnf11_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_13.Obj())->SetValueProperty(vl::Func(::vl_workflow_global::__vwsnf11_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_13.Obj())->SetTextProperty(LAMBDA(::vl_workflow_global::__vwsnf12_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_13.Obj())->SetTextProperty(vl::Func(::vl_workflow_global::__vwsnf12_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_13.Obj())->SetSize(static_cast<::vl::vint>(80));
@@ -3252,19 +3252,19 @@ Class (::demo::MainWindowConstructor)
}
(this->__vwsn_precompile_14 = ::vl::Ptr<::vl::presentation::controls::list::DataColumn>(new ::vl::presentation::controls::list::DataColumn()));
{
::vl::__vwsn::This(this->__vwsn_precompile_14.Obj())->SetVisualizerFactory(::vl::Ptr<::vl::presentation::controls::list::IDataVisualizerFactory>(::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>(new ::vl::presentation::controls::list::DataVisualizerFactory(LAMBDA(::vl_workflow_global::__vwsnf13_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)), ::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>(new ::vl::presentation::controls::list::DataVisualizerFactory(LAMBDA(::vl_workflow_global::__vwsnf14_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)), ::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>()))))));
::vl::__vwsn::This(this->__vwsn_precompile_14.Obj())->SetVisualizerFactory(::vl::Ptr<::vl::presentation::controls::list::IDataVisualizerFactory>(::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>(new ::vl::presentation::controls::list::DataVisualizerFactory(vl::Func(::vl_workflow_global::__vwsnf13_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)), ::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>(new ::vl::presentation::controls::list::DataVisualizerFactory(vl::Func(::vl_workflow_global::__vwsnf14_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)), ::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>()))))));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_14.Obj())->SetSorter(::vl::Ptr<::vl::presentation::controls::list::IDataSorter>(new ::vl_workflow_global::__vwsnc3_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_presentation_controls_list_IDataSorter(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_14.Obj())->SetEditorFactory(::vl::Ptr<::vl::presentation::controls::list::IDataEditorFactory>(::vl::Ptr<::vl::presentation::controls::list::DataEditorFactory>(new ::vl::presentation::controls::list::DataEditorFactory(LAMBDA(::vl_workflow_global::__vwsnf16_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this))))));
::vl::__vwsn::This(this->__vwsn_precompile_14.Obj())->SetEditorFactory(::vl::Ptr<::vl::presentation::controls::list::IDataEditorFactory>(::vl::Ptr<::vl::presentation::controls::list::DataEditorFactory>(new ::vl::presentation::controls::list::DataEditorFactory(vl::Func(::vl_workflow_global::__vwsnf16_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this))))));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_14.Obj())->SetValueProperty(LAMBDA(::vl_workflow_global::__vwsnf17_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_14.Obj())->SetValueProperty(vl::Func(::vl_workflow_global::__vwsnf17_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_14.Obj())->SetTextProperty(LAMBDA(::vl_workflow_global::__vwsnf18_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_14.Obj())->SetTextProperty(vl::Func(::vl_workflow_global::__vwsnf18_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_14.Obj())->SetSize(static_cast<::vl::vint>(80));
@@ -3295,13 +3295,13 @@ Class (::demo::MainWindowConstructor)
::vl::__vwsn::This(this->__vwsn_precompile_15.Obj())->SetSorter(::vl::Ptr<::vl::presentation::controls::list::IDataSorter>(new ::vl_workflow_global::__vwsnc4_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_presentation_controls_list_IDataSorter(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_15.Obj())->SetEditorFactory(::vl::Ptr<::vl::presentation::controls::list::IDataEditorFactory>(::vl::Ptr<::vl::presentation::controls::list::DataEditorFactory>(new ::vl::presentation::controls::list::DataEditorFactory(LAMBDA(::vl_workflow_global::__vwsnf20_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this))))));
::vl::__vwsn::This(this->__vwsn_precompile_15.Obj())->SetEditorFactory(::vl::Ptr<::vl::presentation::controls::list::IDataEditorFactory>(::vl::Ptr<::vl::presentation::controls::list::DataEditorFactory>(new ::vl::presentation::controls::list::DataEditorFactory(vl::Func(::vl_workflow_global::__vwsnf20_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this))))));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_15.Obj())->SetValueProperty(LAMBDA(::vl_workflow_global::__vwsnf21_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_15.Obj())->SetValueProperty(vl::Func(::vl_workflow_global::__vwsnf21_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_15.Obj())->SetTextProperty(LAMBDA(::vl_workflow_global::__vwsnf22_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_15.Obj())->SetTextProperty(vl::Func(::vl_workflow_global::__vwsnf22_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_15.Obj())->SetSize(static_cast<::vl::vint>(80));
@@ -3315,19 +3315,19 @@ Class (::demo::MainWindowConstructor)
}
(this->__vwsn_precompile_18 = ::vl::Ptr<::vl::presentation::controls::list::DataColumn>(new ::vl::presentation::controls::list::DataColumn()));
{
::vl::__vwsn::This(this->__vwsn_precompile_18.Obj())->SetVisualizerFactory(::vl::Ptr<::vl::presentation::controls::list::IDataVisualizerFactory>(::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>(new ::vl::presentation::controls::list::DataVisualizerFactory(LAMBDA(::vl_workflow_global::__vwsnf23_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)), ::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>(new ::vl::presentation::controls::list::DataVisualizerFactory(LAMBDA(::vl_workflow_global::__vwsnf24_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)), ::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>()))))));
::vl::__vwsn::This(this->__vwsn_precompile_18.Obj())->SetVisualizerFactory(::vl::Ptr<::vl::presentation::controls::list::IDataVisualizerFactory>(::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>(new ::vl::presentation::controls::list::DataVisualizerFactory(vl::Func(::vl_workflow_global::__vwsnf23_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)), ::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>(new ::vl::presentation::controls::list::DataVisualizerFactory(vl::Func(::vl_workflow_global::__vwsnf24_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)), ::vl::Ptr<::vl::presentation::controls::list::DataVisualizerFactory>()))))));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_18.Obj())->SetSorter(::vl::Ptr<::vl::presentation::controls::list::IDataSorter>(new ::vl_workflow_global::__vwsnc5_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_presentation_controls_list_IDataSorter(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_18.Obj())->SetEditorFactory(::vl::Ptr<::vl::presentation::controls::list::IDataEditorFactory>(::vl::Ptr<::vl::presentation::controls::list::DataEditorFactory>(new ::vl::presentation::controls::list::DataEditorFactory(LAMBDA(::vl_workflow_global::__vwsnf26_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this))))));
::vl::__vwsn::This(this->__vwsn_precompile_18.Obj())->SetEditorFactory(::vl::Ptr<::vl::presentation::controls::list::IDataEditorFactory>(::vl::Ptr<::vl::presentation::controls::list::DataEditorFactory>(new ::vl::presentation::controls::list::DataEditorFactory(vl::Func(::vl_workflow_global::__vwsnf26_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this))))));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_18.Obj())->SetValueProperty(LAMBDA(::vl_workflow_global::__vwsnf27_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_18.Obj())->SetValueProperty(vl::Func(::vl_workflow_global::__vwsnf27_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_18.Obj())->SetTextProperty(LAMBDA(::vl_workflow_global::__vwsnf28_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
::vl::__vwsn::This(this->__vwsn_precompile_18.Obj())->SetTextProperty(vl::Func(::vl_workflow_global::__vwsnf28_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_18.Obj())->SetSize(static_cast<::vl::vint>(160));
@@ -3349,7 +3349,7 @@ Class (::demo::MainWindowConstructor)
::vl::__vwsn::This(::vl::__vwsn::This(this->self)->GetContainerComposition())->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_0));
}
{
auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf29_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
auto __vwsn_event_handler_ = vl::Func(::vl_workflow_global::__vwsnf29_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->comboView)->SelectedIndexChanged, __vwsn_event_handler_);
}
{
@@ -3545,12 +3545,12 @@ Class (::demo::TextEditorConstructor)
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc11_Demo_demo_TextEditorConstructor___vwsn_demo_TextEditor_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf38_Demo_demo_TextEditorConstructor___vwsn_demo_TextEditor_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf38_Demo_demo_TextEditorConstructor___vwsn_demo_TextEditor_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc12_Demo_demo_TextEditorConstructor___vwsn_demo_TextEditor_Initialize__vl_reflection_description_IValueSubscription(this));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf39_Demo_demo_TextEditorConstructor___vwsn_demo_TextEditor_Initialize_(this)));
::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, vl::Func(::vl_workflow_global::__vwsnf39_Demo_demo_TextEditorConstructor___vwsn_demo_TextEditor_Initialize_(this)));
::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_);
}
{
Tutorial/GacUI_Controls/DataGrid/UI/Source/DemoReflection.cpp
+1 -1
View File
@@ -400,7 +400,7 @@ namespace vl
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
if (auto manager = GetGlobalTypeManager())
{
return manager->AddTypeLoader(MakePtr<DemoTypeLoader>());
return manager->AddTypeLoader(Ptr(new DemoTypeLoader));
}
#endif
return false;

Some files were not shown because too many files have changed in this diff Show More