Add support for anonymous Sequence members

Samuel-Tyler · Nov 7, 2019 · 6f616f2 · 6f616f2
1 parent 29786cc
commit 6f616f2
Show file tree

Hide file tree

Showing 9 changed files with 1,520 additions and 1,276 deletions.
diff --git a/3rd_party/abseil-cpp b/3rd_party/abseil-cpp
diff --git a/include/fast_ber/compiler/CompilerTypes.hpp b/include/fast_ber/compiler/CompilerTypes.hpp
@@ -491,3 +491,5 @@ bool is_oid(const Type& type);
 bool is_defined(const Type& type);
 
 struct Context;
+
+std::string gen_anon_member_name();
diff --git a/src/compiler/CompilerTypes.cpp b/src/compiler/CompilerTypes.cpp
@@ -292,3 +292,9 @@ bool is_oid(const Type& type)
 }
 
 bool is_defined(const Type& type) { return absl::holds_alternative<DefinedType>(type); }
+
+std::string gen_anon_member_name()
+{
+    static size_t count = 0;
+    return "anonymous_member_" + std::to_string(count++);
+}
diff --git a/src/compiler/asn_compiler.yacc b/src/compiler/asn_compiler.yacc
@@ -1227,7 +1227,13 @@ ComponentTypeList:
     { $1.push_back($3); $$ = $1; }
 
 ComponentType:
-    NamedType
+    Type
+    { $$ = ComponentType{{gen_anon_member_name(), $1}, false, absl::nullopt, absl::nullopt}; }
+|   Type OPTIONAL
+    { $$ = ComponentType{{gen_anon_member_name(), $1}, true, absl::nullopt, absl::nullopt}; }
+|   Type DEFAULT SingleValue
+    { $$ = ComponentType{{gen_anon_member_name(), $1}, false, $3, absl::nullopt}; }
+|   NamedType
     { $$ = ComponentType{$1, false, absl::nullopt, absl::nullopt}; }
 |   NamedType OPTIONAL
     { $$ = ComponentType{$1, true, absl::nullopt, absl::nullopt}; }

diff --git a/src/compiler/autogen_copy/asn_compiler.hpp b/src/compiler/autogen_copy/asn_compiler.hpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -25,6 +25,8 @@ fast_ber_generate(${CMAKE_SOURCE_DIR}/testfiles/parameterized_types.asn paramete
 fast_ber_generate(${CMAKE_SOURCE_DIR}/testfiles/sequence_of.asn sequence_of)
 fast_ber_generate(${CMAKE_SOURCE_DIR}/testfiles/time.asn time)
 fast_ber_generate(${CMAKE_SOURCE_DIR}/testfiles/circular.asn circular)
+fast_ber_generate(${CMAKE_SOURCE_DIR}/testfiles/defaults.asn defaults)
+fast_ber_generate(${CMAKE_SOURCE_DIR}/testfiles/anonymous_members.asn anonymous_members)
 fast_ber_generate(${CMAKE_SOURCE_DIR}/testfiles/SGSN-CDR-def-v2009A.asn real_schema)
 fast_ber_generate2(${CMAKE_SOURCE_DIR}/testfiles/multi_file_import_1.asn
                    ${CMAKE_SOURCE_DIR}/testfiles/multi_file_import_2.asn multi_file_import)
@@ -49,7 +51,9 @@ add_executable(fast_ber_tests Test ${TEST_SRC} autogen/choice.hpp
                                                autogen/parameterized_types.hpp
                                                autogen/sequence_of.hpp
                                                autogen/time.hpp
-                                               autogen/circular.hpp)
+                                               autogen/circular.hpp
+                                               autogen/defaults.hpp
+                                               autogen/anonymous_members.hpp)
 target_include_directories(fast_ber_tests PRIVATE SYSTEM ${CMAKE_SOURCE_DIR}/3rd_party/Catch2/single_include)
 target_include_directories(fast_ber_tests PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 target_link_libraries (fast_ber_tests fast_ber_lib)

diff --git a/test/compiler/Anonymous.cpp b/test/compiler/Anonymous.cpp
@@ -0,0 +1,10 @@
+#include "autogen/anonymous_members.hpp"
+
+#include "catch2/catch.hpp"
+
+static_assert(std::is_same<decltype(fast_ber::Anonymous::Anon::anonymous_member_0), fast_ber::Null<>>::value, "Anon");
+static_assert(std::is_same<decltype(fast_ber::Anonymous::Anon::anonymous_member_1),
+                           fast_ber::SequenceOf<fast_ber::OctetString<>>>::value,
+              "Anon");
+static_assert(std::is_same<decltype(fast_ber::Anonymous::Anon::anonymous_member_2), fast_ber::Integer<>>::value,
+              "Anon");
diff --git a/testfiles/anonymous_members.asn b/testfiles/anonymous_members.asn
@@ -0,0 +1,15 @@
+Anonymous
+
+DEFINITIONS EXPLICIT TAGS ::=
+
+BEGIN
+
+Anon ::= SEQUENCE
+{
+    NULL,
+    SEQUENCE OF OCTET STRING,
+    ...,
+    INTEGER
+}
+
+END
diff --git a/testfiles/defaults.asn b/testfiles/defaults.asn
@@ -0,0 +1,14 @@
+Defaults
+
+DEFINITIONS EXPLICIT TAGS ::=
+
+BEGIN
+
+SequenceWithDefault ::= SEQUENCE
+{
+    flag    BOOLEAN DEFAULT FALSE,
+    seq     SEQUENCE OF INTEGER,
+    ...
+}
+
+END