Skip to content

Update OGType Enum stuff #100

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2025
Merged

Update OGType Enum stuff #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 0 additions & 18 deletions Sources/OpenGraph_SPI/Runtime/OGTypeApplyEnumData.cpp
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions Sources/OpenGraph_SPI/Runtime/OGTypeApplyEnumData.h
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions Sources/OpenGraph_SPI/Runtime/OGTypeApplyField.cpp
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions Sources/OpenGraph_SPI/Runtime/OGTypeApplyField.h
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions Sources/OpenGraph_SPI/Runtime/OGTypeApplyOptions.h
View file
Open in desktop

This file was deleted.

81 changes: 74 additions & 7 deletions Sources/OpenGraph_SPI/Runtime/OGTypeID.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include "OGTypeID.h"
#include "metadata.hpp"
#include "../Util/assert.hpp"

#ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
#include <swift/Runtime/Metadata.h>
Expand Down Expand Up @@ -40,28 +41,72 @@ OGTypeKind OGTypeGetKind(OGTypeID typeID) {
#endif
}

void OGTypeApplyFields(const void *type, const void *block, void *context) {
// TODO
return;
}

bool OGTypeApplyFields2(const void *type, OGTypeApplyOptions options, const void *block, void *context) {
// TODO
return false;
}

#if OPENGRAPH_RELEASE >= OPENGRAPH_RELEASE_2024

