Add more types and fix a SD loading issue

Author: parai

examples/generator/data_types/gen_type_defs_array.py

@@ -7,7 +7,6 @@
 from autosar.model import ImplementationModel
 import autosar.generator
 
-
 def main():
     """
     Create workspace and print type header to stdout

examples/template/demo_system/factory.py

@@ -39,7 +39,6 @@ def create(self,
                                      size=self.bit_size,
                                      encoding=self.encoding,
                                      native_declaration=self.native_declaration)
-
         return elem
 
 

examples/template/demo_system/platform.py

@@ -30,8 +30,11 @@ class ImplementationTypes:
 
     _boolean_constraint = factory.DataConstraintInternalTemplate("boolean_DataConstr", NAMESPACE, 0, 1)
     _uint8_constraint = factory.DataConstraintInternalTemplate("uint8_DataConstr", NAMESPACE, 0, 255)
+    _sint8_constraint = factory.DataConstraintInternalTemplate("sint8_DataConstr", NAMESPACE, -128, 127)
     _uint16_constraint = factory.DataConstraintInternalTemplate("uint16_DataConstr", NAMESPACE, 0, 65535)
+    _sint16_constraint = factory.DataConstraintInternalTemplate("sint16_DataConstr", NAMESPACE, -32768, 32767)
     _uint32_constraint = factory.DataConstraintInternalTemplate("uint32_DataConstr", NAMESPACE, 0, 4294967295)
+    _sint32_constraint = factory.DataConstraintInternalTemplate("sint32_DataConstr", NAMESPACE, -2147483648, 2147483647)
     _uint64_constraint = factory.DataConstraintInternalTemplate("uint64_DataConstr", NAMESPACE,
                                                                 0, 18446744073709551615)
     _boolean_compumethod = factory.CompuMethodEnumTemplate("boolean_CompuMethod", NAMESPACE, ["FALSE", "TRUE"])
@@ -40,9 +43,15 @@ class ImplementationTypes:
                                                       _boolean_compumethod, type_emitter="Platform_Type")
     uint8 = factory.ImplementationValueTypeTemplate("uint8", NAMESPACE, BaseTypes.uint8, _uint8_constraint,
                                                     type_emitter="Platform_Type")
+    sint8 = factory.ImplementationValueTypeTemplate("sint8", NAMESPACE, BaseTypes.sint8, _sint8_constraint,
+                                                    type_emitter="Platform_Type")
     uint16 = factory.ImplementationValueTypeTemplate("uint16", NAMESPACE, BaseTypes.uint16, _uint16_constraint,
                                                      type_emitter="Platform_Type")
+    sint16 = factory.ImplementationValueTypeTemplate("sint16", NAMESPACE, BaseTypes.sint16, _sint16_constraint,
+                                                    type_emitter="Platform_Type")
     uint32 = factory.ImplementationValueTypeTemplate("uint32", NAMESPACE, BaseTypes.uint32, _uint32_constraint,
                                                      type_emitter="Platform_Type")
+    sint32 = factory.ImplementationValueTypeTemplate("sint32", NAMESPACE, BaseTypes.sint32, _sint32_constraint,
+                                                    type_emitter="Platform_Type")
     uint64 = factory.ImplementationValueTypeTemplate("uint64", NAMESPACE, BaseTypes.uint64, _uint64_constraint,
                                                      type_emitter="Platform_Type")

src/autosar/generator/type_generator.py

@@ -48,7 +48,7 @@ def _create_code_sequence(self) -> cfile.core.Sequence:
         code.append(C.ifndef(include_guard))
         code.append(C.define(include_guard))
         code.append(C.blank())
-        code.append(C.ifndef("__cplusplus"))
+        code.append(C.ifdef("__cplusplus"))
         code.append(C.line(C.extern("C")))
         code.append(C.line("{"))
         code.append(C.endif())
@@ -60,7 +60,7 @@ def _create_code_sequence(self) -> cfile.core.Sequence:
         code.append(C.blank())
         code.extend(self._gen_type_defs(self.gen_data_type_creation_order()))
         code.append(C.blank())
-        code.append(C.ifndef("__cplusplus"))
+        code.append(C.ifdef("__cplusplus"))
         code.append(C.line("}"))
         code.append([C.endif(), C.line_comment(" __cplusplus")])
         code.append([C.endif(), C.line_comment(" " + include_guard)])

src/autosar/xml/reader.py

@@ -572,9 +572,12 @@ def _read_admin_data_sd(self, xml_element: ElementTree.Element) -> dict[str, str
         """
         Reads Complex-type AR:SD
         """
-        key = xml_element.attrib['GID']
-        value = xml_element.text
-        return {key: value}
+        if 'GID' in xml_element.attrib:
+            key = xml_element.attrib['GID']
+            value = xml_element.text
+            return {key: value}
+        else:
+            return xml_element.text
 
     # --- AUTOSAR Document