Skip to content

Commit

Permalink
XTypes v1.3 refactor (#327)
Browse files Browse the repository at this point in the history
* New argument -genapi [19958] (#261)

* Refs #19944. Initial -genapi

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19944. Remove default templates

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19944. Update scope when getting typecodes

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19944. Fix compilation error

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19944. Apply suggestions

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>

* Update IDL parser submodule to support new Union discriminator as a Member (#262)

* Refs #19932: update IDL parser submodule

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19932: changes required from review suggestion in IDL Parser

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19932: update submodule

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

---------

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
Signed-off-by: Ricardo González Moreno <[email protected]>

* Remove -cdr argument and support of Fast CDR v1 (#265)

* Refs #19971. Remove -cdr argument

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19971. Update submodule

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>

* User types header-only (#263)

* Refs #19960. Implementation

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19960. New argument -no-typesupport

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19960. Remove old template

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19960. New configuration to set explicitly using modules in stg

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19960. Update submodule

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19960. Update submodule

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>

* Fix warning generating TypeObject from IDL file (#266)

* Refs #20003. Fix warnings.

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #20003: do not generate empty namespaces

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20003. Fix warnings and new ReturnCode_t

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>
Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
Co-authored-by: JLBuenoLopez-eProsima <[email protected]>
Signed-off-by: Ricardo González Moreno <[email protected]>

* Fix tests for common struct name in different modules (#268)

* Refs #20052: fix tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20052: update submodule

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

---------

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
Signed-off-by: Ricardo González Moreno <[email protected]>

* Add argument to change default unbounded countainer max size (#270)

* Refs #20056. Argument to change max size of unbounded containers

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #20056. Update submodule

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>

* Fix CLang warning in generated code about unused lambda capture (#269)

* Refs #19837: fix Clang warning, unused lambda capture

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19837: update dds types test submodule

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

---------

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
Signed-off-by: Ricardo González Moreno <[email protected]>

* Support for C++ enum class (#271)

* Refs #20063. Support for C++ enum class

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #20063. Update submodule

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #20063. Update submodule and use Context

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #20063. Update submodule

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>

* Use include header which will be used (#272)

* Refs #20070. Using includes which will be used

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #20070. Fix enum casting

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #20070. Update submodule

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>

* Fix using final string for new annotations (#273)

* Refs #20070. Update submodule

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #20070. Update submodule

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>

* Add replacement for "dds" modules and -no-dependencies option to fastddsgen (#275)

* Added dds to the list of IDL module replacements

Signed-off-by: adriancampo <[email protected]>

* Added -no-dependencies option to avoid generating files for dependencies

Signed-off-by: adriancampo <[email protected]>

* Apply suggestions from code review

Co-authored-by: Ricardo González <[email protected]>
Signed-off-by: adriancampo <[email protected]>

* Use constants for arguments

Signed-off-by: adriancampo <[email protected]>

* Fixed args sorting

Signed-off-by: adriancampo <[email protected]>

---------

Signed-off-by: adriancampo <[email protected]>
Co-authored-by: Ricardo González <[email protected]>
Signed-off-by: Ricardo González Moreno <[email protected]>

* TypeObject generation (#280)

* Typeobjects with tests (#255)

* Fix tests for common struct name in different modules (#268)

* Refs #20052: fix tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20052: update submodule

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

---------

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Added TypeObject tests with templates for primitives and strings structures.

Signed-off-by: adriancampo <[email protected]>

* Added TypeObject tests for most cases.

Signed-off-by: adriancampo <[email protected]>

* Added TypeObject tests for unions enums and annotations.

Signed-off-by: adriancampo <[email protected]>

* Added missing checks

Signed-off-by: adriancampo <[email protected]>

* API changes. Additional checks.

Signed-off-by: adriancampo <[email protected]>

* Changes if TypeIdentifiers checks.

Signed-off-by: adriancampo <[email protected]>

* API changes. Fixed errors.

Signed-off-by: adriancampo <[email protected]>

* Tests use gtest now.

Signed-off-by: adriancampo <[email protected]>

* Format changes.

Signed-off-by: adriancampo <[email protected]>

* Fixed namespaces, inheritance check and type functions.

Signed-off-by: adriancampo <[email protected]>

* Typo

Signed-off-by: adriancampo <[email protected]>

* Refs #19595: -typeobject argument is deprecated. TypeObject files will always be generated

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix copyright and include header order. Remove unused headers

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix TypeObjectRegistry::get_type_identifiers call

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix TypeObjectRegistry::get_type_objects call

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: remove const tests: constants do not have TypeObject

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix templates. Remove non-required parameter

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: simplify test templates and include collection and string tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: refactor struct TypeObject test

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: refactor bitset TypeObject test

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: refactor bitset TypeObject tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix enum type TypeObject tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix enum literals TypeObject test

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix bitmask TypeObject tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix type detail annotations checks

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix alias tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix union type TypeObject tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix union member tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: reorder templates. Fixes for string/wstring

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: check Collection TypeIdentifier EquivalenceKind

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix discriminator API according to review suggestion

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: array type tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix map type tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: map type tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix build errors

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: check TypeIdentifier and TypeObject consistency

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: remove non-necessary template attribute

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: member applied annotations check

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: remove non necessary templates. Check already done within consistency methods

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: check dimension/union label

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: add annotation type test

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: w/string type tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: REMOVE: comment TypeObject code in order to build

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: update submodules

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fixes in TypeObject tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: update dds types test submodule

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: update idl parser submodule

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: fix Fast DDS include

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19595: update submodule

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

---------

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
Signed-off-by: adriancampo <[email protected]>
Co-authored-by: José Luis Bueno López <[email protected]>
Co-authored-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: introduce new templates to generate TypeObject code

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: TypeObject header implementation

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: minor fixes

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: move anonymous collection name generator to common code

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: skeleton

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: improve verbatim annotation test. Alias custom annotations should be included only once

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: fix typo

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: alias type implementation

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: struct_type implementation

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: fix sequential member id

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: struct members

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: refactor TypeObjectSupport infrastructure

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: refactor TypeObjectSupport

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: do not execute code in main function

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: assign proper member id with inheritance

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: refactor register struct type

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: fix calling templates with proper parameters

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: annotation impl

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: enum impl

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: w/string impl

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: several fixes in tests

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: alias impl. Annotation refactor

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: fix get TypeObject template

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: union impl

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: union member impl

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: bitset impl

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: bitmask impl

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: sequences impl

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: small refactor to adapt to new throwing API

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: update unbounded collections name

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: arrays impl

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19906: map impl

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: support for not applied annotations

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: generate TypeObject tests only for main dependency

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: fix expected flags

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: option to avoid generating type object support files

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: delete legacy TypeObject template

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: integration, fix use of external and other minor bugs/typos

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: test integration: fix unbounded collections, correctly test collections, correctly check TypeIdentifiers, correctly use fixed_string API

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: use variables

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: fix conflicts after rebase

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: no type support option disables also TypeObject support generation

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: fix Fast DDS include

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: avoid warning

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: use genapi module conversion in TypeObject templates

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: create register_type_object_representation method in TypeSupport

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: fix map keys

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: add sequence order check and fixes in map keys and minimal annotation parameters

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: update IDL Parser submodule

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: fix Windows warnings C4456: declararion hides previous local declaration

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: fix collection name in case of enum types

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: update IDL Parser submodule

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: fix Windows warning

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: update IDL Parser submodule

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20129: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

---------

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
Signed-off-by: adriancampo <[email protected]>
Co-authored-by: Adrian del Campo <[email protected]>
Signed-off-by: Ricardo González Moreno <[email protected]>

* Fix bounded collections with unbounded elements (#295)

* Refs #20335: fix bounded collections with unbounded elements

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20335: update submodules

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

---------

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
Signed-off-by: Ricardo González Moreno <[email protected]>

* Test case: scoped structures (#299)

* Increase test name uniqueness

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Update dds types tests submodule

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

---------

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
Signed-off-by: Ricardo González Moreno <[email protected]>

* Update FastDDSGen tests for indirect hashes (#307)

* Refs #20533: Fixed tests for member_id of unions.

Signed-off-by: adriancampo <[email protected]>

* Refs #20533: Fix for maps equiv_kind.

Signed-off-by: adriancampo <[email protected]>

* Refs #20533: Removed unnecessary checks.

Signed-off-by: adriancampo <[email protected]>

* Refs #20533: Updated submodule.

Signed-off-by: adriancampo <[email protected]>

* Refs #20533: Added check for id2.

Signed-off-by: adriancampo <[email protected]>

* Refs #20533: Added check for TK_NONE keys

Signed-off-by: adriancampo <[email protected]>

---------

Signed-off-by: adriancampo <[email protected]>
Signed-off-by: Ricardo González Moreno <[email protected]>

* Support new fastdds naming (#315)

* Refs #19451. Support new fastdds naming

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19451. Fix in swig cmake files

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>

* Fix after rebase

Signed-off-by: Ricardo González Moreno <[email protected]>

* New implementation for unions (#310)

* Refs #19451. First implementation

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19451. Fixes

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19451. Remove not needed functions on template

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19451. Remove unused template macros

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19451.- Fix externals

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19451.- Fix fixed_string

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19451.- Fix warnings

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19451.- Update submodule

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>

* Fix TypeObjectPair API (#296)

* Refs #20335: fix TypeObjectPair API

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #20335: use new Fast DDS headers

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

---------

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #20734. Fix windows linkage

Signed-off-by: Ricardo González Moreno <[email protected]>

* Apply suggestion

Signed-off-by: Ricardo González Moreno <[email protected]>

* Update submodule

Signed-off-by: Ricardo González Moreno <[email protected]>

* Apply suggestion

Co-authored-by: José Luis Bueno López <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>
Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
Signed-off-by: adriancampo <[email protected]>
Co-authored-by: Ricardo González <[email protected]>
Co-authored-by: Adrian del Campo <[email protected]>
  • Loading branch information
3 people authored Apr 8, 2024
1 parent 9f1e793 commit 9062ad3
Show file tree
Hide file tree
Showing 45 changed files with 4,089 additions and 9,120 deletions.
6 changes: 6 additions & 0 deletions .github/fastddsgen.meta
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"names":
{
"fastdds": {
"cmake-args": [
"-DEPROSIMA_BUILD_TESTS=ON"

]
},
"fastdds_python": {
"cmake-args": [
"-DBUILD_TESTING=ON"
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/reusable-ubuntu-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,7 @@ jobs:
cmake --version
colcon build --event-handlers=console_direct+ --mixin rel-with-deb-info ccache --metas src/fastddsgen/.github/fastddsgen.meta
- name: Test fastddsgen with fastcdr v1
if: startsWith(inputs.fastcdr_branch, '1')
run: |
source install/local_setup.bash
cd src/fastddsgen
./gradlew test -Dcdr_version=v1 -Dblacklist_tests=external,optional
- name: Test fastddsgen with fastcdr v2
if: ${{ ! startsWith(inputs.fastcdr_branch, '1') }}
- name: Test fastddsgen
run: |
source install/local_setup.bash
cd src/fastddsgen
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/ubuntu-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
description: 'foonathan_memory_vendor branch to be used'
required: true
type: string
fastcdr_version:
description: 'Fast CDR branches to be used. Enclose the branch names like ["1.1.x", "master"], then in single quotes'
fastcdr_branch:
description: 'Fast CDR branches to be used'
required: true
type: string
fastdds_branch:
Expand Down Expand Up @@ -40,14 +40,13 @@ jobs:
java_version:
- 'openjdk-11-jdk'
- 'openjdk-19-jdk'
fastcdr_version: ${{ fromJson(inputs.fastcdr_version || '["master"]') }}

uses: ./.github/workflows/reusable-ubuntu-ci.yaml
with:
os_image: ${{ matrix.os_image }}
java_version: ${{ matrix.java_version }}
foonathan_memory_vendor_branch: ${{ inputs.foonathan_memory_vendor_branch || 'master' }}
fastcdr_branch: ${{ matrix.fastcdr_version }}
fastcdr_branch: ${{ inputs.fastcdr_branch || 'master' }}
fastdds_branch: ${{ inputs.fastdds_branch || github.head_ref }}
fastdds_python_branch: ${{ inputs.fastdds_python_branch || '3.0.x-devel' }}
fastddsgen_branch: ${{ inputs.fastddsgen_branch || github.ref || '4.0.x-devel' }}
Expand Down
7 changes: 6 additions & 1 deletion resources/Custom.stg
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ $definitions; separator="\n"$

module(ctx, parent, module, definition_list) ::= <<

// In case of defining C++ namespaces here (like `namespace $module.name$ {`, property
// `Context.using_explicitly_modules_custom_property` should be added to the related TemplateGroup.
// Example:
// tmanager.addGroup("Custom.stg").enable_custom_property(Context.using_explicitly_modules_custom_property);

$definition_list$

>>
Expand Down Expand Up @@ -84,7 +89,7 @@ string_type(ctx, string) ::= <<>>

wide_string_type(ctx, wstring) ::= <<>>

array_declarator(ctx, array, array_type) ::= <<>>
array_declarator(ctx, array) ::= <<>>

interface(ctx, parent, interface, export_list) ::= <<>>

Expand Down
18 changes: 2 additions & 16 deletions src/main/java/com/eprosima/fastcdr/idl/context/Context.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,27 +39,13 @@ public interface Context

public String getHeaderGuardName ();

public boolean isGenerateTypeObject();

public boolean isGenerateTypesC();

public boolean isGenerateTypesROS2();

public boolean isGenerateTypeObjectSupport();

public boolean isCdr();

public boolean isFastcdr();

public boolean isCdr_v1();

public boolean isCdr_v2();

public boolean isCdr_both();

public void isSetCdrv1Templates();

public void isUnsetCdrv1Templates();

public boolean isCdrv1TemplatesEnabled();

/*** End ***/
}
10 changes: 10 additions & 0 deletions src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,13 @@ member_array_cstring_destructor(ctx, name, loopvar, dims) ::= <<$if(rest(dims))$
{
free(str);
}$endif$>>

member_default_init(member) ::= <%
$if(member.annotationDefault)$
{$member.annotationDefaultValue$}
$elseif(!member.annotationOptional && !member.annotationExternal)$
$if(member.typecode.initialValue)$
{$member.typecode.initialValue$}
$endif$
$endif$
%>
6 changes: 3 additions & 3 deletions src/main/java/com/eprosima/fastcdr/idl/templates/JavaType.stg
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public class $union.name$
}; separator="\n"$
}

public $union.discriminator.javaTypename$ getDiscriminator()
public $union.discriminator.typecode.javaTypename$ getDiscriminator()
{
return d__;
}
Expand All @@ -127,7 +127,7 @@ public class $union.name$
$endif$
}

public void set$member.javaName$($union.discriminator.javaTypename$ discriminator, $member.typecode.javaTypename$ $member.name$)
public void set$member.javaName$($union.discriminator.typecode.javaTypename$ discriminator, $member.typecode.javaTypename$ $member.name$)
throws Exception
{
$if(member.default)$
Expand Down Expand Up @@ -188,7 +188,7 @@ public class $union.name$
return false;
}

$union.discriminator.javaTypename$ d__;
$union.discriminator.typecode.javaTypename$ d__;

$union.members : { member |private $member.typecode.javaTypename$ $member.name$_; }; separator="\n"$

Expand Down
Loading

0 comments on commit 9062ad3

Please sign in to comment.