[19932] Fix union discriminator#106
Merged
richiware merged 2 commits intofeature/typeobject-tests-implfrom Nov 21, 2023
Merged
Conversation
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
e169db4 to
f762e28
Compare
richiware
requested changes
Nov 21, 2023
| { | ||
| super(Kind.KIND_UNION, scope, name); | ||
| m_discriminatorTypeCode = null; | ||
| m_discriminator = null; |
Member
There was a problem hiding this comment.
As you are changing the variable name, please, use the coding style: discriminator_.
| TypeCode discriminatorTypeCode) | ||
| { | ||
| m_discriminatorTypeCode = discriminatorTypeCode; | ||
| m_discriminator = new UnionMember(discriminatorTypeCode, "discriminator", null, false); |
Member
There was a problem hiding this comment.
According to the standard, the name of the disciminator is _d.
Contributor
Author
There was a problem hiding this comment.
XTypes v1.3 clause 7.2.2.4.4.3 states:
The name of the discriminator member is always "discriminator"; that name is reserved for union types and is not permitted for type-specific union members.
IDL C++11 language mapping clause 6.14.2 states:
The union discriminant accessor and modifier functions have the name _d to both be brief and to avoid name conflicts with the union members.
It seems to be some inconsistency, though one specification refers to the accessor/modifier functions and the other to the member name. So I think we should follow XTypes specification for the moment.
| public TypeCode getDiscriminator() | ||
| { | ||
| return m_discriminatorTypeCode; | ||
| return m_discriminator.getTypecode(); |
Member
There was a problem hiding this comment.
Doing this in the better way, in my opinion, this function should return the UnionMember. Because in the future we will need to access, for example, the id.
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
richiware
approved these changes
Nov 21, 2023
richiware
pushed a commit
that referenced
this pull request
Dec 11, 2023
* Refs #19932: fix union discriminator Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19932: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
adriancampo
pushed a commit
that referenced
this pull request
Dec 12, 2023
* Refs #19932: fix union discriminator Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19932: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
richiware
pushed a commit
that referenced
this pull request
Dec 15, 2023
* Refs #19932: fix union discriminator Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19932: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
adriancampo
pushed a commit
that referenced
this pull request
Feb 28, 2024
* Refs #19932: fix union discriminator Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19932: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
JLBuenoLopez
added a commit
that referenced
this pull request
Mar 4, 2024
* Refs #19932: fix union discriminator Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19932: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
richiware
pushed a commit
that referenced
this pull request
Mar 13, 2024
* Refs #19932: fix union discriminator Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19932: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
JLBuenoLopez
added a commit
that referenced
this pull request
Apr 4, 2024
* Refs #19932: fix union discriminator Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19932: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
richiware
pushed a commit
that referenced
this pull request
Apr 8, 2024
* Refs #19932: fix union discriminator Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19932: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
richiware
added a commit
that referenced
this pull request
Apr 8, 2024
* Several changes to support fastddsgen -genapi [19957] (#105) * Refs #19944. Context uses TemplateManager Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19944. Fix setting scope Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fix union discriminator (#106) * Refs #19932: fix union discriminator Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19932: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refactor Member and ContainerTypeCode to use common applied annotations API (#107) * Refs #19968: refactor Member and ContainerTypeCode to use common applied member annotations API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19968: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Remove calling with option -cdr (#109) Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Support to have configuration by STGroup (#108) * Refs #19960. Support to have config by STGroup Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19960. Fix conding style. Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19960. Apply suggestions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Changeable max size for unbounded containers (#111) Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Support for C++ enum class (#112) * Refs #20063. Support C++ enum class Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #20063. Fix bitmasks Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #20063. Accessing through Context Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fix missing function (#113) Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Improve in code (#114) Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fix after rebase Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * New API and fixes for TypeObject generation (#119) * Changes to run typeobject tests (#103) * Refs #19115: include method to check if type is boolean Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: accesors to primitive types and enum types Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: add scoped name to annotation declarations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: add API to check verbatim annotation. Sanity check to ensure that given enumeration value is valid Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: remove quotes from annotation value Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: discriminate builtin annotations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: API for max and min annotation values (@range) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: expose scoped name in Annotation API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: include XTypes v1.3 builtin annotations and fix IDL v4.2 builtin annotations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: throw exception if annotation is not previously defined Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: remove isIsEnumType defined twice (after rebase) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: try_construct implementation Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: type system only supports single inheritance Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: check autoid annotation API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Added TypeObject tests flag. Signed-off-by: adriancampo <adriancampo@eprosima.com> * change run() method to work with different types of tests. Signed-off-by: adriancampo <adriancampo@eprosima.com> * Refs #19595: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: revert changes: -typeobject option will be used to generate legacy TypeObject code Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: check autoid annotation API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: try_construct annotation implementation Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add API to check @id and @hashid builtin annotations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: API to get number of members Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add getBitBound API to enum types Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add API to get number of annotation parameters Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: fix merge conflicts Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add API to check if an annotation is builtin Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add API to check number of applicable labels Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: fix merge conflicts Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: refactor array_type Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add array API to check bound sequence size Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: fix after rebase Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: remove non-necessary template attribute Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: include API to get number of annotation parameters Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: apply review suggestion: use new scopedname strategy Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: apply review suggestion Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: adriancampo <adriancampo@eprosima.com> Co-authored-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Fix API for TypeObject code generation (#110) * Refs #19595: code style Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: return annotation default value Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add Alias API for container types aliased Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: fix typos in primitive API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: explictly override Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: fix TypeCode::isAnnotationAutoidHash function Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: return correct TypeIdentifier kind Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: return correct type identifier Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: unbounded collections use small TypeIdentifier Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: fixes after rebase Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: return correct TypeIdentifier for arrays Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: return correct TypeIdentifier for maps Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: non applied extensibility and try_construct annotations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: get main project API (generate TypeObject tests only for the main project) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fix Annotation Autoid hash return value Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: add getFirstMember API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fix bitset holder type Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fix collection TypeIdentifier Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: recursive types fail generating TypeObject Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: API to check if contained members are forwarded Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fix bitset bitfields Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: use variables instead of hardcoded strings Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fixes after rebase Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: adriancampo <adriancampo@eprosima.com> Co-authored-by: Adrian del Campo <107918259+adriancampo@users.noreply.github.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Hotfix: extend AliasTypeCode API: getCScopedname (#120) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Document isIsBounded and isUnbound API. Correctly use the API (#121) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fixes after rebase Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fix find and set default value for unions [20587] (#124) * Refs #19451. Fix find and set default value for unions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19451. Remove unused functions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19451. Rollback default discriminator Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19451. Apply suggestions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Apply suggestions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Apply suggestions 2 Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: adriancampo <adriancampo@eprosima.com> Co-authored-by: Ricardo González <ricardo@richiware.dev> Co-authored-by: Adrian del Campo <107918259+adriancampo@users.noreply.github.com>
richiware
added a commit
that referenced
this pull request
May 14, 2024
* Several changes to support fastddsgen -genapi [19957] (#105) * Refs #19944. Context uses TemplateManager Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19944. Fix setting scope Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fix union discriminator (#106) * Refs #19932: fix union discriminator Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19932: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refactor Member and ContainerTypeCode to use common applied annotations API (#107) * Refs #19968: refactor Member and ContainerTypeCode to use common applied member annotations API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19968: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Remove calling with option -cdr (#109) Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Support to have configuration by STGroup (#108) * Refs #19960. Support to have config by STGroup Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19960. Fix conding style. Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19960. Apply suggestions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Changeable max size for unbounded containers (#111) Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Support for C++ enum class (#112) * Refs #20063. Support C++ enum class Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #20063. Fix bitmasks Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #20063. Accessing through Context Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fix missing function (#113) Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Improve in code (#114) Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fix after rebase Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * New API and fixes for TypeObject generation (#119) * Changes to run typeobject tests (#103) * Refs #19115: include method to check if type is boolean Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: accesors to primitive types and enum types Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: add scoped name to annotation declarations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: add API to check verbatim annotation. Sanity check to ensure that given enumeration value is valid Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: remove quotes from annotation value Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: discriminate builtin annotations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: API for max and min annotation values (@range) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: expose scoped name in Annotation API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: include XTypes v1.3 builtin annotations and fix IDL v4.2 builtin annotations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: throw exception if annotation is not previously defined Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: remove isIsEnumType defined twice (after rebase) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: try_construct implementation Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: type system only supports single inheritance Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: check autoid annotation API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Added TypeObject tests flag. Signed-off-by: adriancampo <adriancampo@eprosima.com> * change run() method to work with different types of tests. Signed-off-by: adriancampo <adriancampo@eprosima.com> * Refs #19595: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: revert changes: -typeobject option will be used to generate legacy TypeObject code Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: check autoid annotation API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: try_construct annotation implementation Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add API to check @id and @hashid builtin annotations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: API to get number of members Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add getBitBound API to enum types Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add API to get number of annotation parameters Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: fix merge conflicts Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add API to check if an annotation is builtin Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add API to check number of applicable labels Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: fix merge conflicts Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: refactor array_type Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add array API to check bound sequence size Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: fix after rebase Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: remove non-necessary template attribute Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: include API to get number of annotation parameters Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: apply review suggestion: use new scopedname strategy Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: apply review suggestion Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: adriancampo <adriancampo@eprosima.com> Co-authored-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Fix API for TypeObject code generation (#110) * Refs #19595: code style Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: return annotation default value Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add Alias API for container types aliased Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: fix typos in primitive API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: explictly override Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: fix TypeCode::isAnnotationAutoidHash function Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: return correct TypeIdentifier kind Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: return correct type identifier Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: unbounded collections use small TypeIdentifier Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: fixes after rebase Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: return correct TypeIdentifier for arrays Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: return correct TypeIdentifier for maps Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: non applied extensibility and try_construct annotations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: get main project API (generate TypeObject tests only for the main project) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fix Annotation Autoid hash return value Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: add getFirstMember API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fix bitset holder type Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fix collection TypeIdentifier Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: recursive types fail generating TypeObject Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: API to check if contained members are forwarded Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fix bitset bitfields Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: use variables instead of hardcoded strings Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fixes after rebase Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: adriancampo <adriancampo@eprosima.com> Co-authored-by: Adrian del Campo <107918259+adriancampo@users.noreply.github.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Hotfix: extend AliasTypeCode API: getCScopedname (#120) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Document isIsBounded and isUnbound API. Correctly use the API (#121) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fixes after rebase Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fix find and set default value for unions [20587] (#124) * Refs #19451. Fix find and set default value for unions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19451. Remove unused functions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19451. Rollback default discriminator Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19451. Apply suggestions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Apply suggestions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Apply suggestions 2 Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: adriancampo <adriancampo@eprosima.com> Co-authored-by: Ricardo González <ricardo@richiware.dev> Co-authored-by: Adrian del Campo <107918259+adriancampo@users.noreply.github.com>
EduPonz
pushed a commit
that referenced
this pull request
May 14, 2024
* Several changes to support fastddsgen -genapi [19957] (#105) * Refs #19944. Context uses TemplateManager Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19944. Fix setting scope Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fix union discriminator (#106) * Refs #19932: fix union discriminator Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19932: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refactor Member and ContainerTypeCode to use common applied annotations API (#107) * Refs #19968: refactor Member and ContainerTypeCode to use common applied member annotations API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19968: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Remove calling with option -cdr (#109) Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Support to have configuration by STGroup (#108) * Refs #19960. Support to have config by STGroup Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19960. Fix conding style. Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19960. Apply suggestions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Changeable max size for unbounded containers (#111) Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Support for C++ enum class (#112) * Refs #20063. Support C++ enum class Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #20063. Fix bitmasks Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #20063. Accessing through Context Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fix missing function (#113) Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Improve in code (#114) Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fix after rebase Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * New API and fixes for TypeObject generation (#119) * Changes to run typeobject tests (#103) * Refs #19115: include method to check if type is boolean Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: accesors to primitive types and enum types Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: add scoped name to annotation declarations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: add API to check verbatim annotation. Sanity check to ensure that given enumeration value is valid Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: remove quotes from annotation value Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: discriminate builtin annotations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: API for max and min annotation values (@range) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: expose scoped name in Annotation API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: include XTypes v1.3 builtin annotations and fix IDL v4.2 builtin annotations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: throw exception if annotation is not previously defined Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: remove isIsEnumType defined twice (after rebase) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: try_construct implementation Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: type system only supports single inheritance Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19115: check autoid annotation API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Added TypeObject tests flag. Signed-off-by: adriancampo <adriancampo@eprosima.com> * change run() method to work with different types of tests. Signed-off-by: adriancampo <adriancampo@eprosima.com> * Refs #19595: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: revert changes: -typeobject option will be used to generate legacy TypeObject code Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: check autoid annotation API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: try_construct annotation implementation Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add API to check @id and @hashid builtin annotations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: API to get number of members Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add getBitBound API to enum types Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add API to get number of annotation parameters Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: fix merge conflicts Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add API to check if an annotation is builtin Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add API to check number of applicable labels Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: fix merge conflicts Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: refactor array_type Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add array API to check bound sequence size Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: fix after rebase Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: remove non-necessary template attribute Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: include API to get number of annotation parameters Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: apply review suggestion: use new scopedname strategy Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: apply review suggestion Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: adriancampo <adriancampo@eprosima.com> Co-authored-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Fix API for TypeObject code generation (#110) * Refs #19595: code style Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: return annotation default value Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add Alias API for container types aliased Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: fix typos in primitive API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: explictly override Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: fix TypeCode::isAnnotationAutoidHash function Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: return correct TypeIdentifier kind Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: return correct type identifier Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: unbounded collections use small TypeIdentifier Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: fixes after rebase Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: return correct TypeIdentifier for arrays Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19906: return correct TypeIdentifier for maps Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: non applied extensibility and try_construct annotations Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: get main project API (generate TypeObject tests only for the main project) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fix Annotation Autoid hash return value Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: add getFirstMember API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fix bitset holder type Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fix collection TypeIdentifier Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: recursive types fail generating TypeObject Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: API to check if contained members are forwarded Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fix bitset bitfields Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: use variables instead of hardcoded strings Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: fixes after rebase Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20129: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: adriancampo <adriancampo@eprosima.com> Co-authored-by: Adrian del Campo <107918259+adriancampo@users.noreply.github.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Hotfix: extend AliasTypeCode API: getCScopedname (#120) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Document isIsBounded and isUnbound API. Correctly use the API (#121) Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fixes after rebase Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Fix find and set default value for unions [20587] (#124) * Refs #19451. Fix find and set default value for unions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19451. Remove unused functions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19451. Rollback default discriminator Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19451. Apply suggestions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Apply suggestions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Apply suggestions 2 Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: adriancampo <adriancampo@eprosima.com> Co-authored-by: Ricardo González <ricardo@richiware.dev> Co-authored-by: Adrian del Campo <107918259+adriancampo@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Union discriminator should be of UnionMember type and not directly TypeCode.