diff options
Diffstat (limited to 'TAO/CIAO/tests/IDL3/ImpliedIDL')
15 files changed, 29 insertions, 29 deletions
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/README b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/README index fe43b62b221..95a4938475b 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/README +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/README @@ -1,6 +1,6 @@ Converting IDL3 to IDL2 ======================= - + Introduction ============ @@ -20,7 +20,7 @@ would have been generated in one step by a CCM-aware IDL compiler. The tao_idl3_to_idl2 executable itself is built in CIAO_ROOT/tools/IDL3_to_IDL2. It uses the TAO IDL compiler front end parsing engine and the TAO IDL compiler driver -files, so it depends on ACE. The IDL generation is +files, so it depends on ACE. The IDL generation is accomplished by a custom backend library. Running The Test @@ -54,7 +54,7 @@ order of execution. 2. The -Sm option passed to the IDL compiler must be used when processing an IDL file resulting from the execution of -tao_idl3_to_idl2. This option disables the action of the +tao_idl3_to_idl2. This option disables the action of the tao_idl backend 'preprocessor' (which is 'on' by default) that adds implied IDL nodes to the Abstract Syntax Tree for subsequent C++ code generation. In the case of an eventtype, @@ -66,4 +66,4 @@ original eventtype. Without the -Sm option, the event consumer interface would appear redundantly in both explicit and implied IDL, resulting in a name clash. Since the IDL compiler cannot know the origin of the IDL file it is processing, the -Sm -option encapsulates that knowledge.
\ No newline at end of file +option encapsulates that knowledge. diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc index e91274525a4..f3e96309eca 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc @@ -3,19 +3,19 @@ project(ConvertIDL3) : taoidl3toidl2defaults, ciao_component_dnc { idlflags += -Sc -Sm - + IDL3TOIDL2_Files { convert.idl include.idl pass_through.idl } - + IDL_Files { convert_IDL2.idl include_IDL2.idl pass_through_IDL2.idl << include_IDL2.idl } - + Source_Files { convert_IDL2C.cpp convert_IDL2S.cpp diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/include.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/include.idl index 6a08a6c03d6..13b46de54c3 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/include.idl +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/include.idl @@ -17,7 +17,7 @@ module pre_mod string reasons[4][2]; wstring<3> why; }; - + enum which { ZERO, diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl index f5a4a76627c..4d51f0b3030 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl @@ -34,16 +34,16 @@ module mod interface foo { typeprefix foo "preefy"; - + exception wrongety_wrong { base unrelated; string explanation; }; - + attribute base base_attr getraises (wrongety_wrong) - setraises (pre_mod::wrong, wrongety_wrong); + setraises (pre_mod::wrong, wrongety_wrong); }; interface bleep; diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc index 5759c52f43c..c1767d3310f 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n ICBasic" project(ICBasic_stub): ciao_client_dnc { - + sharedname = ICBasic_stub idlflags += -Wb,stub_export_macro=ICBASIC_STUB_Export -Wb,stub_export_include=ICBasic_stub_export.h -Wb,skel_export_macro=ICBASIC_SVNT_Export -Wb,skel_export_include=ICBasic_svnt_export.h dynamicflags = ICBASIC_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl index 01d41895a3a..029e068d1dd 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl @@ -13,7 +13,7 @@ module ImpliedEventSink eventtype foo_event { }; - + component Foo { consumes foo_event foo; diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc index f3707d8bea2..ac7b02caf97 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n ICEventSink" project(ICEventSink_stub): ciao_client_dnc { - + sharedname = ICEventSink_stub idlflags += -Wb,stub_export_macro=ICEVENTSINK_STUB_Export -Wb,stub_export_include=ICEventSink_stub_export.h -Wb,skel_export_macro=ICEVENTSINK_SVNT_Export -Wb,skel_export_include=ICEventSink_svnt_export.h dynamicflags = ICEVENTSINK_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl index 08baec86e3f..48177109a59 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl @@ -13,21 +13,21 @@ module ImpliedSources eventtype foo_event { }; - + eventtype bar_event { }; - + component Foo { publishes foo_event foo; }; - + component Bar { emits bar_event bar; }; - /* + /* interface test { ImpliedSources::FooEventConsumers::foo_eventConsumer test_op (); diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc index c86b9521ce4..b8eaded62c5 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n ICEventSource" project(ICEventSource_stub): ciao_client_dnc { - + sharedname = ICEventSource_stub idlflags += -Wb,stub_export_macro=ICEVENTSOURCE_STUB_Export -Wb,stub_export_include=ICEventSource_stub_export.h -Wb,skel_export_macro=ICEVENTSOURCE_SVNT_Export -Wb,skel_export_include=ICEventSource_svnt_export.h dynamicflags = ICEVENTSOURCE_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl index 7af66e50e8c..56681c3a5cb 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl @@ -2,7 +2,7 @@ /** * @file ICReceptacles.idl * @author Will Otte <wotte@dre.vanderbilt.edu> - * + * * Tests equivalent idl for receptacles. */ #include <Components.idl> @@ -12,12 +12,12 @@ module EquivReceptacles interface foo_interface { }; - - component Foo + + component Foo { uses multiple foo_interface foo_recep; }; - + /** interface bar { diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc index d47827f2a2d..9ab64c3df92 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n ICReceptacles" project(ICReceptacles_stub): ciao_client_dnc { - + sharedname = ICReceptacles_stub idlflags += -Wb,stub_export_macro=ICRECEPTACLES_STUB_Export -Wb,stub_export_include=ICReceptacles_stub_export.h -Wb,skel_export_macro=ICRECEPTACLES_SVNT_Export -Wb,skel_export_include=ICReceptacles_svnt_export.h dynamicflags = ICRECEPTACLES_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl index 62092c9e958..c7940d821e8 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl @@ -2,7 +2,7 @@ /** * @file Events.idl * @author Will Otte <wotte@dre.vanderbilt.edu> - * + * * Tests implied IDL for event types. */ diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc index 7c3478d0b2e..c5b51e417c4 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n Events" project(Events_stub): ciao_client_dnc { - + sharedname = Events_stub idlflags += -Wb,stub_export_macro=EVENTS_STUB_Export -Wb,stub_export_include=Events_stub_export.h -Wb,skel_export_macro=EVENTS_SVNT_Export -Wb,skel_export_include=Events_svnt_export.h dynamicflags = EVENTS_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl index 3440458b4b2..8c781e8fea4 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl @@ -2,7 +2,7 @@ /** * @file Homes.idl * @author Will Otte <wotte@dre.vanderbilt.edu> - * + * * Tests equivalent IDL semantics for Homes */ @@ -13,7 +13,7 @@ module ImplicitHomes component Foo { }; - + home FooHome manages Foo { }; diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc index c81e215abfa..6865c71b120 100644 --- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc +++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n Homes" project(Homes_stub): ciao_client_dnc { - + sharedname = Homes_stub idlflags += -Wb,stub_export_macro=HOMES_STUB_Export -Wb,stub_export_include=Homes_stub_export.h -Wb,skel_export_macro=HOMES_SVNT_Export -Wb,skel_export_include=Homes_svnt_export.h dynamicflags = HOMES_STUB_BUILD_DLL |