Skip to content

Commit

Permalink
Update release
Browse files Browse the repository at this point in the history
  • Loading branch information
@vczh
vczh committed Feb 16, 2024
1 parent 955d77b commit ab3c2fc
Show file tree
Hide file tree
Showing 13 changed files with 10,247 additions and 6,634 deletions.
260 changes: 136 additions & 124 deletions Import/GacUI.Windows.cpp
View file

Large diffs are not rendered by default.

172 changes: 106 additions & 66 deletions Import/GacUI.Windows.h
View file

Large diffs are not rendered by default.

1,849 changes: 1,726 additions & 123 deletions Import/GacUI.cpp
View file

Large diffs are not rendered by default.

13,480 changes: 7,366 additions & 6,114 deletions Import/GacUI.h
View file

Large diffs are not rendered by default.

440 changes: 304 additions & 136 deletions Import/GacUICompiler.cpp
View file

Large diffs are not rendered by default.

104 changes: 64 additions & 40 deletions Import/GacUICompiler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,7 @@ namespace vl::presentation::remoteprotocol
class GuiRpMessageDecl;
class GuiRpMessageRequest;
class GuiRpMessageResponse;
class GuiRpOptionalType;
class GuiRpPrimitiveType;
class GuiRpReferenceType;
class GuiRpSchema;
Expand All @@ -1099,6 +1100,7 @@ namespace vl::presentation::remoteprotocol
String = 4,
Char = 5,
Key = 6,
Color = 7,
};

class GuiRpType abstract : public vl::glr::ParsingAstBase, vl::reflection::Description<GuiRpType>
Expand All @@ -1109,6 +1111,7 @@ namespace vl::presentation::remoteprotocol
public:
virtual void Visit(GuiRpPrimitiveType* node) = 0;
virtual void Visit(GuiRpReferenceType* node) = 0;
virtual void Visit(GuiRpOptionalType* node) = 0;
virtual void Visit(GuiRpArrayType* node) = 0;
};

Expand All @@ -1132,6 +1135,14 @@ namespace vl::presentation::remoteprotocol
void Accept(GuiRpType::IVisitor* visitor) override;
};

class GuiRpOptionalType : public GuiRpType, vl::reflection::Description<GuiRpOptionalType>
{
public:
vl::Ptr<GuiRpType> element;

void Accept(GuiRpType::IVisitor* visitor) override;
};

class GuiRpArrayType : public GuiRpType, vl::reflection::Description<GuiRpArrayType>
{
public:
Expand Down Expand Up @@ -1243,6 +1254,7 @@ namespace vl::reflection::description
DECL_TYPE_INFO(vl::presentation::remoteprotocol::GuiRpPrimitiveTypes)
DECL_TYPE_INFO(vl::presentation::remoteprotocol::GuiRpPrimitiveType)
DECL_TYPE_INFO(vl::presentation::remoteprotocol::GuiRpReferenceType)
DECL_TYPE_INFO(vl::presentation::remoteprotocol::GuiRpOptionalType)
DECL_TYPE_INFO(vl::presentation::remoteprotocol::GuiRpArrayType)
DECL_TYPE_INFO(vl::presentation::remoteprotocol::GuiRpAttribute)
DECL_TYPE_INFO(vl::presentation::remoteprotocol::GuiRpDeclaration)
Expand Down Expand Up @@ -1271,6 +1283,11 @@ namespace vl::reflection::description
INVOKE_INTERFACE_PROXY(Visit, node);
}

void Visit(vl::presentation::remoteprotocol::GuiRpOptionalType* node) override
{
INVOKE_INTERFACE_PROXY(Visit, node);
}

void Visit(vl::presentation::remoteprotocol::GuiRpArrayType* node) override
{
INVOKE_INTERFACE_PROXY(Visit, node);
Expand Down Expand Up @@ -1341,6 +1358,7 @@ namespace vl::presentation::remoteprotocol::json_visitor
virtual void PrintFields(GuiRpMessageDecl* node);
virtual void PrintFields(GuiRpMessageRequest* node);
virtual void PrintFields(GuiRpMessageResponse* node);
virtual void PrintFields(GuiRpOptionalType* node);
virtual void PrintFields(GuiRpPrimitiveType* node);
virtual void PrintFields(GuiRpReferenceType* node);
virtual void PrintFields(GuiRpSchema* node);
Expand All @@ -1351,6 +1369,7 @@ namespace vl::presentation::remoteprotocol::json_visitor
protected:
void Visit(GuiRpPrimitiveType* node) override;
void Visit(GuiRpReferenceType* node) override;
void Visit(GuiRpOptionalType* node) override;
void Visit(GuiRpArrayType* node) override;

void Visit(GuiRpEnumDecl* node) override;
Expand Down Expand Up @@ -1401,12 +1420,13 @@ namespace vl::presentation::remoteprotocol
MessageDecl = 7,
MessageRequest = 8,
MessageResponse = 9,
PrimitiveType = 10,
ReferenceType = 11,
Schema = 12,
StructDecl = 13,
StructMember = 14,
Type = 15,
OptionalType = 10,
PrimitiveType = 11,
ReferenceType = 12,
Schema = 13,
StructDecl = 14,
StructMember = 15,
Type = 16,
};

