aas-core-codegen 0.0.16__py3-none-any.whl → 0.0.17__py3-none-any.whl

aas_core_codegen/__init__.py

@@ -1,6 +1,6 @@
 """Generate implementations and schemas based on an AAS meta-model."""
 
-__version__ = "0.0.16"
+__version__ = "0.0.17"
 __author__ = "Marko Ristin, Nico Braunisch"
 __license__ = "License :: OSI Approved :: MIT License"
 __status__ = "Production/Stable"

aas_core_codegen/cpp/pattern/_generate.py

@@ -201,7 +201,7 @@ def _write_instructions_recursively(
             instruction_code = Stripped(
                 f"""\
 program.emplace_back({maybe_label_comment}
-{I}std::make_unique<revm::InstructionChar>({char_literal})
+{I}common::make_unique<revm::InstructionChar>({char_literal})
 );"""
             )
 
@@ -230,7 +230,7 @@ program.emplace_back({maybe_label_comment}
             instruction_code = Stripped(
                 f"""\
 program.emplace_back({maybe_label_comment}
-{I}std::make_unique<revm::{instruction_cls}>(
+{I}common::make_unique<revm::{instruction_cls}>(
 {II}std::vector<revm::Range>{{
 {III}{indent_but_first_line(ranges_joined, III)}
 {II}}}
@@ -242,7 +242,7 @@ program.emplace_back({maybe_label_comment}
             instruction_code = Stripped(
                 f"""\
 program.emplace_back({maybe_label_comment}
-{I}std::make_unique<revm::InstructionAny>()
+{I}common::make_unique<revm::InstructionAny>()
 );"""
             )
 
@@ -250,7 +250,7 @@ program.emplace_back({maybe_label_comment}
             instruction_code = Stripped(
                 f"""\
 program.emplace_back({maybe_label_comment}
-{I}std::make_unique<revm::InstructionMatch>()
+{I}common::make_unique<revm::InstructionMatch>()
 );"""
             )
 
@@ -258,7 +258,7 @@ program.emplace_back({maybe_label_comment}
             instruction_code = Stripped(
                 f"""\
 program.emplace_back({maybe_label_comment}
-{I}std::make_unique<revm::InstructionJump>({node_or_leaf.instruction.target})
+{I}common::make_unique<revm::InstructionJump>({node_or_leaf.instruction.target})
 );"""
             )
 
@@ -268,7 +268,7 @@ program.emplace_back({maybe_label_comment}
             instruction_code = Stripped(
                 f"""\
 program.emplace_back({maybe_label_comment}
-{I}std::make_unique<revm::InstructionSplit>({first_target}, {second_target})
+{I}common::make_unique<revm::InstructionSplit>({first_target}, {second_target})
 );"""
             )
 
@@ -276,7 +276,7 @@ program.emplace_back({maybe_label_comment}
             instruction_code = Stripped(
                 f"""\
 program.emplace_back({maybe_label_comment}
-{I}std::make_unique<revm::InstructionEnd>()
+{I}common::make_unique<revm::InstructionEnd>()
 );"""
             )
 
@@ -449,6 +449,7 @@ def generate_implementation(
         cpp_common.WARNING,
         Stripped(
             f'''\
+#include "{include_prefix_path}/common.hpp"
 #include "{include_prefix_path}/pattern.hpp"
 #include "{include_prefix_path}/revm.hpp"'''
         ),

aas_core_codegen/cpp/revm/_generate.py

@@ -902,8 +902,8 @@ bool Match(
 {I}// See: https://swtch.com/~rsc/regexp/regexp2.html,
 {I}// Section "Thompson's Implementation".
 
-{I}std::unique_ptr<ThreadList> clist(std::make_unique<ThreadList>(program.size()));
-{I}std::unique_ptr<ThreadList> nlist(std::make_unique<ThreadList>(program.size()));
+{I}std::unique_ptr<ThreadList> clist(common::make_unique<ThreadList>(program.size()));
+{I}std::unique_ptr<ThreadList> nlist(common::make_unique<ThreadList>(program.size()));
 
 {I}clist->Spawn(0);
 

aas_core_codegen/intermediate/__init__.py

@@ -6,6 +6,8 @@ TypeAnnotation = _types.TypeAnnotation
 TypeAnnotationUnion = _types.TypeAnnotationUnion
 AtomicTypeAnnotation = _types.AtomicTypeAnnotation
 PrimitiveType = _types.PrimitiveType
+PRIMITIVE_TYPE_TO_PYTHON_TYPE = _types.PRIMITIVE_TYPE_TO_PYTHON_TYPE
+PYTHON_TYPE_TO_PRIMITIVE_TYPE = _types.PYTHON_TYPE_TO_PRIMITIVE_TYPE
 PrimitiveTypeAnnotation = _types.PrimitiveTypeAnnotation
 OurTypeAnnotation = _types.OurTypeAnnotation
 ListTypeAnnotation = _types.ListTypeAnnotation

aas_core_codegen/intermediate/_stringify.py

@@ -510,6 +510,7 @@ def _stringify_enumeration(
             stringify_mod.PropertyEllipsis("literals_by_name", that.literals_by_name),
             stringify_mod.PropertyEllipsis("literals_by_value", that.literals_by_value),
             stringify_mod.PropertyEllipsis("literal_id_set", that.literal_id_set),
+            stringify_mod.PropertyEllipsis("literal_value_set", that.literal_value_set),
             stringify_mod.PropertyEllipsis("parsed", that.parsed),
         ],
     )
@@ -542,6 +543,13 @@ def _stringify_constrained_primitive(
                 ],
             ),
             stringify_mod.PropertyEllipsis("ancestor_id_set", that.ancestor_id_set),
+            stringify_mod.Property(
+                "descendants",
+                [
+                    f"Reference to {descendant.__class__.__name__} {descendant.name}"
+                    for descendant in that.descendants
+                ],
+            ),
             stringify_mod.PropertyEllipsis("descendant_id_set", that.descendant_id_set),
             stringify_mod.Property("constrainee", that.constrainee.name),
             stringify_mod.Property(
@@ -711,6 +719,7 @@ def _stringify_constant_set_of_enumeration_literals(
                 ],
             ),
             stringify_mod.PropertyEllipsis("literal_id_set", that.literal_id_set),
+            stringify_mod.PropertyEllipsis("literal_value_set", that.literal_value_set),
             stringify_mod.Property(
                 "subsets",
                 [