Rewrite types analyzer

tefra · Apr 14, 2024 · 6b26c61 · 6b26c61
1 parent 606324a
commit 6b26c61
Show file tree

Hide file tree

Showing 84 changed files with 1,990 additions and 1,945 deletions.
diff --git a/autosar/models/admin_data.py b/autosar/models/admin_data.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Type
+from typing import ForwardRef, List, Optional
 
 from .caption import Caption
 from .category_string import CategoryString
@@ -276,27 +276,27 @@ class Meta:
             "choices": (
                 {
                     "name": "SYSC-STRING-REF",
-                    "type": Type["BlueprintFormula.SyscStringRef"],
+                    "type": ForwardRef("BlueprintFormula.SyscStringRef"),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "SYSC-REF",
-                    "type": Type["BlueprintFormula.SyscRef"],
+                    "type": ForwardRef("BlueprintFormula.SyscRef"),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "ECUC-QUERY-REF",
-                    "type": Type["BlueprintFormula.EcucQueryRef"],
+                    "type": ForwardRef("BlueprintFormula.EcucQueryRef"),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "ECUC-REF",
-                    "type": Type["BlueprintFormula.EcucRef"],
+                    "type": ForwardRef("BlueprintFormula.EcucRef"),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "VERBATIM",
-                    "type": Type["MultiLanguageVerbatim"],
+                    "type": ForwardRef("MultiLanguageVerbatim"),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
             ),

diff --git a/autosar/models/boolean_value_variation_point.py b/autosar/models/boolean_value_variation_point.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Type
+from typing import ForwardRef, List, Optional
 
 from .binding_time_enum_simple import BindingTimeEnumSimple
 from .ref import Ref
@@ -101,12 +101,14 @@ class Meta:
             "choices": (
                 {
                     "name": "SYSC-STRING-REF",
-                    "type": Type["BooleanValueVariationPoint.SyscStringRef"],
+                    "type": ForwardRef(
+                        "BooleanValueVariationPoint.SyscStringRef"
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "SYSC-REF",
-                    "type": Type["BooleanValueVariationPoint.SyscRef"],
+                    "type": ForwardRef("BooleanValueVariationPoint.SyscRef"),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
             ),

diff --git a/autosar/models/condition_by_formula.py b/autosar/models/condition_by_formula.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Type
+from typing import ForwardRef, List, Optional
 
 from .binding_time_enum_simple import BindingTimeEnumSimple
 from .ref import Ref
@@ -68,12 +68,12 @@ class Meta:
             "choices": (
                 {
                     "name": "SYSC-STRING-REF",
-                    "type": Type["ConditionByFormula.SyscStringRef"],
+                    "type": ForwardRef("ConditionByFormula.SyscStringRef"),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "SYSC-REF",
-                    "type": Type["ConditionByFormula.SyscRef"],
+                    "type": ForwardRef("ConditionByFormula.SyscRef"),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
             ),

diff --git a/autosar/models/diagnostic_debounce_behavior_enum_value_variation_point.py b/autosar/models/diagnostic_debounce_behavior_enum_value_variation_point.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Type
+from typing import ForwardRef, List, Optional
 
 from .binding_time_enum_simple import BindingTimeEnumSimple
 from .ref import Ref
@@ -119,16 +119,16 @@ class Meta:
             "choices": (
                 {
                     "name": "SYSC-STRING-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "DiagnosticDebounceBehaviorEnumValueVariationPoint.SyscStringRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "SYSC-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "DiagnosticDebounceBehaviorEnumValueVariationPoint.SyscRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
             ),

diff --git a/autosar/models/diagnostic_indicator_type_enum_value_variation_point.py b/autosar/models/diagnostic_indicator_type_enum_value_variation_point.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Type
+from typing import ForwardRef, List, Optional
 
 from .binding_time_enum_simple import BindingTimeEnumSimple
 from .ref import Ref
@@ -119,16 +119,16 @@ class Meta:
             "choices": (
                 {
                     "name": "SYSC-STRING-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "DiagnosticIndicatorTypeEnumValueVariationPoint.SyscStringRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "SYSC-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "DiagnosticIndicatorTypeEnumValueVariationPoint.SyscRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
             ),

diff --git a/autosar/models/diagnostic_test_result_update_enum_value_variation_point.py b/autosar/models/diagnostic_test_result_update_enum_value_variation_point.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Type
+from typing import ForwardRef, List, Optional
 
 from .binding_time_enum_simple import BindingTimeEnumSimple
 from .ref import Ref
@@ -119,16 +119,16 @@ class Meta:
             "choices": (
                 {
                     "name": "SYSC-STRING-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "DiagnosticTestResultUpdateEnumValueVariationPoint.SyscStringRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "SYSC-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "DiagnosticTestResultUpdateEnumValueVariationPoint.SyscRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
             ),

diff --git a/autosar/models/diagnostic_wwh_obd_dtc_class_enum_value_variation_point.py b/autosar/models/diagnostic_wwh_obd_dtc_class_enum_value_variation_point.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Type
+from typing import ForwardRef, List, Optional
 
 from .binding_time_enum_simple import BindingTimeEnumSimple
 from .ref import Ref
@@ -119,16 +119,16 @@ class Meta:
             "choices": (
                 {
                     "name": "SYSC-STRING-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "DiagnosticWwhObdDtcClassEnumValueVariationPoint.SyscStringRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "SYSC-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "DiagnosticWwhObdDtcClassEnumValueVariationPoint.SyscRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
             ),

diff --git a/autosar/models/ecuc_condition_formula.py b/autosar/models/ecuc_condition_formula.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Type
+from typing import ForwardRef, List, Optional
 
 from .ecuc_query_subtypes_enum import EcucQuerySubtypesEnum
 from .ref import Ref
@@ -54,12 +54,14 @@ class Meta:
             "choices": (
                 {
                     "name": "ECUC-QUERY-REF",
-                    "type": Type["EcucConditionFormula.EcucQueryRef"],
+                    "type": ForwardRef("EcucConditionFormula.EcucQueryRef"),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "ECUC-QUERY-STRING-REF",
-                    "type": Type["EcucConditionFormula.EcucQueryStringRef"],
+                    "type": ForwardRef(
+                        "EcucConditionFormula.EcucQueryStringRef"
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
             ),

diff --git a/autosar/models/ecuc_parameter_derivation_formula.py b/autosar/models/ecuc_parameter_derivation_formula.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Type
+from typing import ForwardRef, List, Optional
 
 from .ecuc_query_subtypes_enum import EcucQuerySubtypesEnum
 from .ref import Ref
@@ -53,16 +53,16 @@ class Meta:
             "choices": (
                 {
                     "name": "ECUC-QUERY-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "EcucParameterDerivationFormula.EcucQueryRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "ECUC-QUERY-STRING-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "EcucParameterDerivationFormula.EcucQueryStringRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
             ),

diff --git a/autosar/models/ecuc_query_expression.py b/autosar/models/ecuc_query_expression.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Type
+from typing import ForwardRef, List, Optional
 
 from .ecuc_definition_element_subtypes_enum import (
     EcucDefinitionElementSubtypesEnum,
@@ -57,16 +57,16 @@ class Meta:
             "choices": (
                 {
                     "name": "CONFIG-ELEMENT-DEF-GLOBAL-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "EcucQueryExpression.ConfigElementDefGlobalRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "CONFIG-ELEMENT-DEF-LOCAL-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "EcucQueryExpression.ConfigElementDefLocalRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
             ),

diff --git a/autosar/models/emphasis_text.py b/autosar/models/emphasis_text.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Type
+from typing import ForwardRef, List, Optional
 
 from .e_enum_font_simple import EEnumFontSimple
 from .e_enum_simple import EEnumSimple
@@ -84,12 +84,12 @@ class Meta:
             "choices": (
                 {
                     "name": "SUB",
-                    "type": Type["EmphasisText.Sub"],
+                    "type": ForwardRef("EmphasisText.Sub"),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "SUP",
-                    "type": Type["EmphasisText.Sup"],
+                    "type": ForwardRef("EmphasisText.Sup"),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {

diff --git a/autosar/models/float_value_variation_point.py b/autosar/models/float_value_variation_point.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Type
+from typing import ForwardRef, List, Optional
 
 from .binding_time_enum_simple import BindingTimeEnumSimple
 from .ref import Ref
@@ -101,12 +101,14 @@ class Meta:
             "choices": (
                 {
                     "name": "SYSC-STRING-REF",
-                    "type": Type["FloatValueVariationPoint.SyscStringRef"],
+                    "type": ForwardRef(
+                        "FloatValueVariationPoint.SyscStringRef"
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "SYSC-REF",
-                    "type": Type["FloatValueVariationPoint.SyscRef"],
+                    "type": ForwardRef("FloatValueVariationPoint.SyscRef"),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
             ),

diff --git a/autosar/models/fm_condition_by_features_and_attributes.py b/autosar/models/fm_condition_by_features_and_attributes.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Type
+from typing import ForwardRef, List, Optional
 
 from .fm_attribute_def_subtypes_enum import FmAttributeDefSubtypesEnum
 from .fm_feature_subtypes_enum import FmFeatureSubtypesEnum
@@ -55,16 +55,16 @@ class Meta:
             "choices": (
                 {
                     "name": "ATTRIBUTE-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "FmConditionByFeaturesAndAttributes.AttributeRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "FEATURE-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "FmConditionByFeaturesAndAttributes.FeatureRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
             ),

diff --git a/autosar/models/fm_condition_by_features_and_sw_systemconsts.py b/autosar/models/fm_condition_by_features_and_sw_systemconsts.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Type
+from typing import ForwardRef, List, Optional
 
 from .fm_feature_subtypes_enum import FmFeatureSubtypesEnum
 from .ref import Ref
@@ -54,23 +54,23 @@ class Meta:
             "choices": (
                 {
                     "name": "SYSC-STRING-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "FmConditionByFeaturesAndSwSystemconsts.SyscStringRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "SYSC-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "FmConditionByFeaturesAndSwSystemconsts.SyscRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
                 {
                     "name": "FEATURE-REF",
-                    "type": Type[
+                    "type": ForwardRef(
                         "FmConditionByFeaturesAndSwSystemconsts.FeatureRef"
-                    ],
+                    ),
                     "namespace": "http://autosar.org/schema/r4.0",
                 },
             ),