Skip to content

changes to #85 according to @es3n1n #101

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
Redict wants to merge 1 commit into
base: add_global_type_scope_to_dump
Choose a base branch
from
Open

changes to #85 according to @es3n1n #101

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
6 changes: 5 additions & 1 deletion source2gen/include/sdk/interfaces/tier0/IMemAlloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ class IMemAlloc {
}
};

extern "C" __declspec(dllimport) IMemAlloc* GetMemAlloc();
#if defined(_WIN64) || defined(_WIN32)
extern "C" __declspec(dllimport) IMemAlloc* GetMemAlloc();
#else
extern "C" IMemAlloc* GetMemAlloc();
#endif

#if defined(_MSC_VER)
#pragma warning(pop)
Expand Down
29 changes: 13 additions & 16 deletions source2gen/src/startup/startup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ namespace {
namespace source2_gen {
// TODO: this duplicate of the constant in sdk.h. We should let the user specify the sdk path via Options.
constexpr std::string_view kOutDirName = "sdk";
using sdk::GenerateTypeScopeSdk;

struct module_dump {
std::unordered_set<const CSchemaEnumBinding*> enums{};
Expand All @@ -75,31 +76,28 @@ namespace source2_gen {
// Key is the module name, e.g. SchemaEnumInfoData_t::m_pszModule.
std::unordered_map<std::string, unique_module_dump> dumped_modules{};

for (const auto* current_scope : type_scopes) {
auto current_enums = current_scope->GetEnumBindings();
const auto append_scope = [&dumped_modules](const CSchemaSystemTypeScope* scope) {
if (scope == nullptr) {
return;
}

auto current_enums = scope->GetEnumBindings();
for (auto el : current_enums.GetElements()) {
auto& dump{dumped_modules.emplace(el->m_pszModule, unique_module_dump{}).first->second};
dump.enums.emplace(el->m_pszName, el);
}

auto current_classes = current_scope->GetClassBindings();
auto current_classes = scope->GetClassBindings();
for (auto el : current_classes.GetElements()) {
auto& dump{dumped_modules.emplace(el->m_pszModule, unique_module_dump{}).first->second};
dump.classes.emplace(el->m_pszName, el);
}
}
};

const auto global_scope = sdk::g_schema->GlobalTypeScope();
auto current_enums = global_scope->GetEnumBindings();
for (auto el : current_enums.GetElements()) {
auto& dump{dumped_modules.emplace(el->m_pszModule, unique_module_dump{}).first->second};
dump.enums.emplace(el->m_pszName, el);
}
append_scope(sdk::g_schema->GlobalTypeScope());

auto current_classes = global_scope->GetClassBindings();
for (auto el : current_classes.GetElements()) {
auto& dump{dumped_modules.emplace(el->m_pszModule, unique_module_dump{}).first->second};
dump.classes.emplace(el->m_pszName, el);
for (const auto* current_scope : type_scopes) {
append_scope(current_scope);
}

std::unordered_map<std::string, module_dump> result{};
Expand Down Expand Up @@ -250,10 +248,9 @@ namespace source2_gen {
}

// @note: @es3n1n: Obtaining type scopes and generating sdk
auto type_scopes = sdk::g_schema->GetTypeScopes();
const auto type_scopes = sdk::g_schema->GetTypeScopes();
assert(type_scopes.Count() > 0 && "sdk is outdated");


const std::unordered_map all_modules = CollectModules(std::span{type_scopes.m_pElements, static_cast<std::size_t>(type_scopes.m_Size)});

sdk::GeneratorCache cache{};
Expand Down