From 3a274dfecbc2de746669aa1267864271cc9cbe96 Mon Sep 17 00:00:00 2001 From: Dennis Potman Date: Thu, 16 Mar 2023 12:53:34 +0100 Subject: [PATCH] Add exception for array of bytes in builder and re-generate xtypes type support Signed-off-by: Dennis Potman --- cyclonedds/idl/_builder.py | 4 +- .../idl/_typesupport/DDS/.idlpy_manifest | 4 +- .../_typesupport/DDS/XTypes/.idlpy_manifest | 10 +- .../idl/_typesupport/DDS/XTypes/__init__.py | 218 +++++++++++++++++- .../DDS/XTypes/_ddsi_xt_type_object.py | 150 ++++++------ .../DDS/XTypes/_ddsi_xt_typemap.py | 4 +- cyclonedds/idl/_typesupport/DDS/__init__.py | 6 +- cyclonedds/idl/_typesupport/__init__.py | 9 + cyclonedds/idl/_typesupport/howto.md | 5 + 9 files changed, 320 insertions(+), 90 deletions(-) diff --git a/cyclonedds/idl/_builder.py b/cyclonedds/idl/_builder.py index 3fc48c4d..776959a4 100644 --- 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 index 68fec8c9..65b8021a 100644 --- 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 index 12ee5ed9..8b0c41e8 100644 --- 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 index 0dd14d2b..a9b77c6a 100644 --- a/cyclonedds/idl/_typesupport/DDS/XTypes/__init__.py +++ b/cyclonedds/idl/_typesupport/DDS/XTypes/__init__.py @@ -1,10 +1,222 @@ """ 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 """ -from ._ddsi_xt_type_object import ANNOTATION_OCTETSEC_VALUE_MAX_LEN, ANNOTATION_STR_VALUE_MAX_LEN, AliasMemberFlag, AliasTypeFlag, AnnotationParameterFlag, AnnotationParameterValue, AnnotationTypeFlag, AppliedAnnotation, AppliedAnnotationParameter, AppliedAnnotationParameterSeq, AppliedAnnotationSeq, AppliedBuiltinMemberAnnotations, AppliedBuiltinTypeAnnotations, AppliedVerbatimAnnotation, BitBound, BitflagFlag, BitmaskTypeFlag, BitsetMemberFlag, BitsetTypeFlag, CollectionElementFlag, CollectionTypeFlag, CommonAliasBody, CommonAnnotationParameter, CommonArrayHeader, CommonBitfield, CommonBitflag, CommonBitmaskHeader, CommonCollectionElement, CommonCollectionHeader, CommonDiscriminatorMember, CommonEnumeratedHeader, CommonEnumeratedLiteral, CommonStructMember, CommonUnionMember, CompleteAliasBody, CompleteAliasHeader, CompleteAliasType, CompleteAnnotationHeader, CompleteAnnotationParameter, CompleteAnnotationParameterSeq, CompleteAnnotationType, CompleteArrayHeader, CompleteArrayType, CompleteBitfield, CompleteBitfieldSeq, CompleteBitflag, CompleteBitflagSeq, CompleteBitmaskHeader, CompleteBitmaskType, CompleteBitsetHeader, CompleteBitsetType, CompleteCollectionElement, CompleteCollectionHeader, CompleteDiscriminatorMember, CompleteElementDetail, CompleteEnumeratedHeader, CompleteEnumeratedLiteral, CompleteEnumeratedLiteralSeq, CompleteEnumeratedType, CompleteExtendedType, CompleteMapType, CompleteMemberDetail, CompleteSequenceType, CompleteStructHeader, CompleteStructMember, CompleteStructMemberSeq, CompleteStructType, CompleteTypeDetail, CompleteTypeObject, CompleteUnionHeader, CompleteUnionMember, CompleteUnionMemberSeq, CompleteUnionType, EK_BOTH, EK_COMPLETE, EK_MINIMAL, EnumTypeFlag, EnumeratedLiteralFlag, EquivalenceHash, EquivalenceKind, ExtendedAnnotationParameterValue, ExtendedTypeDefn, INVALID_LBOUND, INVALID_SBOUND, LBound, LBoundSeq, MEMBER_NAME_MAX_LENGTH, MemberFlag, MemberFlagMinimalMask, MemberId, MemberName, MinimalAliasBody, MinimalAliasHeader, MinimalAliasType, MinimalAnnotationHeader, MinimalAnnotationParameter, MinimalAnnotationParameterSeq, MinimalAnnotationType, MinimalArrayHeader, MinimalArrayType, MinimalBitfield, MinimalBitfieldSeq, MinimalBitflag, MinimalBitflagSeq, MinimalBitmaskHeader, MinimalBitmaskType, MinimalBitsetHeader, MinimalBitsetType, MinimalCollectionElement, MinimalCollectionHeader, MinimalDiscriminatorMember, MinimalEnumeratedHeader, MinimalEnumeratedLiteral, MinimalEnumeratedLiteralSeq, MinimalEnumeratedType, MinimalExtendedType, MinimalMapType, MinimalMemberDetail, MinimalSequenceType, MinimalStructHeader, MinimalStructMember, MinimalStructMemberSeq, MinimalStructType, MinimalTypeDetail, MinimalTypeObject, MinimalUnionHeader, MinimalUnionMember, MinimalUnionMemberSeq, MinimalUnionType, NameHash, PlainArrayLElemDefn, PlainArraySElemDefn, PlainCollectionHeader, PlainMapLTypeDefn, PlainMapSTypeDefn, PlainSequenceLElemDefn, PlainSequenceSElemDefn, PrimitiveTypeId, QualifiedTypeName, SBound, SBoundSeq, StringLTypeDefn, StringSTypeDefn, StronglyConnectedComponent, StronglyConnectedComponentId, StructMemberFlag, StructTypeFlag, TI_PLAIN_ARRAY_LARGE, TI_PLAIN_ARRAY_SMALL, TI_PLAIN_MAP_LARGE, TI_PLAIN_MAP_SMALL, TI_PLAIN_SEQUENCE_LARGE, TI_PLAIN_SEQUENCE_SMALL, TI_STRING16_LARGE, TI_STRING16_SMALL, TI_STRING8_LARGE, TI_STRING8_SMALL, TI_STRONGLY_CONNECTED_COMPONENT, TK_ALIAS, TK_ANNOTATION, TK_ARRAY, TK_BITMASK, TK_BITSET, TK_BOOLEAN, TK_BYTE, TK_CHAR16, TK_CHAR8, TK_ENUM, TK_FLOAT128, TK_FLOAT32, TK_FLOAT64, TK_INT8, TK_INT16, TK_INT32, TK_INT64, TK_MAP, TK_NONE, TK_SEQUENCE, TK_STRING16, TK_STRING8, TK_STRUCTURE, TK_UINT8, TK_UINT16, TK_UINT32, TK_UINT64, TK_UNION, TYPE_NAME_MAX_LENGTH, TypeFlag, TypeFlagMinimalMask, TypeIdentfierWithSizeSeq, TypeIdentiferKind, TypeIdentifier, TypeIdentifierPair, TypeIdentifierPairSeq, TypeIdentifierSeq, TypeIdentifierTypeObjectPair, TypeIdentifierTypeObjectPairSeq, TypeIdentifierWithDependencies, TypeIdentifierWithDependenciesSeq, TypeIdentifierWithSize, TypeInformation, TypeInformationSeq, TypeKind, TypeObject, TypeObjectHashId, TypeObjectSeq, UnionCaseLabelSeq, UnionDiscriminatorFlag, UnionMemberFlag, UnionTypeFlag from ._ddsi_xt_typemap import TypeMapping -__all__ = ["ANNOTATION_OCTETSEC_VALUE_MAX_LEN", "ANNOTATION_STR_VALUE_MAX_LEN", "AliasMemberFlag", "AliasTypeFlag", "AnnotationParameterFlag", "AnnotationParameterValue", "AnnotationTypeFlag", "AppliedAnnotation", "AppliedAnnotationParameter", "AppliedAnnotationParameterSeq", "AppliedAnnotationSeq", "AppliedBuiltinMemberAnnotations", "AppliedBuiltinTypeAnnotations", "AppliedVerbatimAnnotation", "BitBound", "BitflagFlag", "BitmaskTypeFlag", "BitsetMemberFlag", "BitsetTypeFlag", "CollectionElementFlag", "CollectionTypeFlag", "CommonAliasBody", "CommonAnnotationParameter", "CommonArrayHeader", "CommonBitfield", "CommonBitflag", "CommonBitmaskHeader", "CommonCollectionElement", "CommonCollectionHeader", "CommonDiscriminatorMember", "CommonEnumeratedHeader", "CommonEnumeratedLiteral", "CommonStructMember", "CommonUnionMember", "CompleteAliasBody", "CompleteAliasHeader", "CompleteAliasType", "CompleteAnnotationHeader", "CompleteAnnotationParameter", "CompleteAnnotationParameterSeq", "CompleteAnnotationType", "CompleteArrayHeader", "CompleteArrayType", "CompleteBitfield", "CompleteBitfieldSeq", "CompleteBitflag", "CompleteBitflagSeq", "CompleteBitmaskHeader", "CompleteBitmaskType", "CompleteBitsetHeader", "CompleteBitsetType", "CompleteCollectionElement", "CompleteCollectionHeader", "CompleteDiscriminatorMember", "CompleteElementDetail", "CompleteEnumeratedHeader", "CompleteEnumeratedLiteral", "CompleteEnumeratedLiteralSeq", "CompleteEnumeratedType", "CompleteExtendedType", "CompleteMapType", "CompleteMemberDetail", "CompleteSequenceType", "CompleteStructHeader", "CompleteStructMember", "CompleteStructMemberSeq", "CompleteStructType", "CompleteTypeDetail", "CompleteTypeObject", "CompleteUnionHeader", "CompleteUnionMember", "CompleteUnionMemberSeq", "CompleteUnionType", "EK_BOTH", "EK_COMPLETE", "EK_MINIMAL", "EnumTypeFlag", "EnumeratedLiteralFlag", "EquivalenceHash", "EquivalenceKind", "ExtendedAnnotationParameterValue", "ExtendedTypeDefn", "INVALID_LBOUND", "INVALID_SBOUND", "LBound", "LBoundSeq", "MEMBER_NAME_MAX_LENGTH", "MemberFlag", "MemberFlagMinimalMask", "MemberId", "MemberName", "MinimalAliasBody", "MinimalAliasHeader", "MinimalAliasType", "MinimalAnnotationHeader", "MinimalAnnotationParameter", "MinimalAnnotationParameterSeq", "MinimalAnnotationType", "MinimalArrayHeader", "MinimalArrayType", "MinimalBitfield", "MinimalBitfieldSeq", "MinimalBitflag", "MinimalBitflagSeq", "MinimalBitmaskHeader", "MinimalBitmaskType", "MinimalBitsetHeader", "MinimalBitsetType", "MinimalCollectionElement", "MinimalCollectionHeader", "MinimalDiscriminatorMember", "MinimalEnumeratedHeader", "MinimalEnumeratedLiteral", "MinimalEnumeratedLiteralSeq", "MinimalEnumeratedType", "MinimalExtendedType", "MinimalMapType", "MinimalMemberDetail", "MinimalSequenceType", "MinimalStructHeader", "MinimalStructMember", "MinimalStructMemberSeq", "MinimalStructType", "MinimalTypeDetail", "MinimalTypeObject", "MinimalUnionHeader", "MinimalUnionMember", "MinimalUnionMemberSeq", "MinimalUnionType", "NameHash", "PlainArrayLElemDefn", "PlainArraySElemDefn", "PlainCollectionHeader", "PlainMapLTypeDefn", "PlainMapSTypeDefn", "PlainSequenceLElemDefn", "PlainSequenceSElemDefn", "PrimitiveTypeId", "QualifiedTypeName", "SBound", "SBoundSeq", "StringLTypeDefn", "StringSTypeDefn", "StronglyConnectedComponent", "StronglyConnectedComponentId", "StructMemberFlag", "StructTypeFlag", "TI_PLAIN_ARRAY_LARGE", "TI_PLAIN_ARRAY_SMALL", "TI_PLAIN_MAP_LARGE", "TI_PLAIN_MAP_SMALL", "TI_PLAIN_SEQUENCE_LARGE", "TI_PLAIN_SEQUENCE_SMALL", "TI_STRING16_LARGE", "TI_STRING16_SMALL", "TI_STRING8_LARGE", "TI_STRING8_SMALL", "TI_STRONGLY_CONNECTED_COMPONENT", "TK_ALIAS", "TK_ANNOTATION", "TK_ARRAY", "TK_BITMASK", "TK_BITSET", "TK_BOOLEAN", "TK_BYTE", "TK_CHAR16", "TK_CHAR8", "TK_ENUM", "TK_FLOAT128", "TK_FLOAT32", "TK_FLOAT64", "TK_INT8", "TK_INT16", "TK_INT32", "TK_INT64", "TK_MAP", "TK_NONE", "TK_SEQUENCE", "TK_STRING16", "TK_STRING8", "TK_STRUCTURE", "TK_UINT8", "TK_UINT16", "TK_UINT32", "TK_UINT64", "TK_UNION", "TYPE_NAME_MAX_LENGTH", "TypeFlag", "TypeFlagMinimalMask", "TypeIdentfierWithSizeSeq", "TypeIdentiferKind", "TypeIdentifier", "TypeIdentifierPair", "TypeIdentifierPairSeq", "TypeIdentifierSeq", "TypeIdentifierTypeObjectPair", "TypeIdentifierTypeObjectPairSeq", "TypeIdentifierWithDependencies", "TypeIdentifierWithDependenciesSeq", "TypeIdentifierWithSize", "TypeInformation", "TypeInformationSeq", "TypeKind", "TypeObject", "TypeObjectHashId", "TypeObjectSeq", "UnionCaseLabelSeq", "UnionDiscriminatorFlag", "UnionMemberFlag", "UnionTypeFlag", "TypeMapping", ] +from ._ddsi_xt_type_object import ANNOTATION_OCTETSEC_VALUE_MAX_LEN, ANNOTATION_STR_VALUE_MAX_LEN, AliasMemberFlag, AliasTypeFlag, AnnotationParameterFlag, AnnotationParameterValue, AnnotationTypeFlag, AppliedAnnotation, AppliedAnnotationParameter, AppliedAnnotationParameterSeq, AppliedAnnotationSeq, AppliedBuiltinMemberAnnotations, AppliedBuiltinTypeAnnotations, AppliedVerbatimAnnotation, BitBound, BitflagFlag, BitmaskTypeFlag, BitsetMemberFlag, BitsetTypeFlag, CollectionElementFlag, CollectionTypeFlag, CommonAliasBody, CommonAnnotationParameter, CommonArrayHeader, CommonBitfield, CommonBitflag, CommonBitmaskHeader, CommonCollectionElement, CommonCollectionHeader, CommonDiscriminatorMember, CommonEnumeratedHeader, CommonEnumeratedLiteral, CommonStructMember, CommonUnionMember, CompleteAliasBody, CompleteAliasHeader, CompleteAliasType, CompleteAnnotationHeader, CompleteAnnotationParameter, CompleteAnnotationParameterSeq, CompleteAnnotationType, CompleteArrayHeader, CompleteArrayType, CompleteBitfield, CompleteBitfieldSeq, CompleteBitflag, CompleteBitflagSeq, CompleteBitmaskHeader, CompleteBitmaskType, CompleteBitsetHeader, CompleteBitsetType, CompleteCollectionElement, CompleteCollectionHeader, CompleteDiscriminatorMember, CompleteElementDetail, CompleteEnumeratedHeader, CompleteEnumeratedLiteral, CompleteEnumeratedLiteralSeq, CompleteEnumeratedType, CompleteExtendedType, CompleteMapType, CompleteMemberDetail, CompleteSequenceType, CompleteStructHeader, CompleteStructMember, CompleteStructMemberSeq, CompleteStructType, CompleteTypeDetail, CompleteTypeObject, CompleteUnionHeader, CompleteUnionMember, CompleteUnionMemberSeq, CompleteUnionType, EK_BOTH, EK_COMPLETE, EK_MINIMAL, EnumTypeFlag, EnumeratedLiteralFlag, EquivalenceHash, EquivalenceKind, ExtendedAnnotationParameterValue, ExtendedTypeDefn, INVALID_LBOUND, INVALID_SBOUND, LBound, LBoundSeq, MEMBER_NAME_MAX_LENGTH, MemberFlag, MemberFlagMinimalMask, MemberId, MemberName, MinimalAliasBody, MinimalAliasHeader, MinimalAliasType, MinimalAnnotationHeader, MinimalAnnotationParameter, MinimalAnnotationParameterSeq, MinimalAnnotationType, MinimalArrayHeader, MinimalArrayType, MinimalBitfield, MinimalBitfieldSeq, MinimalBitflag, MinimalBitflagSeq, MinimalBitmaskHeader, MinimalBitmaskType, MinimalBitsetHeader, MinimalBitsetType, MinimalCollectionElement, MinimalCollectionHeader, MinimalDiscriminatorMember, MinimalEnumeratedHeader, MinimalEnumeratedLiteral, MinimalEnumeratedLiteralSeq, MinimalEnumeratedType, MinimalExtendedType, MinimalMapType, MinimalMemberDetail, MinimalSequenceType, MinimalStructHeader, MinimalStructMember, MinimalStructMemberSeq, MinimalStructType, MinimalTypeDetail, MinimalTypeObject, MinimalUnionHeader, MinimalUnionMember, MinimalUnionMemberSeq, MinimalUnionType, NameHash, PlainArrayLElemDefn, PlainArraySElemDefn, PlainCollectionHeader, PlainMapLTypeDefn, PlainMapSTypeDefn, PlainSequenceLElemDefn, PlainSequenceSElemDefn, PrimitiveTypeId, QualifiedTypeName, SBound, SBoundSeq, StringLTypeDefn, StringSTypeDefn, StronglyConnectedComponent, StronglyConnectedComponentId, StructMemberFlag, StructTypeFlag, TI_PLAIN_ARRAY_LARGE, TI_PLAIN_ARRAY_SMALL, TI_PLAIN_MAP_LARGE, TI_PLAIN_MAP_SMALL, TI_PLAIN_SEQUENCE_LARGE, TI_PLAIN_SEQUENCE_SMALL, TI_STRING16_LARGE, TI_STRING16_SMALL, TI_STRING8_LARGE, TI_STRING8_SMALL, TI_STRONGLY_CONNECTED_COMPONENT, TK_ALIAS, TK_ANNOTATION, TK_ARRAY, TK_BITMASK, TK_BITSET, TK_BOOLEAN, TK_BYTE, TK_CHAR16, TK_CHAR8, TK_ENUM, TK_FLOAT128, TK_FLOAT32, TK_FLOAT64, TK_INT16, TK_INT32, TK_INT64, TK_INT8, TK_MAP, TK_NONE, TK_SEQUENCE, TK_STRING16, TK_STRING8, TK_STRUCTURE, TK_UINT16, TK_UINT32, TK_UINT64, TK_UINT8, TK_UNION, TYPE_NAME_MAX_LENGTH, TypeFlag, TypeFlagMinimalMask, TypeIdentfierWithSizeSeq, TypeIdentiferKind, TypeIdentifier, TypeIdentifierPair, TypeIdentifierPairSeq, TypeIdentifierSeq, TypeIdentifierTypeObjectPair, TypeIdentifierTypeObjectPairSeq, TypeIdentifierWithDependencies, TypeIdentifierWithDependenciesSeq, TypeIdentifierWithSize, TypeInformation, TypeInformationSeq, TypeKind, TypeObject, TypeObjectHashId, TypeObjectSeq, UnionCaseLabelSeq, UnionDiscriminatorFlag, UnionMemberFlag, UnionTypeFlag +__all__ = [ + "TypeMapping", + "ANNOTATION_OCTETSEC_VALUE_MAX_LEN", + "ANNOTATION_STR_VALUE_MAX_LEN", + "AliasMemberFlag", + "AliasTypeFlag", + "AnnotationParameterFlag", + "AnnotationParameterValue", + "AnnotationTypeFlag", + "AppliedAnnotation", + "AppliedAnnotationParameter", + "AppliedAnnotationParameterSeq", + "AppliedAnnotationSeq", + "AppliedBuiltinMemberAnnotations", + "AppliedBuiltinTypeAnnotations", + "AppliedVerbatimAnnotation", + "BitBound", + "BitflagFlag", + "BitmaskTypeFlag", + "BitsetMemberFlag", + "BitsetTypeFlag", + "CollectionElementFlag", + "CollectionTypeFlag", + "CommonAliasBody", + "CommonAnnotationParameter", + "CommonArrayHeader", + "CommonBitfield", + "CommonBitflag", + "CommonBitmaskHeader", + "CommonCollectionElement", + "CommonCollectionHeader", + "CommonDiscriminatorMember", + "CommonEnumeratedHeader", + "CommonEnumeratedLiteral", + "CommonStructMember", + "CommonUnionMember", + "CompleteAliasBody", + "CompleteAliasHeader", + "CompleteAliasType", + "CompleteAnnotationHeader", + "CompleteAnnotationParameter", + "CompleteAnnotationParameterSeq", + "CompleteAnnotationType", + "CompleteArrayHeader", + "CompleteArrayType", + "CompleteBitfield", + "CompleteBitfieldSeq", + "CompleteBitflag", + "CompleteBitflagSeq", + "CompleteBitmaskHeader", + "CompleteBitmaskType", + "CompleteBitsetHeader", + "CompleteBitsetType", + "CompleteCollectionElement", + "CompleteCollectionHeader", + "CompleteDiscriminatorMember", + "CompleteElementDetail", + "CompleteEnumeratedHeader", + "CompleteEnumeratedLiteral", + "CompleteEnumeratedLiteralSeq", + "CompleteEnumeratedType", + "CompleteExtendedType", + "CompleteMapType", + "CompleteMemberDetail", + "CompleteSequenceType", + "CompleteStructHeader", + "CompleteStructMember", + "CompleteStructMemberSeq", + "CompleteStructType", + "CompleteTypeDetail", + "CompleteTypeObject", + "CompleteUnionHeader", + "CompleteUnionMember", + "CompleteUnionMemberSeq", + "CompleteUnionType", + "EK_BOTH", + "EK_COMPLETE", + "EK_MINIMAL", + "EnumTypeFlag", + "EnumeratedLiteralFlag", + "EquivalenceHash", + "EquivalenceKind", + "ExtendedAnnotationParameterValue", + "ExtendedTypeDefn", + "INVALID_LBOUND", + "INVALID_SBOUND", + "LBound", + "LBoundSeq", + "MEMBER_NAME_MAX_LENGTH", + "MemberFlag", + "MemberFlagMinimalMask", + "MemberId", + "MemberName", + "MinimalAliasBody", + "MinimalAliasHeader", + "MinimalAliasType", + "MinimalAnnotationHeader", + "MinimalAnnotationParameter", + "MinimalAnnotationParameterSeq", + "MinimalAnnotationType", + "MinimalArrayHeader", + "MinimalArrayType", + "MinimalBitfield", + "MinimalBitfieldSeq", + "MinimalBitflag", + "MinimalBitflagSeq", + "MinimalBitmaskHeader", + "MinimalBitmaskType", + "MinimalBitsetHeader", + "MinimalBitsetType", + "MinimalCollectionElement", + "MinimalCollectionHeader", + "MinimalDiscriminatorMember", + "MinimalEnumeratedHeader", + "MinimalEnumeratedLiteral", + "MinimalEnumeratedLiteralSeq", + "MinimalEnumeratedType", + "MinimalExtendedType", + "MinimalMapType", + "MinimalMemberDetail", + "MinimalSequenceType", + "MinimalStructHeader", + "MinimalStructMember", + "MinimalStructMemberSeq", + "MinimalStructType", + "MinimalTypeDetail", + "MinimalTypeObject", + "MinimalUnionHeader", + "MinimalUnionMember", + "MinimalUnionMemberSeq", + "MinimalUnionType", + "NameHash", + "PlainArrayLElemDefn", + "PlainArraySElemDefn", + "PlainCollectionHeader", + "PlainMapLTypeDefn", + "PlainMapSTypeDefn", + "PlainSequenceLElemDefn", + "PlainSequenceSElemDefn", + "PrimitiveTypeId", + "QualifiedTypeName", + "SBound", + "SBoundSeq", + "StringLTypeDefn", + "StringSTypeDefn", + "StronglyConnectedComponent", + "StronglyConnectedComponentId", + "StructMemberFlag", + "StructTypeFlag", + "TI_PLAIN_ARRAY_LARGE", + "TI_PLAIN_ARRAY_SMALL", + "TI_PLAIN_MAP_LARGE", + "TI_PLAIN_MAP_SMALL", + "TI_PLAIN_SEQUENCE_LARGE", + "TI_PLAIN_SEQUENCE_SMALL", + "TI_STRING16_LARGE", + "TI_STRING16_SMALL", + "TI_STRING8_LARGE", + "TI_STRING8_SMALL", + "TI_STRONGLY_CONNECTED_COMPONENT", + "TK_ALIAS", + "TK_ANNOTATION", + "TK_ARRAY", + "TK_BITMASK", + "TK_BITSET", + "TK_BOOLEAN", + "TK_BYTE", + "TK_CHAR16", + "TK_CHAR8", + "TK_ENUM", + "TK_FLOAT128", + "TK_FLOAT32", + "TK_FLOAT64", + "TK_INT16", + "TK_INT32", + "TK_INT64", + "TK_INT8", + "TK_MAP", + "TK_NONE", + "TK_SEQUENCE", + "TK_STRING16", + "TK_STRING8", + "TK_STRUCTURE", + "TK_UINT16", + "TK_UINT32", + "TK_UINT64", + "TK_UINT8", + "TK_UNION", + "TYPE_NAME_MAX_LENGTH", + "TypeFlag", + "TypeFlagMinimalMask", + "TypeIdentfierWithSizeSeq", + "TypeIdentiferKind", + "TypeIdentifier", + "TypeIdentifierPair", + "TypeIdentifierPairSeq", + "TypeIdentifierSeq", + "TypeIdentifierTypeObjectPair", + "TypeIdentifierTypeObjectPairSeq", + "TypeIdentifierWithDependencies", + "TypeIdentifierWithDependenciesSeq", + "TypeIdentifierWithSize", + "TypeInformation", + "TypeInformationSeq", + "TypeKind", + "TypeObject", + "TypeObjectHashId", + "TypeObjectSeq", + "UnionCaseLabelSeq", + "UnionDiscriminatorFlag", + "UnionMemberFlag", + "UnionTypeFlag", +] diff --git a/cyclonedds/idl/_typesupport/DDS/XTypes/_ddsi_xt_type_object.py b/cyclonedds/idl/_typesupport/DDS/XTypes/_ddsi_xt_type_object.py index 9af17dfe..3c578283 100644 --- a/cyclonedds/idl/_typesupport/DDS/XTypes/_ddsi_xt_type_object.py +++ b/cyclonedds/idl/_typesupport/DDS/XTypes/_ddsi_xt_type_object.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_type_object.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 @@ -17,11 +17,11 @@ # root module import for resolving types import cyclonedds.idl._typesupport.DDS -EquivalenceKind = types.typedef['EquivalenceKind', types.uint8] +EquivalenceKind = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.EquivalenceKind', types.byte] EK_MINIMAL = 241 EK_COMPLETE = 242 EK_BOTH = 243 -TypeKind = types.typedef['TypeKind', types.uint8] +TypeKind = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.TypeKind', types.byte] TK_NONE = 0 TK_BOOLEAN = 1 TK_BYTE = 2 @@ -50,7 +50,7 @@ TK_SEQUENCE = 96 TK_ARRAY = 97 TK_MAP = 98 -TypeIdentiferKind = types.typedef['TypeIdentiferKind', types.uint8] +TypeIdentiferKind = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentiferKind', types.byte] TI_STRING8_SMALL = 112 TI_STRING8_LARGE = 113 TI_STRING16_SMALL = 114 @@ -63,24 +63,24 @@ TI_PLAIN_MAP_LARGE = 161 TI_STRONGLY_CONNECTED_COMPONENT = 176 MEMBER_NAME_MAX_LENGTH = 256 -MemberName = types.typedef['MemberName', types.bounded_str[256]] +MemberName = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.MemberName', types.bounded_str[256]] TYPE_NAME_MAX_LENGTH = 256 -QualifiedTypeName = types.typedef['QualifiedTypeName', types.bounded_str[256]] -PrimitiveTypeId = types.typedef['PrimitiveTypeId', types.uint8] -EquivalenceHash = types.typedef['EquivalenceHash', types.array[types.uint8, 14]] -NameHash = types.typedef['NameHash', types.array[types.uint8, 4]] -LBound = types.typedef['LBound', types.uint32] -LBoundSeq = types.typedef['LBoundSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.LBound']] +QualifiedTypeName = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.QualifiedTypeName', types.bounded_str[256]] +PrimitiveTypeId = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.PrimitiveTypeId', types.byte] +EquivalenceHash = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.EquivalenceHash', types.array[types.byte, 14]] +NameHash = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.NameHash', types.array[types.byte, 4]] +LBound = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.LBound', types.uint32] +LBoundSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.LBoundSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.LBound']] INVALID_LBOUND = 0 -SBound = types.typedef['SBound', types.uint8] -SBoundSeq = types.typedef['SBoundSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.SBound']] +SBound = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.SBound', types.byte] +SBoundSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.SBoundSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.SBound']] INVALID_SBOUND = 0 @annotate.final @annotate.nested -class TypeObjectHashId(idl.IdlUnion, discriminator=types.uint8, discriminator_is_key=False, typename="DDS.XTypes.TypeObjectHashId"): - hash: types.case[[242, 241], types.array[types.uint8, 14]] +class TypeObjectHashId(idl.IdlUnion, discriminator=types.byte, discriminator_is_key=False, typename="DDS.XTypes.TypeObjectHashId"): + hash: types.case[[242, 241], 'cyclonedds.idl._typesupport.DDS.XTypes.EquivalenceHash'] @dataclass @@ -101,15 +101,15 @@ class MemberFlag(idl.IdlBitmask, typename="DDS.XTypes.MemberFlag"): IS_DEFAULT: bool = False annotate.position("IS_DEFAULT", 6) -CollectionElementFlag = types.typedef['CollectionElementFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] -StructMemberFlag = types.typedef['StructMemberFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] -UnionMemberFlag = types.typedef['UnionMemberFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] -UnionDiscriminatorFlag = types.typedef['UnionDiscriminatorFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] -EnumeratedLiteralFlag = types.typedef['EnumeratedLiteralFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] -AnnotationParameterFlag = types.typedef['AnnotationParameterFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] -AliasMemberFlag = types.typedef['AliasMemberFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] -BitflagFlag = types.typedef['BitflagFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] -BitsetMemberFlag = types.typedef['BitsetMemberFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] +CollectionElementFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.CollectionElementFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] +StructMemberFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.StructMemberFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] +UnionMemberFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.UnionMemberFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] +UnionDiscriminatorFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.UnionDiscriminatorFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] +EnumeratedLiteralFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.EnumeratedLiteralFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] +AnnotationParameterFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.AnnotationParameterFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] +AliasMemberFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.AliasMemberFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] +BitflagFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.BitflagFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] +BitsetMemberFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.BitsetMemberFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.MemberFlag'] MemberFlagMinimalMask = 63 @dataclass @@ -126,14 +126,14 @@ class TypeFlag(idl.IdlBitmask, typename="DDS.XTypes.TypeFlag"): IS_AUTOID_HASH: bool = False annotate.position("IS_AUTOID_HASH", 4) -StructTypeFlag = types.typedef['StructTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] -UnionTypeFlag = types.typedef['UnionTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] -CollectionTypeFlag = types.typedef['CollectionTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] -AnnotationTypeFlag = types.typedef['AnnotationTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] -AliasTypeFlag = types.typedef['AliasTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] -EnumTypeFlag = types.typedef['EnumTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] -BitmaskTypeFlag = types.typedef['BitmaskTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] -BitsetTypeFlag = types.typedef['BitsetTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] +StructTypeFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.StructTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] +UnionTypeFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.UnionTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] +CollectionTypeFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.CollectionTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] +AnnotationTypeFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.AnnotationTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] +AliasTypeFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.AliasTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] +EnumTypeFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.EnumTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] +BitmaskTypeFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.BitmaskTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] +BitsetTypeFlag = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.BitsetTypeFlag', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeFlag'] TypeFlagMinimalMask = 7 @dataclass @@ -254,7 +254,7 @@ class ExtendedTypeDefn(idl.IdlStruct, typename="DDS.XTypes.ExtendedTypeDefn"): @annotate.final @annotate.nested -class TypeIdentifier(idl.IdlUnion, discriminator=types.uint8, discriminator_is_key=False, typename="DDS.XTypes.TypeIdentifier"): +class TypeIdentifier(idl.IdlUnion, discriminator=types.byte, discriminator_is_key=False, typename="DDS.XTypes.TypeIdentifier"): string_sdefn: types.case[[112, 114], 'cyclonedds.idl._typesupport.DDS.XTypes.StringSTypeDefn'] string_ldefn: types.case[[113, 115], 'cyclonedds.idl._typesupport.DDS.XTypes.StringLTypeDefn'] seq_sdefn: types.case[[128], 'cyclonedds.idl._typesupport.DDS.XTypes.PlainSequenceSElemDefn'] @@ -264,10 +264,10 @@ class TypeIdentifier(idl.IdlUnion, discriminator=types.uint8, discriminator_is_k map_sdefn: types.case[[160], 'cyclonedds.idl._typesupport.DDS.XTypes.PlainMapSTypeDefn'] map_ldefn: types.case[[161], 'cyclonedds.idl._typesupport.DDS.XTypes.PlainMapLTypeDefn'] sc_component_id: types.case[[176], 'cyclonedds.idl._typesupport.DDS.XTypes.StronglyConnectedComponentId'] - equivalence_hash: types.case[[242, 241], types.array[types.uint8, 14]] + equivalence_hash: types.case[[242, 241], 'cyclonedds.idl._typesupport.DDS.XTypes.EquivalenceHash'] -TypeIdentifierSeq = types.typedef['TypeIdentifierSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifier']] -MemberId = types.typedef['MemberId', types.uint32] +TypeIdentifierSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifier']] +MemberId = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.MemberId', types.uint32] ANNOTATION_STR_VALUE_MAX_LEN = 128 ANNOTATION_OCTETSEC_VALUE_MAX_LEN = 128 @@ -282,11 +282,11 @@ class ExtendedAnnotationParameterValue(idl.IdlStruct, typename="DDS.XTypes.Exten @annotate.final @annotate.nested -class AnnotationParameterValue(idl.IdlUnion, discriminator=types.uint8, discriminator_is_key=False, typename="DDS.XTypes.AnnotationParameterValue"): +class AnnotationParameterValue(idl.IdlUnion, discriminator=types.byte, discriminator_is_key=False, typename="DDS.XTypes.AnnotationParameterValue"): boolean_value: types.case[[1], bool] - byte_value: types.case[[2], types.uint8] + byte_value: types.case[[2], types.byte] int8_value: types.case[[12], types.int8] - uint_8_value: types.case[[13], types.uint8] + uint8_value: types.case[[13], types.uint8] int16_value: types.case[[3], types.int16] uint_16_value: types.case[[6], types.uint16] int32_value: types.case[[4], types.int32] @@ -305,10 +305,10 @@ class AnnotationParameterValue(idl.IdlUnion, discriminator=types.uint8, discrimi @annotate.autoid("sequential") @annotate.nested class AppliedAnnotationParameter(idl.IdlStruct, typename="DDS.XTypes.AppliedAnnotationParameter"): - paramname_hash: types.array[types.uint8, 4] + paramname_hash: 'cyclonedds.idl._typesupport.DDS.XTypes.NameHash' value: 'cyclonedds.idl._typesupport.DDS.XTypes.AnnotationParameterValue' -AppliedAnnotationParameterSeq = types.typedef['AppliedAnnotationParameterSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.AppliedAnnotationParameter']] +AppliedAnnotationParameterSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.AppliedAnnotationParameterSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.AppliedAnnotationParameter']] @dataclass @annotate.appendable @@ -318,7 +318,7 @@ class AppliedAnnotation(idl.IdlStruct, typename="DDS.XTypes.AppliedAnnotation"): annotation_typeid: 'cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifier' param_seq: Optional['cyclonedds.idl._typesupport.DDS.XTypes.AppliedAnnotationParameterSeq'] -AppliedAnnotationSeq = types.typedef['AppliedAnnotationSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.AppliedAnnotation']] +AppliedAnnotationSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.AppliedAnnotationSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.AppliedAnnotation']] @dataclass @annotate.final @@ -366,7 +366,7 @@ class CompleteMemberDetail(idl.IdlStruct, typename="DDS.XTypes.CompleteMemberDet @annotate.autoid("sequential") @annotate.nested class MinimalMemberDetail(idl.IdlStruct, typename="DDS.XTypes.MinimalMemberDetail"): - name_hash: types.array[types.uint8, 4] + name_hash: 'cyclonedds.idl._typesupport.DDS.XTypes.NameHash' @dataclass @@ -377,7 +377,7 @@ class CompleteStructMember(idl.IdlStruct, typename="DDS.XTypes.CompleteStructMem common: 'cyclonedds.idl._typesupport.DDS.XTypes.CommonStructMember' detail: 'cyclonedds.idl._typesupport.DDS.XTypes.CompleteMemberDetail' -CompleteStructMemberSeq = types.typedef['CompleteStructMemberSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.CompleteStructMember']] +CompleteStructMemberSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.CompleteStructMemberSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.CompleteStructMember']] @dataclass @annotate.appendable @@ -387,7 +387,7 @@ class MinimalStructMember(idl.IdlStruct, typename="DDS.XTypes.MinimalStructMembe common: 'cyclonedds.idl._typesupport.DDS.XTypes.CommonStructMember' detail: 'cyclonedds.idl._typesupport.DDS.XTypes.MinimalMemberDetail' -MinimalStructMemberSeq = types.typedef['MinimalStructMemberSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.MinimalStructMember']] +MinimalStructMemberSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.MinimalStructMemberSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.MinimalStructMember']] @dataclass @annotate.appendable @@ -452,7 +452,7 @@ class MinimalStructType(idl.IdlStruct, typename="DDS.XTypes.MinimalStructType"): header: 'cyclonedds.idl._typesupport.DDS.XTypes.MinimalStructHeader' member_seq: 'cyclonedds.idl._typesupport.DDS.XTypes.MinimalStructMemberSeq' -UnionCaseLabelSeq = types.typedef['UnionCaseLabelSeq', types.sequence[types.int32]] +UnionCaseLabelSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.UnionCaseLabelSeq', types.sequence[types.int32]] @dataclass @annotate.final @@ -473,7 +473,7 @@ class CompleteUnionMember(idl.IdlStruct, typename="DDS.XTypes.CompleteUnionMembe common: 'cyclonedds.idl._typesupport.DDS.XTypes.CommonUnionMember' detail: 'cyclonedds.idl._typesupport.DDS.XTypes.CompleteMemberDetail' -CompleteUnionMemberSeq = types.typedef['CompleteUnionMemberSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.CompleteUnionMember']] +CompleteUnionMemberSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.CompleteUnionMemberSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.CompleteUnionMember']] @dataclass @annotate.appendable @@ -483,7 +483,7 @@ class MinimalUnionMember(idl.IdlStruct, typename="DDS.XTypes.MinimalUnionMember" common: 'cyclonedds.idl._typesupport.DDS.XTypes.CommonUnionMember' detail: 'cyclonedds.idl._typesupport.DDS.XTypes.MinimalMemberDetail' -MinimalUnionMemberSeq = types.typedef['MinimalUnionMemberSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.MinimalUnionMember']] +MinimalUnionMemberSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.MinimalUnionMemberSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.MinimalUnionMember']] @dataclass @annotate.final @@ -568,7 +568,7 @@ class CompleteAnnotationParameter(idl.IdlStruct, typename="DDS.XTypes.CompleteAn name: 'cyclonedds.idl._typesupport.DDS.XTypes.MemberName' default_value: 'cyclonedds.idl._typesupport.DDS.XTypes.AnnotationParameterValue' -CompleteAnnotationParameterSeq = types.typedef['CompleteAnnotationParameterSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.CompleteAnnotationParameter']] +CompleteAnnotationParameterSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.CompleteAnnotationParameterSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.CompleteAnnotationParameter']] @dataclass @annotate.appendable @@ -576,10 +576,10 @@ class CompleteAnnotationParameter(idl.IdlStruct, typename="DDS.XTypes.CompleteAn @annotate.nested class MinimalAnnotationParameter(idl.IdlStruct, typename="DDS.XTypes.MinimalAnnotationParameter"): common: 'cyclonedds.idl._typesupport.DDS.XTypes.CommonAnnotationParameter' - name_hash: types.array[types.uint8, 4] + name_hash: 'cyclonedds.idl._typesupport.DDS.XTypes.NameHash' default_value: 'cyclonedds.idl._typesupport.DDS.XTypes.AnnotationParameterValue' -MinimalAnnotationParameterSeq = types.typedef['MinimalAnnotationParameterSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.MinimalAnnotationParameter']] +MinimalAnnotationParameterSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.MinimalAnnotationParameterSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.MinimalAnnotationParameter']] @dataclass @annotate.appendable @@ -826,7 +826,7 @@ class MinimalMapType(idl.IdlStruct, typename="DDS.XTypes.MinimalMapType"): key: 'cyclonedds.idl._typesupport.DDS.XTypes.MinimalCollectionElement' element: 'cyclonedds.idl._typesupport.DDS.XTypes.MinimalCollectionElement' -BitBound = types.typedef['BitBound', types.uint16] +BitBound = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.BitBound', types.uint16] @dataclass @annotate.appendable @@ -845,7 +845,7 @@ class CompleteEnumeratedLiteral(idl.IdlStruct, typename="DDS.XTypes.CompleteEnum common: 'cyclonedds.idl._typesupport.DDS.XTypes.CommonEnumeratedLiteral' detail: 'cyclonedds.idl._typesupport.DDS.XTypes.CompleteMemberDetail' -CompleteEnumeratedLiteralSeq = types.typedef['CompleteEnumeratedLiteralSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.CompleteEnumeratedLiteral']] +CompleteEnumeratedLiteralSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.CompleteEnumeratedLiteralSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.CompleteEnumeratedLiteral']] @dataclass @annotate.appendable @@ -855,7 +855,7 @@ class MinimalEnumeratedLiteral(idl.IdlStruct, typename="DDS.XTypes.MinimalEnumer common: 'cyclonedds.idl._typesupport.DDS.XTypes.CommonEnumeratedLiteral' detail: 'cyclonedds.idl._typesupport.DDS.XTypes.MinimalMemberDetail' -MinimalEnumeratedLiteralSeq = types.typedef['MinimalEnumeratedLiteralSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.MinimalEnumeratedLiteral']] +MinimalEnumeratedLiteralSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.MinimalEnumeratedLiteralSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.MinimalEnumeratedLiteral']] @dataclass @annotate.final @@ -919,7 +919,7 @@ class CompleteBitflag(idl.IdlStruct, typename="DDS.XTypes.CompleteBitflag"): common: 'cyclonedds.idl._typesupport.DDS.XTypes.CommonBitflag' detail: 'cyclonedds.idl._typesupport.DDS.XTypes.CompleteMemberDetail' -CompleteBitflagSeq = types.typedef['CompleteBitflagSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.CompleteBitflag']] +CompleteBitflagSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.CompleteBitflagSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.CompleteBitflag']] @dataclass @annotate.appendable @@ -929,7 +929,7 @@ class MinimalBitflag(idl.IdlStruct, typename="DDS.XTypes.MinimalBitflag"): common: 'cyclonedds.idl._typesupport.DDS.XTypes.CommonBitflag' detail: 'cyclonedds.idl._typesupport.DDS.XTypes.MinimalMemberDetail' -MinimalBitflagSeq = types.typedef['MinimalBitflagSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.MinimalBitflag']] +MinimalBitflagSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.MinimalBitflagSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.MinimalBitflag']] @dataclass @annotate.final @@ -938,8 +938,8 @@ class MinimalBitflag(idl.IdlStruct, typename="DDS.XTypes.MinimalBitflag"): class CommonBitmaskHeader(idl.IdlStruct, typename="DDS.XTypes.CommonBitmaskHeader"): bit_bound: 'cyclonedds.idl._typesupport.DDS.XTypes.BitBound' -CompleteBitmaskHeader = types.typedef['CompleteBitmaskHeader', 'cyclonedds.idl._typesupport.DDS.XTypes.CompleteEnumeratedHeader'] -MinimalBitmaskHeader = types.typedef['MinimalBitmaskHeader', 'cyclonedds.idl._typesupport.DDS.XTypes.MinimalEnumeratedHeader'] +CompleteBitmaskHeader = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.CompleteBitmaskHeader', 'cyclonedds.idl._typesupport.DDS.XTypes.CompleteEnumeratedHeader'] +MinimalBitmaskHeader = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.MinimalBitmaskHeader', 'cyclonedds.idl._typesupport.DDS.XTypes.MinimalEnumeratedHeader'] @dataclass @annotate.appendable @@ -968,7 +968,7 @@ class MinimalBitmaskType(idl.IdlStruct, typename="DDS.XTypes.MinimalBitmaskType" class CommonBitfield(idl.IdlStruct, typename="DDS.XTypes.CommonBitfield"): position: types.uint16 flags: 'cyclonedds.idl._typesupport.DDS.XTypes.BitsetMemberFlag' - bitcount: types.uint8 + bitcount: types.byte holder_type: 'cyclonedds.idl._typesupport.DDS.XTypes.TypeKind' @@ -980,7 +980,7 @@ class CompleteBitfield(idl.IdlStruct, typename="DDS.XTypes.CompleteBitfield"): common: 'cyclonedds.idl._typesupport.DDS.XTypes.CommonBitfield' detail: 'cyclonedds.idl._typesupport.DDS.XTypes.CompleteMemberDetail' -CompleteBitfieldSeq = types.typedef['CompleteBitfieldSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.CompleteBitfield']] +CompleteBitfieldSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.CompleteBitfieldSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.CompleteBitfield']] @dataclass @annotate.appendable @@ -988,9 +988,9 @@ class CompleteBitfield(idl.IdlStruct, typename="DDS.XTypes.CompleteBitfield"): @annotate.nested class MinimalBitfield(idl.IdlStruct, typename="DDS.XTypes.MinimalBitfield"): common: 'cyclonedds.idl._typesupport.DDS.XTypes.CommonBitfield' - name_hash: types.array[types.uint8, 4] + name_hash: 'cyclonedds.idl._typesupport.DDS.XTypes.NameHash' -MinimalBitfieldSeq = types.typedef['MinimalBitfieldSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.MinimalBitfield']] +MinimalBitfieldSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.MinimalBitfieldSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.MinimalBitfield']] @dataclass @annotate.appendable @@ -1039,7 +1039,7 @@ class CompleteExtendedType(idl.IdlStruct, typename="DDS.XTypes.CompleteExtendedT @annotate.final @annotate.nested -class CompleteTypeObject(idl.IdlUnion, discriminator=types.uint8, discriminator_is_key=False, typename="DDS.XTypes.CompleteTypeObject"): +class CompleteTypeObject(idl.IdlUnion, discriminator=types.byte, discriminator_is_key=False, typename="DDS.XTypes.CompleteTypeObject"): alias_type: types.case[[48], 'cyclonedds.idl._typesupport.DDS.XTypes.CompleteAliasType'] annotation_type: types.case[[80], 'cyclonedds.idl._typesupport.DDS.XTypes.CompleteAnnotationType'] struct_type: types.case[[81], 'cyclonedds.idl._typesupport.DDS.XTypes.CompleteStructType'] @@ -1063,7 +1063,7 @@ class MinimalExtendedType(idl.IdlStruct, typename="DDS.XTypes.MinimalExtendedTyp @annotate.final @annotate.nested -class MinimalTypeObject(idl.IdlUnion, discriminator=types.uint8, discriminator_is_key=False, typename="DDS.XTypes.MinimalTypeObject"): +class MinimalTypeObject(idl.IdlUnion, discriminator=types.byte, discriminator_is_key=False, typename="DDS.XTypes.MinimalTypeObject"): alias_type: types.case[[48], 'cyclonedds.idl._typesupport.DDS.XTypes.MinimalAliasType'] annotation_type: types.case[[80], 'cyclonedds.idl._typesupport.DDS.XTypes.MinimalAnnotationType'] struct_type: types.case[[81], 'cyclonedds.idl._typesupport.DDS.XTypes.MinimalStructType'] @@ -1079,12 +1079,12 @@ class MinimalTypeObject(idl.IdlUnion, discriminator=types.uint8, discriminator_i @annotate.appendable @annotate.nested -class TypeObject(idl.IdlUnion, discriminator=types.uint8, discriminator_is_key=False, typename="DDS.XTypes.TypeObject"): +class TypeObject(idl.IdlUnion, discriminator=types.byte, discriminator_is_key=False, typename="DDS.XTypes.TypeObject"): complete: types.case[[242], 'cyclonedds.idl._typesupport.DDS.XTypes.CompleteTypeObject'] minimal: types.case[[241], 'cyclonedds.idl._typesupport.DDS.XTypes.MinimalTypeObject'] -TypeObjectSeq = types.typedef['TypeObjectSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeObject']] -StronglyConnectedComponent = types.typedef['StronglyConnectedComponent', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeObjectSeq'] +TypeObjectSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.TypeObjectSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeObject']] +StronglyConnectedComponent = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.StronglyConnectedComponent', 'cyclonedds.idl._typesupport.DDS.XTypes.TypeObjectSeq'] @dataclass @annotate.final @@ -1094,7 +1094,7 @@ class TypeIdentifierTypeObjectPair(idl.IdlStruct, typename="DDS.XTypes.TypeIdent type_identifier: 'cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifier' type_object: 'cyclonedds.idl._typesupport.DDS.XTypes.TypeObject' -TypeIdentifierTypeObjectPairSeq = types.typedef['TypeIdentifierTypeObjectPairSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierTypeObjectPair']] +TypeIdentifierTypeObjectPairSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierTypeObjectPairSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierTypeObjectPair']] @dataclass @annotate.final @@ -1104,7 +1104,7 @@ class TypeIdentifierPair(idl.IdlStruct, typename="DDS.XTypes.TypeIdentifierPair" type_identifier1: 'cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifier' type_identifier2: 'cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifier' -TypeIdentifierPairSeq = types.typedef['TypeIdentifierPairSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierPair']] +TypeIdentifierPairSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierPairSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierPair']] @dataclass @annotate.appendable @@ -1114,7 +1114,7 @@ class TypeIdentifierWithSize(idl.IdlStruct, typename="DDS.XTypes.TypeIdentifierW type_id: 'cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifier' typeobject_serialized_size: types.uint32 -TypeIdentfierWithSizeSeq = types.typedef['TypeIdentfierWithSizeSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierWithSize']] +TypeIdentfierWithSizeSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentfierWithSizeSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierWithSize']] @dataclass @annotate.appendable @@ -1125,7 +1125,7 @@ class TypeIdentifierWithDependencies(idl.IdlStruct, typename="DDS.XTypes.TypeIde dependent_typeid_count: types.int32 dependent_typeids: types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierWithSize'] -TypeIdentifierWithDependenciesSeq = types.typedef['TypeIdentifierWithDependenciesSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierWithDependencies']] +TypeIdentifierWithDependenciesSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierWithDependenciesSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierWithDependencies']] @dataclass @annotate.mutable @@ -1133,9 +1133,9 @@ class TypeIdentifierWithDependencies(idl.IdlStruct, typename="DDS.XTypes.TypeIde @annotate.nested class TypeInformation(idl.IdlStruct, typename="DDS.XTypes.TypeInformation"): minimal: 'cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierWithDependencies' - annotate.member_id('minimal', 4097) + annotate.member_id("minimal", 4097) complete: 'cyclonedds.idl._typesupport.DDS.XTypes.TypeIdentifierWithDependencies' - annotate.member_id('complete', 4098) + annotate.member_id("complete", 4098) -TypeInformationSeq = types.typedef['TypeInformationSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeInformation']] +TypeInformationSeq = types.typedef['cyclonedds.idl._typesupport.DDS.XTypes.TypeInformationSeq', types.sequence['cyclonedds.idl._typesupport.DDS.XTypes.TypeInformation']] diff --git a/cyclonedds/idl/_typesupport/DDS/XTypes/_ddsi_xt_typemap.py b/cyclonedds/idl/_typesupport/DDS/XTypes/_ddsi_xt_typemap.py index 3ab3abc8..d053122f 100644 --- 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 index 86470589..ead6b926 100644 --- 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 index e69de29b..739e0374 100644 --- 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 index 8d161c70..cecc4a81 100644 --- 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)`