OGTypeSignature const OGTypeGetSignature(OGTypeID typeID) {
uint32_t OGTypeGetEnumTag(OGTypeID typeID, const void *value) {
#ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
auto metadata = reinterpret_cast<OG::swift::metadata const*>(typeID);
// TODO
return OGTypeSignature{};
auto vwt = metadata->getValueWitnesses();
if (!swift::EnumValueWitnessTable::classof(vwt)) {
OG::precondition_failure("not an enum type: %s", metadata->name(false).data);
}
auto enum_vwt = static_cast<const swift::EnumValueWitnessTable *>(vwt);
return enum_vwt->getEnumTag(static_cast<const swift::OpaqueValue *>(value), metadata);
#else
return OGTypeSignature{};
return 0;
#endif
}
void const* OGTypeGetDescriptor(OGTypeID typeID) {

void OGTypeProjectEnumData(OGTypeID typeID, void *value) {
#ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
auto metadata = reinterpret_cast<OG::swift::metadata const*>(typeID);
return metadata->descriptor();
auto vwt = metadata->getValueWitnesses();
if (!swift::EnumValueWitnessTable::classof(vwt)) {
OG::precondition_failure("not an enum type: %s", metadata->name(false).data);
}
auto enum_vwt = static_cast<const swift::EnumValueWitnessTable *>(vwt);
enum_vwt->destructiveProjectEnumData(static_cast<swift::OpaqueValue *>(value), metadata);
#else
return nullptr;
return;
#endif
}

void OGTypeInjectEnumTag(OGTypeID typeID, uint32_t tag, void *value) {
#ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
auto metadata = reinterpret_cast<OG::swift::metadata const*>(typeID);
auto vwt = metadata->getValueWitnesses();
if (!swift::EnumValueWitnessTable::classof(vwt)) {
OG::precondition_failure("not an enum type: %s", metadata->name(false).data);
}
auto enum_vwt = static_cast<const swift::EnumValueWitnessTable *>(vwt);
return enum_vwt->destructiveInjectEnumTag(static_cast<swift::OpaqueValue *>(value), tag, metadata);
#else
return;
#endif
}

#endif /* OPENGRAPH_RELEASE */

bool OGTypeApplyEnumData() {
// TODO
return false;
}

bool OGTypeApplyMutableEnumData() {
// TODO
return false;
}

CFStringRef OGTypeDescription(OGTypeID typeID) {
CFMutableStringRef ref = CFStringCreateMutable(CFAllocatorGetDefault(), 0);
#ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
Expand All @@ -71,6 +116,28 @@ CFStringRef OGTypeDescription(OGTypeID typeID) {
return ref;
}

#if OPENGRAPH_RELEASE >= OPENGRAPH_RELEASE_2024

OGTypeSignature const OGTypeGetSignature(OGTypeID typeID) {
#ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
auto metadata = reinterpret_cast<OG::swift::metadata const*>(typeID);
// TODO
return OGTypeSignature{};
#else
return OGTypeSignature{};
#endif
}
void const* OGTypeGetDescriptor(OGTypeID typeID) {
#ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
auto metadata = reinterpret_cast<OG::swift::metadata const*>(typeID);
return metadata->descriptor();
#else
return nullptr;
#endif
}

#endif /* OPENGRAPH_RELEASE */

void const* OGTypeNominalDescriptor(OGTypeID typeID) {
#ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
auto metadata = reinterpret_cast<OG::swift::metadata const*>(typeID);
Expand Down
48 changes: 46 additions & 2 deletions Sources/OpenGraph_SPI/Runtime/OGTypeID.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ typedef OG_CLOSED_ENUM(uint32_t, OGTypeKind) {
OGTypeKindMetatype,
} OG_SWIFT_NAME(Metadata.Kind);

typedef OG_OPTIONS(uint32_t, OGTypeApplyOptions) {
OGTypeApplyOptions_0 = 0,
OGTypeApplyOptions_1 = 1 << 0,
OGTypeApplyOptions_2 = 1 << 1,
OGTypeApplyOptions_4 = 1 << 2,
};

#if OPENGRAPH_RELEASE >= OPENGRAPH_RELEASE_2024

typedef struct OG_SWIFT_NAME(Signature) OGTypeSignature {
Expand All @@ -44,22 +51,59 @@ OG_EXPORT
OG_REFINED_FOR_SWIFT
OGTypeKind OGTypeGetKind(OGTypeID typeID) OG_SWIFT_NAME(getter:Metadata.kind(self:));

// TODO
// OGOverrideComparisonForTypeDescriptor();

OG_EXPORT
OG_REFINED_FOR_SWIFT
void OGTypeApplyFields(const void *type, const void *block, void *context);

OG_EXPORT
OG_REFINED_FOR_SWIFT
bool OGTypeApplyFields2(const void *type, OGTypeApplyOptions options, const void *block, void *context);

OG_EXPORT
OG_REFINED_FOR_SWIFT
uint32_t OGTypeGetEnumTag(OGTypeID typeID, const void *value) OG_SWIFT_NAME(Metadata.enumTag(self:_:));

#if OPENGRAPH_RELEASE >= OPENGRAPH_RELEASE_2024

OG_EXPORT
OG_REFINED_FOR_SWIFT
OGTypeSignature const OGTypeGetSignature(OGTypeID typeID) OG_SWIFT_NAME(getter:Metadata.signature(self:));
void OGTypeProjectEnumData(OGTypeID typeID, void *value) OG_SWIFT_NAME(Metadata.projectEnumData(self:_:));

OG_EXPORT
OG_REFINED_FOR_SWIFT
void const* _Nullable OGTypeGetDescriptor(OGTypeID typeID) OG_SWIFT_NAME(getter:Metadata.descriptor(self:));
void OGTypeInjectEnumTag(OGTypeID typeID, uint32_t tag, void *value) OG_SWIFT_NAME(Metadata.injectEnumTag(self:tag:_:));

#endif /* OPENGRAPH_RELEASE */

// TODO
OG_EXPORT
OG_REFINED_FOR_SWIFT
bool OGTypeApplyEnumData();

// TODO
OG_EXPORT
OG_REFINED_FOR_SWIFT
bool OGTypeApplyMutableEnumData();

OG_EXPORT
OG_REFINED_FOR_SWIFT
CFStringRef OGTypeDescription(OGTypeID typeID);

#if OPENGRAPH_RELEASE >= OPENGRAPH_RELEASE_2024

OG_EXPORT
OG_REFINED_FOR_SWIFT
OGTypeSignature const OGTypeGetSignature(OGTypeID typeID) OG_SWIFT_NAME(getter:Metadata.signature(self:));

OG_EXPORT
OG_REFINED_FOR_SWIFT
void const* _Nullable OGTypeGetDescriptor(OGTypeID typeID) OG_SWIFT_NAME(getter:Metadata.descriptor(self:));

#endif /* OPENGRAPH_RELEASE */

OG_EXPORT
OG_REFINED_FOR_SWIFT
void const* _Nullable OGTypeNominalDescriptor(OGTypeID typeID) OG_SWIFT_NAME(getter:Metadata.nominalDescriptor(self:));
Expand Down
1 change: 0 additions & 1 deletion Sources/OpenGraph_SPI/include/OGTypeApplyEnumData.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Sources/OpenGraph_SPI/include/OGTypeApplyField.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Sources/OpenGraph_SPI/include/OGTypeApplyOptions.h
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Sources/OpenGraph_SPI/include/OpenGraph-umbrella.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
#include "OGSearchOptions.h"
#include "OGSubgraph.h"
#include "OGTupleType.h"
#include "OGTypeApplyEnumData.h"
#include "OGTypeApplyField.h"
#include "OGTypeApplyOptions.h"
#include "OGTypeID.h"
#include "OGUniqueID.h"
#include "OGValue.h"
Expand Down
Loading