Skip to content

Commit

Permalink
Update plugify
Browse files Browse the repository at this point in the history
  • Loading branch information
@qubka
qubka committed Aug 3, 2024
1 parent c9d4dfd commit 18d9356
Show file tree
Hide file tree
Showing 7 changed files with 80 additions and 81 deletions.
2 changes: 1 addition & 1 deletion external/plugify
Submodule plugify updated 19 files
+1 −1 include/plugify/function.h
+9 −9 include/plugify/language_module_descriptor.h
+4 −4 include/plugify/method.h
+4 −4 include/plugify/module.h
+3 −3 include/plugify/plugin.h
+10 −10 include/plugify/plugin_descriptor.h
+1 −1 include/plugify/plugin_manager.h
+4 −4 include/plugify/plugin_reference_descriptor.h
+23 −23 include/plugify/reference_wrapper.h
+13 −36 src/core/module.cpp
+2 −2 src/core/module.h
+3 −2 src/core/plugin.h
+9 −9 src/interface/language_module_descriptor.cpp
+3 −3 src/interface/method.cpp
+4 −4 src/interface/module.cpp
+3 −3 src/interface/plugin.cpp
+10 −10 src/interface/plugin_descriptor.cpp
+1 −1 src/interface/plugin_reference_descriptor.cpp
+6 −0 src/utils/assembly_windows.cpp
28 changes: 14 additions & 14 deletions include/plugify/cpp_plugin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ namespace plugify {

namespace plugin {
using GetIdFn = std::ptrdiff_t (*)(void*);
using GetNameFn = std::string_view (*)(void*);
using GetFullNameFn = std::string_view (*)(void*);
using GetDescriptionFn = std::string_view (*)(void*);
using GetVersionFn = std::string_view (*)(void*);
using GetAuthorFn = std::string_view (*)(void*);
using GetWebsiteFn = std::string_view (*)(void*);
using GetNameFn = const std::string& (*)(void*);
using GetFullNameFn = const std::string& (*)(void*);
using GetDescriptionFn = const std::string& (*)(void*);
using GetVersionFn = const std::string& (*)(void*);
using GetAuthorFn = const std::string& (*)(void*);
using GetWebsiteFn = const std::string& (*)(void*);
using GetBaseDirFn = const std::filesystem::path& (*)(void*);
using GetDependenciesFn = std::vector<std::string_view> (*)(void*);
using GetDependenciesFn = std::vector<std::string> (*)(void*);
using FindResourceFn = std::optional<std::filesystem::path> (*)(void*, const std::filesystem::path&);
extern void* handle;
extern GetIdFn GetId;
Expand All @@ -64,14 +64,14 @@ namespace plugify {

public:
std::ptrdiff_t GetId() const { return plugin::GetId(plugin::handle); }
std::string_view GetName() const { return plugin::GetName(plugin::handle); }
std::string_view GetFullName() const { return plugin::GetFullName(plugin::handle); }
std::string_view GetDescription() const { return plugin::GetDescription(plugin::handle); }
std::string_view GetVersion() const { return plugin::GetVersion(plugin::handle); }
std::string_view GetAuthor() const { return plugin::GetAuthor(plugin::handle); }
std::string_view GetWebsite() const { return plugin::GetWebsite(plugin::handle); }
const std::string& GetName() const { return plugin::GetName(plugin::handle); }
const std::string& GetFullName() const { return plugin::GetFullName(plugin::handle); }
const std::string& GetDescription() const { return plugin::GetDescription(plugin::handle); }
const std::string& GetVersion() const { return plugin::GetVersion(plugin::handle); }
const std::string& GetAuthor() const { return plugin::GetAuthor(plugin::handle); }
const std::string& GetWebsite() const { return plugin::GetWebsite(plugin::handle); }
const std::filesystem::path& GetBaseDir() const { return plugin::GetBaseDir(plugin::handle); }
std::vector<std::string_view> GetDependencies() const { return plugin::GetDependencies(plugin::handle); }
std::vector<std::string> GetDependencies() const { return plugin::GetDependencies(plugin::handle); }
std::optional<std::filesystem::path> FindResource(const std::filesystem::path& path) const { return plugin::FindResource(plugin::handle, path); }

virtual void OnPluginStart() {};
Expand Down
19 changes: 9 additions & 10 deletions src/module.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ void CppLanguageModule::Shutdown() {
}

void CppLanguageModule::OnMethodExport(PluginRef plugin) {
auto pluginName = plugin.GetName();
for (const auto& [method, addr] : plugin.GetMethods()) {
_nativesMap.try_emplace(std::format("{}.{}", pluginName, method.GetName()), addr);
_nativesMap.try_emplace(std::format("{}.{}", plugin.GetName(), method.GetName()), addr);
}
}

Expand Down Expand Up @@ -187,37 +186,37 @@ UniqueId GetPluginId(PluginRef plugin) {
return plugin.GetId();
}

std::string_view GetPluginName(PluginRef plugin) {
const std::string& GetPluginName(PluginRef plugin) {
return plugin.GetName();
}

std::string_view GetPluginFullName(PluginRef plugin) {
const std::string& GetPluginFullName(PluginRef plugin) {
return plugin.GetFriendlyName();
}

std::string_view GetPluginDescription(PluginRef plugin) {
const std::string& GetPluginDescription(PluginRef plugin) {
return plugin.GetDescriptor().GetDescription();
}

std::string_view GetPluginVersion(PluginRef plugin) {
const std::string& GetPluginVersion(PluginRef plugin) {
return plugin.GetDescriptor().GetVersionName();
}

std::string_view GetPluginAuthor(PluginRef plugin) {
const std::string& GetPluginAuthor(PluginRef plugin) {
return plugin.GetDescriptor().GetCreatedBy();
}

std::string_view GetPluginWebsite(PluginRef plugin) {
const std::string& GetPluginWebsite(PluginRef plugin) {
return plugin.GetDescriptor().GetCreatedByURL();
}

const fs::path& GetPluginBaseDir(PluginRef plugin) {
return plugin.GetBaseDir();
}

std::vector<std::string_view> GetPluginDependencies(PluginRef plugin) {
std::vector<std::string> GetPluginDependencies(PluginRef plugin) {
std::span<const PluginReferenceDescriptorRef> dependencies = plugin.GetDescriptor().GetDependencies();
std::vector<std::string_view> deps;
std::vector<std::string> deps;
deps.reserve(dependencies.size());
for (const auto& dependency : dependencies) {
deps.emplace_back(dependency.GetName());
Expand Down
28 changes: 14 additions & 14 deletions test/cross_call_master/plugify/cpp_plugin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ namespace plugify {

namespace plugin {
using GetIdFn = std::ptrdiff_t (*)(void*);
using GetNameFn = std::string_view (*)(void*);
using GetFullNameFn = std::string_view (*)(void*);
using GetDescriptionFn = std::string_view (*)(void*);
using GetVersionFn = std::string_view (*)(void*);
using GetAuthorFn = std::string_view (*)(void*);
using GetWebsiteFn = std::string_view (*)(void*);
using GetNameFn = const std::string& (*)(void*);
using GetFullNameFn = const std::string& (*)(void*);
using GetDescriptionFn = const std::string& (*)(void*);
using GetVersionFn = const std::string& (*)(void*);
using GetAuthorFn = const std::string& (*)(void*);
using GetWebsiteFn = const std::string& (*)(void*);
using GetBaseDirFn = const std::filesystem::path& (*)(void*);
using GetDependenciesFn = std::vector<std::string_view> (*)(void*);
using GetDependenciesFn = std::vector<std::string> (*)(void*);
using FindResourceFn = std::optional<std::filesystem::path> (*)(void*, const std::filesystem::path&);
extern void* handle;
extern GetIdFn GetId;
Expand All @@ -64,14 +64,14 @@ namespace plugify {

public:
std::ptrdiff_t GetId() const { return plugin::GetId(plugin::handle); }
std::string_view GetName() const { return plugin::GetName(plugin::handle); }
std::string_view GetFullName() const { return plugin::GetFullName(plugin::handle); }
std::string_view GetDescription() const { return plugin::GetDescription(plugin::handle); }
std::string_view GetVersion() const { return plugin::GetVersion(plugin::handle); }
std::string_view GetAuthor() const { return plugin::GetAuthor(plugin::handle); }
std::string_view GetWebsite() const { return plugin::GetWebsite(plugin::handle); }
const std::string& GetName() const { return plugin::GetName(plugin::handle); }
const std::string& GetFullName() const { return plugin::GetFullName(plugin::handle); }
const std::string& GetDescription() const { return plugin::GetDescription(plugin::handle); }
const std::string& GetVersion() const { return plugin::GetVersion(plugin::handle); }
const std::string& GetAuthor() const { return plugin::GetAuthor(plugin::handle); }
const std::string& GetWebsite() const { return plugin::GetWebsite(plugin::handle); }
const std::filesystem::path& GetBaseDir() const { return plugin::GetBaseDir(plugin::handle); }
std::vector<std::string_view> GetDependencies() const { return plugin::GetDependencies(plugin::handle); }
std::vector<std::string> GetDependencies() const { return plugin::GetDependencies(plugin::handle); }
std::optional<std::filesystem::path> FindResource(const std::filesystem::path& path) const { return plugin::FindResource(plugin::handle, path); }

virtual void OnPluginStart() {};
Expand Down
28 changes: 14 additions & 14 deletions test/cross_call_worker/plugify/cpp_plugin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ namespace plugify {

namespace plugin {
using GetIdFn = std::ptrdiff_t (*)(void*);
using GetNameFn = std::string_view (*)(void*);
using GetFullNameFn = std::string_view (*)(void*);
using GetDescriptionFn = std::string_view (*)(void*);
using GetVersionFn = std::string_view (*)(void*);
using GetAuthorFn = std::string_view (*)(void*);
using GetWebsiteFn = std::string_view (*)(void*);
using GetNameFn = const std::string& (*)(void*);
using GetFullNameFn = const std::string& (*)(void*);
using GetDescriptionFn = const std::string& (*)(void*);
using GetVersionFn = const std::string& (*)(void*);
using GetAuthorFn = const std::string& (*)(void*);
using GetWebsiteFn = const std::string& (*)(void*);
using GetBaseDirFn = const std::filesystem::path& (*)(void*);
using GetDependenciesFn = std::vector<std::string_view> (*)(void*);
using GetDependenciesFn = std::vector<std::string> (*)(void*);
using FindResourceFn = std::optional<std::filesystem::path> (*)(void*, const std::filesystem::path&);
extern void* handle;
extern GetIdFn GetId;
Expand All @@ -64,14 +64,14 @@ namespace plugify {

public:
std::ptrdiff_t GetId() const { return plugin::GetId(plugin::handle); }
std::string_view GetName() const { return plugin::GetName(plugin::handle); }
std::string_view GetFullName() const { return plugin::GetFullName(plugin::handle); }
std::string_view GetDescription() const { return plugin::GetDescription(plugin::handle); }
std::string_view GetVersion() const { return plugin::GetVersion(plugin::handle); }
std::string_view GetAuthor() const { return plugin::GetAuthor(plugin::handle); }
std::string_view GetWebsite() const { return plugin::GetWebsite(plugin::handle); }
const std::string& GetName() const { return plugin::GetName(plugin::handle); }
const std::string& GetFullName() const { return plugin::GetFullName(plugin::handle); }
const std::string& GetDescription() const { return plugin::GetDescription(plugin::handle); }
const std::string& GetVersion() const { return plugin::GetVersion(plugin::handle); }
const std::string& GetAuthor() const { return plugin::GetAuthor(plugin::handle); }
const std::string& GetWebsite() const { return plugin::GetWebsite(plugin::handle); }
const std::filesystem::path& GetBaseDir() const { return plugin::GetBaseDir(plugin::handle); }
std::vector<std::string_view> GetDependencies() const { return plugin::GetDependencies(plugin::handle); }
std::vector<std::string> GetDependencies() const { return plugin::GetDependencies(plugin::handle); }
std::optional<std::filesystem::path> FindResource(const std::filesystem::path& path) const { return plugin::FindResource(plugin::handle, path); }

virtual void OnPluginStart() {};
Expand Down
28 changes: 14 additions & 14 deletions test/example_plugin/plugify/cpp_plugin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ namespace plugify {

namespace plugin {
using GetIdFn = std::ptrdiff_t (*)(void*);
using GetNameFn = std::string_view (*)(void*);
using GetFullNameFn = std::string_view (*)(void*);
using GetDescriptionFn = std::string_view (*)(void*);
using GetVersionFn = std::string_view (*)(void*);
using GetAuthorFn = std::string_view (*)(void*);
using GetWebsiteFn = std::string_view (*)(void*);
using GetNameFn = const std::string& (*)(void*);
using GetFullNameFn = const std::string& (*)(void*);
using GetDescriptionFn = const std::string& (*)(void*);
using GetVersionFn = const std::string& (*)(void*);
using GetAuthorFn = const std::string& (*)(void*);
using GetWebsiteFn = const std::string& (*)(void*);
using GetBaseDirFn = const std::filesystem::path& (*)(void*);
using GetDependenciesFn = std::vector<std::string_view> (*)(void*);
using GetDependenciesFn = std::vector<std::string> (*)(void*);
using FindResourceFn = std::optional<std::filesystem::path> (*)(void*, const std::filesystem::path&);
extern void* handle;
extern GetIdFn GetId;
Expand All @@ -64,14 +64,14 @@ namespace plugify {

public:
std::ptrdiff_t GetId() const { return plugin::GetId(plugin::handle); }
std::string_view GetName() const { return plugin::GetName(plugin::handle); }
std::string_view GetFullName() const { return plugin::GetFullName(plugin::handle); }
std::string_view GetDescription() const { return plugin::GetDescription(plugin::handle); }
std::string_view GetVersion() const { return plugin::GetVersion(plugin::handle); }
std::string_view GetAuthor() const { return plugin::GetAuthor(plugin::handle); }
std::string_view GetWebsite() const { return plugin::GetWebsite(plugin::handle); }
const std::string& GetName() const { return plugin::GetName(plugin::handle); }
const std::string& GetFullName() const { return plugin::GetFullName(plugin::handle); }
const std::string& GetDescription() const { return plugin::GetDescription(plugin::handle); }
const std::string& GetVersion() const { return plugin::GetVersion(plugin::handle); }
const std::string& GetAuthor() const { return plugin::GetAuthor(plugin::handle); }
const std::string& GetWebsite() const { return plugin::GetWebsite(plugin::handle); }
const std::filesystem::path& GetBaseDir() const { return plugin::GetBaseDir(plugin::handle); }
std::vector<std::string_view> GetDependencies() const { return plugin::GetDependencies(plugin::handle); }
std::vector<std::string> GetDependencies() const { return plugin::GetDependencies(plugin::handle); }
std::optional<std::filesystem::path> FindResource(const std::filesystem::path& path) const { return plugin::FindResource(plugin::handle, path); }

virtual void OnPluginStart() {};
Expand Down
28 changes: 14 additions & 14 deletions test/mega/plugify/cpp_plugin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ namespace plugify {

namespace plugin {
using GetIdFn = std::ptrdiff_t (*)(void*);
using GetNameFn = std::string_view (*)(void*);
using GetFullNameFn = std::string_view (*)(void*);
using GetDescriptionFn = std::string_view (*)(void*);
using GetVersionFn = std::string_view (*)(void*);
using GetAuthorFn = std::string_view (*)(void*);
using GetWebsiteFn = std::string_view (*)(void*);
using GetNameFn = const std::string& (*)(void*);
using GetFullNameFn = const std::string& (*)(void*);
using GetDescriptionFn = const std::string& (*)(void*);
using GetVersionFn = const std::string& (*)(void*);
using GetAuthorFn = const std::string& (*)(void*);
using GetWebsiteFn = const std::string& (*)(void*);
using GetBaseDirFn = const std::filesystem::path& (*)(void*);
using GetDependenciesFn = std::vector<std::string_view> (*)(void*);
using GetDependenciesFn = std::vector<std::string> (*)(void*);
using FindResourceFn = std::optional<std::filesystem::path> (*)(void*, const std::filesystem::path&);
extern void* handle;
extern GetIdFn GetId;
Expand All @@ -64,14 +64,14 @@ namespace plugify {

public:
std::ptrdiff_t GetId() const { return plugin::GetId(plugin::handle); }
std::string_view GetName() const { return plugin::GetName(plugin::handle); }
std::string_view GetFullName() const { return plugin::GetFullName(plugin::handle); }
std::string_view GetDescription() const { return plugin::GetDescription(plugin::handle); }
std::string_view GetVersion() const { return plugin::GetVersion(plugin::handle); }
std::string_view GetAuthor() const { return plugin::GetAuthor(plugin::handle); }
std::string_view GetWebsite() const { return plugin::GetWebsite(plugin::handle); }
const std::string& GetName() const { return plugin::GetName(plugin::handle); }
const std::string& GetFullName() const { return plugin::GetFullName(plugin::handle); }
const std::string& GetDescription() const { return plugin::GetDescription(plugin::handle); }
const std::string& GetVersion() const { return plugin::GetVersion(plugin::handle); }
const std::string& GetAuthor() const { return plugin::GetAuthor(plugin::handle); }
const std::string& GetWebsite() const { return plugin::GetWebsite(plugin::handle); }
const std::filesystem::path& GetBaseDir() const { return plugin::GetBaseDir(plugin::handle); }
std::vector<std::string_view> GetDependencies() const { return plugin::GetDependencies(plugin::handle); }
std::vector<std::string> GetDependencies() const { return plugin::GetDependencies(plugin::handle); }
std::optional<std::filesystem::path> FindResource(const std::filesystem::path& path) const { return plugin::FindResource(plugin::handle, path); }

virtual void OnPluginStart() {};
Expand Down

0 comments on commit 18d9356

Please sign in to comment.