From 760523a45a348c26c87eb59657204f0e3cd90b26 Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Sat, 6 Jul 2024 06:49:39 -0400 Subject: Add find_intern to v2script Parser --- include/openvic-dataloader/detail/SymbolIntern.hpp | 13 +++++++++++++ include/openvic-dataloader/v2script/Parser.hpp | 1 + src/openvic-dataloader/v2script/Parser.cpp | 8 ++++++++ 3 files changed, 22 insertions(+) diff --git a/include/openvic-dataloader/detail/SymbolIntern.hpp b/include/openvic-dataloader/detail/SymbolIntern.hpp index d72a0ba..56576c5 100644 --- a/include/openvic-dataloader/detail/SymbolIntern.hpp +++ b/include/openvic-dataloader/detail/SymbolIntern.hpp @@ -173,6 +173,19 @@ namespace ovdl { return success; } + symbol find_intern(const CharT* str, std::size_t length) { + auto entry = _map.lookup_entry(typename traits::string_view { str, length }, traits { &_buffer }); + if (entry) + return symbol(_buffer.c_str(entry.get())); + + return symbol(); + } + template + symbol find_intern(const CharT (&literal)[N]) { + DRYAD_PRECONDITION(literal[N - 1] == CharT(0)); + return find_intern(literal, N - 1); + } + symbol intern(const CharT* str, std::size_t length) { if (_map.should_rehash()) _map.rehash(_resource, traits { &_buffer }); diff --git a/include/openvic-dataloader/v2script/Parser.hpp b/include/openvic-dataloader/v2script/Parser.hpp index 2518e61..c5f37be 100644 --- a/include/openvic-dataloader/v2script/Parser.hpp +++ b/include/openvic-dataloader/v2script/Parser.hpp @@ -51,6 +51,7 @@ namespace ovdl::v2script { const FileTree* get_file_node() const; std::string_view value(const ovdl::v2script::ast::FlatValue* node) const; + ovdl::symbol find_intern(std::string_view string) const; std::string make_native_string() const; std::string make_list_string() const; diff --git a/src/openvic-dataloader/v2script/Parser.cpp b/src/openvic-dataloader/v2script/Parser.cpp index 9c6a0c5..2375a1a 100644 --- a/src/openvic-dataloader/v2script/Parser.cpp +++ b/src/openvic-dataloader/v2script/Parser.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -269,6 +270,13 @@ std::string_view Parser::value(const ovdl::v2script::ast::FlatValue* node) const return node->value().view(); } +ovdl::symbol Parser::find_intern(std::string_view string) const { + if (!_parse_handler->is_valid()) { + return ovdl::symbol(); + } + return _parse_handler->parse_state().ast().symbol_interner().find_intern(string.data(), string.size()); +} + std::string Parser::make_native_string() const { return _parse_handler->parse_state().ast().make_native_visualizer(); } -- cgit v1.2.3-56-ga3b1