From 235924fbca7fa78161f048ad17f22b90819d5b44 Mon Sep 17 00:00:00 2001 From: Christoph Schueler Date: Thu, 4 Jul 2024 19:55:00 +0300 Subject: [PATCH] today() --- CMakeLists.txt | 2 +- poetry.lock | 26 +++--- pya2l/__init__.py | 14 +-- pya2l/aml/unmarshal.cpp | 162 +++++++++++++++++++++++---------- pya2l/aml_parser.cpp | 3 +- pya2l/extensions/tokenizer.cpp | 9 +- pyproject.toml | 3 +- 7 files changed, 148 insertions(+), 71 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ebff493..80e16f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ SET(MSVC_BASE_OPTIONS "/W3 /permissive- /EHsc /bigobj /Zc:__cplusplus /std:c++la if (CMAKE_BUILD_TYPE STREQUAL "Debug") if (MSVC) - SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS} /Od /fsanitize=address /Zi") + SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS} /Od /fsanitize=address /Zi /FAcs") else() SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS} -Og -g3 -ggdb --fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined -fsanitize=bounds") # -fsanitize=hwaddress endif() diff --git a/poetry.lock b/poetry.lock index b54258b..9d802e2 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,15 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. - -[[package]] -name = "antlr4-python3-runtime" -version = "4.13.1" -description = "ANTLR 4.13.1 runtime for Python 3" -optional = false -python-versions = "*" -files = [ - {file = "antlr4-python3-runtime-4.13.1.tar.gz", hash = "sha256:3cd282f5ea7cfb841537fe01f143350fdb1c0b1ce7981443a2fa8513fddb6d1a"}, - {file = "antlr4_python3_runtime-4.13.1-py3-none-any.whl", hash = "sha256:78ec57aad12c97ac039ca27403ad61cb98aaec8a3f9bb8144f889aa0fa28b943"}, -] +# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. [[package]] name = "attrs" @@ -714,6 +703,7 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -721,8 +711,16 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -739,6 +737,7 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -746,6 +745,7 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, @@ -1071,4 +1071,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "dd6d23b8f5a106b23f5471f037a87f5bd6394b5ca6802c55a7b70790f59487f5" +content-hash = "d200861f817727d2967542f73078bd14c2d7658aff53d58d1c3c07970fa91e05" diff --git a/pya2l/__init__.py b/pya2l/__init__.py index 4d9d7f3..2c0f3b3 100644 --- a/pya2l/__init__.py +++ b/pya2l/__init__.py @@ -27,7 +27,7 @@ __version__ = "0.10.2" -import pickle # nosec +# import pickle # nosec import pkgutil import sys from pathlib import Path @@ -143,11 +143,11 @@ def import_a2l( self.db, listener_result = a2l_parser.parse(filename=filenames.a2l, dbname=str(self._dbfn), encoding=encoding) self.session = self.db.session - self.logger.info("Parsing AML section ...") - aml_parser = parsers.aml(prepro_result=prepro_result) - aml_result = aml_parser.parseFromFile(filename=filenames.aml, dbname=str(self._dbfn), encoding=encoding).listener_result - aml_parsed = pickle.dumps(aml_result) - aml_text = open(filenames.aml).read() + # self.logger.info("Parsing AML section ...") + # aml_parser = parsers.aml(prepro_result=prepro_result) + # aml_result = aml_parser.parseFromFile(filename=filenames.aml, dbname=str(self._dbfn), encoding=encoding).listener_result + # aml_parsed = pickle.dumps(aml_result) + # aml_text = open(filenames.aml).read() """ self.session.add(model.AMLSection(text=aml_text, parsed=aml_parsed)) self.logger.info("Parsing IF_DATA sections ...") @@ -160,7 +160,7 @@ def import_a2l( """ self.session.commit() - self.session.add(model.AMLSection(text=aml_text, parsed=aml_parsed)) + # self.session.add(model.AMLSection(text=aml_text, parsed=aml_parsed)) # self.session.commit() self.logger.info(f"Done [Elapsed time {perf_counter() - start_time:.2f}s].") diff --git a/pya2l/aml/unmarshal.cpp b/pya2l/aml/unmarshal.cpp index 7937ece..d37c0e1 100644 --- a/pya2l/aml/unmarshal.cpp +++ b/pya2l/aml/unmarshal.cpp @@ -1,6 +1,7 @@ #include #include +#include #include #include @@ -11,7 +12,7 @@ class Reader { Reader() = delete; - Reader(const std::stringstream& inbuf) : m_buf(inbuf.str()) { + explicit Reader(const std::stringstream& inbuf) : m_buf(inbuf.str()) { } template @@ -40,86 +41,143 @@ class Reader { class Unmarshaller { public: + struct type_t; + + using referrer_t = std::tuple; + using enumerators_t = std::map; + using enumeration_t = std::tuple; + using enumeration_or_referrer_t = std::variant; + + using member_t = std::tuple, std::unique_ptr>; + + using block_intern_t = std::variant>; + using block_t = std::tuple; + + using tagged_struct_definition_t = std::tuple>>; + using tagged_struct_member_t = std::tuple>; + using tagged_struct_t = std::tuple>>; + using tagged_struct_or_referrer_t = std::variant; + + using tagged_union_member_t = std::tuple< std::string, std::variant>; + using tagged_union_t = std::tuple>; + using tagged_union_or_referrer_t = std::variant; + + using struct_member_t = std::tuple; + using struct_t = std::tuple>; + using struct_or_referrer_t = std::variant; + + struct type_t { + type_t() = default; + type_t(const type_t&) = delete; + type_t(type_t&&) = default; + + type_t(auto&& value) : m_value(std::move(value)) { + } + + virtual ~type_t() = default; + + std::variant< + std::monostate, AMLPredefinedType, enumeration_or_referrer_t, tagged_struct_or_referrer_t, tagged_union_or_referrer_t, + struct_or_referrer_t> + m_value; + }; + Unmarshaller(const std::stringstream& inbuf) : m_reader(inbuf) { } - void load_pdt() { - const auto pdt = AMLPredefinedType(m_reader.from_binary()); + AMLPredefinedType load_pdt() { + return AMLPredefinedType(m_reader.from_binary()); } - void load_referrrer() { + referrer_t load_referrrer() { const auto cat = ReferrerType(m_reader.from_binary()); const auto& identifier = m_reader.from_binary_str(); + return referrer_t{ cat, identifier }; } - void load_enum() { + enumeration_or_referrer_t load_enum() { const auto& disc = m_reader.from_binary_str(); if (disc == "E") { auto name = m_reader.from_binary_str(); auto enumerator_count = m_reader.from_binary(); + enumerators_t enumerators; + for (auto idx = 0; idx < enumerator_count; ++idx) { auto tag = m_reader.from_binary_str(); auto value = m_reader.from_binary< std::uint32_t>(); + + enumerators.try_emplace(tag, value); } + return enumeration_t{ name, enumerators }; } else if (disc == "R") { - load_referrrer(); + return load_referrrer(); } } - void load_tagged_struct_definition() { + tagged_struct_definition_t load_tagged_struct_definition() { const auto multiple = m_reader.from_binary(); auto available = m_reader.from_binary< bool >(); + if (available) { - load_type(); + return tagged_struct_definition_t{ multiple, std::make_unique(load_type()) }; } - // Else TAG only. + // else TAG only. + return tagged_struct_definition_t{ multiple, std::nullopt }; } - void load_tagged_struct_member() { + tagged_struct_member_t load_tagged_struct_member() { const auto multiple = m_reader.from_binary(); const auto& dt = m_reader.from_binary_str(); + if (dt == "T") { - load_tagged_struct_definition(); + return tagged_struct_member_t{ multiple, load_tagged_struct_definition() }; } else if (dt == "B") { - load_block(); + return tagged_struct_member_t{ multiple, load_block() }; } } - void load_tagged_struct() { + tagged_struct_or_referrer_t load_tagged_struct() { const auto& disc = m_reader.from_binary_str(); if (disc == "S") { - auto name = m_reader.from_binary_str(); - auto tags_count = m_reader.from_binary(); + auto name = m_reader.from_binary_str(); + auto tags_count = m_reader.from_binary(); + std::vector> members; for (auto idx = 0; idx < tags_count; ++idx) { const auto& tag = m_reader.from_binary_str(); - load_tagged_struct_member(); + members.emplace_back(tag, load_tagged_struct_member()); } + return tagged_struct_t{ name, std::move(members) }; } else if (disc == "R") { - load_referrrer(); + return load_referrrer(); } } - void load_tagged_union() { + tagged_union_or_referrer_t load_tagged_union() { const auto& disc = m_reader.from_binary_str(); if (disc == "U") { - auto name = m_reader.from_binary_str(); - auto tags_count = m_reader.from_binary(); + auto name = m_reader.from_binary_str(); + auto tags_count = m_reader.from_binary(); + std::vector members; + for (auto idx = 0; idx < tags_count; ++idx) { auto tag = m_reader.from_binary_str(); const auto& dt = m_reader.from_binary_str(); + if (dt == "M") { - load_member(); + members.emplace_back(tag, load_member()); } else if (dt == "B") { - load_block(); + members.emplace_back(tag, load_block()); } } + return tagged_union_t{ name, std::move(members) }; + } else if (disc == "R") { - load_referrrer(); + return load_referrrer(); } } - void load_type() { + type_t load_type() { const auto& tag = m_reader.from_binary_str(); // "PD" - AMLPredefinedType // "TS" - TaggedStruct @@ -127,67 +185,79 @@ class Unmarshaller { // "ST" - Struct // "EN" - Enumeration const auto& disc = m_reader.from_binary_str(); + type_t result; if (disc == "PD") { - load_pdt(); + return load_pdt(); } else if (disc == "TS") { - load_tagged_struct(); + return load_tagged_struct(); } else if (disc == "TU") { - load_tagged_union(); + return load_tagged_union(); } else if (disc == "ST") { - load_struct(); + return load_struct(); } else if (disc == "EN") { - load_enum(); + return load_enum(); } else { assert(true == false); } + return result; } - void load_member() { + member_t load_member() { auto arr_count = m_reader.from_binary(); std::vector array_spec; for (auto idx = 0; idx < arr_count; ++idx) { array_spec.push_back(m_reader.from_binary()); } - load_type(); + return member_t{ array_spec, std::make_unique(load_type()) }; } - void load_struct() { + struct_or_referrer_t load_struct() { const auto& disc = m_reader.from_binary_str(); if (disc == "S") { - auto name = m_reader.from_binary_str(); - auto member_count = m_reader.from_binary(); + auto name = m_reader.from_binary_str(); + auto member_count = m_reader.from_binary(); + std::vector members; + for (auto idx = 0; idx < member_count; ++idx) { - load_member(); - auto mult = m_reader.from_binary(); + auto member = load_member(); + auto mult = m_reader.from_binary(); + members.emplace_back(mult, std::move(member)); } + return struct_t{ name, std::move(members) }; } else if (disc == "R") { - load_referrrer(); + return load_referrrer(); } } - void load_block() { + block_t load_block() { const auto& tag = m_reader.from_binary_str(); const auto& disc = m_reader.from_binary_str(); + + block_intern_t result{}; if (disc == "T") { - load_type(); + result = std::make_unique(load_type()); } else if (disc == "M") { - load_member(); + result = load_member(); } auto multiple = m_reader.from_binary(); + + return block_t{ tag, multiple, std::move(result) }; } - void run() { - auto decl_count = m_reader.from_binary(); + std::vector> run() { + auto decl_count = m_reader.from_binary(); + std::vector> result; for (auto idx = 0; idx < decl_count; ++idx) { const auto& disc1 = m_reader.from_binary_str(); if (disc1 == "TY") { - load_type(); + result.emplace_back(load_type()); } else if (disc1 == "BL") { - load_block(); + result.emplace_back(load_block()); } } + return result; } private: @@ -196,6 +266,6 @@ class Unmarshaller { }; void unmarshal(const std::stringstream& inbuf) { - auto unm = Unmarshaller(inbuf); - unm.run(); + auto unm = Unmarshaller(inbuf); + auto result = unm.run(); } diff --git a/pya2l/aml_parser.cpp b/pya2l/aml_parser.cpp index 063c8a0..cb212eb 100644 --- a/pya2l/aml_parser.cpp +++ b/pya2l/aml_parser.cpp @@ -15,7 +15,8 @@ int main(int argc, const char* argv[]) { if (argc == 2) { stream.open(argv[1]); } else { - stream.open("C:/csProjects/pyA2L/examples/xcp100.aml"); + // stream.open("C:/csProjects/pyA2L/examples/xcp100.aml"); + stream.open("C:/csProjects/pyA2L/pya2l/examples/AML.tmp"); } ANTLRInputStream input(stream); diff --git a/pya2l/extensions/tokenizer.cpp b/pya2l/extensions/tokenizer.cpp index 0207ed1..5a54963 100644 --- a/pya2l/extensions/tokenizer.cpp +++ b/pya2l/extensions/tokenizer.cpp @@ -1,7 +1,7 @@ /* pySART - Simplified AUTOSAR-Toolkit for Python. - (C) 2023 by Christoph Schueler + (C) 2023-2024 by Christoph Schueler All Rights Reserved @@ -247,6 +247,13 @@ Generator tokenizer(std::basic_istream &stream, bool if ((string_state == StringStateType::IDLE) && (!in_comment())) { token[char_class_to_int(current)].push_back(ch); } else { + auto sz = std::size(token[char_class_to_int(CharClass::STRING)]); + if ((sz == 1) && (ch == DQUOTE) && (previous == CharClass::REGULAR) && + (string_state == StringStateType::IN_STRING)) { + LineNumbers line_numbers{ start_line, start_column, line, column - 1 }; + co_yield { Token(TokenClass::REGULAR, line_numbers, token[char_class_to_int(current)]) }; + token[char_class_to_int(CharClass::REGULAR)].clear(); + } token[char_class_to_int(CharClass::STRING)].push_back(ch); } } else { diff --git a/pyproject.toml b/pyproject.toml index ff7ad38..cfef75e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,6 @@ packages = [ [tool.poetry.dependencies] python = "^3.9" -antlr4-python3-runtime = "4.13.1" chardet = "^5.2.0" Mako = "^1.3.5" SQLAlchemy = "^2.0.30" @@ -52,7 +51,7 @@ pre-commit-hooks = "^4.6.0" pyupgrade = "^3.16.0" [build-system] -requires = ["poetry-core>=1.6.0", "pybind11>=2.12.0", "wheel", "cmake>=3.12", "pybind11[global]>=2.11.1"] +requires = ["poetry-core>=1.6.0", "wheel", "cmake>=3.12", "pybind11[global]>=2.12.0"] build-backend = "poetry.core.masonry.api"