From 885e46dab82b5015701de81b9ae7045a8b36adfb Mon Sep 17 00:00:00 2001 From: xR3b0rn <6249046+xR3b0rn@users.noreply.github.com> Date: Thu, 26 Jan 2023 13:11:57 +0100 Subject: [PATCH 1/4] Update DBCX3.cpp fix #130 --- src/libdbcppp/DBCX3.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libdbcppp/DBCX3.cpp b/src/libdbcppp/DBCX3.cpp index 22e6b7d6..d1976b24 100644 --- a/src/libdbcppp/DBCX3.cpp +++ b/src/libdbcppp/DBCX3.cpp @@ -268,7 +268,7 @@ namespace dbcppp::DBCX3::Grammar static const auto attribute_default_def = (lexeme[(lit("BA_DEF_DEF_REL_") | lit("BA_DEF_DEF_")) >> omit[space]]) > attribute_name > attribute_value > ';'; - static const auto attribute_value_def = double_ | signed_int | quoted_string; + static const auto attribute_value_def = signed_int | double_ | quoted_string; static const auto attribute_value_ent_def = lexeme[lit("BA_") >> omit[skipper]] @@ -469,4 +469,4 @@ std::optional dbcppp::DBCX3::ParseFromMemory(cons return gnet; } return std::nullopt; -} \ No newline at end of file +} From 4ffa347ae46fdc1854327b4c67596f0cb1a8f2e2 Mon Sep 17 00:00:00 2001 From: xR3b0rn <6249046+xR3b0rn@users.noreply.github.com> Date: Thu, 26 Jan 2023 13:31:32 +0100 Subject: [PATCH 2/4] Update DBCX3.cpp --- src/libdbcppp/DBCX3.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libdbcppp/DBCX3.cpp b/src/libdbcppp/DBCX3.cpp index d1976b24..6d874d1f 100644 --- a/src/libdbcppp/DBCX3.cpp +++ b/src/libdbcppp/DBCX3.cpp @@ -267,8 +267,8 @@ namespace dbcppp::DBCX3::Grammar static const auto attribute_value_type_enum_def = (lit("ENUM") > (quoted_string % ','))[SetAttributeValuetypeEnum]; static const auto attribute_default_def = - (lexeme[(lit("BA_DEF_DEF_REL_") | lit("BA_DEF_DEF_")) >> omit[space]]) > attribute_name > attribute_value > ';'; - static const auto attribute_value_def = signed_int | double_ | quoted_string; + (lexeme[(lit("BA_DEF_DEF_REL_") | lit("BA_DEF_DEF_")) >> omit[space]]) > attribute_name > attribute_value; + static const auto attribute_value_def = (signed_int > ';') | (double_ > ';') | (quoted_string > ';'); static const auto attribute_value_ent_def = lexeme[lit("BA_") >> omit[skipper]] From 9836bd7814641607b04ff3d211c340ac84ff595f Mon Sep 17 00:00:00 2001 From: xR3b0rn <6249046+xR3b0rn@users.noreply.github.com> Date: Thu, 26 Jan 2023 13:52:27 +0100 Subject: [PATCH 3/4] Update DBCX3.cpp --- src/libdbcppp/DBCX3.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libdbcppp/DBCX3.cpp b/src/libdbcppp/DBCX3.cpp index 6d874d1f..a28422e1 100644 --- a/src/libdbcppp/DBCX3.cpp +++ b/src/libdbcppp/DBCX3.cpp @@ -268,13 +268,13 @@ namespace dbcppp::DBCX3::Grammar static const auto attribute_default_def = (lexeme[(lit("BA_DEF_DEF_REL_") | lit("BA_DEF_DEF_")) >> omit[space]]) > attribute_name > attribute_value; - static const auto attribute_value_def = (signed_int > ';') | (double_ > ';') | (quoted_string > ';'); + static const auto attribute_value_def = (signed_int > ';') | (signed_int > ';') | (quoted_string > ';') ; static const auto attribute_value_ent_def = lexeme[lit("BA_") >> omit[skipper]] > (attribute_value_ent_network | attribute_value_ent_node | attribute_value_ent_message | attribute_value_ent_signal - | attribute_value_ent_env_var) > ';'; + | attribute_value_ent_env_var); static const auto attribute_value_ent_network_def = attribute_name >> attribute_value; static const auto attribute_value_ent_node_def = attribute_name >> lit("BU_") > node_name > attribute_value; static const auto attribute_value_ent_message_def = attribute_name >> lit("BO_") > message_id > attribute_value; From 8725d95707300a3b435ff5bcb48d1f02f20bf024 Mon Sep 17 00:00:00 2001 From: xR3b0rn <6249046+xR3b0rn@users.noreply.github.com> Date: Thu, 26 Jan 2023 15:22:26 +0100 Subject: [PATCH 4/4] Update DBCX3.cpp --- src/libdbcppp/DBCX3.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libdbcppp/DBCX3.cpp b/src/libdbcppp/DBCX3.cpp index a28422e1..3128eab2 100644 --- a/src/libdbcppp/DBCX3.cpp +++ b/src/libdbcppp/DBCX3.cpp @@ -268,7 +268,7 @@ namespace dbcppp::DBCX3::Grammar static const auto attribute_default_def = (lexeme[(lit("BA_DEF_DEF_REL_") | lit("BA_DEF_DEF_")) >> omit[space]]) > attribute_name > attribute_value; - static const auto attribute_value_def = (signed_int > ';') | (signed_int > ';') | (quoted_string > ';') ; + static const auto attribute_value_def = (signed_int > ';') | (double_ > ';') | (quoted_string > ';') ; static const auto attribute_value_ent_def = lexeme[lit("BA_") >> omit[skipper]]