enum class GuiRemoteProtocolFields : vl::vint32_t
Expand All @@ -1424,12 +1444,13 @@ namespace vl::presentation::remoteprotocol
MessageDecl_response = 10,
MessageRequest_type = 11,
MessageResponse_type = 12,
PrimitiveType_type = 13,
ReferenceType_name = 14,
Schema_declarations = 15,
StructDecl_members = 16,
StructMember_name = 17,
StructMember_type = 18,
OptionalType_element = 13,
PrimitiveType_type = 14,
ReferenceType_name = 15,
Schema_declarations = 16,
StructDecl_members = 17,
StructMember_name = 18,
StructMember_type = 19,
};

extern const wchar_t* GuiRemoteProtocolTypeName(GuiRemoteProtocolClasses type);
Expand Down Expand Up @@ -1480,22 +1501,24 @@ namespace vl::presentation::remoteprotocol
STRING = 11,
CHAR = 12,
KEY = 13,
CPP_NAME = 14,
ATT_NAME = 15,
NAME = 16,
OPEN_BRACE = 17,
CLOSE_BRACE = 18,
OPEN_ARRAY = 19,
CLOSE_ARRAY = 20,
OPEN = 21,
CLOSE = 22,
COLON = 23,
SEMICOLON = 24,
COMMA = 25,
SPACE = 26,
COLOR = 14,
CPP_NAME = 15,
ATT_NAME = 16,
NAME = 17,
OPEN_BRACE = 18,
CLOSE_BRACE = 19,
OPEN_ARRAY = 20,
CLOSE_ARRAY = 21,
OPEN = 22,
CLOSE = 23,
COLON = 24,
SEMICOLON = 25,
COMMA = 26,
QUESTION = 27,
SPACE = 28,
};

constexpr vl::vint GuiRemoteProtocolTokenCount = 27;
constexpr vl::vint GuiRemoteProtocolTokenCount = 29;
extern bool GuiRemoteProtocolTokenDeleter(vl::vint token);
extern const wchar_t* GuiRemoteProtocolTokenId(GuiRemoteProtocolTokens token);
extern const wchar_t* GuiRemoteProtocolTokenDisplayText(GuiRemoteProtocolTokens token);
Expand All @@ -1522,20 +1545,20 @@ namespace vl::presentation::remoteprotocol
enum class ParserStates
{
RType = 0,
RAttributeParameter = 13,
RAttribute = 16,
REnumMember = 24,
REnum = 28,
RStructMember = 35,
RStruct = 42,
RMessageRequest = 49,
RMessageResponse = 55,
RMessage = 61,
REventRequest = 69,
REvent = 75,
RDeclDetail = 82,
RDecl = 88,
Schema = 92,
RAttributeParameter = 16,
RAttribute = 19,
REnumMember = 27,
REnum = 31,
RStructMember = 38,
RStruct = 45,
RMessageRequest = 52,
RMessageResponse = 58,
RMessage = 64,
REventRequest = 72,
REvent = 78,
RDeclDetail = 85,
RDecl = 91,
Schema = 95,
};

const wchar_t* ParserRuleName(vl::vint index);
Expand Down Expand Up @@ -1584,6 +1607,7 @@ namespace vl::presentation
struct GuiRpSymbols
{
collections::Dictionary<WString, WString> cppMapping;
collections::Dictionary<WString, WString> cppNamespaces;
collections::SortedList<WString> dropRepeatDeclNames;
collections::SortedList<WString> dropConsecutiveDeclNames;
collections::Dictionary<WString, remoteprotocol::GuiRpEnumDecl*> enumDecls;
Expand Down
3 changes: 2 additions & 1 deletion Import/GacUIReflection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1316,6 +1316,7 @@ Type Declaration (Class)
CLASS_MEMBER_PROPERTY_READONLY_FAST(RelatedControl)
CLASS_MEMBER_PROPERTY_READONLY_FAST(RelatedControlHost)
CLASS_MEMBER_PROPERTY_READONLY_FAST(RelatedCursor)
CLASS_MEMBER_PROPERTY_READONLY_FAST(RelatedHitTestResult)
CLASS_MEMBER_PROPERTY_FAST(InternalMargin)
CLASS_MEMBER_PROPERTY_FAST(PreferredMinSize)

Expand All @@ -1327,7 +1328,7 @@ Type Declaration (Class)
CLASS_MEMBER_METHOD(RemoveChild, {L"child"})
CLASS_MEMBER_METHOD(MoveChild, {L"child" _ L"newIndex"})
CLASS_MEMBER_METHOD(Render, {L"size"})
CLASS_MEMBER_METHOD(FindComposition, {L"location" _ L"forMouseEvent"})
CLASS_MEMBER_METHOD(FindVisibleComposition, {L"location" _ L"forMouseEvent"})

CLASS_MEMBER_GUIEVENT(CachedMinSizeChanged)
CLASS_MEMBER_GUIEVENT(CachedBoundsChanged)
Expand Down
Loading

0 comments on commit ab3c2fc

Please sign in to comment.