diff --git a/setup.py b/setup.py index d6d7eb75..3607d16e 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ "twine", "jsonschema==3.2.0", "xmlschema==3.3.1", - "aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@bd56058#egg=aas-core-meta", + "aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@35aa2cc#egg=aas-core-meta", "ssort==0.12.3", ] }, diff --git a/test_data/cpp/test_main/aas_core_meta.v3/expected_output/verification.cpp b/test_data/cpp/test_main/aas_core_meta.v3/expected_output/verification.cpp index 3261152b..287dcec8 100644 --- a/test_data/cpp/test_main/aas_core_meta.v3/expected_output/verification.cpp +++ b/test_data/cpp/test_main/aas_core_meta.v3/expected_output/verification.cpp @@ -11551,13 +11551,8 @@ void OfSubmodelElementList::Execute() { case 15: { if ( !(( - (instance_->type_value_list_element().has_value()) - && ( - ( - instance_->type_value_list_element() == types::AasSubmodelElements::kProperty - || instance_->type_value_list_element() == types::AasSubmodelElements::kRange - ) - ) + instance_->type_value_list_element() == types::AasSubmodelElements::kProperty + || instance_->type_value_list_element() == types::AasSubmodelElements::kRange )) || (( (instance_->value_type_list_element().has_value()) diff --git a/test_data/csharp/test_main/aas_core_meta.v3/expected_output/verification.cs b/test_data/csharp/test_main/aas_core_meta.v3/expected_output/verification.cs index e8cc2b93..4932c0d9 100644 --- a/test_data/csharp/test_main/aas_core_meta.v3/expected_output/verification.cs +++ b/test_data/csharp/test_main/aas_core_meta.v3/expected_output/verification.cs @@ -4286,11 +4286,8 @@ Aas.ISubmodelElementList that if (!( !( - (that.TypeValueListElement != null) - && ( - that.TypeValueListElement == AasSubmodelElements.Property - || that.TypeValueListElement == AasSubmodelElements.Range - ) + that.TypeValueListElement == AasSubmodelElements.Property + || that.TypeValueListElement == AasSubmodelElements.Range ) || ( (that.ValueTypeListElement != null) diff --git a/test_data/golang/test_main/aas_core_meta.v3/expected_output/verification/verification.go b/test_data/golang/test_main/aas_core_meta.v3/expected_output/verification/verification.go index 99f6480a..5a38c266 100644 --- a/test_data/golang/test_main/aas_core_meta.v3/expected_output/verification/verification.go +++ b/test_data/golang/test_main/aas_core_meta.v3/expected_output/verification/verification.go @@ -5250,9 +5250,8 @@ func VerifySubmodelElementList( } if !( - !((that.TypeValueListElement() != nil) && - (that.TypeValueListElement() == aastypes.AASSubmodelElementsProperty || - that.TypeValueListElement() == aastypes.AASSubmodelElementsRange)) || + !(that.TypeValueListElement() == aastypes.AASSubmodelElementsProperty || + that.TypeValueListElement() == aastypes.AASSubmodelElementsRange) || ((that.ValueTypeListElement() != nil) && ((that.Value() == nil) || PropertiesOrRangesHaveValueType( diff --git a/test_data/intermediate/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt b/test_data/intermediate/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt index bf754c66..25d460df 100644 --- a/test_data/intermediate/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt +++ b/test_data/intermediate/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt @@ -9834,48 +9834,37 @@ SymbolTable( description='Constraint AASd-109: If type value list element is equal to Property or Range value type list element shall be set and all first level child elements shall have the value type as specified in value type list element.', body=textwrap.dedent("""\ Implication( - antecedent=And( + antecedent=Or( values=[ - IsNotNone( - value=Member( + Comparison( + left=Member( instance=Name( identifier='self', original_node=...), name='type_value_list_element', original_node=...), + op='EQ', + right=Member( + instance=Name( + identifier='AAS_submodel_elements', + original_node=...), + name='Property', + original_node=...), original_node=...), - Or( - values=[ - Comparison( - left=Member( - instance=Name( - identifier='self', - original_node=...), - name='type_value_list_element', - original_node=...), - op='EQ', - right=Member( - instance=Name( - identifier='AAS_submodel_elements', - original_node=...), - name='Property', - original_node=...), + Comparison( + left=Member( + instance=Name( + identifier='self', original_node=...), - Comparison( - left=Member( - instance=Name( - identifier='self', - original_node=...), - name='type_value_list_element', - original_node=...), - op='EQ', - right=Member( - instance=Name( - identifier='AAS_submodel_elements', - original_node=...), - name='Range', - original_node=...), - original_node=...)], + name='type_value_list_element', + original_node=...), + op='EQ', + right=Member( + instance=Name( + identifier='AAS_submodel_elements', + original_node=...), + name='Range', + original_node=...), original_node=...)], original_node=...), consequent=And( diff --git a/test_data/java/test_main/aas_core_meta.v3/expected_output/verification/Verification.java b/test_data/java/test_main/aas_core_meta.v3/expected_output/verification/Verification.java index c400fa67..af6be478 100644 --- a/test_data/java/test_main/aas_core_meta.v3/expected_output/verification/Verification.java +++ b/test_data/java/test_main/aas_core_meta.v3/expected_output/verification/Verification.java @@ -3795,11 +3795,8 @@ public Stream transformSubmodelElementList( if (!( !( - (that.getTypeValueListElement() != null) - && ( - that.getTypeValueListElement() == AasSubmodelElements.PROPERTY - || that.getTypeValueListElement() == AasSubmodelElements.RANGE - ) + that.getTypeValueListElement() == AasSubmodelElements.PROPERTY + || that.getTypeValueListElement() == AasSubmodelElements.RANGE ) || ( (that.getValueTypeListElement().isPresent()) diff --git a/test_data/parse/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt b/test_data/parse/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt index bdc445e3..130d9095 100644 --- a/test_data/parse/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt +++ b/test_data/parse/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt @@ -4463,48 +4463,37 @@ UnverifiedSymbolTable( description='Constraint AASd-109: If type value list element is equal to Property or Range value type list element shall be set and all first level child elements shall have the value type as specified in value type list element.', body=textwrap.dedent("""\ Implication( - antecedent=And( + antecedent=Or( values=[ - IsNotNone( - value=Member( + Comparison( + left=Member( instance=Name( identifier='self', original_node=...), name='type_value_list_element', original_node=...), + op='EQ', + right=Member( + instance=Name( + identifier='AAS_submodel_elements', + original_node=...), + name='Property', + original_node=...), original_node=...), - Or( - values=[ - Comparison( - left=Member( - instance=Name( - identifier='self', - original_node=...), - name='type_value_list_element', - original_node=...), - op='EQ', - right=Member( - instance=Name( - identifier='AAS_submodel_elements', - original_node=...), - name='Property', - original_node=...), + Comparison( + left=Member( + instance=Name( + identifier='self', original_node=...), - Comparison( - left=Member( - instance=Name( - identifier='self', - original_node=...), - name='type_value_list_element', - original_node=...), - op='EQ', - right=Member( - instance=Name( - identifier='AAS_submodel_elements', - original_node=...), - name='Range', - original_node=...), - original_node=...)], + name='type_value_list_element', + original_node=...), + op='EQ', + right=Member( + instance=Name( + identifier='AAS_submodel_elements', + original_node=...), + name='Range', + original_node=...), original_node=...)], original_node=...), consequent=And( diff --git a/test_data/python/test_main/aas_core_meta.v3/expected_output/verification.py b/test_data/python/test_main/aas_core_meta.v3/expected_output/verification.py index 8496b1e0..79926889 100644 --- a/test_data/python/test_main/aas_core_meta.v3/expected_output/verification.py +++ b/test_data/python/test_main/aas_core_meta.v3/expected_output/verification.py @@ -3426,13 +3426,8 @@ def transform_submodel_element_list( if not ( not ( ( - (that.type_value_list_element is not None) - and ( - ( - that.type_value_list_element == aas_types.AASSubmodelElements.PROPERTY - or that.type_value_list_element == aas_types.AASSubmodelElements.RANGE - ) - ) + that.type_value_list_element == aas_types.AASSubmodelElements.PROPERTY + or that.type_value_list_element == aas_types.AASSubmodelElements.RANGE ) ) or ( diff --git a/test_data/typescript/test_main/aas_core_meta.v3/expected_output/verification.ts b/test_data/typescript/test_main/aas_core_meta.v3/expected_output/verification.ts index b38949ad..c30cb489 100644 --- a/test_data/typescript/test_main/aas_core_meta.v3/expected_output/verification.ts +++ b/test_data/typescript/test_main/aas_core_meta.v3/expected_output/verification.ts @@ -3988,13 +3988,8 @@ class Verifier if (!( !( ( - (that.typeValueListElement !== null) - && ( - ( - that.typeValueListElement == AasTypes.AasSubmodelElements.Property - || that.typeValueListElement == AasTypes.AasSubmodelElements.Range - ) - ) + that.typeValueListElement == AasTypes.AasSubmodelElements.Property + || that.typeValueListElement == AasTypes.AasSubmodelElements.Range ) ) || (