From 5aacd90c3ef565c5bcd3c337dfd444a8fccc03f8 Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Mon, 9 Oct 2023 06:00:12 -0400 Subject: Add Lua Defines parsing --- src/headless/main.cpp | 39 +++++++ .../v2script/LuaDefinesGrammar.hpp | 112 +++++++++++++++++++++ src/openvic-dataloader/v2script/Parser.cpp | 23 +++++ 3 files changed, 174 insertions(+) create mode 100644 src/openvic-dataloader/v2script/LuaDefinesGrammar.hpp (limited to 'src') diff --git a/src/headless/main.cpp b/src/headless/main.cpp index 2075d9b..1f0b4c3 100644 --- a/src/headless/main.cpp +++ b/src/headless/main.cpp @@ -64,6 +64,42 @@ int print_csv(const std::string_view path) { return EXIT_SUCCESS; } +int print_lua(const std::string_view path) { + auto parser = ovdl::v2script::Parser::from_file(path); + if (parser.has_error()) { + return 1; + } + + parser.lua_defines_parse(); + if (parser.has_error()) { + return 2; + } + + if (parser.has_warning()) { + for (auto& warning : parser.get_warnings()) { + std::cerr << "Warning: " << warning.message << std::endl; + } + } + + parser.generate_node_location_map(); + + for (const auto& node : parser.get_file_node()->_statements) { + std::cout << node->get_type() << ": " << parser.get_node_begin(node.get()) << std::endl; + if (auto assign_node = node->cast_to(); assign_node) { + auto lnode_ptr = assign_node->_initializer.get(); + std::cout << lnode_ptr->get_type() << " begin: " << parser.get_node_begin(lnode_ptr) << std::endl; + std::cout << lnode_ptr->get_type() << " end: " << parser.get_node_end(lnode_ptr) << std::endl; + if (auto list_node = lnode_ptr->cast_to(); list_node) { + for (const auto& inode : list_node->_statements) { + std::cout << inode->get_type() << ": " << parser.get_node_begin(inode.get()) << std::endl; + } + } + } + } + std::cout << parser.get_file_node() << std::endl; + return EXIT_SUCCESS; +} + int print_v2script_simple(const std::string_view path) { auto parser = ovdl::v2script::Parser::from_file(path); if (parser.has_error()) { @@ -103,6 +139,9 @@ int print_v2script_simple(const std::string_view path) { int main(int argc, char** argv) { switch (argc) { case 2: + if (insenitive_trim_eq(std::filesystem::path(argv[1]).extension().string(), ".lua")) { + return print_lua(argv[1]); + } return print_v2script_simple(argv[1]); case 4: if (insenitive_trim_eq(argv[1], "csv") && insenitive_trim_eq(argv[2], "utf")) diff --git a/src/openvic-dataloader/v2script/LuaDefinesGrammar.hpp b/src/openvic-dataloader/v2script/LuaDefinesGrammar.hpp new file mode 100644 index 0000000..b64d0f9 --- /dev/null +++ b/src/openvic-dataloader/v2script/LuaDefinesGrammar.hpp @@ -0,0 +1,112 @@ +#pragma once + +#include + +#include "SimpleGrammar.hpp" +#include "detail/LexyLitRange.hpp" + +namespace ovdl::v2script::lua::grammar { + struct ParseOptions { + }; + + template + struct StatementListBlock; + + static constexpr auto comment_specifier = LEXY_LIT("--") >> lexy::dsl::until(lexy::dsl::newline).or_eof(); + + template + struct Identifier { + static constexpr auto rule = lexy::dsl::identifier(lexy::dsl::ascii::alpha_underscore, lexy::dsl::ascii::alpha_digit_underscore); + static constexpr auto value = lexy::callback( + [](auto lexeme) { + std::string str(lexeme.data(), lexeme.size()); + return ast::make_node_ptr(ast::NodeLocation { lexeme.begin(), lexeme.end() }, LEXY_MOV(str)); + }); + }; + + template + struct Value { + static constexpr auto rule = lexy::dsl::identifier(lexy::dsl::ascii::digit / lexy::dsl::lit_c<'.'> / lexy::dsl::lit_c<'-'>); + static constexpr auto value = lexy::callback( + [](auto lexeme) { + std::string str(lexeme.data(), lexeme.size()); + return ast::make_node_ptr(ast::NodeLocation { lexeme.begin(), lexeme.end() }, LEXY_MOV(str)); + }); + }; + + template + struct String { + static constexpr auto rule = [] { + // Arbitrary code points that aren't control characters. + auto c = ovdl::detail::lexydsl::make_range<0x20, 0xFF>() - lexy::dsl::ascii::control; + + return lexy::dsl::delimited(lexy::dsl::position(lexy::dsl::lit_b<'"'>))(c) | lexy::dsl::delimited(lexy::dsl::position(lexy::dsl::lit_b<'\''>))(c); + }(); + + static constexpr auto value = + lexy::as_string >> + lexy::callback( + [](const char* begin, auto&& str, const char* end) { + return ast::make_node_ptr(ast::NodeLocation::make_from(begin, end), LEXY_MOV(str)); + }); + }; + + template + struct Expression { + static constexpr auto rule = lexy::dsl::p> | lexy::dsl::p>; + static constexpr auto value = lexy::forward; + }; + + template + struct AssignmentStatement { + static constexpr auto rule = + lexy::dsl::position(lexy::dsl::p>) >> + lexy::dsl::equal_sign >> + (lexy::dsl::p> | lexy::dsl::recurse_branch>); + + static constexpr auto value = lexy::callback( + [](const char* pos, auto name, lexy::nullopt = {}) { + return LEXY_MOV(name); + }, + [](auto name, lexy::nullopt = {}) { + return LEXY_MOV(name); + }, + [](const char* pos, auto name, auto&& initalizer) { + return ast::make_node_ptr(pos, LEXY_MOV(name), LEXY_MOV(initalizer)); + }); + }; + + template + struct StatementListBlock { + static constexpr auto rule = + lexy::dsl::position(lexy::dsl::curly_bracketed.open()) >> + lexy::dsl::opt( + lexy::dsl::list( + lexy::dsl::recurse_branch>, + lexy::dsl::trailing_sep(lexy::dsl::lit_c<','>))) >> + lexy::dsl::position(lexy::dsl::curly_bracketed.close()); + + static constexpr auto value = + lexy::as_list> >> + lexy::callback( + [](const char* begin, lexy::nullopt, const char* end) { + return ast::make_node_ptr(ast::NodeLocation::make_from(begin, end)); + }, + [](const char* begin, auto&& list, const char* end) { + return ast::make_node_ptr(ast::NodeLocation::make_from(begin, end), LEXY_MOV(list)); + }, + [](const char* begin, auto& list, const char* end) { + return ast::make_node_ptr(ast::NodeLocation::make_from(begin, end), list); + }); + }; + + template + struct File { + // Allow arbitrary spaces between individual tokens. + static constexpr auto whitespace = ovdl::v2script::grammar::whitespace_specifier | comment_specifier; + + static constexpr auto rule = lexy::dsl::position + lexy::dsl::terminator(lexy::dsl::eof).opt_list(lexy::dsl::p>); + + static constexpr auto value = lexy::as_list> >> lexy::new_; + }; +} \ No newline at end of file diff --git a/src/openvic-dataloader/v2script/Parser.cpp b/src/openvic-dataloader/v2script/Parser.cpp index 9e74e32..d7e4106 100644 --- a/src/openvic-dataloader/v2script/Parser.cpp +++ b/src/openvic-dataloader/v2script/Parser.cpp @@ -31,6 +31,7 @@ #include "detail/Warnings.hpp" #include "v2script/DecisionGrammar.hpp" #include "v2script/EventGrammar.hpp" +#include "v2script/LuaDefinesGrammar.hpp" using namespace ovdl; using namespace ovdl::v2script; @@ -232,6 +233,28 @@ bool Parser::decision_parse() { return true; } +bool Parser::lua_defines_parse() { + if (!_buffer_handler->is_valid()) { + return false; + } + + if (_buffer_handler->is_exclusive_utf8()) { + _warnings.push_back(warnings::make_utf8_warning(_file_path)); + } + + auto errors = _buffer_handler->parse>(ovdl::detail::ReporError.path(_file_path).to(detail::OStreamOutputIterator { _error_stream })); + if (errors) { + _errors.reserve(errors->size()); + for (auto& err : errors.value()) { + _has_fatal_error |= err.type == ParseError::Type::Fatal; + _errors.push_back(err); + } + return false; + } + _file_node.reset(static_cast(_buffer_handler->get_root().release())); + return true; +} + const FileNode* Parser::get_file_node() const { return _file_node.get(); } -- cgit v1.2.3-56-ga3b1