diff options
Diffstat (limited to 'TAO/CIAO/tests')
52 files changed, 179 insertions, 179 deletions
diff --git a/TAO/CIAO/tests/CIDL/CodeGen/Basic.idl b/TAO/CIAO/tests/CIDL/CodeGen/Basic.idl index 2d8ab209e5a..8b45f9e9c75 100644 --- a/TAO/CIAO/tests/CIDL/CodeGen/Basic.idl +++ b/TAO/CIAO/tests/CIDL/CodeGen/Basic.idl @@ -27,7 +27,7 @@ module Extra long superfluous_op (in string empty_arg) raises (NoReason); }; - + interface Supernumerary { void supernumerary_op (out string dummy_arg) @@ -39,11 +39,11 @@ module Extra module Basic { - interface ReadData : Extra::Superfluous + interface ReadData : Extra::Superfluous { string get_data (); }; - + interface AnalyzeData { void perform_analysis (inout string data); diff --git a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.idl b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.idl index e14f5fde42e..0c22cce2c50 100644 --- a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.idl +++ b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.idl @@ -8,7 +8,7 @@ module Basic provides ReadData data_read; attribute boolean is_not_necessary; }; - + component CodeGen : Base { provides ReadData data_out; @@ -16,30 +16,30 @@ module Basic publishes DataAvailable out_avail; consumes DataAvailable in_avail; provides AnalyzeData data_crunch; - + readonly attribute boolean is_necessary; }; - + home BaseHome supports Extra::Supernumerary manages Base { void base_do_nothing (); - + factory create_no_base (in long fake_id) raises (Extra::NoRhyme); - + finder find_no_base (); - + readonly attribute boolean is_useful; }; home CodeGenHome : BaseHome manages CodeGen { factory create_no_derived (); - + finder find_no_derived (); - + attribute boolean is_not_useful; - + string do_nothing (); }; }; diff --git a/TAO/CIAO/tests/CIDL/CodeGen/README b/TAO/CIAO/tests/CIDL/CodeGen/README index da6e8f6ee90..770843887af 100644 --- a/TAO/CIAO/tests/CIDL/CodeGen/README +++ b/TAO/CIAO/tests/CIDL/CodeGen/README @@ -37,4 +37,4 @@ ACE_ROOT/TAO/TAO_IDL) and gperf (ACE_ROOT/apps/gperf/src). Enjoy! -Jeff
\ No newline at end of file +Jeff diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl index 15c32fe82b3..e65b1ea7794 100644 --- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl +++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl @@ -13,37 +13,37 @@ module Attributes attribute float test; attribute long testA, testB; }; - + component Bar { readonly attribute float test1; readonly attribute long testB, testC; }; - + exception FooException { }; - + exception BarException { }; - + component FooRaises { attribute float test2 getraises (FooException); }; - + component BarRaises { attribute float test3 setraises (BarException); }; - + component FooBarRaises { - attribute float test4 + attribute float test4 getraises (FooException) setraises (BarException); }; - + component ROFooRaises { readonly attribute float test5 raises (FooException); diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc index 1372ae82668..9776b118333 100644 --- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc +++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n Attributes" project(Attributes_stub): ciao_client_dnc { - + sharedname = Attributes_stub idlflags += -Wb,stub_export_macro=ATTRIBUTES_STUB_Export -Wb,stub_export_include=Attributes_stub_export.h -Wb,skel_export_macro=ATTRIBUTES_SVNT_Export -Wb,skel_export_include=Attributes_svnt_export.h dynamicflags = ATTRIBUTES_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl index 7d995acb617..7103e984472 100644 --- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl +++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl @@ -11,19 +11,19 @@ module EventSink eventtype foo_event { }; - + eventtype bar_event { }; - + component Foo { consumes foo_event foo; }; - + component Bar : Foo { consumes bar_event bar; }; - + }; diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc index a1a90abe9a3..918c9d56747 100644 --- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc +++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n EventSink" project(EventSink_stub): ciao_client_dnc { - + sharedname = EventSink_stub idlflags += -Wb,stub_export_macro=EVENTSINK_STUB_Export -Wb,stub_export_include=EventSink_stub_export.h -Wb,skel_export_macro=EVENTSINK_SVNT_Export -Wb,skel_export_include=EventSink_svnt_export.h dynamicflags = EVENTSINK_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl index 2ac7e663556..fa36b76d986 100644 --- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl +++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl @@ -11,12 +11,12 @@ module PublishesEmits eventtype foo_event { }; - + component Foo { publishes foo_event foo; }; - + component Bar { emits foo_event foo; diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc index e98d21e8a5a..71995df3a31 100644 --- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc +++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n EventSource" project(EventSource_stub): ciao_client_dnc { - + sharedname = EventSource_stub idlflags += -Wb,stub_export_macro=EVENTSOURCE_STUB_Export -Wb,stub_export_include=EventSource_stub_export.h -Wb,skel_export_macro=EVENTSOURCE_SVNT_Export -Wb,skel_export_include=EventSource_svnt_export.h dynamicflags = EVENTSOURCE_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl index 0d134e40d52..3cbf39c936e 100644 --- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl +++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl @@ -10,19 +10,19 @@ module Facets { - interface foo_interface + interface foo_interface { }; - + interface bar_interface { }; - + component Foo { provides foo_interface foo; }; - + component Bar : Foo { provides bar_interface bar; diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc index 1f1ba286b7d..0e60e3be139 100644 --- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc +++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n Facets" project(Facets_stub): ciao_client_dnc { - + sharedname = Facets_stub idlflags += -Wb,stub_export_macro=FACETS_STUB_Export -Wb,stub_export_include=Facets_stub_export.h -Wb,skel_export_macro=FACETS_SVNT_Export -Wb,skel_export_include=Facets_svnt_export.h dynamicflags = FACETS_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl index 99162919b47..d63ea3cdc1e 100644 --- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl +++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl @@ -13,7 +13,7 @@ module ReceptaclesSingle interface foo_interface { }; - + interface bar_interface { }; @@ -22,23 +22,23 @@ module ReceptaclesSingle { uses foo_interface foo; }; - + component Bar : Foo { uses bar_interface bar; }; - + component FooBar { uses foo_interface foo; uses bar_interface bar; }; - + component ObjectFoo { uses Object foo; }; - + }; module ReceptaclesMultiple @@ -46,21 +46,21 @@ module ReceptaclesMultiple interface foo_interface { }; - + interface bar_interface { }; - + component Foo { uses multiple foo_interface foo; }; - + component Bar { uses multiple bar_interface bar; }; - + component ObjectFoo { uses multiple Object foo; diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc index 6ecfc50f438..78dd6b6978b 100644 --- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc +++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n Receptacles" project(Receptacles_stub): ciao_client_dnc { - + sharedname = Receptacles_stub idlflags += -Wb,stub_export_macro=RECEPTACLES_STUB_Export -Wb,stub_export_include=Receptacles_stub_export.h -Wb,skel_export_macro=RECEPTACLES_SVNT_Export -Wb,skel_export_include=Receptacles_svnt_export.h dynamicflags = RECEPTACLES_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl b/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl index cc07a3f12e9..6a926a50846 100644 --- a/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl +++ b/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl @@ -9,31 +9,31 @@ module VerySimple { - + component Foo { }; - + home FooHome manages Foo { }; - + }; module SupportsInterface { - interface foo_interface + interface foo_interface { }; - + component Foo supports foo_interface { }; - + home FooHome manages Foo { }; - + }; @@ -42,15 +42,15 @@ module SupportsMultiple interface foo_interface { }; - + interface bar_interface { }; - + component FooBar supports foo_interface, bar_interface { }; - + home FooBarHome manages FooBar { }; @@ -65,19 +65,19 @@ module Inheritance interface Bar_interface { }; - + component Foo supports foo_interface { }; - + component Bar : Foo { }; - + home FooHome manages Foo { }; - + home BarHome manages Bar { }; diff --git a/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc b/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc index da4084ee9f3..df62e90c6da 100644 --- a/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc +++ b/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl SimpleComponent" project(SimpleComponent_stub): ciao_client_dnc { - + sharedname = SimpleComponent_stub idlflags += -Wb,stub_export_macro=SIMPLECOMPONENT_STUB_Export -Wb,stub_export_include=SimpleComponent_stub_export.h -Wb,skel_export_macro=SIMPLECOMPONENT_SVNT_Export -Wb,skel_export_include=SimpleComponent_svnt_export.h dynamicflags = SIMPLECOMPONENT_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.idl b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.idl index 15eb50971b3..9d07f285c90 100644 --- a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.idl +++ b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.idl @@ -17,21 +17,21 @@ module AbstractEvents abstract eventtype InhFoo_event : foo_event { }; - + abstract eventtype bar_event { }; - + abstract eventtype foobar_event : foo_event, bar_event { }; // test event multiple inheretance - + eventtype concrete_foo { }; - + eventtype concrete_foobar : concrete_foo, foo_event { }; diff --git a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc index bffbdebb9df..e1a4a36cc54 100644 --- a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc +++ b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n Abstract" project(Abstract_stub): ciao_client_dnc { - + sharedname = Abstract_stub idlflags += -Wb,stub_export_macro=ABSTRACT_STUB_Export -Wb,stub_export_include=Abstract_stub_export.h -Wb,skel_export_macro=ABSTRACT_SVNT_Export -Wb,skel_export_include=Abstract_svnt_export.h dynamicflags = ABSTRACT_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/Events/Regular/Regular.idl b/TAO/CIAO/tests/IDL3/Events/Regular/Regular.idl index f9169026e88..c244ea4af3e 100644 --- a/TAO/CIAO/tests/IDL3/Events/Regular/Regular.idl +++ b/TAO/CIAO/tests/IDL3/Events/Regular/Regular.idl @@ -13,21 +13,21 @@ module RegularEvents eventtype foo { }; - + eventtype bar { }; - + eventtype InhFoo : foo { }; - /* @@ - * TAO_IDL cannot handle custom yet. + /* @@ + * TAO_IDL cannot handle custom yet. custom eventtype custom_foo { }; - + custom eventtype custom_InhFoo : foo { }; @@ -39,6 +39,6 @@ module RegularEvents void test_op_a (in long foo, out float bar); InhFoo test_op_b (); }; - - + + }; diff --git a/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc b/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc index 81faf3a8e4f..b654e690bae 100644 --- a/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc +++ b/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n Regular" project(Regular_stub): ciao_client_dnc { - + sharedname = Regular_stub idlflags += -Wb,stub_export_macro=REGULAR_STUB_Export -Wb,stub_export_include=Regular_stub_export.h -Wb,skel_export_macro=REGULAR_SVNT_Export -Wb,skel_export_include=Regular_svnt_export.h dynamicflags = REGULAR_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl b/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl index 7dd338d871e..245a0eb449c 100644 --- a/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl +++ b/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl @@ -10,45 +10,45 @@ module HomeAttributes { - interface foo_interface + interface foo_interface { }; - - component Foo supports foo_interface + + component Foo supports foo_interface { }; - + home FooHome manages Foo { attribute float test; attribute long testA, testB; }; - + exception FooException { }; - + exception BarException { }; - + home ROFooHome manages Foo { readonly attribute float test1; readonly attribute long testB, testC; }; - + home FooRaisesHome manages Foo { attribute float test2 getraises (FooException); attribute float test3 setraises (BarException); - attribute float test4 + attribute float test4 getraises (FooException) setraises (BarException); }; - + home ROFooRaisesHome manages Foo { readonly attribute float test5 raises (FooException); }; - + }; diff --git a/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc b/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc index 413748705d0..4105b180342 100644 --- a/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc +++ b/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n HomeAttributes" project(HomeAttributes_stub): ciao_client_dnc { - + sharedname = HomeAttributes_stub idlflags += -Wb,stub_export_macro=HOMEATTRIBUTES_STUB_Export -Wb,stub_export_include=HomeAttributes_stub_export.h -Wb,skel_export_macro=HOMEATTRIBUTES_SVNT_Export -Wb,skel_export_include=HomeAttributes_svnt_export.h dynamicflags = HOMEATTRIBUTES_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.idl b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.idl index 3d9f4c5162e..47705a7bdb2 100644 --- a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.idl +++ b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.idl @@ -10,22 +10,22 @@ module BasicHomes { - + interface foo_interface {}; - + component Foo supports foo_interface {}; - + home FooHome manages Foo { }; - - + + interface bar_interface {}; - + component Bar supports bar_interface {}; - + home BarHome supports foo_interface manages Bar { }; - + }; diff --git a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc index f364c13c293..c79cf8c919b 100644 --- a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc +++ b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n Basic" project(IDL3_Basic_stub): ciao_client_dnc { - + sharedname = Homes_Basic_stub idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h dynamicflags = BASIC_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.idl b/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.idl index c9520b11c0a..64646d93515 100644 --- a/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.idl +++ b/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.idl @@ -13,23 +13,23 @@ module FactoryHomes exception foo_exception { }; - - interface foo_interface + + interface foo_interface { }; - - component Foo supports foo_interface + + component Foo supports foo_interface { }; - + home FooHome manages Foo { factory FooFactory (in string foo, in short bar) raises (foo_exception); }; - + eventtype food { }; - + }; diff --git a/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc b/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc index 7ff6c2a75bc..c861d0df611 100644 --- a/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc +++ b/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n Factory" project(Factory_stub): ciao_client_dnc { - + sharedname = Factory_stub idlflags += -Wb,stub_export_macro=FACTORY_STUB_Export -Wb,stub_export_include=Factory_stub_export.h -Wb,skel_export_macro=FACTORY_SVNT_Export -Wb,skel_export_include=Factory_svnt_export.h dynamicflags = FACTORY_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.idl b/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.idl index 5057b162fc3..ce5abc74804 100644 --- a/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.idl +++ b/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.idl @@ -13,18 +13,18 @@ module FactoryHomes exception foo_exception { }; - - interface foo_interface + + interface foo_interface { }; - - component Foo supports foo_interface + + component Foo supports foo_interface { }; - + home FooHome manages Foo { factory FooFinder (in string foo, in short bar) raises (foo_exception); }; - + }; diff --git a/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc b/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc index 0409af4d8ad..9881aad88f1 100644 --- a/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc +++ b/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n Finder" project(Finder_stub): ciao_client_dnc { - + sharedname = Finder_stub idlflags += -Wb,stub_export_macro=FINDER_STUB_Export -Wb,stub_export_include=Finder_stub_export.h -Wb,skel_export_macro=FINDER_SVNT_Export -Wb,skel_export_include=Finder_svnt_export.h dynamicflags = FINDER_STUB_BUILD_DLL diff --git a/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl b/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl index e1bce50fc2f..dca1c828c20 100644 --- a/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl +++ b/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl @@ -2,7 +2,7 @@ /** * @file Inheritance.idl * @author Will Otte <wotte@dre.vanderbilt.edu> - * + * * Tests the compilation of Home inheritance. */ @@ -10,24 +10,24 @@ module HomeInheritance { - interface foo_interface + interface foo_interface { }; - + component Foo supports foo_interface { }; - + home FooHome manages Foo { }; - + component Bar { }; - + home BarHome : FooHome manages Bar { }; - + }; diff --git a/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc b/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc index b8c27d5b42d..6faf9f0b6cc 100644 --- a/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc +++ b/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n Inheritance" project(Inheritance_stub): ciao_client_dnc { - + sharedname = Inheritance_stub idlflags += -Wb,stub_export_macro=INHERITANCE_STUB_Export -Wb,stub_export_include=Inheritance_stub_export.h -Wb,skel_export_macro=INHERITANCE_SVNT_Export -Wb,skel_export_include=Inheritance_svnt_export.h dynamicflags = INHERITANCE_STUB_BUILD_DLL 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 diff --git a/TAO/CIAO/tests/IDL3/Lookup/README b/TAO/CIAO/tests/IDL3/Lookup/README index a92531070a6..3dec4403a9a 100644 --- a/TAO/CIAO/tests/IDL3/Lookup/README +++ b/TAO/CIAO/tests/IDL3/Lookup/README @@ -18,4 +18,4 @@ original example IDL file, which has been slightly modified for use in this test. -Jeff Parsons
\ No newline at end of file +Jeff Parsons diff --git a/TAO/CIAO/tests/IDL3/Lookup/lookup_test.idl b/TAO/CIAO/tests/IDL3/Lookup/lookup_test.idl index 74d9b85de22..4850ab2e743 100644 --- a/TAO/CIAO/tests/IDL3/Lookup/lookup_test.idl +++ b/TAO/CIAO/tests/IDL3/Lookup/lookup_test.idl @@ -3,7 +3,7 @@ * @file lookup_test.idl * @authors Boris Kolpackov <boris@dre.vanderbilt.edu> * Jeff Parsons <j.parsons@vanderbilt.edu> - * + * * Tests IDL compiler lookup when local names are used * to reference declarations in supported interfaces, * base valuetypes, base components, and base homes. @@ -27,46 +27,46 @@ module M { void f (in Foo bar) raises (Ex); }; - + valuetype VB { typedef long Bar; }; - + valuetype V : VB supports IB { void f (in Bar foo) raises (Ex); }; - + valuetype EB { typedef long Bar; }; - + valuetype E : EB supports IB { void f (in Bar foo) raises (Ex); }; - + interface T { typedef long Bar; }; - + component CB supports T { }; - + component C : CB { attribute Bar baz; }; - + home HB supports IB manages CB { typedef long Bar; }; - + home H : HB manages C { void f (in Bar b) raises (Ex); diff --git a/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc b/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc index 9814f248c5a..9cec290e5a1 100644 --- a/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc +++ b/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc @@ -1,7 +1,7 @@ // $Id$ project(LookupTest_stub): ciao_client_dnc { - + sharedname = LookupTest_stub idlflags += -Sc diff --git a/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc b/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc index f4393115c4f..2262a8485bd 100644 --- a/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc +++ b/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n Minimum_Base" project(Minimum_Base_DnC_stub): ciao_client_dnc { - + sharedname = Minimum_Base_DnC_stub idlflags += -Sc \ -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \ @@ -18,11 +18,11 @@ project(Minimum_Base_DnC_stub): ciao_client_dnc { Source_Files { Minimum_BaseC.cpp } - + Header_Files { Minimum_BaseC.h } - + Inline_Files { Minimum_BaseC.inl } @@ -31,14 +31,14 @@ project(Minimum_Base_DnC_stub): ciao_client_dnc { project(Minimum_Base_DnC_svnt) : ciao_servant_dnc { after += Minimum_Base_DnC_stub sharedname = Minimum_Base_DnC_svnt - libs += Minimum_Base_DnC_stub - + libs += Minimum_Base_DnC_stub + idlflags += -Sc \ -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \ -Wb,stub_export_include=Minimum_Base_stub_export.h \ -Wb,skel_export_macro=MINIMUM_BASE_SVNT_Export \ -Wb,skel_export_include=Minimum_Base_svnt_export.h - dynamicflags = MINIMUM_BASE_SVNT_BUILD_DLL + dynamicflags = MINIMUM_BASE_SVNT_BUILD_DLL IDL_Files { Minimum_Base.idl @@ -47,11 +47,11 @@ project(Minimum_Base_DnC_svnt) : ciao_servant_dnc { Source_Files { Minimum_BaseS.cpp } - + Header_Files { Minimum_BaseS.h } - + Inline_Files { Minimum_BaseS.inl } diff --git a/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc b/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc index 3b7d613143d..1a84ab4d137 100644 --- a/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc +++ b/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc @@ -19,11 +19,11 @@ project(Minimum_Base_Receiver_DnC_stub): ciao_client_dnc { Source_Files { ReceiverC.cpp } - + Header_Files { ReceiverC.h } - + Inline_Files { ReceiverC.inl } @@ -36,7 +36,7 @@ project(Minimum_Base_Receiver_DnC_svnt) : ciao_servant_dnc { libs += Minimum_Receiver_DnC_stub \ Minimum_Base_DnC_stub \ Minimum_Base_DnC_svnt - + idlflags += -Sc \ -Wb,export_macro=RECEIVER_SVNT_Export \ -Wb,export_include=Receiver_svnt_export.h @@ -76,7 +76,7 @@ project(Minimum_Base_Receiver_DnC_exec) : ciao_component_dnc { Minimum_Receiver_DnC_svnt \ Minimum_Base_DnC_stub \ Minimum_Base_DnC_svnt - + idlflags += -Sc \ -Wb,export_macro=RECEIVER_EXEC_Export \ -Wb,export_include=Receiver_exec_export.h @@ -88,10 +88,10 @@ project(Minimum_Base_Receiver_DnC_exec) : ciao_component_dnc { Source_Files { Receiver_exec.cpp } - + Header_Files { } - + Inline_Files { } } diff --git a/TAO/CIAO/tests/Minimum/Sender/Sender.idl b/TAO/CIAO/tests/Minimum/Sender/Sender.idl index 74b9bf76f9a..dc1548f5394 100644 --- a/TAO/CIAO/tests/Minimum/Sender/Sender.idl +++ b/TAO/CIAO/tests/Minimum/Sender/Sender.idl @@ -11,7 +11,7 @@ module Minimum /* This is a Sender specific interface which will be used to get the * process start. */ - + interface trigger { void bar (); diff --git a/TAO/CIAO/tests/Minimum/Sender/Sender.mpc b/TAO/CIAO/tests/Minimum/Sender/Sender.mpc index d1a92577943..0c3c40f2279 100644 --- a/TAO/CIAO/tests/Minimum/Sender/Sender.mpc +++ b/TAO/CIAO/tests/Minimum/Sender/Sender.mpc @@ -19,11 +19,11 @@ project(Minimum_Base_Sender_DnC_stub): ciao_client_dnc { Source_Files { SenderC.cpp } - + Header_Files { SenderC.h } - + Inline_Files { SenderC.inl } @@ -55,13 +55,13 @@ project(Minimum_Base_Sender_DnC_svnt) : ciao_servant_dnc { SenderS.cpp Sender_svnt.cpp } - + Header_Files { SenderEC.h SenderS.h Sender_svnt.h } - + Inline_Files { SenderEC.inl SenderS.inl @@ -87,7 +87,7 @@ project(Minimum_Base_Sender_DnC_exec) : ciao_component_dnc { Source_Files { Sender_exec.cpp } - + Header_Files { Sender_exec.h } diff --git a/TAO/CIAO/tests/tests.mwc b/TAO/CIAO/tests/tests.mwc index 6479880bd23..d924d0f1726 100644 --- a/TAO/CIAO/tests/tests.mwc +++ b/TAO/CIAO/tests/tests.mwc @@ -6,4 +6,4 @@ workspace { RTCCM } -}
\ No newline at end of file +} |