Add exception for array of bytes in builder and re-generate xtypes ty…

…pe support Signed-off-by: Dennis Potman <[email protected]>
eclipse-cyclonedds · Mar 16, 2023 · 3a274df · 3a274df
1 parent 11c9f50
commit 3a274df
Show file tree

Hide file tree

Showing 9 changed files with 320 additions and 90 deletions.
diff --git a/cyclonedds/idl/_builder.py b/cyclonedds/idl/_builder.py
@@ -23,7 +23,7 @@
     PlainCdrV2ArrayOfPrimitiveMachine, PlainCdrV2SequenceOfPrimitiveMachine, LenType, BitMaskMachine, BitBoundEnumMachine
 
 from .types import array, bounded_str, sequence, _type_code_align_size_default_mapping, NoneType, char, typedef, uint8, \
-    case, default
+    byte, case, default
 
 
 class XCDRSupported(IntFlag):
@@ -138,7 +138,7 @@ def _machine_for_type(cls, _type, add_size_header, use_version_2):
             submachine = cls._machine_for_type(_type.subtype, add_size_header, use_version_2)
 
             if isinstance(submachine, PrimitiveMachine):
-                if submachine.type == uint8:
+                if submachine.type == uint8 or submachine.type == byte:
                     return ByteArrayMachine(_type.length)
 
                 return PlainCdrV2ArrayOfPrimitiveMachine(submachine.type, _type.length)

diff --git a/cyclonedds/idl/_typesupport/DDS/.idlpy_manifest b/cyclonedds/idl/_typesupport/DDS/.idlpy_manifest
@@ -1,7 +1,7 @@
-ddsi_xt_type_object
+ddsi_xt_typemap
 XTypes
 
 
-ddsi_xt_typemap
+ddsi_xt_type_object
 XTypes
 
diff --git a/cyclonedds/idl/_typesupport/DDS/XTypes/.idlpy_manifest b/cyclonedds/idl/_typesupport/DDS/XTypes/.idlpy_manifest
@@ -1,3 +1,7 @@
+ddsi_xt_typemap
+
+TypeMapping
+
 ddsi_xt_type_object
 
 ANNOTATION_OCTETSEC_VALUE_MAX_LEN
@@ -174,6 +178,7 @@ TK_FLOAT64
 TK_INT16
 TK_INT32
 TK_INT64
+TK_INT8
 TK_MAP
 TK_NONE
 TK_SEQUENCE
@@ -183,6 +188,7 @@ TK_STRUCTURE
 TK_UINT16
 TK_UINT32
 TK_UINT64
+TK_UINT8
 TK_UNION
 TYPE_NAME_MAX_LENGTH
 TypeFlag
@@ -208,7 +214,3 @@ UnionCaseLabelSeq
 UnionDiscriminatorFlag
 UnionMemberFlag
 UnionTypeFlag
-
-ddsi_xt_typemap
-
-TypeMapping
diff --git a/cyclonedds/idl/_typesupport/DDS/XTypes/__init__.py b/cyclonedds/idl/_typesupport/DDS/XTypes/__init__.py
diff --git a/cyclonedds/idl/_typesupport/DDS/XTypes/_ddsi_xt_type_object.py b/cyclonedds/idl/_typesupport/DDS/XTypes/_ddsi_xt_type_object.py
diff --git a/cyclonedds/idl/_typesupport/DDS/XTypes/_ddsi_xt_typemap.py b/cyclonedds/idl/_typesupport/DDS/XTypes/_ddsi_xt_typemap.py
@@ -1,14 +1,14 @@
 """
   Generated by Eclipse Cyclone DDS idlc Python Backend
-  Cyclone DDS IDL version: v0.9.0
+  Cyclone DDS IDL version: v0.11.0
   Module: DDS.XTypes
   IDL file: ddsi_xt_typemap.idl
 
 """
 
+from dataclasses import dataclass
 from enum import auto
 from typing import TYPE_CHECKING, Optional
-from dataclasses import dataclass
 
 import cyclonedds.idl as idl
 import cyclonedds.idl.annotations as annotate

diff --git a/cyclonedds/idl/_typesupport/DDS/__init__.py b/cyclonedds/idl/_typesupport/DDS/__init__.py
@@ -1,9 +1,11 @@
 """
   Generated by Eclipse Cyclone DDS idlc Python Backend
-  Cyclone DDS IDL version: v0.9.0
+  Cyclone DDS IDL version: v0.11.0
   Module: DDS
 
 """
 
 from . import XTypes
-__all__ = ["XTypes", ]
+__all__ = [
+	"XTypes",
+]
diff --git a/cyclonedds/idl/_typesupport/__init__.py b/cyclonedds/idl/_typesupport/__init__.py
@@ -0,0 +1,9 @@
+"""
+  Generated by Eclipse Cyclone DDS idlc Python Backend
+  Cyclone DDS IDL version: v0.11.0
+  Module: 
+
+"""
+
+__all__ = [
+]
diff --git a/cyclonedds/idl/_typesupport/howto.md b/cyclonedds/idl/_typesupport/howto.md
@@ -4,3 +4,8 @@ The cyclonedds.idl._typesupport module is generated by normal idlc usage:
 
 $ idlc -l py -p py-root-prefix=cyclonedds.idl._typesupport ddsi_xt_type_object.idl
 $ idlc -l py -p py-root-prefix=cyclonedds.idl._typesupport ddsi_xt_typemap.idl
+
+After generating, the type `StronglyConnectedComponentId` in the generated
+file `DDS/XTypes/_ddsi_xt_type_object.py` needs an unsafe-hash flag:
+
+`@dataclass(unsafe_hash=True)`