diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-05-04 12:11:21 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-05-04 12:11:21 -0400 |
| commit | 8e2d2f4e7ce61c451014acd3d7b8a27ee5ad0611 (patch) | |
| tree | 0a4d95032906d08ba46fc7433c5a890f8ac28941 | |
| parent | Fixed allTests.py to support --workers even when cross testing (diff) | |
| download | ice-8e2d2f4e7ce61c451014acd3d7b8a27ee5ad0611.tar.bz2 ice-8e2d2f4e7ce61c451014acd3d7b8a27ee5ad0611.tar.xz ice-8e2d2f4e7ce61c451014acd3d7b8a27ee5ad0611.zip | |
Removed optional semicolons after braces
680 files changed, 5696 insertions, 5696 deletions
diff --git a/cpp/src/Glacier2/Instrumentation.ice b/cpp/src/Glacier2/Instrumentation.ice index d045db8ccf7..9220b5d67e8 100644 --- a/cpp/src/Glacier2/Instrumentation.ice +++ b/cpp/src/Glacier2/Instrumentation.ice @@ -58,7 +58,7 @@ local interface SessionObserver extends Ice::Instrumentation::Observer * **/ void routingTableSize(int delta); -}; +} /** * @@ -84,7 +84,7 @@ local interface ObserverUpdater * **/ void updateSessionObservers(); -}; +} /** * @@ -123,8 +123,8 @@ local interface RouterObserver * **/ void setObserverUpdater(ObserverUpdater updater); -}; +} -}; +} -}; +} diff --git a/cpp/src/IceGrid/Internal.ice b/cpp/src/IceGrid/Internal.ice index 5b17a72317f..0f078bf6bf6 100644 --- a/cpp/src/IceGrid/Internal.ice +++ b/cpp/src/IceGrid/Internal.ice @@ -25,7 +25,7 @@ module IceGrid local exception SynchronizationException { -}; +} class InternalDbEnvDescriptor { @@ -34,7 +34,7 @@ class InternalDbEnvDescriptor /** The database properties. */ PropertyDescriptorSeq properties; -}; +} sequence<InternalDbEnvDescriptor> InternalDbEnvDescriptorSeq; class InternalAdapterDescriptor @@ -44,7 +44,7 @@ class InternalAdapterDescriptor /** Specifies if the lifetime of the adapter is the same as the server. */ bool serverLifetime; -}; +} sequence<InternalAdapterDescriptor> InternalAdapterDescriptorSeq; class InternalDistributionDescriptor @@ -54,7 +54,7 @@ class InternalDistributionDescriptor /** The source directories. */ ["java:type:java.util.LinkedList<String>"] Ice::StringSeq directories; -}; +} dictionary<string, PropertyDescriptorSeq> PropertyDescriptorSeqDict; @@ -122,7 +122,7 @@ class InternalServerDescriptor /** IceBox service names */ optional(1) Ice::StringSeq services; -}; +} /** * @@ -131,13 +131,13 @@ class InternalServerDescriptor **/ exception AdapterActiveException { -}; +} exception AdapterNotActiveException { /** True if the adapter can be activated on demand. */ bool activatable; -}; +} interface Adapter { @@ -180,7 +180,7 @@ interface Adapter **/ void setDirectProxy(Object* proxy) throws AdapterActiveException; -}; +} /** * @@ -191,7 +191,7 @@ interface Adapter exception AdapterExistsException { string id; -}; +} dictionary<string, Adapter*> AdapterPrxDict; @@ -213,7 +213,7 @@ interface FileReader **/ ["cpp:const"] idempotent bool read(string filename, long pos, int size, out long newPos, out Ice::StringSeq lines) throws FileNotAvailableException; -}; +} interface Server extends FileReader { @@ -306,7 +306,7 @@ interface Server extends FileReader * **/ ["amd"] void setProcess(Ice::Process* proc); -}; +} interface InternalRegistry; sequence<InternalRegistry*> InternalRegistryPrxSeq; @@ -335,7 +335,7 @@ interface ReplicaObserver * **/ void replicaRemoved(InternalRegistry* replica); -}; +} interface PatcherFeedback { @@ -352,7 +352,7 @@ interface PatcherFeedback * **/ void failed(string reason); -}; +} interface Node extends FileReader, ReplicaObserver { @@ -460,7 +460,7 @@ interface Node extends FileReader, ReplicaObserver * **/ ["nonmutating", "cpp:const"] idempotent void shutdown(); -}; +} sequence<Node*> NodePrxSeq; @@ -472,7 +472,7 @@ sequence<Node*> NodePrxSeq; **/ exception NodeActiveException { -}; +} interface NodeSession { @@ -537,7 +537,7 @@ interface NodeSession * **/ void destroy(); -}; +} /** * @@ -547,7 +547,7 @@ interface NodeSession **/ exception ReplicaActiveException { -}; +} enum TopicName { @@ -556,11 +556,11 @@ enum TopicName ApplicationObserverTopicName, AdapterObserverTopicName, ObjectObserverTopicName -}; +} interface DatabaseObserver extends ApplicationObserver, ObjectObserver, AdapterObserver { -}; +} dictionary<string, long> StringLongDict; @@ -630,7 +630,7 @@ interface ReplicaSession * **/ void destroy(); -}; +} /** * @@ -696,7 +696,7 @@ class InternalNodeInfo * **/ string dataDir; -}; +} /** * @@ -719,7 +719,7 @@ class InternalReplicaInfo * **/ string hostname; -}; +} interface InternalRegistry extends FileReader { @@ -801,8 +801,8 @@ interface InternalRegistry extends FileReader * **/ ["cpp:const"] idempotent void shutdown(); -}; +} -}; +} diff --git a/cpp/src/IceStorm/DBTypes.ice b/cpp/src/IceStorm/DBTypes.ice index 7975bb0ed1d..1eaa469c960 100644 --- a/cpp/src/IceStorm/DBTypes.ice +++ b/cpp/src/IceStorm/DBTypes.ice @@ -17,7 +17,7 @@ module IceStormElection { dictionary<string, LogUpdate> StringLogUpdateDict; -}; +} module IceStorm { @@ -27,6 +27,6 @@ struct AllData { IceStormElection::StringLogUpdateDict llus; IceStorm::SubscriberRecordDict subscribers; -}; +} -}; +} diff --git a/cpp/src/IceStorm/Election.ice b/cpp/src/IceStorm/Election.ice index ef2b2abc470..4927b070753 100644 --- a/cpp/src/IceStorm/Election.ice +++ b/cpp/src/IceStorm/Election.ice @@ -26,7 +26,7 @@ struct TopicContent Ice::Identity id; /** The topic subscribers. */ IceStorm::SubscriberRecordSeq records; -}; +} /** A sequence of topic content. */ sequence<TopicContent> TopicContentSeq; @@ -36,7 +36,7 @@ exception ObserverInconsistencyException { /** The reason for the inconsistency. */ string reason; -}; +} /** The replica observer. */ interface ReplicaObserver @@ -119,7 +119,7 @@ interface ReplicaObserver **/ void removeSubscriber(LogUpdate llu, string topic, Ice::IdentitySeq subscribers) throws ObserverInconsistencyException; -}; +} /** Interface used to sync topics. */ interface TopicManagerSync @@ -133,7 +133,7 @@ interface TopicManagerSync * **/ void getContent(out LogUpdate llu, out TopicContentSeq content); -}; +} /** The node state. */ enum NodeState @@ -146,7 +146,7 @@ enum NodeState NodeStateReorganization, /** The replica group is active & replicating. */ NodeStateNormal -}; +} /** Forward declaration. */ interface Node; @@ -158,7 +158,7 @@ struct NodeInfo int id; /** The node proxy. */ Node* n; -}; +} /** A sequence of node info. */ sequence<NodeInfo> NodeInfoSeq; @@ -170,7 +170,7 @@ struct GroupInfo int id; /** The last known log update for this node. */ LogUpdate llu; -}; +} /** A sequence of group info. */ sequence<GroupInfo> GroupInfoSeq; @@ -196,7 +196,7 @@ struct QueryInfo /** The highest priority node that this node has seen. */ int max; -}; +} /** A replica node. */ interface Node @@ -302,6 +302,6 @@ interface Node * **/ ["cpp:const"] idempotent QueryInfo query(); -}; +} -}; +} diff --git a/cpp/src/IceStorm/IceStormInternal.ice b/cpp/src/IceStorm/IceStormInternal.ice index dfe00bdecae..450ffe44c4f 100644 --- a/cpp/src/IceStorm/IceStormInternal.ice +++ b/cpp/src/IceStorm/IceStormInternal.ice @@ -37,11 +37,11 @@ module IceStorm Ice::ByteSeq data; /** The Ice::Current::Context data from the originating request. */ Ice::Context context; -}; +} local exception SendQueueSizeMaxReached { -}; +} /** A sequence of EventData. */ ["cpp:type:std::deque< ::IceStorm::EventDataPtr>"] sequence<EventData> EventDataSeq; @@ -64,12 +64,12 @@ interface TopicLink * **/ void forward(EventDataSeq events); -}; +} /** Thrown if the reap call would block. */ exception ReapWouldBlock { -}; +} /** * @@ -99,7 +99,7 @@ interface TopicInternal extends Topic * **/ void reap(Ice::IdentitySeq id) throws ReapWouldBlock; -}; +} /** * @@ -119,7 +119,7 @@ interface TopicManagerInternal extends TopicManager * **/ ["cpp:const"] idempotent IceStormElection::Node* getReplicaNode(); -}; +} -}; // End module IceStorm +} // End module IceStorm diff --git a/cpp/src/IceStorm/Instrumentation.ice b/cpp/src/IceStorm/Instrumentation.ice index f7d983ddcb8..bab72065d00 100644 --- a/cpp/src/IceStorm/Instrumentation.ice +++ b/cpp/src/IceStorm/Instrumentation.ice @@ -35,7 +35,7 @@ local interface TopicObserver extends Ice::Instrumentation::Observer * **/ void forwarded(); -}; +} local interface SubscriberObserver extends Ice::Instrumentation::Observer { @@ -59,7 +59,7 @@ local interface SubscriberObserver extends Ice::Instrumentation::Observer * **/ void delivered(int count); -}; +} /** * @@ -97,7 +97,7 @@ local interface ObserverUpdater * **/ void updateSubscriberObservers(); -}; +} enum SubscriberState { @@ -121,7 +121,7 @@ enum SubscriberState * **/ SubscriberStateError -}; +} /** * @@ -177,8 +177,8 @@ local interface TopicManagerObserver * **/ void setObserverUpdater(ObserverUpdater updater); -}; +} -}; +} -}; +} diff --git a/cpp/src/IceStorm/LLURecord.ice b/cpp/src/IceStorm/LLURecord.ice index e8e24f0d4fc..345faa804a3 100644 --- a/cpp/src/IceStorm/LLURecord.ice +++ b/cpp/src/IceStorm/LLURecord.ice @@ -21,7 +21,7 @@ struct LogUpdate long generation; /** The iteration within this generation. */ long iteration; -}; +} -}; +} diff --git a/cpp/src/IceStorm/LinkRecord.ice b/cpp/src/IceStorm/LinkRecord.ice index ec73c5146f1..54d429580aa 100644 --- a/cpp/src/IceStorm/LinkRecord.ice +++ b/cpp/src/IceStorm/LinkRecord.ice @@ -27,6 +27,6 @@ struct LinkRecord TopicLink* obj; // The topic link object. int cost; // The cost. Topic* theTopic; // The linked topic for getLinkInfoSeq -}; +} -}; // End module IceStorm +} // End module IceStorm diff --git a/cpp/src/IceStorm/SubscriberRecord.ice b/cpp/src/IceStorm/SubscriberRecord.ice index d3c143d372b..94f15664f57 100644 --- a/cpp/src/IceStorm/SubscriberRecord.ice +++ b/cpp/src/IceStorm/SubscriberRecord.ice @@ -35,7 +35,7 @@ struct SubscriberRecordKey // The identity of the subscriber. If this is empty then the key // is a placeholder for a topic. Ice::Identity id; -}; +} /** * @@ -61,9 +61,9 @@ struct SubscriberRecord // Link subscriber data. int cost; // The cost. Topic* theTopic; // The linked topic. -}; +} sequence<SubscriberRecord> SubscriberRecordSeq; -}; // End module IceStorm +} // End module IceStorm diff --git a/cpp/src/icegriddb/DBTypes.ice b/cpp/src/icegriddb/DBTypes.ice index 4da1ed2aa86..a49b9179d95 100644 --- a/cpp/src/icegriddb/DBTypes.ice +++ b/cpp/src/icegriddb/DBTypes.ice @@ -25,6 +25,6 @@ struct AllData ObjectInfoSeq objects; ObjectInfoSeq internalObjects; StringLongDict serials; -}; +} -}; +} diff --git a/cpp/test/Glacier2/application/Callback.ice b/cpp/test/Glacier2/application/Callback.ice index bc89faf6f81..8a16bb84c4c 100644 --- a/cpp/test/Glacier2/application/Callback.ice +++ b/cpp/test/Glacier2/application/Callback.ice @@ -15,14 +15,14 @@ module Test interface CallbackReceiver { void callback(); -}; +} interface Callback { void initiateCallback(CallbackReceiver* proxy); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Glacier2/attack/Backend.ice b/cpp/test/Glacier2/attack/Backend.ice index 73be98deac6..b83c7827f70 100644 --- a/cpp/test/Glacier2/attack/Backend.ice +++ b/cpp/test/Glacier2/attack/Backend.ice @@ -15,7 +15,7 @@ module Test interface Backend { void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Glacier2/dynamicFiltering/Test.ice b/cpp/test/Glacier2/dynamicFiltering/Test.ice index 5494b9c8805..a725dc48886 100644 --- a/cpp/test/Glacier2/dynamicFiltering/Test.ice +++ b/cpp/test/Glacier2/dynamicFiltering/Test.ice @@ -18,9 +18,9 @@ interface Backend { void check(); void shutdown(); -}; +} -enum StateCode { Initial, Running, Finished }; +enum StateCode { Initial, Running, Finished } struct TestToken { @@ -30,7 +30,7 @@ struct TestToken short config; short caseIndex; string testReference; -}; +} /** * @@ -45,12 +45,12 @@ interface TestController { void step(Glacier2::Session* currentSession, TestToken currentState, out TestToken newState); void shutdown(); -}; +} interface TestSession extends Glacier2::Session { void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Glacier2/override/Callback.ice b/cpp/test/Glacier2/override/Callback.ice index 7597680538b..8b80b52d2fb 100644 --- a/cpp/test/Glacier2/override/Callback.ice +++ b/cpp/test/Glacier2/override/Callback.ice @@ -19,7 +19,7 @@ interface CallbackReceiver void callback(int token); void callbackWithPayload(Ice::ByteSeq payload); -}; +} interface Callback { @@ -28,7 +28,7 @@ interface Callback ["amd"] void initiateCallbackWithPayload(CallbackReceiver* proxy); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Glacier2/router/Callback.ice b/cpp/test/Glacier2/router/Callback.ice index 0b79b4b1ecd..9ba5aa49e96 100644 --- a/cpp/test/Glacier2/router/Callback.ice +++ b/cpp/test/Glacier2/router/Callback.ice @@ -18,7 +18,7 @@ exception CallbackException { double someValue; string someString; -}; +} interface CallbackReceiver { @@ -32,7 +32,7 @@ interface CallbackReceiver void waitCallback(); void callbackWithPayload(Ice::ByteSeq payload); -}; +} interface Callback { @@ -48,7 +48,7 @@ interface Callback ["amd"] void initiateCallbackWithPayload(CallbackReceiver* proxy); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Glacier2/sessionControl/Session.ice b/cpp/test/Glacier2/sessionControl/Session.ice index c438c9cf24b..e20c434c4e4 100644 --- a/cpp/test/Glacier2/sessionControl/Session.ice +++ b/cpp/test/Glacier2/sessionControl/Session.ice @@ -19,7 +19,7 @@ interface Session extends Glacier2::Session ["amd"] void destroyFromClient(); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Glacier2/sessionHelper/Callback.ice b/cpp/test/Glacier2/sessionHelper/Callback.ice index 14fd14d6048..3ab836f2d6e 100644 --- a/cpp/test/Glacier2/sessionHelper/Callback.ice +++ b/cpp/test/Glacier2/sessionHelper/Callback.ice @@ -16,7 +16,7 @@ exception CallbackException { double someValue; string someString; -}; +} interface CallbackReceiver { @@ -24,7 +24,7 @@ interface CallbackReceiver void callbackEx() throws CallbackException; -}; +} interface Callback { @@ -34,7 +34,7 @@ interface Callback throws CallbackException; void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Glacier2/staticFiltering/Backend.ice b/cpp/test/Glacier2/staticFiltering/Backend.ice index 73be98deac6..b83c7827f70 100644 --- a/cpp/test/Glacier2/staticFiltering/Backend.ice +++ b/cpp/test/Glacier2/staticFiltering/Backend.ice @@ -15,7 +15,7 @@ module Test interface Backend { void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/acm/Test.ice b/cpp/test/Ice/acm/Test.ice index 7018c9df821..520c551ce34 100644 --- a/cpp/test/Ice/acm/Test.ice +++ b/cpp/test/Ice/acm/Test.ice @@ -19,7 +19,7 @@ interface TestIntf void interruptSleep(); void startHeartbeatCount(); void waitForHeartbeatCount(int count); -}; +} interface RemoteObjectAdapter { @@ -27,13 +27,13 @@ interface RemoteObjectAdapter void activate(); void hold(); void deactivate(); -}; +} interface RemoteCommunicator { RemoteObjectAdapter* createObjectAdapter(int acmTimeout, int close, int heartbeat); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/adapterDeactivation/Test.ice b/cpp/test/Ice/adapterDeactivation/Test.ice index faae27462f1..0b674a620cc 100644 --- a/cpp/test/Ice/adapterDeactivation/Test.ice +++ b/cpp/test/Ice/adapterDeactivation/Test.ice @@ -17,11 +17,11 @@ interface TestIntf void transient(); void deactivate(); -}; +} local class Cookie { ["cpp:const"] string message(); -}; +} -}; +} diff --git a/cpp/test/Ice/admin/Test.ice b/cpp/test/Ice/admin/Test.ice index ba1eec0f62e..2b16eedd470 100644 --- a/cpp/test/Ice/admin/Test.ice +++ b/cpp/test/Ice/admin/Test.ice @@ -37,20 +37,20 @@ interface RemoteCommunicator void waitForShutdown(); void destroy(); -}; +} interface RemoteCommunicatorFactory { RemoteCommunicator* createCommunicator(Ice::PropertyDict props); void shutdown(); -}; +} interface TestFacet { void op(); -}; +} -}; +} #endif diff --git a/cpp/test/Ice/ami/Test.ice b/cpp/test/Ice/ami/Test.ice index 7d3faa2d1c4..55cb96b97b1 100644 --- a/cpp/test/Ice/ami/Test.ice +++ b/cpp/test/Ice/ami/Test.ice @@ -17,19 +17,19 @@ module Test exception TestIntfException { -}; +} enum CloseMode { Forcefully, Gracefully, GracefullyWithWait -}; +} interface PingReply { void reply(); -}; +} interface TestIntf { @@ -56,13 +56,13 @@ interface TestIntf bool supportsFunctionalTests(); void pingBiDir(Ice::Identity id); -}; +} interface TestIntfController { void holdAdapter(); void resumeAdapter(); -}; +} -}; +} diff --git a/cpp/test/Ice/background/Test.ice b/cpp/test/Ice/background/Test.ice index 8f5a071c546..8732c9d5213 100644 --- a/cpp/test/Ice/background/Test.ice +++ b/cpp/test/Ice/background/Test.ice @@ -22,7 +22,7 @@ interface Background void opWithPayload(Ice::ByteSeq seq); void shutdown(); -}; +} interface BackgroundController { @@ -42,7 +42,7 @@ interface BackgroundController void writeException(bool enable); void buffered(bool enable); -}; +} -}; +} diff --git a/cpp/test/Ice/binding/Test.ice b/cpp/test/Ice/binding/Test.ice index 732aef3be4b..32929b4d959 100644 --- a/cpp/test/Ice/binding/Test.ice +++ b/cpp/test/Ice/binding/Test.ice @@ -15,14 +15,14 @@ module Test interface TestIntf { string getAdapterName(); -}; +} interface RemoteObjectAdapter { TestIntf* getTestIntf(); void deactivate(); -}; +} interface RemoteCommunicator { @@ -31,7 +31,7 @@ interface RemoteCommunicator void deactivateObjectAdapter(RemoteObjectAdapter* adapter); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/checksum/ClientTypes.ice b/cpp/test/Ice/checksum/ClientTypes.ice index c15d5c94633..1ed68f50407 100644 --- a/cpp/test/Ice/checksum/ClientTypes.ice +++ b/cpp/test/Ice/checksum/ClientTypes.ice @@ -30,42 +30,42 @@ const int IntConst3 = 100; // // TEST: Same // -enum Enum1 { Enum11, Enum12, Enum13 }; +enum Enum1 { Enum11, Enum12, Enum13 } // // TEST: Add enumerator // -enum Enum2 { Enum21, Enum22, Enum23 }; +enum Enum2 { Enum21, Enum22, Enum23 } // // TEST: Remove enumerator // -enum Enum3 { Enum31, Enum32, Enum33 }; +enum Enum3 { Enum31, Enum32, Enum33 } // // TEST: Change to a different type // -enum Enum4 { Enum41, Enum42, Enum43 }; +enum Enum4 { Enum41, Enum42, Enum43 } // // TEST: Enum with explicit values. // -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 }; +enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } // // TEST: Enum with same explicit values, different order. // -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 }; +enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } // // TEST: Enum with different explicit values. // -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3}; +enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} // // TEST: Enum with explicit values, removed enumerator. // -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3}; +enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} // // TEST: Same @@ -109,7 +109,7 @@ struct Struct1 { string str; bool b; -}; +} // // TEST: Add member @@ -118,7 +118,7 @@ struct Struct2 { string str; bool b; -}; +} // // TEST: Change member type @@ -127,7 +127,7 @@ struct Struct3 { string str; bool b; -}; +} // // TEST: Remove member @@ -136,7 +136,7 @@ struct Struct4 { string str; bool b; -}; +} // // TEST: Change to a different type @@ -145,70 +145,70 @@ struct Struct5 { string str; bool b; -}; +} // // TEST: Same // interface Interface1 { -}; +} // // TEST: Change interface to class // interface Interface2 { -}; +} // // TEST: Add base interface // interface Interface3 { -}; +} // // TEST: Add operation // interface Interface4 { -}; +} // // TEST: Same // class EmptyClass1 { -}; +} // // TEST: Add data member // class EmptyClass2 { -}; +} // // TEST: Add operation // class EmptyClass3 { -}; +} // // TEST: Add base class // class EmptyClass4 { -}; +} // // TEST: Add interface // class EmptyClass5 { -}; +} // // TEST: Same @@ -217,7 +217,7 @@ class SimpleClass1 { string str; float f; -}; +} // // TEST: Add operation @@ -226,7 +226,7 @@ class SimpleClass2 { string str; float f; -}; +} // // TEST: Rename member @@ -235,7 +235,7 @@ class SimpleClass3 { string str; float f; -}; +} // // TEST: Add member @@ -244,7 +244,7 @@ class SimpleClass4 { string str; float f; -}; +} // // TEST: Remove member @@ -253,7 +253,7 @@ class SimpleClass5 { string str; float f; -}; +} // // TEST: Reorder members @@ -262,7 +262,7 @@ class SimpleClass6 { string str; float f; -}; +} // // TEST: Change member type @@ -271,7 +271,7 @@ class SimpleClass7 { string str; float f; -}; +} // // TEST: Same @@ -280,7 +280,7 @@ exception Exception1 { string str; bool b; -}; +} // // TEST: Add member @@ -289,7 +289,7 @@ exception Exception2 { string str; bool b; -}; +} // // TEST: Change member type @@ -298,7 +298,7 @@ exception Exception3 { string str; bool b; -}; +} // // TEST: Remove member @@ -307,14 +307,14 @@ exception Exception4 { string str; bool b; -}; +} // // TEST: Add base exception // exception Exception5 { -}; +} // // TEST: Change to a different type @@ -323,7 +323,7 @@ exception Exception6 { string str; bool b; -}; +} // // TEST: Exception with optional members. @@ -333,7 +333,7 @@ exception OptionalEx0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members, different order, same tags. @@ -343,7 +343,7 @@ exception OptionalEx1 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -353,7 +353,7 @@ exception OptionalEx2 string firstName; string secondName; optional(1) string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -363,7 +363,7 @@ exception OptionalEx3 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members using different tags. @@ -373,7 +373,7 @@ exception OptionalEx4 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Same @@ -382,7 +382,7 @@ interface BaseInterface1 { void baseOp1(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change return type @@ -391,7 +391,7 @@ interface BaseInterface2 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add parameter @@ -400,7 +400,7 @@ interface BaseInterface3 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add exception @@ -409,7 +409,7 @@ interface BaseInterface4 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change out parameter to in parameter @@ -418,7 +418,7 @@ interface BaseInterface5 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove parameter @@ -427,7 +427,7 @@ interface BaseInterface6 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove exception @@ -436,7 +436,7 @@ interface BaseInterface7 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove operation @@ -445,7 +445,7 @@ interface BaseInterface8 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add base interface @@ -454,7 +454,7 @@ interface BaseInterface9 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Class with compact id @@ -462,14 +462,14 @@ interface BaseInterface9 class Compact1(1) { int id; -}; +} // // TEST: Derived from class with compact id // class Derived1 extends Compact1 { -}; +} // // TEST: Same class names but different compact id @@ -477,7 +477,7 @@ class Derived1 extends Compact1 class Compact2(2) { int id; -}; +} // // TEST: Class with optional members. @@ -487,7 +487,7 @@ class Optional0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members, different order, same tags. @@ -497,7 +497,7 @@ class Optional1 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -507,7 +507,7 @@ class Optional2 string firstName; string secondName; optional(1) string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -517,7 +517,7 @@ class Optional3 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members using different tags. @@ -527,7 +527,7 @@ class Optional4 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Interface with optional parameters. @@ -536,7 +536,7 @@ interface OptionalParameters0 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different order. @@ -545,7 +545,7 @@ interface OptionalParameters1 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different tags. @@ -554,7 +554,7 @@ interface OptionalParameters2 { void op1(string firstName, optional(1) string emailAddress, optional(2) string secondName); -}; +} // // TEST: Interface with different optional parameters. @@ -563,7 +563,7 @@ interface OptionalParameters3 { void op1(string firstName, optional(1) string emailAddress, string secondName); -}; +} // // TEST: Interface with optional return type. @@ -571,7 +571,7 @@ interface OptionalParameters3 interface OptionalReturn0 { optional(1) int op(); -}; +} // // TEST: Interface that changes optional return type. @@ -579,12 +579,12 @@ interface OptionalReturn0 interface OptionalReturn2 { optional(1) int op(); -}; +} // // TEST: Local // -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 }; +local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } // // TEST: Local @@ -602,13 +602,13 @@ local dictionary<string, string> LocalDictionary; local struct LocalStruct { string str; -}; +} // // TEST: Local // local class LocalClass { -}; +} -}; +} diff --git a/cpp/test/Ice/checksum/ServerTypes.ice b/cpp/test/Ice/checksum/ServerTypes.ice index 33efcbd7587..b4d541bed69 100644 --- a/cpp/test/Ice/checksum/ServerTypes.ice +++ b/cpp/test/Ice/checksum/ServerTypes.ice @@ -32,42 +32,42 @@ const short IntConst3 = 100; // // TEST: Same // -enum Enum1 { Enum11, Enum12, Enum13 }; +enum Enum1 { Enum11, Enum12, Enum13 } // // TEST: Add enumerator // -enum Enum2 { Enum21, Enum22, Enum23, Enum24 }; +enum Enum2 { Enum21, Enum22, Enum23, Enum24 } // // TEST: Remove enumerator // -enum Enum3 { Enum32, Enum33 }; +enum Enum3 { Enum32, Enum33 } // // TEST: Enum with explicit values. // -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 }; +enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } // // TEST: Enum with same explicit values, different order. // -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 }; +enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 } // // TEST: Enum with different explicit values. // -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 }; +enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 } // // TEST: Enum with explicit values, removed enumerator. // -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2}; +enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2} // // TEST: Change to a different type // -class Enum4 {}; +class Enum4 {} // // TEST: Same @@ -82,7 +82,7 @@ sequence<short> Sequence2; // // TEST: Change to a different type // -class Sequence3 {}; +class Sequence3 {} // // TEST: Same @@ -102,7 +102,7 @@ dictionary<string, bool> Dictionary3; // // TEST: Change to a different type // -class Dictionary4 {}; +class Dictionary4 {} // // TEST: Same @@ -111,7 +111,7 @@ struct Struct1 { string str; bool b; -}; +} // // TEST: Add member @@ -121,7 +121,7 @@ struct Struct2 string str; bool b; float f; -}; +} // // TEST: Change member type @@ -130,7 +130,7 @@ struct Struct3 { string str; double b; -}; +} // // TEST: Remove member @@ -138,33 +138,33 @@ struct Struct3 struct Struct4 { bool b; -}; +} // // TEST: Change to a different type // -class Struct5 {}; +class Struct5 {} // // TEST: Same // interface Interface1 { -}; +} // // TEST: Change interface to class // class Interface2 { -}; +} // // TEST: Add base interface // interface Interface3 extends Interface1 { -}; +} // // TEST: Add operation @@ -172,14 +172,14 @@ interface Interface3 extends Interface1 interface Interface4 { void opInterface4(); -}; +} // // TEST: Same // class EmptyClass1 { -}; +} // // TEST: Add data member @@ -187,7 +187,7 @@ class EmptyClass1 class EmptyClass2 { double d; -}; +} // // TEST: Add operation @@ -195,21 +195,21 @@ class EmptyClass2 class EmptyClass3 { void newOp(); -}; +} // // TEST: Add base class // class EmptyClass4 extends EmptyClass1 { -}; +} // // TEST: Add interface // class EmptyClass5 implements Interface1 { -}; +} // // TEST: Same @@ -218,7 +218,7 @@ class SimpleClass1 { string str; float f; -}; +} // // TEST: Add operation @@ -228,7 +228,7 @@ class SimpleClass2 string str; float f; void newOp(); -}; +} // // TEST: Rename member @@ -237,7 +237,7 @@ class SimpleClass3 { string str; float g; -}; +} // // TEST: Add member @@ -247,7 +247,7 @@ class SimpleClass4 string str; float f; bool b; -}; +} // // TEST: Remove member @@ -255,7 +255,7 @@ class SimpleClass4 class SimpleClass5 { string str; -}; +} // // TEST: Reorder members @@ -264,7 +264,7 @@ class SimpleClass6 { float f; string str; -}; +} // // TEST: Change member type @@ -273,7 +273,7 @@ class SimpleClass7 { string str; double f; -}; +} // // TEST: Same @@ -282,7 +282,7 @@ exception Exception1 { string str; bool b; -}; +} // // TEST: Add member @@ -292,7 +292,7 @@ exception Exception2 string str; bool b; float f; -}; +} // // TEST: Change member type @@ -301,7 +301,7 @@ exception Exception3 { string str; double b; -}; +} // // TEST: Remove member @@ -309,19 +309,19 @@ exception Exception3 exception Exception4 { bool b; -}; +} // // TEST: Add base exception // exception Exception5 extends Exception1 { -}; +} // // TEST: Change to a different type // -class Exception6 {}; +class Exception6 {} // // TEST: Exception with optional members. @@ -331,7 +331,7 @@ exception OptionalEx0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members, different order, same tags. @@ -341,7 +341,7 @@ exception OptionalEx1 string firstName; optional(2) string emailAddress; optional(1) string secondName; -}; +} // // TEST: Exception with different optional members. @@ -351,7 +351,7 @@ exception OptionalEx2 string firstName; optional(1) string secondName; string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -362,7 +362,7 @@ exception OptionalEx3 optional(1) string secondName; optional(2) string emailAddress; optional(3) string phoneNumber; -}; +} // // TEST: Exception with optional members using different tags. @@ -372,7 +372,7 @@ exception OptionalEx4 string firstName; optional(2) string secondName; optional(1) string emailAddress; -}; +} // // TEST: Same @@ -381,7 +381,7 @@ interface BaseInterface1 { void baseOp1(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change return type @@ -390,7 +390,7 @@ interface BaseInterface2 { int baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add parameter @@ -399,7 +399,7 @@ interface BaseInterface3 { void baseOp(Object o); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add exception @@ -408,7 +408,7 @@ interface BaseInterface4 { void baseOp(); void baseOp2(int i, out string s) throws Exception1, Exception2; -}; +} // // TEST: Change out parameter to in parameter @@ -417,7 +417,7 @@ interface BaseInterface5 { void baseOp(); void baseOp2(int i, string s) throws Exception1; -}; +} // // TEST: Remove parameter @@ -426,7 +426,7 @@ interface BaseInterface6 { void baseOp(); void baseOp2(out string s) throws Exception1; -}; +} // // TEST: Remove exception @@ -435,7 +435,7 @@ interface BaseInterface7 { void baseOp(); void baseOp2(int i, out string s); -}; +} // // TEST: Remove operation @@ -443,7 +443,7 @@ interface BaseInterface7 interface BaseInterface8 { void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add base interface @@ -452,7 +452,7 @@ interface BaseInterface9 extends Interface1 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Class with compact id @@ -460,14 +460,14 @@ interface BaseInterface9 extends Interface1 class Compact1(1) { int id; -}; +} // // TEST: Derived from class with compact id // class Derived1 extends Compact1 { -}; +} // // TEST: Same class names but different compact id @@ -475,7 +475,7 @@ class Derived1 extends Compact1 class Compact2(3) { int id; -}; +} // // TEST: Class with optional members. @@ -485,7 +485,7 @@ class Optional0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members, different order, same tags. @@ -495,7 +495,7 @@ class Optional1 string firstName; optional(2) string emailAddress; optional(1) string secondName; -}; +} // // TEST: Class with different optional members. @@ -505,7 +505,7 @@ class Optional2 string firstName; optional(1) string secondName; string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -516,7 +516,7 @@ class Optional3 optional(1) string secondName; optional(2) string emailAddress; optional(3) string phoneNumber; -}; +} // // TEST: Class with optional members using different tags. @@ -526,7 +526,7 @@ class Optional4 string firstName; optional(2) string secondName; optional(1) string emailAddress; -}; +} // // TEST: Interface with optional parameters. @@ -535,7 +535,7 @@ interface OptionalParameters0 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different order. @@ -544,7 +544,7 @@ interface OptionalParameters1 { void op1(string firstName, optional(2) string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with optional parameters, different tags. @@ -553,7 +553,7 @@ interface OptionalParameters2 { void op1(string firstName, optional(2) string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with different optional parameters. @@ -562,7 +562,7 @@ interface OptionalParameters3 { void op1(string firstName, string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with optional return type. @@ -570,7 +570,7 @@ interface OptionalParameters3 interface OptionalReturn0 { optional(1) int op(); -}; +} // // TEST: Interface that changes optional return type. @@ -578,12 +578,12 @@ interface OptionalReturn0 interface OptionalReturn2 { int op(); -}; +} // // TEST: Local // -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 }; +local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } // // TEST: Local @@ -601,13 +601,13 @@ local dictionary<string, string> LocalDictionary; local struct LocalStruct { string str; -}; +} // // TEST: Local // local class LocalClass { -}; +} -}; +} diff --git a/cpp/test/Ice/checksum/Test.ice b/cpp/test/Ice/checksum/Test.ice index 9c737d019dc..ba1f503b7ec 100644 --- a/cpp/test/Ice/checksum/Test.ice +++ b/cpp/test/Ice/checksum/Test.ice @@ -19,7 +19,7 @@ interface Checksum ["cpp:const"] idempotent Ice::SliceChecksumDict getSliceChecksums(); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/custom/Test.ice b/cpp/test/Ice/custom/Test.ice index 614137c680a..644167b1d85 100644 --- a/cpp/test/Ice/custom/Test.ice +++ b/cpp/test/Ice/custom/Test.ice @@ -41,7 +41,7 @@ sequence<StringList> StringListSeq; struct Fixed { short s; -}; +} sequence<Fixed> FixedSeq; ["cpp:type:std::list< ::Test::Fixed>"] sequence<Fixed> FixedList; @@ -55,7 +55,7 @@ sequence<FixedList> FixedListSeq; string s; BoolList bl; ["cpp:type:std::list<std::string>"] StringSeq ss; -}; +} sequence<Variable> VariableSeq; ["cpp:type:std::list< ::Test::Variable>"] sequence<Variable> VariableList; @@ -72,7 +72,7 @@ sequence<StringStringDict> StringStringDictSeq; sequence<StringStringDictList> StringStringDictListSeq; ["cpp:type:std::list< ::Test::StringStringDictSeq>"] sequence<StringStringDictSeq> StringStringDictSeqList; -enum E { E1, E2, E3 }; +enum E { E1, E2, E3 } sequence<E> ESeq; ["cpp:type:std::list< ::Test::E>"] sequence<E> EList; @@ -80,7 +80,7 @@ sequence<E> ESeq; sequence<EList> EListSeq; ["cpp:type:std::list< ::Test::ESeq>"] sequence<ESeq> ESeqList; -class C {}; +class C {} sequence<C> CSeq; ["cpp:type:std::list< ::Test::CPtr>", "cpp11:type:std::list<std::shared_ptr<::Test::C>>"] sequence<C> CList; @@ -100,7 +100,7 @@ sequence<double> DoubleSeq; ["cpp:class"] struct ClassOtherStruct { int x; -}; +} sequence<ClassOtherStruct> ClassOtherStructSeq; ["cpp:class", "cpp:comparable"] struct ClassStruct @@ -108,7 +108,7 @@ sequence<ClassOtherStruct> ClassOtherStructSeq; ClassOtherStructSeq otherSeq; ClassOtherStruct other; int y; -}; +} sequence<ClassStruct> ClassStructSeq; ["cpp:type:Test::CustomMap<Ice::Int, std::string>"] dictionary<int, string> IntStringDict; @@ -118,7 +118,7 @@ dictionary<string, int> StringIntDict; class DictClass { IntStringDict isdict; -}; +} ["cpp:type:Test::CustomBuffer<bool>"] sequence<bool> BoolBuffer; ["cpp:type:Test::CustomBuffer<Ice::Short>"] sequence<short> ShortBuffer; @@ -136,7 +136,7 @@ class DictClass LongBuffer longBuf; FloatBuffer floatBuf; DoubleBuffer doubleBuf; -}; +} interface TestIntf { @@ -258,6 +258,6 @@ interface TestIntf BufferStruct opBufferStruct(BufferStruct s); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/custom/TestAMD.ice b/cpp/test/Ice/custom/TestAMD.ice index 0d3a3c39b88..156959e750d 100644 --- a/cpp/test/Ice/custom/TestAMD.ice +++ b/cpp/test/Ice/custom/TestAMD.ice @@ -39,7 +39,7 @@ sequence<StringList> StringListSeq; struct Fixed { short s; -}; +} sequence<Fixed> FixedSeq; ["cpp:type:std::list< ::Test::Fixed>"] sequence<Fixed> FixedList; @@ -53,7 +53,7 @@ struct Variable string s; BoolList bl; ["cpp:type:std::list<std::string>"] StringSeq ss; -}; +} sequence<Variable> VariableSeq; ["cpp:type:std::list< ::Test::Variable>"] sequence<Variable> VariableList; @@ -70,7 +70,7 @@ sequence<StringStringDict> StringStringDictSeq; sequence<StringStringDictList> StringStringDictListSeq; ["cpp:type:std::list< ::Test::StringStringDictSeq>"] sequence<StringStringDictSeq> StringStringDictSeqList; -enum E { E1, E2, E3 }; +enum E { E1, E2, E3 } sequence<E> ESeq; ["cpp:type:std::list< ::Test::E>"] sequence<E> EList; @@ -78,7 +78,7 @@ sequence<E> ESeq; sequence<EList> EListSeq; ["cpp:type:std::list< ::Test::ESeq>"] sequence<ESeq> ESeqList; -class C {}; +class C {} sequence<C> CSeq; ["cpp:type:std::list< ::Test::CPtr>", "cpp11:type:std::list<std::shared_ptr<::Test::C>>"] sequence<C> CList; @@ -98,7 +98,7 @@ sequence<double> DoubleSeq; ["cpp:class"] struct ClassOtherStruct { int x; -}; +} sequence<ClassOtherStruct> ClassOtherStructSeq; ["cpp:class"] struct ClassStruct @@ -106,7 +106,7 @@ sequence<ClassOtherStruct> ClassOtherStructSeq; ClassOtherStructSeq otherSeq; ClassOtherStruct other; int y; -}; +} sequence<ClassStruct> ClassStructSeq; ["cpp:type:Test::CustomMap<Ice::Int, std::string>"] dictionary<int, string> IntStringDict; @@ -116,7 +116,7 @@ dictionary<string, int> StringIntDict; class DictClass { IntStringDict isdict; -}; +} ["cpp:type:Test::CustomBuffer<bool>"] sequence<bool> BoolBuffer; ["cpp:type:Test::CustomBuffer<Ice::Short>"] sequence<short> ShortBuffer; @@ -134,7 +134,7 @@ struct BufferStruct LongBuffer longBuf; FloatBuffer floatBuf; DoubleBuffer doubleBuf; -}; +} ["amd"] interface TestIntf { @@ -244,6 +244,6 @@ struct BufferStruct BufferStruct opBufferStruct(BufferStruct s); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/custom/Wstring.ice b/cpp/test/Ice/custom/Wstring.ice index 3ce8d111095..2fa9db98fc2 100644 --- a/cpp/test/Ice/custom/Wstring.ice +++ b/cpp/test/Ice/custom/Wstring.ice @@ -19,12 +19,12 @@ dictionary<string, string> WstringWStringDict; struct WstringStruct { string s; -}; +} exception WstringException { string reason; -}; +} interface WstringClass { @@ -34,9 +34,9 @@ interface WstringClass void throwExcept(string reason) throws WstringException; -}; +} -}; +} module Test2 { @@ -48,12 +48,12 @@ dictionary<["cpp:type:wstring"] string, ["cpp:type:wstring"] string> WstringWStr ["cpp:type:wstring"] struct WstringStruct { string s; -}; +} ["cpp:type:wstring"] exception WstringException { string reason; -}; +} ["cpp:type:wstring"] interface WstringClass { @@ -63,7 +63,7 @@ dictionary<["cpp:type:wstring"] string, ["cpp:type:wstring"] string> WstringWStr void throwExcept(string reason) throws WstringException; -}; +} -}; +} diff --git a/cpp/test/Ice/custom/WstringAMD.ice b/cpp/test/Ice/custom/WstringAMD.ice index 2b52952dea8..46d9078b6e7 100644 --- a/cpp/test/Ice/custom/WstringAMD.ice +++ b/cpp/test/Ice/custom/WstringAMD.ice @@ -19,12 +19,12 @@ dictionary<string, string> WstringWStringDict; struct WstringStruct { string s; -}; +} exception WstringException { string reason; -}; +} ["amd"] interface WstringClass { @@ -34,9 +34,9 @@ exception WstringException void throwExcept(string reason) throws WstringException; -}; +} -}; +} module Test2 { @@ -48,12 +48,12 @@ dictionary<["cpp:type:wstring"] string, ["cpp:type:wstring"] string> WstringWStr ["cpp:type:wstring"] struct WstringStruct { string s; -}; +} ["cpp:type:wstring"] exception WstringException { string reason; -}; +} ["amd", "cpp:type:wstring"] interface WstringClass { @@ -63,7 +63,7 @@ dictionary<["cpp:type:wstring"] string, ["cpp:type:wstring"] string> WstringWStr void throwExcept(string reason) throws WstringException; -}; +} -}; +} diff --git a/cpp/test/Ice/defaultServant/Test.ice b/cpp/test/Ice/defaultServant/Test.ice index 579a3f3b204..008af826dc6 100644 --- a/cpp/test/Ice/defaultServant/Test.ice +++ b/cpp/test/Ice/defaultServant/Test.ice @@ -15,7 +15,7 @@ module Test interface MyObject { string getName(); -}; +} -}; +} diff --git a/cpp/test/Ice/defaultValue/Test.ice b/cpp/test/Ice/defaultValue/Test.ice index 18b547c2f49..771b8b40131 100644 --- a/cpp/test/Ice/defaultValue/Test.ice +++ b/cpp/test/Ice/defaultValue/Test.ice @@ -14,14 +14,14 @@ module Test { -enum Color { red, green, blue }; +enum Color { red, green, blue } module Nested { -enum Color { red, green, blue }; +enum Color { red, green, blue } -}; +} struct Struct1 { @@ -47,7 +47,7 @@ struct Struct1 float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} const bool ConstBool = true; const byte ConstByte = 254; @@ -92,7 +92,7 @@ struct Struct2 float zeroDotF = ConstZeroDotF; double zeroD = ConstZeroD; double zeroDotD = ConstZeroDotD; -}; +} ["cpp:class"] struct Struct3 @@ -119,7 +119,7 @@ struct Struct3 float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} class Base { @@ -139,7 +139,7 @@ class Base float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} class Derived extends Base { @@ -149,7 +149,7 @@ class Derived extends Base Nested::Color nc1 = ::Test::Nested::Color::red; Nested::Color nc2 = Nested::green; Nested::Color nc3 = blue; -}; +} exception BaseEx { @@ -169,7 +169,7 @@ exception BaseEx float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} exception DerivedEx extends BaseEx { @@ -179,6 +179,6 @@ exception DerivedEx extends BaseEx Nested::Color nc1 = ConstNestedColor1; Nested::Color nc2 = ConstNestedColor2; Nested::Color nc3 = ConstNestedColor3; -}; +} -}; +} diff --git a/cpp/test/Ice/dispatcher/Test.ice b/cpp/test/Ice/dispatcher/Test.ice index 674f4bb1c07..16999999741 100644 --- a/cpp/test/Ice/dispatcher/Test.ice +++ b/cpp/test/Ice/dispatcher/Test.ice @@ -20,13 +20,13 @@ interface TestIntf void sleep(int to); void opWithPayload(Ice::ByteSeq seq); void shutdown(); -}; +} interface TestIntfController { void holdAdapter(); void resumeAdapter(); -}; +} -}; +} diff --git a/cpp/test/Ice/echo/Test.ice b/cpp/test/Ice/echo/Test.ice index 7cf7ec721bd..8bf1b33020f 100644 --- a/cpp/test/Ice/echo/Test.ice +++ b/cpp/test/Ice/echo/Test.ice @@ -21,6 +21,6 @@ interface Echo void startBatch(); void flushBatch(); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/enums/Test.ice b/cpp/test/Ice/enums/Test.ice index 9851ef668ce..1eaf84a017b 100644 --- a/cpp/test/Ice/enums/Test.ice +++ b/cpp/test/Ice/enums/Test.ice @@ -35,7 +35,7 @@ enum ByteEnum benum9 = LongConst1, benum10, benum11 = ByteConst2 -}; +} sequence<ByteEnum> ByteEnumSeq; enum ShortEnum @@ -51,7 +51,7 @@ enum ShortEnum senum9 = LongConst1, senum10, senum11 = ShortConst2 -}; +} sequence<ShortEnum> ShortEnumSeq; enum IntEnum @@ -68,7 +68,7 @@ enum IntEnum ienum10, ienum11 = IntConst2, ienum12 = LongConst2 -}; +} sequence<IntEnum> IntEnumSeq; enum SimpleEnum @@ -76,7 +76,7 @@ enum SimpleEnum red, green, blue -}; +} sequence<SimpleEnum> SimpleEnumSeq; interface TestIntf @@ -92,6 +92,6 @@ interface TestIntf SimpleEnumSeq opSimpleSeq(SimpleEnumSeq s1, out SimpleEnumSeq s2); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/exceptions/Test.ice b/cpp/test/Ice/exceptions/Test.ice index 0d83efeac97..145811a6449 100644 --- a/cpp/test/Ice/exceptions/Test.ice +++ b/cpp/test/Ice/exceptions/Test.ice @@ -16,59 +16,59 @@ module Test interface Empty { -}; +} interface Thrower; exception A { int aMem; -}; +} exception B extends A { int bMem; -}; +} exception C extends B { int cMem; -}; +} exception D { int dMem; -}; +} exception E { string data; -}; +} ["cpp:ice_print"] exception F { string data; -}; +} local exception G { string data; -}; +} ["cpp:ice_print"] local exception H { string data; -}; +} module Mod { exception A extends ::Test::A { int a2Mem; - }; -}; + } +} interface Thrower { @@ -98,12 +98,12 @@ interface Thrower void throwAfterResponse(); void throwAfterException() throws A; -}; +} interface WrongOperation { void noSuchOperation(); -}; +} -}; +} diff --git a/cpp/test/Ice/exceptions/TestAMD.ice b/cpp/test/Ice/exceptions/TestAMD.ice index 0b6d433233f..153692feb78 100644 --- a/cpp/test/Ice/exceptions/TestAMD.ice +++ b/cpp/test/Ice/exceptions/TestAMD.ice @@ -16,59 +16,59 @@ module Test interface Empty { -}; +} interface Thrower; exception A { int aMem; -}; +} exception B extends A { int bMem; -}; +} exception C extends B { int cMem; -}; +} exception D { int dMem; -}; +} exception E { string data; -}; +} ["cpp:ice_print"] exception F { string data; -}; +} local exception G { string data; -}; +} ["cpp:ice_print"] local exception H { string data; -}; +} module Mod { exception A extends ::Test::A { int a2Mem; - }; -}; + } +} ["amd"] interface Thrower @@ -104,12 +104,12 @@ module Mod void throwF() throws F; void throwG(); void throwH(); -}; +} ["amd"] interface WrongOperation { void noSuchOperation(); -}; +} -}; +} diff --git a/cpp/test/Ice/facets/Test.ice b/cpp/test/Ice/facets/Test.ice index 95576fade19..4269e7deb11 100644 --- a/cpp/test/Ice/facets/Test.ice +++ b/cpp/test/Ice/facets/Test.ice @@ -14,48 +14,48 @@ module Test interface Empty { -}; +} interface A { string callA(); -}; +} interface B extends A { string callB(); -}; +} interface C extends A { string callC(); -}; +} interface D extends B, C { string callD(); -}; +} interface E { string callE(); -}; +} interface F extends E { string callF(); -}; +} interface G { void shutdown(); string callG(); -}; +} interface H extends G { string callH(); -}; +} -}; +} diff --git a/cpp/test/Ice/faultTolerance/Test.ice b/cpp/test/Ice/faultTolerance/Test.ice index 2eb092e5203..a9e41465f35 100644 --- a/cpp/test/Ice/faultTolerance/Test.ice +++ b/cpp/test/Ice/faultTolerance/Test.ice @@ -18,6 +18,6 @@ interface TestIntf void abort(); idempotent void idempotentAbort(); idempotent int pid(); -}; +} -}; +} diff --git a/cpp/test/Ice/gc/Test.ice b/cpp/test/Ice/gc/Test.ice index a26a351437d..cd01a1f6a71 100644 --- a/cpp/test/Ice/gc/Test.ice +++ b/cpp/test/Ice/gc/Test.ice @@ -16,7 +16,7 @@ class C { C left; C right; -}; +} sequence<C> CSeq; dictionary<int, C> CDict; @@ -24,7 +24,7 @@ dictionary<int, C> CDict; struct S { C theC; -}; +} sequence<S> SSeq; class C2; @@ -33,25 +33,25 @@ dictionary<int, C2> C2Dict; struct S2 { C2Dict theC2Dict; -}; +} sequence<S2> S2Seq; class C2 { S2Seq theS2Seq; -}; +} class Leaf { int i; -}; +} class Node { Leaf l; Node n; -}; +} // // Remainder of definitions are there to test that the generated code compiles; @@ -72,14 +72,14 @@ sequence<CSeq> CSeqSeq; // Sequence of sequence. struct A // Struct containing sequence. { SSeq theSSeq; -}; +} // Struct containing dictionary defined above. struct B // Struct containing struct. { S theS; -}; +} // Dictionary of classes defined above. @@ -103,7 +103,7 @@ class CTest CSeqDict theCSeqDict; SDict theSDict; CDictDict theCDictDict; -}; +} module AAA { @@ -114,7 +114,7 @@ module AAA struct BStruct { B bMem; - }; + } class C { @@ -125,8 +125,8 @@ module AAA BSeq x; BDict y; BStruct z; - }; -}; + } +} module AAA { @@ -135,7 +135,7 @@ module AAA struct CStruct { C cMem; - }; + } class B { @@ -146,32 +146,32 @@ module AAA CSeq x; CDict y; CStruct z; - }; -}; + } +} module CCC { class Forward; sequence<Forward*> ForwardProxySeq; -}; +} module CCC { class Forward { - }; -}; + } +} module DDD { interface I { void op(); - }; + } class C { - }; + } class C2; @@ -183,11 +183,11 @@ module DDD C* myCstar; C2 myC2; C2* myC2star; - }; + } class C2 { - }; -}; + } +} -}; +} diff --git a/cpp/test/Ice/hash/Test.ice b/cpp/test/Ice/hash/Test.ice index 876998c2a6f..f7bc51e3f85 100644 --- a/cpp/test/Ice/hash/Test.ice +++ b/cpp/test/Ice/hash/Test.ice @@ -14,7 +14,7 @@ module Test class Point { -}; +} -}; +} diff --git a/cpp/test/Ice/hold/Test.ice b/cpp/test/Ice/hold/Test.ice index 3d18b9e1631..0e450781798 100644 --- a/cpp/test/Ice/hold/Test.ice +++ b/cpp/test/Ice/hold/Test.ice @@ -19,6 +19,6 @@ interface Hold void setOneway(int value, int expected); int set(int value, int delay); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/impl/Test.ice b/cpp/test/Ice/impl/Test.ice index 8b331ec2b50..35a26eb85eb 100644 --- a/cpp/test/Ice/impl/Test.ice +++ b/cpp/test/Ice/impl/Test.ice @@ -19,21 +19,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -64,7 +64,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -92,7 +92,7 @@ dictionary<string, DoubleS> StringDoubleSD; dictionary<string, StringS> StringStringSD; dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; -exception SomeException {}; +exception SomeException {} interface MyClass { @@ -262,28 +262,28 @@ interface MyClass ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -422,4 +422,4 @@ const ["cpp:type:wstring"]string wsu0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃 const ["cpp:type:wstring"]string wsu1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const ["cpp:type:wstring"]string wsu2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} diff --git a/cpp/test/Ice/impl/TestAMD.ice b/cpp/test/Ice/impl/TestAMD.ice index 5500bdf241d..c3cd3ed48da 100644 --- a/cpp/test/Ice/impl/TestAMD.ice +++ b/cpp/test/Ice/impl/TestAMD.ice @@ -19,21 +19,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -64,7 +64,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -260,21 +260,21 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} ["amd"] interface MyDerivedClass extends MyClass @@ -282,7 +282,7 @@ class MyClass1 void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // @@ -421,4 +421,4 @@ const ["cpp:type:wstring"]string wsu0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃 const ["cpp:type:wstring"]string wsu1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const ["cpp:type:wstring"]string wsu2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} diff --git a/cpp/test/Ice/info/Test.ice b/cpp/test/Ice/info/Test.ice index c518d54b867..6741d5348d4 100644 --- a/cpp/test/Ice/info/Test.ice +++ b/cpp/test/Ice/info/Test.ice @@ -21,6 +21,6 @@ interface TestIntf Ice::Context getEndpointInfoAsContext(); Ice::Context getConnectionInfoAsContext(); -}; +} -}; +} diff --git a/cpp/test/Ice/inheritance/Test.ice b/cpp/test/Ice/inheritance/Test.ice index 2fee2738fed..6245e88b13f 100644 --- a/cpp/test/Ice/inheritance/Test.ice +++ b/cpp/test/Ice/inheritance/Test.ice @@ -20,14 +20,14 @@ module MA interface IA { IA* iaop(IA* p); -}; +} class CA { CA* caop(CA* p); -}; +} -}; +} module MB { @@ -35,19 +35,19 @@ module MB interface IB1 extends MA::IA { IB1* ib1op(IB1* p); -}; +} interface IB2 extends MA::IA { IB2* ib2op(IB2* p); -}; +} ["cpp:virtual"]class CB extends MA::CA { CB* cbop(CB* p); -}; +} -}; +} module MA { @@ -55,19 +55,19 @@ module MA interface IC extends MB::IB1, MB::IB2 { IC* icop(IC* p); -}; +} ["cpp:virtual"]class CC extends MB::CB { CC* ccop(CC* p); -}; +} ["cpp:virtual"]class CD extends CC implements MB::IB1, MB::IB2 { CD* cdop(CD* p); -}; +} -}; +} interface Initial { @@ -80,7 +80,7 @@ interface Initial MB::IB1* ib1op(); MB::IB2* ib2op(); MA::IC* icop(); -}; +} module MC @@ -89,24 +89,24 @@ module MC class A { int aA; -}; +} class B extends A { int bB; -}; +} class C extends B { int cC; -}; +} ["cpp:virtual"] class D extends C { int dD; -}; +} -}; +} module MD { @@ -114,24 +114,24 @@ module MD ["cpp:virtual"] class A { int aA; -}; +} ["cpp:virtual"] class B extends A { int bB; -}; +} ["cpp:virtual"] class C extends B { int cC; -}; +} ["cpp:virtual"] class D extends C { int dD; -}; +} -}; +} module ME { @@ -139,24 +139,24 @@ module ME class A { int aA; -}; +} class B extends A { int bB; -}; +} ["cpp:virtual"] class C extends B { int cC; -}; +} ["cpp:virtual"] class D extends C { int dD; -}; +} -}; +} module MF { @@ -164,24 +164,24 @@ module MF class A { int aA; -}; +} ["cpp:virtual"] class B extends A { int bB; -}; +} class C extends B { int cC; -}; +} ["cpp:virtual"] class D extends C { int dD; -}; +} -}; +} module MG { @@ -189,24 +189,24 @@ module MG class A { int aA; -}; +} ["cpp:virtual"] class B extends A { int bB; -}; +} ["cpp:virtual"] class C extends B { int cC; -}; +} class D extends C { int dD; -}; +} -}; +} module MH { @@ -214,23 +214,23 @@ module MH class A { int aA; -}; +} class B extends A { int bB; -}; +} class C extends B { int cC; -}; +} class D extends C { int dD; -}; +} -}; +} -}; +} diff --git a/cpp/test/Ice/interceptor/Test.ice b/cpp/test/Ice/interceptor/Test.ice index 031ef3b4289..8d221c4e4d3 100644 --- a/cpp/test/Ice/interceptor/Test.ice +++ b/cpp/test/Ice/interceptor/Test.ice @@ -17,12 +17,12 @@ module Test exception InvalidInputException { string message; -}; +} ["cpp:ice_print"] local exception RetryException { -}; +} interface MyObject { @@ -80,7 +80,7 @@ interface MyObject // ["amd"] int amdBadSystemAdd(int x, int y); -}; +} -}; +} diff --git a/cpp/test/Ice/invoke/Test.ice b/cpp/test/Ice/invoke/Test.ice index 2636b194c1c..738da002141 100644 --- a/cpp/test/Ice/invoke/Test.ice +++ b/cpp/test/Ice/invoke/Test.ice @@ -14,7 +14,7 @@ module Test exception MyException { -}; +} interface MyClass { @@ -25,6 +25,6 @@ interface MyClass void opException() throws MyException; void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/library/Test.ice b/cpp/test/Ice/library/Test.ice index c1397e02a13..701ce6ae033 100644 --- a/cpp/test/Ice/library/Test.ice +++ b/cpp/test/Ice/library/Test.ice @@ -17,11 +17,11 @@ module Test exception UserError { string message; -}; +} interface MyInterface { void op(bool throwIt) throws UserError; -}; +} -}; +} diff --git a/cpp/test/Ice/location/Test.ice b/cpp/test/Ice/location/Test.ice index d3f656f69d4..e69636b2724 100644 --- a/cpp/test/Ice/location/Test.ice +++ b/cpp/test/Ice/location/Test.ice @@ -20,7 +20,7 @@ interface TestLocatorRegistry extends ::Ice::LocatorRegistry // Allow remote addition of objects to the locator registry. // void addObject(Object* obj); -}; +} interface TestLocator extends ::Ice::Locator { @@ -28,18 +28,18 @@ interface TestLocator extends ::Ice::Locator // Returns the number of request on the locator interface. // ["cpp:const"] idempotent int getRequestCount(); -}; +} interface ServerManager { void startServer(); void shutdown(); -}; +} interface Hello { void sayHello(); -}; +} interface TestIntf { @@ -50,6 +50,6 @@ interface TestIntf Hello* getReplicatedHello(); void migrateHello(); -}; +} -}; +} diff --git a/cpp/test/Ice/metrics/Test.ice b/cpp/test/Ice/metrics/Test.ice index 45383f6b458..142b1e3d777 100644 --- a/cpp/test/Ice/metrics/Test.ice +++ b/cpp/test/Ice/metrics/Test.ice @@ -14,7 +14,7 @@ module Test exception UserEx { -}; +} sequence<byte> ByteSeq; @@ -38,13 +38,13 @@ interface Metrics Object* getAdmin(); void shutdown(); -}; +} interface Controller { void hold(); void resume(); -}; +} -}; +} diff --git a/cpp/test/Ice/metrics/TestAMD.ice b/cpp/test/Ice/metrics/TestAMD.ice index ba885ae60f6..54ddb250199 100644 --- a/cpp/test/Ice/metrics/TestAMD.ice +++ b/cpp/test/Ice/metrics/TestAMD.ice @@ -14,7 +14,7 @@ module Test exception UserEx { -}; +} sequence<byte> ByteSeq; @@ -38,13 +38,13 @@ interface Metrics Object* getAdmin(); void shutdown(); -}; +} interface Controller { void hold(); void resume(); -}; +} -}; +} diff --git a/cpp/test/Ice/networkProxy/Test.ice b/cpp/test/Ice/networkProxy/Test.ice index efaa03d8366..e3a95f4cdfc 100644 --- a/cpp/test/Ice/networkProxy/Test.ice +++ b/cpp/test/Ice/networkProxy/Test.ice @@ -15,6 +15,6 @@ module Test interface TestIntf { void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/objects/Derived.ice b/cpp/test/Ice/objects/Derived.ice index e79fe47a6c8..9a2d817852e 100644 --- a/cpp/test/Ice/objects/Derived.ice +++ b/cpp/test/Ice/objects/Derived.ice @@ -17,6 +17,6 @@ module Test class Derived extends Base { string b; -}; +} -}; +} diff --git a/cpp/test/Ice/objects/DerivedEx.ice b/cpp/test/Ice/objects/DerivedEx.ice index bf06cef1587..545cb602818 100644 --- a/cpp/test/Ice/objects/DerivedEx.ice +++ b/cpp/test/Ice/objects/DerivedEx.ice @@ -16,6 +16,6 @@ module Test exception DerivedEx extends BaseEx { -}; +} -}; +} diff --git a/cpp/test/Ice/objects/Test.ice b/cpp/test/Ice/objects/Test.ice index 7d64f20614e..73e4c51a071 100644 --- a/cpp/test/Ice/objects/Test.ice +++ b/cpp/test/Ice/objects/Test.ice @@ -17,23 +17,23 @@ module Test struct S { string str; -}; +} class Base { S theS; string str; -}; +} exception BaseEx { string reason; -}; +} class AbstractBase extends Base { void op(); -}; +} class B; class C; @@ -45,12 +45,12 @@ class A bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class B extends A { A theA; -}; +} class C { @@ -58,7 +58,7 @@ class C bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class D { @@ -68,31 +68,31 @@ class D bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} ["protected"] class E { int i; string s; -}; +} class F { ["protected"] E e1; E e2; -}; +} interface I { -}; +} interface J extends I { -}; +} class H implements I { -}; +} sequence<Base> BaseSeq; @@ -100,13 +100,13 @@ class CompactExt; class Compact(1) { -}; +} const int CompactExtId = 789; class CompactExt(CompactExtId) extends Compact { -}; +} module Inner { @@ -114,12 +114,12 @@ module Inner class A { ::Test::A theA; -}; +} exception Ex { string reason; -}; +} module Sub { @@ -127,50 +127,50 @@ module Sub class A { ::Test::Inner::A theA; -}; +} exception Ex { string reason; -}; +} -}; +} -}; +} class A1 { string name; -}; +} class B1 { A1 a1; A1 a2; -}; +} class D1 extends B1 { A1 a3; A1 a4; -}; +} exception EBase { A1 a1; A1 a2; -}; +} exception EDerived extends EBase { A1 a3; A1 a4; -}; +} class Recursive { Recursive v; -}; +} interface Initial { @@ -208,26 +208,26 @@ interface Initial void throwInnerEx() throws Inner::Ex; void throwInnerSubEx() throws Inner::Sub::Ex; -}; +} interface TestIntf { Base opDerived(); void throwDerived() throws BaseEx; -}; +} class Empty { -}; +} class AlsoEmpty { -}; +} interface UnexpectedObjectExceptionTest { Empty op(); -}; +} // // Remaining definitions are here to ensure that the generated code compiles. @@ -236,37 +236,37 @@ interface UnexpectedObjectExceptionTest class COneMember { Empty e; -}; +} class CTwoMembers { Empty e1; Empty e2; -}; +} exception EOneMember { Empty e; -}; +} exception ETwoMembers { Empty e1; Empty e2; -}; +} struct SOneMember { Empty e; -}; +} struct STwoMembers { Empty e1; Empty e2; -}; +} dictionary<int, COneMember> DOneMember; dictionary<int, CTwoMembers> DTwoMembers; -}; +} diff --git a/cpp/test/Ice/operations/Test.ice b/cpp/test/Ice/operations/Test.ice index cb899d6f847..5920e979a9d 100644 --- a/cpp/test/Ice/operations/Test.ice +++ b/cpp/test/Ice/operations/Test.ice @@ -19,21 +19,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -64,7 +64,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -92,7 +92,7 @@ dictionary<string, DoubleS> StringDoubleSD; dictionary<string, StringS> StringStringSD; dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; -exception SomeException {}; +exception SomeException {} interface MyClass { @@ -262,28 +262,28 @@ interface MyClass ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -422,7 +422,7 @@ const ["cpp:type:wstring"]string wsu0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃 const ["cpp:type:wstring"]string wsu1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const ["cpp:type:wstring"]string wsu2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} module Test2 { @@ -435,6 +435,6 @@ module Test2 **/ interface MyDerivedClass extends Test::MyClass { -}; +} -}; +} diff --git a/cpp/test/Ice/operations/TestAMD.ice b/cpp/test/Ice/operations/TestAMD.ice index 5500bdf241d..c3cd3ed48da 100644 --- a/cpp/test/Ice/operations/TestAMD.ice +++ b/cpp/test/Ice/operations/TestAMD.ice @@ -19,21 +19,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -64,7 +64,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -260,21 +260,21 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} ["amd"] interface MyDerivedClass extends MyClass @@ -282,7 +282,7 @@ class MyClass1 void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // @@ -421,4 +421,4 @@ const ["cpp:type:wstring"]string wsu0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃 const ["cpp:type:wstring"]string wsu1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const ["cpp:type:wstring"]string wsu2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} diff --git a/cpp/test/Ice/optional/Test.ice b/cpp/test/Ice/optional/Test.ice index d5c71bcb2de..d6fae007472 100644 --- a/cpp/test/Ice/optional/Test.ice +++ b/cpp/test/Ice/optional/Test.ice @@ -17,32 +17,32 @@ module Test class OneOptional { optional(1) int a; -}; +} enum MyEnum { MyEnumMember -}; +} struct SmallStruct { byte m; -}; +} struct FixedStruct { int m; -}; +} struct VarStruct { string m; -}; +} ["cpp:class"] struct ClassVarStruct { int a; -}; +} sequence<byte> ByteSeq; sequence<bool> BoolSeq; @@ -109,7 +109,7 @@ class MultiOptional optional(29) BoolSeq bos; optional(30) Serializable ser; -}; +} class A { @@ -117,26 +117,26 @@ class A optional(1) int ma; optional(50) int mb; optional(500) int mc; -}; +} ["preserve-slice"] class B extends A { int requiredB = 0; optional(10) int md; -}; +} class C extends B { string ss; optional(890) string ms; -}; +} class WD { optional(1) int a = 5; optional(2) string s = "test"; -}; +} exception OptionalException { @@ -144,46 +144,46 @@ exception OptionalException optional(1) int a = 5; optional(2) string b; optional(50) OneOptional o; -}; +} exception DerivedException extends OptionalException { optional(600) string ss = "test"; optional(601) OneOptional o2; -}; +} exception RequiredException extends OptionalException { string ss = "test"; OneOptional o2; -}; +} class OptionalWithCustom { optional(1) SmallStructList l; ["protected"] optional(2) SmallStructList lp; optional(3) ClassVarStruct s; -}; +} class E { A ae; -}; +} class F extends E { optional(1) A af; -}; +} class G1 { string a; -}; +} class G2 { long a; -}; +} class G { @@ -191,7 +191,7 @@ class G G2 gg2; optional(0) G2 gg2Opt; G1 gg1; -}; +} class Recursive; sequence<Recursive> RecursiveSeq; @@ -199,7 +199,7 @@ sequence<Recursive> RecursiveSeq; class Recursive { optional(0) RecursiveSeq value; -}; +} interface Initial { @@ -335,6 +335,6 @@ interface Initial bool supportsCppStringView(); bool supportsNullOptional(); -}; +} -}; +} diff --git a/cpp/test/Ice/optional/TestAMD.ice b/cpp/test/Ice/optional/TestAMD.ice index 4757f716e57..1414bb7dccb 100644 --- a/cpp/test/Ice/optional/TestAMD.ice +++ b/cpp/test/Ice/optional/TestAMD.ice @@ -17,32 +17,32 @@ module Test class OneOptional { optional(1) int a; -}; +} enum MyEnum { MyEnumMember -}; +} struct SmallStruct { byte m; -}; +} struct FixedStruct { int m; -}; +} struct VarStruct { string m; -}; +} ["cpp:class"] struct ClassVarStruct { int a; -}; +} sequence<byte> ByteSeq; sequence<bool> BoolSeq; @@ -109,7 +109,7 @@ class MultiOptional optional(29) BoolSeq bos; optional(30) Serializable ser; -}; +} class A { @@ -117,26 +117,26 @@ class A optional(1) int ma; optional(50) int mb; optional(500) int mc; -}; +} ["preserve-slice"] class B extends A { int requiredB = 0; optional(10) int md; -}; +} class C extends B { string ss; optional(890) string ms; -}; +} class WD { optional(1) int a = 5; optional(2) string s = "test"; -}; +} exception OptionalException { @@ -144,46 +144,46 @@ exception OptionalException optional(1) int a = 5; optional(2) string b; optional(50) OneOptional o; -}; +} exception DerivedException extends OptionalException { optional(600) string ss = "test"; optional(601) OneOptional o2; -}; +} exception RequiredException extends OptionalException { string ss = "test"; OneOptional o2; -}; +} class OptionalWithCustom { optional(1) SmallStructList l; ["protected"] optional(2) SmallStructList lp; optional(3) ClassVarStruct s; -}; +} class E { A ae; -}; +} class F extends E { optional(1) A af; -}; +} class G1 { string a; -}; +} class G2 { long a; -}; +} class G { @@ -191,7 +191,7 @@ class G G2 gg2; optional(0) G2 gg2Opt; G1 gg1; -}; +} class Recursive; sequence<Recursive> RecursiveSeq; @@ -199,7 +199,7 @@ sequence<Recursive> RecursiveSeq; class Recursive { optional(0) RecursiveSeq value; -}; +} ["amd"] interface Initial @@ -336,6 +336,6 @@ interface Initial bool supportsCppStringView(); bool supportsNullOptional(); -}; +} -}; +} diff --git a/cpp/test/Ice/proxy/Test.ice b/cpp/test/Ice/proxy/Test.ice index f98d7dbcb3d..711ed0289f1 100644 --- a/cpp/test/Ice/proxy/Test.ice +++ b/cpp/test/Ice/proxy/Test.ice @@ -19,11 +19,11 @@ interface MyClass void shutdown(); Ice::Context getContext(); -}; +} interface MyDerivedClass extends MyClass { Object* echo(Object* obj); -}; +} -}; +} diff --git a/cpp/test/Ice/proxy/TestAMD.ice b/cpp/test/Ice/proxy/TestAMD.ice index d0312f701b1..2af61997486 100644 --- a/cpp/test/Ice/proxy/TestAMD.ice +++ b/cpp/test/Ice/proxy/TestAMD.ice @@ -19,11 +19,11 @@ module Test void shutdown(); Ice::Context getContext(); -}; +} ["amd"] interface MyDerivedClass extends MyClass { Object* echo(Object* obj); -}; +} -}; +} diff --git a/cpp/test/Ice/retry/Test.ice b/cpp/test/Ice/retry/Test.ice index 7df682dafca..abe9815da89 100644 --- a/cpp/test/Ice/retry/Test.ice +++ b/cpp/test/Ice/retry/Test.ice @@ -21,6 +21,6 @@ interface Retry void opSystemException(); idempotent void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/servantLocator/Test.ice b/cpp/test/Ice/servantLocator/Test.ice index e76652c3f3d..44a5ae1503e 100644 --- a/cpp/test/Ice/servantLocator/Test.ice +++ b/cpp/test/Ice/servantLocator/Test.ice @@ -14,11 +14,11 @@ module Test exception TestIntfUserException { -}; +} exception TestImpossibleException { -}; +} interface TestIntf { @@ -40,16 +40,16 @@ interface TestIntf void asyncException() throws TestIntfUserException, TestImpossibleException; void shutdown(); -}; +} interface TestActivation { void activateServantLocator(bool activate); -}; +} local class Cookie { ["cpp:const"] string message(); -}; +} -}; +} diff --git a/cpp/test/Ice/servantLocator/TestAMD.ice b/cpp/test/Ice/servantLocator/TestAMD.ice index 57ffc59e6a2..a5fa6bfe387 100644 --- a/cpp/test/Ice/servantLocator/TestAMD.ice +++ b/cpp/test/Ice/servantLocator/TestAMD.ice @@ -14,11 +14,11 @@ module Test exception TestIntfUserException { -}; +} exception TestImpossibleException { -}; +} ["amd"] interface TestIntf { @@ -40,17 +40,17 @@ exception TestImpossibleException void asyncException() throws TestIntfUserException, TestImpossibleException; void shutdown(); -}; +} interface TestActivation { void activateServantLocator(bool activate); -}; +} local class Cookie { ["cpp:const"] string message(); -}; +} -}; +} diff --git a/cpp/test/Ice/services/Test.ice b/cpp/test/Ice/services/Test.ice index c42f0dc0014..60863a4625c 100644 --- a/cpp/test/Ice/services/Test.ice +++ b/cpp/test/Ice/services/Test.ice @@ -15,6 +15,6 @@ module Test interface Clock { void tick(string time); -}; +} -}; +} diff --git a/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice b/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice index 47f9db97d22..eee256e04cd 100644 --- a/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice +++ b/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice @@ -17,16 +17,16 @@ module Test class PreservedClass extends BaseClass { string pc; -}; +} exception Preserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception Preserved2 extends Preserved1 { BaseClass p2; -}; +} -}; +} diff --git a/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice b/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice index 9c7d56ca391..d290938c3a2 100644 --- a/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice +++ b/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice @@ -17,36 +17,36 @@ module Test exception UnknownDerived extends Base { string ud; -}; +} exception UnknownIntermediate extends Base { string ui; -}; +} exception UnknownMostDerived1 extends KnownIntermediate { string umd1; -}; +} exception UnknownMostDerived2 extends UnknownIntermediate { string umd2; -}; +} class SPreservedClass extends BaseClass { string spc; -}; +} exception SPreserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception SPreserved2 extends SPreserved1 { BaseClass p2; -}; +} -}; +} diff --git a/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice index dade40f59b9..3ceb00da959 100644 --- a/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice +++ b/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice @@ -17,36 +17,36 @@ module Test exception UnknownDerived extends Base { string ud; -}; +} exception UnknownIntermediate extends Base { string ui; -}; +} exception UnknownMostDerived1 extends KnownIntermediate { string umd1; -}; +} exception UnknownMostDerived2 extends UnknownIntermediate { string umd2; -}; +} class SPreservedClass extends BaseClass { string spc; -}; +} exception SPreserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception SPreserved2 extends SPreserved1 { BaseClass p2; -}; +} -}; +} diff --git a/cpp/test/Ice/slicing/exceptions/Test.ice b/cpp/test/Ice/slicing/exceptions/Test.ice index 3ce6959161d..c6931b59a43 100644 --- a/cpp/test/Ice/slicing/exceptions/Test.ice +++ b/cpp/test/Ice/slicing/exceptions/Test.ice @@ -15,39 +15,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -57,7 +57,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["format:sliced"] interface TestIntf @@ -93,6 +93,6 @@ interface TestIntf void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/slicing/exceptions/TestAMD.ice b/cpp/test/Ice/slicing/exceptions/TestAMD.ice index 18a20b1e0ac..79a4060e2d4 100644 --- a/cpp/test/Ice/slicing/exceptions/TestAMD.ice +++ b/cpp/test/Ice/slicing/exceptions/TestAMD.ice @@ -15,39 +15,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -57,7 +57,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["amd", "format:sliced"] interface TestIntf @@ -93,6 +93,6 @@ interface TestIntf void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/slicing/objects/ClientPrivate.ice b/cpp/test/Ice/slicing/objects/ClientPrivate.ice index d8445516d19..e5be8a809aa 100644 --- a/cpp/test/Ice/slicing/objects/ClientPrivate.ice +++ b/cpp/test/Ice/slicing/objects/ClientPrivate.ice @@ -18,32 +18,32 @@ class D3 extends B { string sd3; B pd3; -}; +} ["preserve-slice"] class PCUnknown extends PBase { string pu; -}; +} class PCDerived extends PDerived { PBaseSeq pbs; -}; +} class PCDerived2 extends PCDerived { int pcd2; -}; +} class PCDerived3 extends PCDerived2 { Object pcd3; -}; +} class CompactPCDerived(57) extends CompactPDerived { PBaseSeq pbs; -}; +} -}; +} diff --git a/cpp/test/Ice/slicing/objects/ServerPrivate.ice b/cpp/test/Ice/slicing/objects/ServerPrivate.ice index 010e74801d8..be4a3b3f131 100644 --- a/cpp/test/Ice/slicing/objects/ServerPrivate.ice +++ b/cpp/test/Ice/slicing/objects/ServerPrivate.ice @@ -17,51 +17,51 @@ module Test class SBSUnknownDerived extends SBase { string sbsud; -}; +} class SUnknown { string su; -}; +} class D2 extends B { string sd2; B pd2; -}; +} class D4 extends B { B p1; B p2; -}; +} exception UnknownDerivedException extends BaseException { string sude; D2 pd2; -}; +} class MyClass { int i; -}; +} class PSUnknown extends Preserved { string psu; PNode graph; MyClass cl; -}; +} class PSUnknown2 extends Preserved { PBase pb; -}; +} exception PSUnknownException extends PreservedException { PSUnknown2 p; -}; +} -}; +} diff --git a/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice b/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice index 118dc768839..e23c09b68f6 100644 --- a/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice +++ b/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice @@ -17,51 +17,51 @@ module Test class SBSUnknownDerived extends SBase { string sbsud; -}; +} class SUnknown { string su; -}; +} class D2 extends B { string sd2; B pd2; -}; +} class D4 extends B { B p1; B p2; -}; +} exception UnknownDerivedException extends BaseException { string sude; D2 pd2; -}; +} class MyClass { int i; -}; +} class PSUnknown extends Preserved { string psu; PNode graph; MyClass cl; -}; +} class PSUnknown2 extends Preserved { PBase pb; -}; +} exception PSUnknownException extends PreservedException { PSUnknown2 p; -}; +} -}; +} diff --git a/cpp/test/Ice/slicing/objects/Test.ice b/cpp/test/Ice/slicing/objects/Test.ice index 89f2780c352..6c25277a348 100644 --- a/cpp/test/Ice/slicing/objects/Test.ice +++ b/cpp/test/Ice/slicing/objects/Test.ice @@ -15,42 +15,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS3 { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -58,20 +58,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -79,28 +79,28 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} class CompactPDerived(56) extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["format:sliced"] interface TestIntf @@ -158,17 +158,17 @@ interface TestIntf void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */ void shutdown(); -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} -}; +} diff --git a/cpp/test/Ice/slicing/objects/TestAMD.ice b/cpp/test/Ice/slicing/objects/TestAMD.ice index dc034da87ab..8fcace1b888 100644 --- a/cpp/test/Ice/slicing/objects/TestAMD.ice +++ b/cpp/test/Ice/slicing/objects/TestAMD.ice @@ -15,42 +15,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS3 { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -58,20 +58,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -79,23 +79,23 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["amd", "format:sliced"] interface TestIntf @@ -153,16 +153,16 @@ interface TestIntf void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */ void shutdown(); -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} -}; +} diff --git a/cpp/test/Ice/stream/Test.ice b/cpp/test/Ice/stream/Test.ice index 91183361811..414b2130450 100644 --- a/cpp/test/Ice/stream/Test.ice +++ b/cpp/test/Ice/stream/Test.ice @@ -19,7 +19,7 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyInterface; class MyClass; @@ -36,12 +36,12 @@ class MyClass; string str; MyEnum e; MyInterface* p; -}; +} ["cpp:class"] struct ClassStruct { int i; -}; +} class OptionalClass { @@ -49,7 +49,7 @@ class OptionalClass byte by; optional(1) short sh; optional(2) int i; -}; +} sequence<MyEnum> MyEnumS; sequence<SmallStruct> SmallStructS; @@ -89,16 +89,16 @@ class MyClass MyEnumS seq9; MyClassS seq10; StringMyClassD d; -}; +} interface MyInterface { -}; +} exception MyException { MyClass c; -}; +} module Sub { @@ -107,7 +107,7 @@ module Sub nestedEnum1, nestedEnum2, nestedEnum3 - }; + } ["cpp:comparable"] struct NestedStruct { @@ -120,19 +120,19 @@ module Sub double d; string str; NestedEnum e; - }; + } ["cpp:class"] struct NestedClassStruct { int i; - }; + } exception NestedException { string str; - }; -}; -}; + } +} +} module Test2 { @@ -143,7 +143,7 @@ module Sub2 nestedEnum4, nestedEnum5, nestedEnum6 - }; + } ["cpp:comparable"] struct NestedStruct2 { @@ -156,17 +156,17 @@ module Sub2 double d; string str; NestedEnum2 e; - }; + } ["cpp:class"] struct NestedClassStruct2 { int i; - }; + } exception NestedException2 { string str; - }; -}; -}; + } +} +} diff --git a/cpp/test/Ice/stringConverter/Test.ice b/cpp/test/Ice/stringConverter/Test.ice index 1edff36c6e9..44e5fd239e0 100644 --- a/cpp/test/Ice/stringConverter/Test.ice +++ b/cpp/test/Ice/stringConverter/Test.ice @@ -12,7 +12,7 @@ module Test { -exception BadEncodingException {}; +exception BadEncodingException {} interface MyObject { @@ -20,7 +20,7 @@ interface MyObject string narrow(["cpp:type:wstring"] string wmsg); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/threadPoolPriority/Test.ice b/cpp/test/Ice/threadPoolPriority/Test.ice index 1f0d830a9c9..63e84288259 100644 --- a/cpp/test/Ice/threadPoolPriority/Test.ice +++ b/cpp/test/Ice/threadPoolPriority/Test.ice @@ -16,6 +16,6 @@ interface Priority { void shutdown(); int getPriority(); -}; +} -}; +} diff --git a/cpp/test/Ice/timeout/Test.ice b/cpp/test/Ice/timeout/Test.ice index d34168a950a..aad831a9993 100644 --- a/cpp/test/Ice/timeout/Test.ice +++ b/cpp/test/Ice/timeout/Test.ice @@ -23,6 +23,6 @@ interface Timeout void holdAdapter(int to); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Ice/udp/Test.ice b/cpp/test/Ice/udp/Test.ice index 997bf2fa9e4..f994f2963f9 100644 --- a/cpp/test/Ice/udp/Test.ice +++ b/cpp/test/Ice/udp/Test.ice @@ -17,7 +17,7 @@ module Test interface PingReply { void reply(); -}; +} sequence<byte> ByteSeq; @@ -27,6 +27,6 @@ interface TestIntf void sendByteSeq(ByteSeq seq, PingReply* reply); void pingBiDir(Ice::Identity reply); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/IceBox/admin/Test.ice b/cpp/test/IceBox/admin/Test.ice index f0d93d24882..8753d0af205 100644 --- a/cpp/test/IceBox/admin/Test.ice +++ b/cpp/test/IceBox/admin/Test.ice @@ -18,8 +18,8 @@ module Test interface TestFacet { Ice::PropertyDict getChanges(); -}; +} -}; +} #endif diff --git a/cpp/test/IceBox/configuration/Test.ice b/cpp/test/IceBox/configuration/Test.ice index 8f11f08148d..42ed1705bfe 100644 --- a/cpp/test/IceBox/configuration/Test.ice +++ b/cpp/test/IceBox/configuration/Test.ice @@ -19,6 +19,6 @@ interface TestIntf string getProperty(string name); Ice::StringSeq getArgs(); -}; +} -}; +} diff --git a/cpp/test/IceDiscovery/simple/Test.ice b/cpp/test/IceDiscovery/simple/Test.ice index 1bce253ee70..9375593e475 100644 --- a/cpp/test/IceDiscovery/simple/Test.ice +++ b/cpp/test/IceDiscovery/simple/Test.ice @@ -16,7 +16,7 @@ module Test interface TestIntf { string getAdapterId(); -}; +} interface Controller { @@ -27,6 +27,6 @@ interface Controller void removeObject(string oaName, string id); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/IceGrid/activation/Test.ice b/cpp/test/IceGrid/activation/Test.ice index 4f6e26e6c5a..4735007f5f6 100644 --- a/cpp/test/IceGrid/activation/Test.ice +++ b/cpp/test/IceGrid/activation/Test.ice @@ -17,6 +17,6 @@ interface TestIntf void fail(); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/IceGrid/allocation/Test.ice b/cpp/test/IceGrid/allocation/Test.ice index 8a5b7b0ee4e..ff85256e0ac 100644 --- a/cpp/test/IceGrid/allocation/Test.ice +++ b/cpp/test/IceGrid/allocation/Test.ice @@ -17,6 +17,6 @@ interface TestIntf void shutdown(); string getProperty(string name); -}; +} -}; +} diff --git a/cpp/test/IceGrid/deployer/Test.ice b/cpp/test/IceGrid/deployer/Test.ice index 8a5b7b0ee4e..ff85256e0ac 100644 --- a/cpp/test/IceGrid/deployer/Test.ice +++ b/cpp/test/IceGrid/deployer/Test.ice @@ -17,6 +17,6 @@ interface TestIntf void shutdown(); string getProperty(string name); -}; +} -}; +} diff --git a/cpp/test/IceGrid/distribution/Test.ice b/cpp/test/IceGrid/distribution/Test.ice index 426f2784e70..6742df9efce 100644 --- a/cpp/test/IceGrid/distribution/Test.ice +++ b/cpp/test/IceGrid/distribution/Test.ice @@ -16,6 +16,6 @@ interface TestIntf { string getServerFile(string path); string getApplicationFile(string path); -}; +} -}; +} diff --git a/cpp/test/IceGrid/noRestartUpdate/Test.ice b/cpp/test/IceGrid/noRestartUpdate/Test.ice index f3eb7f88f9d..8dca623e122 100644 --- a/cpp/test/IceGrid/noRestartUpdate/Test.ice +++ b/cpp/test/IceGrid/noRestartUpdate/Test.ice @@ -18,8 +18,8 @@ interface TestIntf void shutdown(); string getProperty(string name); -}; +} -}; +} #endif diff --git a/cpp/test/IceGrid/replicaGroup/Test.ice b/cpp/test/IceGrid/replicaGroup/Test.ice index 06d37ea144d..9ed70323697 100644 --- a/cpp/test/IceGrid/replicaGroup/Test.ice +++ b/cpp/test/IceGrid/replicaGroup/Test.ice @@ -16,6 +16,6 @@ interface TestIntf { string getReplicaId(); string getReplicaIdAndShutdown(); -}; +} -}; +} diff --git a/cpp/test/IceGrid/replication/Test.ice b/cpp/test/IceGrid/replication/Test.ice index ff15a45c189..16b5accd061 100644 --- a/cpp/test/IceGrid/replication/Test.ice +++ b/cpp/test/IceGrid/replication/Test.ice @@ -14,6 +14,6 @@ module Test interface TestIntf { -}; +} -}; +} diff --git a/cpp/test/IceGrid/session/Test.ice b/cpp/test/IceGrid/session/Test.ice index 62dd20b477b..21c26a4fa85 100644 --- a/cpp/test/IceGrid/session/Test.ice +++ b/cpp/test/IceGrid/session/Test.ice @@ -16,6 +16,6 @@ module Test exception ExtendedPermissionDeniedException extends Glacier2::PermissionDeniedException { -}; +} -}; +} diff --git a/cpp/test/IceGrid/simple/Test.ice b/cpp/test/IceGrid/simple/Test.ice index efaa03d8366..e3a95f4cdfc 100644 --- a/cpp/test/IceGrid/simple/Test.ice +++ b/cpp/test/IceGrid/simple/Test.ice @@ -15,6 +15,6 @@ module Test interface TestIntf { void shutdown(); -}; +} -}; +} diff --git a/cpp/test/IceGrid/update/Test.ice b/cpp/test/IceGrid/update/Test.ice index 699db41e97a..2030ef2a5bf 100644 --- a/cpp/test/IceGrid/update/Test.ice +++ b/cpp/test/IceGrid/update/Test.ice @@ -17,7 +17,7 @@ interface TestIntf void shutdown(); string getProperty(string name); -}; +} -}; +} diff --git a/cpp/test/IceSSL/configuration/Test.ice b/cpp/test/IceSSL/configuration/Test.ice index fbe20c252c0..d5d5573a73e 100644 --- a/cpp/test/IceSSL/configuration/Test.ice +++ b/cpp/test/IceSSL/configuration/Test.ice @@ -17,7 +17,7 @@ interface Server void noCert(); void checkCert(string subjectDN, string issuerDN); void checkCipher(string cipher); -}; +} dictionary<string, string> Properties; @@ -26,6 +26,6 @@ interface ServerFactory Server* createServer(Properties props); void destroyServer(Server* srv); void shutdown(); -}; +} -}; +} diff --git a/cpp/test/IceStorm/federation/Event.ice b/cpp/test/IceStorm/federation/Event.ice index ec5c71e1d37..02933faf639 100644 --- a/cpp/test/IceStorm/federation/Event.ice +++ b/cpp/test/IceStorm/federation/Event.ice @@ -15,6 +15,6 @@ module Test interface Event { void pub(string data); -}; +} -}; +} diff --git a/cpp/test/IceStorm/federation2/Event.ice b/cpp/test/IceStorm/federation2/Event.ice index ec5c71e1d37..02933faf639 100644 --- a/cpp/test/IceStorm/federation2/Event.ice +++ b/cpp/test/IceStorm/federation2/Event.ice @@ -15,6 +15,6 @@ module Test interface Event { void pub(string data); -}; +} -}; +} diff --git a/cpp/test/IceStorm/rep1/Single.ice b/cpp/test/IceStorm/rep1/Single.ice index 2c675d51046..d0a76598538 100644 --- a/cpp/test/IceStorm/rep1/Single.ice +++ b/cpp/test/IceStorm/rep1/Single.ice @@ -15,6 +15,6 @@ module Test interface Single { void event(int i); -}; +} -}; +} diff --git a/cpp/test/IceStorm/repgrid/Single.ice b/cpp/test/IceStorm/repgrid/Single.ice index 2c675d51046..d0a76598538 100644 --- a/cpp/test/IceStorm/repgrid/Single.ice +++ b/cpp/test/IceStorm/repgrid/Single.ice @@ -15,6 +15,6 @@ module Test interface Single { void event(int i); -}; +} -}; +} diff --git a/cpp/test/IceStorm/repstress/Controller.ice b/cpp/test/IceStorm/repstress/Controller.ice index 9a3ca573d99..2115c9827be 100644 --- a/cpp/test/IceStorm/repstress/Controller.ice +++ b/cpp/test/IceStorm/repstress/Controller.ice @@ -15,6 +15,6 @@ module Test interface Controller { void stop(); -}; +} -}; +} diff --git a/cpp/test/IceStorm/repstress/Single.ice b/cpp/test/IceStorm/repstress/Single.ice index 2c675d51046..d0a76598538 100644 --- a/cpp/test/IceStorm/repstress/Single.ice +++ b/cpp/test/IceStorm/repstress/Single.ice @@ -15,6 +15,6 @@ module Test interface Single { void event(int i); -}; +} -}; +} diff --git a/cpp/test/IceStorm/single/Single.ice b/cpp/test/IceStorm/single/Single.ice index 2c675d51046..d0a76598538 100644 --- a/cpp/test/IceStorm/single/Single.ice +++ b/cpp/test/IceStorm/single/Single.ice @@ -15,6 +15,6 @@ module Test interface Single { void event(int i); -}; +} -}; +} diff --git a/cpp/test/IceStorm/stress/Event.ice b/cpp/test/IceStorm/stress/Event.ice index 8854f0eaa58..bdec83c1d10 100644 --- a/cpp/test/IceStorm/stress/Event.ice +++ b/cpp/test/IceStorm/stress/Event.ice @@ -15,6 +15,6 @@ module Test interface Event { void pub(int counter); -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.ice b/cpp/test/Slice/errorDetection/CaseInsensitive.ice index 2da44702f2e..37bbea6f0e3 100644 --- a/cpp/test/Slice/errorDetection/CaseInsensitive.ice +++ b/cpp/test/Slice/errorDetection/CaseInsensitive.ice @@ -16,165 +16,165 @@ interface i1 { void op(); void op(); -}; +} interface i2 { void op(); void oP(); -}; +} class c1 { long l; void l(); -}; +} class c2 { long l; void L(); -}; +} module m1 -{}; +{} module m1 -{}; +{} module M1 -{}; +{} module c1 -{}; +{} module C1 -{}; +{} interface i3 { void op(long aa, int aa); void op2(long bb, out int BB); -}; +} interface i4 { void I4(); -}; +} interface i5 { void i5(); -}; +} interface i6 { void op(); -}; +} interface i7 extends i6 { void op(); -}; +} interface i8 extends i6 { void OP(); -}; +} class c3 { long l; -}; +} class c4 extends c3 { void l(); -}; +} class c5 extends c3 { void L(); -}; +} class c6 { long l; void L(); -}; +} class c7 extends c3 { long l; -}; +} class c8 extends c3 { long L; -}; +} class c9 { void L(); long l; -}; +} exception e1 { long l; string l; -}; +} exception e2 { long l; string L; -}; +} exception e3 { long e3; -}; +} exception e4 { long E4; -}; +} exception e5 { long l; -}; +} exception e6 extends e5 { string l; -}; +} exception e7 extends e5 { string L; -}; +} struct s1 { long l; string l; -}; +} struct s2 { long l; string L; -}; +} struct s3 { long s3; string x; -}; +} struct s4 { long S4; string x; -}; +} sequence<long> ls; sequence<long> LS; @@ -186,11 +186,11 @@ dictionary<long, string> D; dictionary<long, string> m1; dictionary<long, string> M1; -enum en1 { red }; -enum eN1 { lilac }; -enum m1 { green }; -enum M1 { blue }; -enum en2 { yellow, en1, EN1}; +enum en1 { red } +enum eN1 { lilac } +enum m1 { green } +enum M1 { blue } +enum en2 { yellow, en1, EN1} module xxx { @@ -201,23 +201,23 @@ module xx interface Base { void op(); -}; +} interface Derived extends Base { -}; +} interface Derived extends base { -}; +} exception e1 { -}; +} exception e2 extends E1 { -}; +} sequence<long> s1; struct s @@ -226,17 +226,17 @@ struct s xxx::xx::S1 y; xxx::XX::s1 z; xxx::XX::s1 w; -}; +} struct s2 { Derived* blah; derived* bletch; -}; +} -}; +} -}; +} interface Foo { @@ -253,24 +253,24 @@ interface Foo void op11() throws ::Test::XXX::xx::e1; void op12(long op12); void op13(long OP13); -}; +} module CI { interface base1 { void op(); - }; + } interface base2 { void OP(); - }; + } interface derived extends base1, base2 { - }; -}; + } +} module DI { @@ -278,7 +278,7 @@ module DI { void aa(int AA); void xx(int base); - }; + } class base1 { @@ -286,38 +286,38 @@ module DI void aa(int BASE1); void bb(int base1, string BASE1); - }; + } struct Foo { int foo; - }; + } struct Foo1 { int Foo1; - }; + } exception Bar { string bar; - }; + } exception Bar1 { string Bar1; - }; + } class base2 { int X; - }; + } class derived2 extends base2 { string x; - }; + } -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.ice b/cpp/test/Slice/errorDetection/ChangedMeaning.ice index 1b4432452ae..66254c4a48e 100644 --- a/cpp/test/Slice/errorDetection/ChangedMeaning.ice +++ b/cpp/test/Slice/errorDetection/ChangedMeaning.ice @@ -18,107 +18,107 @@ struct s00 { ls ls; // OK as of Ice 3.6 (data member has its own scope) ls l; -}; +} struct s0 { Test::ls ls; // OK -}; +} struct s1 { ls mem; long ls; // OK as of Ice 3.6 (data member has its own scope) -}; +} struct s2 { Test::ls mem; long ls; // OK -}; +} module M { sequence<long> ls; -}; +} interface i1 { M::ls op(); void M(); // Changed meaning -}; +} interface i2 { M::ls op(); long M(); // Changed meaning -}; +} module N { - interface n1 extends i1 {}; - interface i1 {}; // Changed meaning - interface i2 extends i2 {}; // Changed meaning + interface n1 extends i1 {} + interface i1 {} // Changed meaning + interface i2 extends i2 {} // Changed meaning -}; +} module O { - interface n1 extends ::Test::i1 {}; - interface i1 {}; // OK - interface i2 extends ::Test::i2 {}; // OK + interface n1 extends ::Test::i1 {} + interface i1 {} // OK + interface i2 extends ::Test::i2 {} // OK -}; +} -exception e1 {}; +exception e1 {} -exception e2 {}; +exception e2 {} module E { - exception ee1 extends e1 {}; - exception e1 {}; // Changed meaning - exception e2 extends e2 {}; // Changed meaning + exception ee1 extends e1 {} + exception e1 {} // Changed meaning + exception e2 extends e2 {} // Changed meaning -}; +} -interface c1 {}; +interface c1 {} -class c2 {}; +class c2 {} module C { - class cc1 implements c1 {}; - class c1 {}; // Changed meaning - class c2 extends c2 {}; // Changed meaning + class cc1 implements c1 {} + class c1 {} // Changed meaning + class c2 extends c2 {} // Changed meaning -}; +} -enum color { blue }; +enum color { blue } module B { const color fc = blue; - interface blue {}; // OK as of Ice 3.7 (enumerators are in their enum's namespace) + interface blue {} // OK as of Ice 3.7 (enumerators are in their enum's namespace) -}; +} -enum counter { one, two }; +enum counter { one, two } sequence<counter> CounterSeq; module SS { sequence<CounterSeq> y; - enum CounterSeq { a, b }; -}; + enum CounterSeq { a, b } +} interface ParamTest { @@ -127,57 +127,57 @@ interface ParamTest void param(counter counter); // OK as of Ice 3.6 (parameters have their own scope) void op3(long counter, counter x); // OK as of Ice 3.6.1 (second "counter" is not a type) void op4(long param, long param); -}; +} sequence<int> IS; struct x { IS is; // OK as of Ice 3.6 (data member has its own scope) -}; +} struct y { ::Test::IS is; // OK, nothing introduced -}; +} interface Blah { void op1() throws ::Test::E::ee1; // Nothing introduced void E(); // OK void op2() throws E; // Changed meaning -}; +} interface Blah2 { void op3() throws ::Test::E::ee1; // Nothing introduced void E(); // OK void op4() throws E::ee1; // Changed meaning -}; +} interface Blah3 { void op5() throws E::ee1; // Introduces E void E(); // Changed meaning -}; +} module M1 { - enum smnpEnum { a }; + enum smnpEnum { a } struct smnpStruct { smnpEnum e; - }; + } exception smnpException { - }; + } module M2 { - enum C { C1, C2, C3 }; - }; -}; + enum C { C1, C2, C3 } + } +} const Test::M1::M2::C MyConstant1 = Test::M1::M2::C2; // OK const ::Test::M1::M2::C MyConstant2 = Test::M1::M2::C2; // OK @@ -187,43 +187,43 @@ const ::Test::M1::M2::C MyConstant4 = ::Test::M1::M2::C2; // OK interface smnpTest1Class { M1::smnpStruct smnpTest1Op1() throws M1::smnpException; // OK -}; +} class Foo { string x; string X; -}; +} struct Foo1 { string x; string X; -}; +} interface Foo2 { void op1(int a, int A); // Changed meaning void op2(int Foo2); // OK void op3(int op3); // Ok -}; +} class Foo3 { void x(int x); string x; // Changed meaning -}; +} class Foo4 { void op(int x); string x; // Ok -}; +} exception Foo5 { string x; int X; // Changed meaning -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/ClassRedefinition.ice b/cpp/test/Slice/errorDetection/ClassRedefinition.ice index 31cb658dfcd..3924e209aca 100644 --- a/cpp/test/Slice/errorDetection/ClassRedefinition.ice +++ b/cpp/test/Slice/errorDetection/ClassRedefinition.ice @@ -12,12 +12,12 @@ module Test { -class Class1 { byte b; long l; }; +class Class1 { byte b; long l; } class Class1; -class Class1 { long l; }; +class Class1 { long l; } -class Class2 { byte b; }; +class Class2 { byte b; } class Class2; -class Class2 { byte b; }; +class Class2 { byte b; } -}; +} diff --git a/cpp/test/Slice/errorDetection/ConstDef.ice b/cpp/test/Slice/errorDetection/ConstDef.ice index d0932e3bb0f..5c44649ab8a 100644 --- a/cpp/test/Slice/errorDetection/ConstDef.ice +++ b/cpp/test/Slice/errorDetection/ConstDef.ice @@ -25,7 +25,7 @@ const float floatconst = 0.; const double doubleconst = 0.; const string stringconst = "X\aX\x01000\x100\rX\007\xff\xff\xff\x0ff\xfff\x1X"; const string stringconst2 = "Hello World!"; -enum color { red, green, blue }; +enum color { red, green, blue } const color colorconst = blue; const ::Test::color colorconst2 = ::Test::color::green; @@ -88,7 +88,7 @@ const long ic8 = false; // type mismatch const long = 0; // missing identifier -enum digit { one, two }; +enum digit { one, two } const color ic9 = two; // wrong enumerator type const color ic10 = 0; // wrong initializer type @@ -154,4 +154,4 @@ const string octalRange = "\455"; // Octal escape sequence out const string badHex = "\x"; // Missing hex digit const string surrogatePair = "\uD83C\uDF4C"; // surrogate pair not allow in slice -}; +} diff --git a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice index 0851e67d0af..97355f2f792 100644 --- a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice @@ -16,43 +16,43 @@ class C { int member; int member; -}; +} class base1 { void x(); -}; +} class derived1 extends base1 { int x; -}; +} class base2 { int x; -}; +} class derived2 extends base2 { void x(); -}; +} class base3 { string x; -}; +} class derived3 extends base3 { string x; -}; +} struct S { int member; int member; -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice index 0585e29f55a..185213a7c54 100644 --- a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice +++ b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice @@ -16,6 +16,6 @@ interface Foo { int bar(string, long l, out bool, out short s); int bar2(string s, long, out bool b, out short); -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice index ad7be074b6f..a5a41db8ff5 100644 --- a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice @@ -16,38 +16,38 @@ interface Base1 { void op(); void op2(); -}; +} interface Derived1 extends Base1 { void op(); // error long op(); // error void foo(); -}; +} interface Base2 { void op(); -}; +} interface D1 extends Base1 { void foo(); // OK -}; +} interface D2 extends D1 { void op(); // error, op() in Base1 -}; +} interface D3 extends D1, Base2 { void bar(); // error, op() in Base1 and Base2 -}; +} -class c1 { long l; }; -class c2 extends c1 { double l; }; // error -class c3 extends c1 { double d; }; // OK -class c4 extends c3 { short l; }; // error, l in c1 +class c1 { long l; } +class c2 extends c1 { double l; } // error +class c3 extends c1 { double d; } // OK +class c4 extends c3 { short l; } // error, l in c1 -}; +} diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice index ab46045b50f..bbf7f9f2807 100644 --- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice @@ -17,4 +17,4 @@ module Test dictionary<int, long> foo; dictionary<int, long> foo; -}; +} diff --git a/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice b/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice index e58d74b61fe..611d2c2a623 100644 --- a/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice +++ b/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice @@ -11,17 +11,17 @@ interface Foo { void op() throws UndefinedException; void op2() throws class; -}; +} sequence<int> IntSeq; struct S { int i; -}; +} dictionary<string, string> StringDict; -enum E { red }; +enum E { red } const int x = 1; diff --git a/cpp/test/Slice/errorDetection/DuplicateParameter.ice b/cpp/test/Slice/errorDetection/DuplicateParameter.ice index 32d01beedc0..ffd27f64ef6 100644 --- a/cpp/test/Slice/errorDetection/DuplicateParameter.ice +++ b/cpp/test/Slice/errorDetection/DuplicateParameter.ice @@ -19,7 +19,7 @@ class Foo string bar2(string s, out int s); string bar3(out string s, out int s); string bar4(string s, int i, out int i); -}; +} interface IFoo { @@ -28,6 +28,6 @@ interface IFoo string bar2(string s, out int s); string bar3(out string s, out int s); string bar4(string s, int i, out int i); -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/DuplicateThrows.ice b/cpp/test/Slice/errorDetection/DuplicateThrows.ice index eb6d026c48a..3ac539b781a 100644 --- a/cpp/test/Slice/errorDetection/DuplicateThrows.ice +++ b/cpp/test/Slice/errorDetection/DuplicateThrows.ice @@ -12,11 +12,11 @@ module Test { -exception e {}; -exception e2 {}; -interface i2 { void op() throws ::Test::e, e; }; -interface i3 { void op() throws e, ::Test::e; }; -interface i4 { void op() throws e2, e, e2; }; -interface i5 { void op() throws e2, e, e2, ::Test::e; }; +exception e {} +exception e2 {} +interface i2 { void op() throws ::Test::e, e; } +interface i3 { void op() throws e, ::Test::e; } +interface i4 { void op() throws e2, e, e2; } +interface i5 { void op() throws e2, e, e2, ::Test::e; } -}; +} diff --git a/cpp/test/Slice/errorDetection/EnumEmpty.ice b/cpp/test/Slice/errorDetection/EnumEmpty.ice index 4a341513644..c414b5ec775 100644 --- a/cpp/test/Slice/errorDetection/EnumEmpty.ice +++ b/cpp/test/Slice/errorDetection/EnumEmpty.ice @@ -12,6 +12,6 @@ module Test { -enum foo {}; +enum foo {} -}; +} diff --git a/cpp/test/Slice/errorDetection/EnumRedefinition.ice b/cpp/test/Slice/errorDetection/EnumRedefinition.ice index 29bac0f69e2..3ddd02312fb 100644 --- a/cpp/test/Slice/errorDetection/EnumRedefinition.ice +++ b/cpp/test/Slice/errorDetection/EnumRedefinition.ice @@ -12,7 +12,7 @@ module Test { -enum E1 { A, B, C }; -enum E1 { D, E, F }; +enum E1 { A, B, C } +enum E1 { D, E, F } -}; +} diff --git a/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice b/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice index ee4452899c8..db6f48653fa 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice +++ b/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice @@ -16,6 +16,6 @@ enum Enum1 B = 0, C, D = 1 -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice index 5ba1c4634fd..0cda852bd6b 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice +++ b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice @@ -12,8 +12,8 @@ module Test { -enum Enum1 { A, B, C }; // Ok as of 3.7 -enum Enum2 { A, B, E }; // Ok as of 3.7 -enum Enum3 { A, B, C, A }; +enum Enum1 { A, B, C } // Ok as of 3.7 +enum Enum2 { A, B, E } // Ok as of 3.7 +enum Enum3 { A, B, C, A } -}; +} diff --git a/cpp/test/Slice/errorDetection/EnumeratorValues.ice b/cpp/test/Slice/errorDetection/EnumeratorValues.ice index ffd315e4fd5..fb5e8411002 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorValues.ice +++ b/cpp/test/Slice/errorDetection/EnumeratorValues.ice @@ -18,6 +18,6 @@ enum Enum1 D = 2147483649, E = -1, F = -2147483649 -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice b/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice index 9896db1cbfa..60c26526ca2 100644 --- a/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice +++ b/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice @@ -10,9 +10,9 @@ module Test { -exception Base {}; -exception Base { int i; }; -exception Derived extends Base { int j; }; -exception Derived { int j; }; +exception Base {} +exception Base { int i; } +exception Derived extends Base { int j; } +exception Derived { int j; } -}; +} diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice index 661a7adf080..8f4aef6b4d0 100644 --- a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice +++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice @@ -12,35 +12,35 @@ module Test { -INTERFACE i { void op(); }; +INTERFACE i { void op(); } -exception Void {}; -exception int {}; +exception Void {} +exception int {} -struct OUT { long l; }; -struct double { long l; }; +struct OUT { long l; } +struct double { long l; } -struct s1 { long Int; }; -struct s2 { long byte; }; -struct s3 { short Int; byte b; }; -struct s4 { float byte; byte b; }; +struct s1 { long Int; } +struct s2 { long byte; } +struct s3 { short Int; byte b; } +struct s4 { float byte; byte b; } class inTERface; class interface; -class MOdule { long l; }; -class module { long l; }; +class MOdule { long l; } +class module { long l; } -class C { long extendS; }; -class C { long extends; }; -class D { long extends; }; +class C { long extendS; } +class C { long extends; } +class D { long extends; } interface local; interface Local; -interface Object { void op(); }; -interface object { void op(); }; -interface long { void op(); }; +interface Object { void op(); } +interface object { void op(); } +interface long { void op(); } sequence<long> impLEments; sequence<long> implements; @@ -62,28 +62,28 @@ dictionary<long, OUT> d4; dictionary<void, void> d5; dictionary<VOID, VOID> d6; -enum local { a, b }; -enum LOCAL { c, e }; +enum local { a, b } +enum LOCAL { c, e } -enum e1 { long, byte, foo }; -enum e2 { LONG, BYTE, bar }; // Ok as of 3.7 +enum e1 { long, byte, foo } +enum e2 { LONG, BYTE, bar } // Ok as of 3.7 -interface i1 { long module(); }; -interface i2 { long mODule(); }; +interface i1 { long module(); } +interface i2 { long mODule(); } -interface i3 { void exception(); }; -interface i4 { void EXception(); }; +interface i3 { void exception(); } +interface i4 { void EXception(); } -interface i5 { out op(); }; -interface i6 { OUT op(); }; +interface i5 { out op(); } +interface i6 { OUT op(); } -interface i7 { void op(double byte); }; -interface i8 { void op(double BYTE); }; +interface i7 { void op(double byte); } +interface i8 { void op(double BYTE); } -interface i9 { void op(out double byte); }; -interface i10 { void op(out double BYTE); }; +interface i9 { void op(out double byte); } +interface i10 { void op(out double BYTE); } -interface \true {}; // OK, escaped keyword +interface \true {} // OK, escaped keyword interface _a; // Illegal leading underscore interface _true; // Illegal leading underscore @@ -97,4 +97,4 @@ interface b___c; // Illegal underscores interface a_b; // Illegal underscore interface a_b_c; // Illegal underscores -}; +} diff --git a/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice b/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice index c91d4a49e93..9edc2a8e146 100644 --- a/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice +++ b/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice @@ -12,35 +12,35 @@ module Test { -INTERFACE i { void op(); }; +INTERFACE i { void op(); } -exception Void {}; -exception int {}; +exception Void {} +exception int {} -struct OUT { long l; }; -struct double { long l; }; +struct OUT { long l; } +struct double { long l; } -struct s1 { long Int; }; -struct s2 { long byte; }; -struct s3 { short Int; byte b; }; -struct s4 { float byte; byte b; }; +struct s1 { long Int; } +struct s2 { long byte; } +struct s3 { short Int; byte b; } +struct s4 { float byte; byte b; } class inTERface; class interface; -class MOdule { long l; }; -class module { long l; }; +class MOdule { long l; } +class module { long l; } -class C { long extendS; }; -class C { long extends; }; -class D { long extends; }; +class C { long extendS; } +class C { long extends; } +class D { long extends; } interface local; interface Local; -interface Object { void op(); }; -interface object { void op(); }; -interface long { void op(); }; +interface Object { void op(); } +interface object { void op(); } +interface long { void op(); } sequence<long> impLEments; sequence<long> implements; @@ -62,28 +62,28 @@ dictionary<long, OUT> d4; dictionary<void, void> d5; dictionary<VOID, VOID> d6; -enum local { a, b }; -enum LOCAL { c, e }; +enum local { a, b } +enum LOCAL { c, e } -enum e1 { long, byte, foo }; -enum e2 { LONG, BYTE, bar }; +enum e1 { long, byte, foo } +enum e2 { LONG, BYTE, bar } -interface i1 { long module(); }; -interface i2 { long mODule(); }; +interface i1 { long module(); } +interface i2 { long mODule(); } -interface i3 { void exception(); }; -interface i4 { void EXception(); }; +interface i3 { void exception(); } +interface i4 { void EXception(); } -interface i5 { out op(); }; -interface i6 { OUT op(); }; +interface i5 { out op(); } +interface i6 { OUT op(); } -interface i7 { void op(double byte); }; -interface i8 { void op(double BYTE); }; +interface i7 { void op(double byte); } +interface i8 { void op(double BYTE); } -interface i9 { void op(out double byte); }; -interface i10 { void op(out double BYTE); }; +interface i9 { void op(out double byte); } +interface i10 { void op(out double BYTE); } -interface \true {}; // OK, escaped keyword +interface \true {} // OK, escaped keyword interface _a; // Illegal leading underscore interface _true; // Illegal leading underscore @@ -97,4 +97,4 @@ interface b___c; // Illegal underscores interface a_b; // OK interface a_b_c; // OK -}; +} diff --git a/cpp/test/Slice/errorDetection/IllegalDictionary.ice b/cpp/test/Slice/errorDetection/IllegalDictionary.ice index 120e7f36aee..20aff11a0be 100644 --- a/cpp/test/Slice/errorDetection/IllegalDictionary.ice +++ b/cpp/test/Slice/errorDetection/IllegalDictionary.ice @@ -38,17 +38,17 @@ struct st1 { long x; long y; -}; +} dictionary<st1, long> d8; // OK struct st2 { long x; float y; -}; +} dictionary<st2, long> b8; // Bad -enum e { e1, e2 }; +enum e { e1, e2 } dictionary<e, long> d9; // OK sequence<e> s4; @@ -56,4 +56,4 @@ dictionary<s4, long> d10; // Deprecated dictionary<d9, long> b9; // Bad -}; +} diff --git a/cpp/test/Slice/errorDetection/IllegalIdentifier.ice b/cpp/test/Slice/errorDetection/IllegalIdentifier.ice index 9f9905bd13b..d803fbf41e9 100644 --- a/cpp/test/Slice/errorDetection/IllegalIdentifier.ice +++ b/cpp/test/Slice/errorDetection/IllegalIdentifier.ice @@ -22,5 +22,5 @@ module Test interface Œuvre { void cœur(); - }; -}; + } +} diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.ice b/cpp/test/Slice/errorDetection/IllegalLocal.ice index e44ed1002b6..8f2e0fd5a6f 100644 --- a/cpp/test/Slice/errorDetection/IllegalLocal.ice +++ b/cpp/test/Slice/errorDetection/IllegalLocal.ice @@ -12,26 +12,26 @@ module Test { -interface i1 {}; +interface i1 {} -local interface i2 extends i1 {}; // error +local interface i2 extends i1 {} // error -interface i3 extends i2 {}; // error +interface i3 extends i2 {} // error -local interface i4 extends i2 {}; // OK +local interface i4 extends i2 {} // OK -class c1 implements i1 {}; // Warning +class c1 implements i1 {} // Warning -class c2 implements i2 {}; // error +class c2 implements i2 {} // error -local exception le {}; +local exception le {} interface i { void op() throws le; // error -}; +} -exception le2 extends le {}; // error +exception le2 extends le {} // error local sequence<long> lls; @@ -41,17 +41,17 @@ class c3 i2* lo2; // error i2 lo3; // error lls ls; // error -}; +} struct s1 { lls ls; // error -}; +} exception e3 { lls ls; // error -}; +} sequence<LocalObject> los; // error @@ -64,32 +64,32 @@ local interface i4; struct s2 { i4 m; -}; +} -local enum en { a }; +local enum en { a } struct s3 { en e; -}; +} interface i5 { void op(en p); LocalObject op2(); -}; +} exception E { -}; +} local interface i6 { void op() throws E; // error -}; +} local class c7 { void op() throws E; // error -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/IllegalMI.ice b/cpp/test/Slice/errorDetection/IllegalMI.ice index bec2be86286..644b04431c6 100644 --- a/cpp/test/Slice/errorDetection/IllegalMI.ice +++ b/cpp/test/Slice/errorDetection/IllegalMI.ice @@ -18,24 +18,24 @@ module M1 interface A1 { void ia1(); - }; + } interface A2 extends A1 { void ia2(); - }; + } interface B2 extends A1 { void ib2(); - }; + } interface A3 extends A2, B2 { // OK void ia3(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -45,26 +45,26 @@ module M2 interface A1 { void ia1(); - }; + } interface A2 extends A1 { void ia2(); void op(); - }; + } interface B2 extends A1 { void ib2(); void op(); - }; + } interface A3 extends A2, B2 // Error { void ia3(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -74,26 +74,26 @@ module M3 interface A1 { void ia1(); - }; + } interface A2 extends A1 { void ia2(); void op(); - }; + } interface B2 extends A1 { void ib2(); - }; + } interface A3 extends A2, B2 { void ia3(); void op(); // Error - }; + } -}; +} // ---------------------------------------------------------------------- @@ -103,26 +103,26 @@ module M4 interface A1 { void ia1(); - }; + } interface A2 extends A1 { void ia2(); - }; + } interface B2 extends A1 { void ib2(); void op(); - }; + } interface A3 extends A2, B2 { void ia3(); void op(); // Error - }; + } -}; +} // ---------------------------------------------------------------------- @@ -133,25 +133,25 @@ module M5 { void ia1(); void op(); - }; + } interface A2 extends A1 { void ia2(); - }; + } interface B2 extends A1 { void ib2(); - }; + } interface A3 extends A2, B2 { void ia3(); void op(); // Error - }; + } -}; +} // ---------------------------------------------------------------------- @@ -161,22 +161,22 @@ module M6 interface A1 { void ia1(); - }; + } interface B1 { void ib1(); - }; + } interface C1 { void ic1(); - }; + } interface A2 extends A1, B1, C1 { // OK void ia2(); - }; -}; + } +} // ---------------------------------------------------------------------- @@ -187,24 +187,24 @@ module M7 { void ia1(); void op(); - }; + } interface B1 { void ib1(); void op(); - }; + } interface C1 { void ic1(); - }; + } interface A2 extends A1, B1, C1 // Error { void ia2(); - }; -}; + } +} // ---------------------------------------------------------------------- @@ -215,25 +215,25 @@ module M8 { void ia1(); void op(); - }; + } interface B1 { void ib1(); - }; + } interface C1 { void ic1(); void op(); - }; + } interface A2 extends A1, B1, C1 // Error { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -242,26 +242,26 @@ module M9 interface A1 { void ia1(); - }; + } interface B1 { void ib1(); void op(); - }; + } interface C1 { void ic1(); void op(); - }; + } interface A2 extends A1, B1, C1 // Error { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -272,26 +272,26 @@ module M10 { void ia1(); void op(); - }; + } interface B1 { void ib1(); void op(); - }; + } interface C1 { void ic1(); void op(); - }; + } interface A2 extends A1, B1, C1 // Error { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -301,27 +301,27 @@ module M11 interface A1 { void ia1(); - }; + } interface B1 { void ib1(); - }; + } interface C1 { void ic1(); - }; + } interface D1 { void id1(); - }; + } interface A2 extends A1, B1, C1, D1 { // OK void ia2(); - }; -}; + } +} // ---------------------------------------------------------------------- @@ -332,30 +332,30 @@ module M12 { void ia1(); void op(); - }; + } interface B1 { void ib1(); void op(); - }; + } interface C1 { void ic1(); - }; + } interface D1 { void id1(); - }; + } interface A2 extends A1, B1, C1, D1 // Error { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -366,30 +366,30 @@ module M13 { void ia1(); void op(); - }; + } interface B1 { void ib1(); - }; + } interface C1 { void ic1(); void op(); - }; + } interface D1 { void id1(); - }; + } interface A2 extends A1, B1, C1, D1 // Error { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -399,30 +399,30 @@ module M14 { void ia1(); void op(); - }; + } interface B1 { void ib1(); - }; + } interface C1 { void ic1(); - }; + } interface D1 { void id1(); void op(); - }; + } interface A2 extends A1, B1, C1, D1 // Error { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -432,31 +432,31 @@ module M15 interface A1 { void ia1(); - }; + } interface B1 { void ib1(); void op(); - }; + } interface C1 { void ic1(); void op(); - }; + } interface D1 { void id1(); - }; + } interface A2 extends A1, B1, C1, D1 // Error { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -466,31 +466,31 @@ module M16 interface A1 { void ia1(); - }; + } interface B1 { void ib1(); void op(); - }; + } interface C1 { void ic1(); - }; + } interface D1 { void id1(); void op(); - }; + } interface A2 extends A1, B1, C1, D1 // Error { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -500,31 +500,31 @@ module M17 interface A1 { void ia1(); - }; + } interface B1 { void ib1(); - }; + } interface C1 { void ic1(); void op(); - }; + } interface D1 { void id1(); void op(); - }; + } interface A2 extends A1, B1, C1, D1 // Error { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -535,31 +535,31 @@ module M18 { void ia1(); void op(); - }; + } interface B1 { void ib1(); void op(); - }; + } interface C1 { void ic1(); void op(); - }; + } interface D1 { void id1(); - }; + } interface A2 extends A1, B1, C1, D1 // Error { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -570,31 +570,31 @@ module M19 { void ia1(); void op(); - }; + } interface B1 { void ib1(); void op(); - }; + } interface C1 { void ic1(); - }; + } interface D1 { void id1(); void op(); - }; + } interface A2 extends A1, B1, C1, D1 { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -605,31 +605,31 @@ module M20 { void ia1(); void op(); - }; + } interface B1 { void ib1(); - }; + } interface C1 { void ic1(); void op(); - }; + } interface D1 { void id1(); void op(); - }; + } interface A2 extends A1, B1, C1, D1 // Error { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -639,32 +639,32 @@ module M21 interface A1 { void ia1(); - }; + } interface B1 { void ib1(); void op(); - }; + } interface C1 { void ic1(); void op(); - }; + } interface D1 { void id1(); void op(); - }; + } interface A2 extends A1, B1, C1, D1 // Error { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -675,32 +675,32 @@ module M22 { void ia1(); void op(); - }; + } interface B1 { void ib1(); void op(); - }; + } interface C1 { void ic1(); void op(); - }; + } interface D1 { void id1(); void op(); - }; + } interface A2 extends A1, B1, C1, D1 // Error { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -710,39 +710,39 @@ module M23 interface A0 { void ia0(); - }; + } interface B0 { void ib0(); - }; + } interface A1 extends A0, B0 { void ia1(); - }; + } interface B1 { void ib1(); - }; + } interface C1 { void ic1(); - }; + } interface D1 { void id1(); - }; + } interface A2 extends A1, B1, C1, D1 // OK { void ia2(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -753,40 +753,40 @@ module M24 { void ia0(); void op(); - }; + } interface B0 { void ib0(); - }; + } interface A1 extends A0, B0 { void ia1(); - }; + } interface B1 { void ib1(); - }; + } interface C1 { void ic1(); - }; + } interface D1 { void id1(); - }; + } interface A2 extends A1, B1, C1, D1 { void ia2(); void op(); // Error - }; + } -}; +} // ---------------------------------------------------------------------- @@ -796,41 +796,41 @@ module M25 interface A0 { void ia0(); - }; + } interface B0 { void ib0(); void op(); - }; + } interface A1 extends A0, B0 { void ia1(); - }; + } interface B1 { void ib1(); - }; + } interface C1 { void ic1(); - }; + } interface D1 { void id1(); - }; + } interface A2 extends A1, B1, C1, D1 { void ia2(); void op(); // Error - }; + } -}; +} // ---------------------------------------------------------------------- @@ -840,71 +840,71 @@ module M26 // A0 B0 C0 D0 // interface A0 { // \ / \ / \ // void ia0(); // \ / \ / \ // - }; // A1 B1 C1 // + } // A1 B1 C1 // // / \ / \ / // interface B0 { // / \ / \ / // void ib0(); // A2 B2 C2 D2 // - }; // \ / \ / // + } // \ / \ / // // \ / \ / // interface C0 { // A3 B3 // void ic0(); // \ / // - }; // \ / // + } // \ / // // \ / // interface D0 { // \ / // void id0(); // A4 // - }; + } interface A1 extends A0, B0 { void ia1(); - }; + } interface B1 extends C0, D0 { void ib1(); - }; + } interface C1 extends D0 { void ic1(); - }; + } interface A2 extends A1 { void ia2(); - }; + } interface B2 extends A1 { void ib2(); - }; + } interface C2 extends B1 { void ic2(); - }; + } interface D2 extends B1, C1 { void id2(); - }; + } interface A3 extends A2, B2 { void ia3(); - }; + } interface B3 extends C2, D2 { void ib3(); - }; + } interface A4 extends A3, B3 // OK { void ia4(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -914,71 +914,71 @@ module M27 // A0 B0 C0 D0 // interface A0 { // \ / \ / \ // void ia0(); // \ / \ / \ // - }; // A1 B1 C1 // + } // A1 B1 C1 // // / \ / \ / // interface B0 { // / \ / \ / // void ib0(); // A2 B2 C2 D2 // - }; // \ / \ / // + } // \ / \ / // // \ / \ / // interface C0 { // A3 B3 // void ic0(); void op(); // \ / // - }; // \ / // + } // \ / // // \ / // interface D0 { // \ / // void id0(); // A4 // - }; + } interface A1 extends A0, B0 { void ia1(); - }; + } interface B1 extends C0, D0 { void ib1(); - }; + } interface C1 extends D0 { void ic1(); - }; + } interface A2 extends A1 { void ia2(); void op(); - }; + } interface B2 extends A1 { void ib2(); - }; + } interface C2 extends B1 { void ic2(); - }; + } interface D2 extends B1, C1 { void id2(); - }; + } interface A3 extends A2, B2 { void ia3(); - }; + } interface B3 extends C2, D2 { void ib3(); - }; + } interface A4 extends A3, B3 // Error { void ia4(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -988,71 +988,71 @@ module M28 // A0 B0 C0 D0 // interface A0 { // \ / \ / \ // void ia0(); // \ / \ / \ // - }; // A1 B1 C1 // + } // A1 B1 C1 // // / \ / \ / // interface B0 { // / \ / \ / // void ib0(); void op(); // A2 B2 C2 D2 // - }; // \ / \ / // + } // \ / \ / // // \ / \ / // interface C0 { // A3 B3 // void ic0(); void op(); // \ / // - }; // \ / // + } // \ / // // \ / // interface D0 { // \ / // void id0(); // A4 // - }; + } interface A1 extends A0, B0 { void ia1(); - }; + } interface B1 extends C0, D0 { void ib1(); - }; + } interface C1 extends D0 { void ic1(); - }; + } interface A2 extends A1 { void ia2(); - }; + } interface B2 extends A1 { void ib2(); - }; + } interface C2 extends B1 { void ic2(); - }; + } interface D2 extends B1, C1 { void id2(); - }; + } interface A3 extends A2, B2 { void ia3(); - }; + } interface B3 extends C2, D2 { void ib3(); - }; + } interface A4 extends A3, B3 // Error { void ia4(); - }; + } -}; +} // ---------------------------------------------------------------------- @@ -1062,71 +1062,71 @@ module M29 // A0 B0 C0 D0 // interface A0 { // \ / \ / \ // void ia0(); // \ / \ / \ // - }; // A1 B1 C1 // + } // A1 B1 C1 // // / \ / \ / // interface B0 { // / \ / \ / // void ib0(); void op(); // A2 B2 C2 D2 // - }; // \ / \ / // + } // \ / \ / // // \ / \ / // interface C0 { // A3 B3 // void ic0(); // \ / // - }; // \ / // + } // \ / // // \ / // interface D0 { // \ / // void id0(); void op(); // A4 // - }; + } interface A1 extends A0, B0 { void ia1(); - }; + } interface B1 extends C0, D0 { void ib1(); - }; + } interface C1 extends D0 { void ic1(); - }; + } interface A2 extends A1 { void ia2(); - }; + } interface B2 extends A1 { void ib2(); - }; + } interface C2 extends B1 { void ic2(); - }; + } interface D2 extends B1, C1 { void id2(); - }; + } interface A3 extends A2, B2 { void ia3(); - }; + } interface B3 extends C2, D2 { void ib3(); - }; + } interface A4 extends A3, B3 // Error { void ia4(); - }; + } -}; +} module M30 { @@ -1134,71 +1134,71 @@ module M30 // A0 B0 C0 D0 // interface A0 { // \ / \ / \ // void ia0(); // \ / \ / \ // - }; // A1 B1 C1 // + } // A1 B1 C1 // // / \ / \ / // interface B0 { // / \ / \ / // void ib0(); void op(); // A2 B2 C2 D2 // - }; // \ / \ / // + } // \ / \ / // // \ / \ / // interface C0 { // A3 B3 // void ic0(); // \ / // - }; // \ / // + } // \ / // // \ / // interface D0 { // \ / // void id0(); // A4 // - }; + } interface A1 extends A0, B0 { void ia1(); - }; + } interface B1 extends C0, D0 { void ib1(); - }; + } interface C1 extends D0 { void ic1(); void op(); - }; + } interface A2 extends A1 { void ia2(); - }; + } interface B2 extends A1 { void ib2(); - }; + } interface C2 extends B1 { void ic2(); - }; + } interface D2 extends B1, C1 { void id2(); - }; + } interface A3 extends A2, B2 { void ia3(); - }; + } interface B3 extends C2, D2 { void ib3(); - }; + } interface A4 extends A3, B3 // Error { void ia4(); - }; + } -}; +} module M31 { @@ -1206,67 +1206,67 @@ module M31 // A0 B0 C0 D0 // interface A0 { // \ / \ / \ // void ia0(); // \ / \ / \ // - }; // A1 B1 C1 // + } // A1 B1 C1 // // / \ / \ / // interface B0 { // / \ / \ / // void ib0(); // A2 B2 C2 D2 // - }; // \ / \ / // + } // \ / \ / // // \ / \ / // interface C0 { // A3 B3 // void ic0(); // \ / // - }; // \ / // + } // \ / // // \ / // interface D0 { // \ / // void id0(); // A4 // - }; + } interface A1 extends A0, B0 { void ia1(); void op(); - }; + } interface B1 extends C0, D0 { void ib1(); - }; + } interface C1 extends D0 { void ic1(); void op(); - }; + } interface A2 extends A1 { void ia2(); - }; + } interface B2 extends A1 { void ib2(); - }; + } interface C2 extends B1 { void ic2(); - }; + } interface D2 extends B1, C1 { void id2(); - }; + } interface A3 extends A2, B2 { void ia3(); - }; + } interface B3 extends C2, D2 { void ib3(); - }; + } interface A4 extends A3, B3 // Error { void ia4(); - }; -}; + } +} diff --git a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice index e0d0c02e19b..3908c8646fd 100644 --- a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice +++ b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice @@ -16,26 +16,26 @@ exception module; exception void { int i; -}; +} struct exception; struct class { int i; -}; +} class interface; class struct { void f(); int i; -}; +} interface local; interface extends { void f(); -}; +} interface Foo { @@ -44,7 +44,7 @@ interface Foo int bar(string throws, long l, out bool void, out short s); int bar2(string s, long byte, out bool b, out short short); -}; +} class Bar { @@ -52,7 +52,7 @@ class Bar float long; double float; string double; -}; +} sequence<int> Object; @@ -61,7 +61,7 @@ dictionary<int, int> LocalObject; enum string { a, b, c -}; +} enum E { @@ -69,10 +69,10 @@ enum E dictionary, enum, laksdjflkj -}; +} interface Bletch extends Object { -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice index 244eb660a88..d283a4381e3 100644 --- a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice +++ b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice @@ -14,16 +14,16 @@ module Test interface Foo1; class Foo1; -class Foo1 { void op(); }; +class Foo1 { void op(); } -interface Foo2 { void op(); }; +interface Foo2 { void op(); } class Foo2; class Foo3; interface Foo3; -interface Foo3 { void op(); }; +interface Foo3 { void op(); } -class Foo4 { long l; }; +class Foo4 { long l; } interface Foo4; -}; +} diff --git a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice index c5b0fd9ea39..b970b49f12f 100644 --- a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice +++ b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice @@ -12,12 +12,12 @@ module Test { -interface Intf1 { void op(); }; -interface Intf1 { void op(); }; +interface Intf1 { void op(); } +interface Intf1 { void op(); } interface Intf1; -local interface Intf2 { void op(); }; -local interface Intf2 { void op(); }; +local interface Intf2 { void op(); } +local interface Intf2 { void op(); } local interface Intf2; -}; +} diff --git a/cpp/test/Slice/errorDetection/LocalMismatch.ice b/cpp/test/Slice/errorDetection/LocalMismatch.ice index dcc10dfe134..811e54de96e 100644 --- a/cpp/test/Slice/errorDetection/LocalMismatch.ice +++ b/cpp/test/Slice/errorDetection/LocalMismatch.ice @@ -14,30 +14,30 @@ module Test interface Intf1; local interface Intf1; -local interface Intf1 { void op(); }; +local interface Intf1 { void op(); } -interface Intf2 { void op(); }; +interface Intf2 { void op(); } local interface Intf2; local interface Intf3; interface Intf3; -interface Intf3 { void op(); }; +interface Intf3 { void op(); } -local interface Intf4 { void op(); }; +local interface Intf4 { void op(); } interface Intf4; interface Class1; local interface Class1; -local interface Class1 { void op(); }; +local interface Class1 { void op(); } -interface Class2 { void op(); }; +interface Class2 { void op(); } local interface Class2; local interface Class3; interface Class3; -interface Class3 { void op(); }; +interface Class3 { void op(); } -local interface Class4 { void op(); }; +local interface Class4 { void op(); } interface Class4; -}; +} diff --git a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice index 50d18144b0f..8ea7d57be5e 100644 --- a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice +++ b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice @@ -16,27 +16,27 @@ class Foo { void Foo(); long l; -}; +} interface IFoo { void IFoo(); -}; +} class Bar { string Bar; // Valid as Ice-3.6 (member names has its own scope) long l; -}; +} exception EBar { string EBar; // Valid as Ice-3.6 (member names has its own scope) -}; +} struct SBar { string SBar; // Valid as Ice-3.6 (member names has its own scope) -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice index b2200f34acf..1ae00d9fe02 100644 --- a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice +++ b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice @@ -16,9 +16,9 @@ sequence<int> Seq; sequence<int> Sequence1; sequence<int> Sequence2; sequence<int> Sequence3; -interface BarIntf extends Seq { void op(); }; -class BarClass1 extends Seq { long l; }; -class BarClass2 implements Sequence1, Sequence2, Sequence3 { long l; }; -class BarClass3 extends Seq implements Sequence1, Sequence2, Sequence3 { long l; }; +interface BarIntf extends Seq { void op(); } +class BarClass1 extends Seq { long l; } +class BarClass2 implements Sequence1, Sequence2, Sequence3 { long l; } +class BarClass3 extends Seq implements Sequence1, Sequence2, Sequence3 { long l; } -}; +} diff --git a/cpp/test/Slice/errorDetection/NotException.ice b/cpp/test/Slice/errorDetection/NotException.ice index 1e5f69c6a6a..96c969292c7 100644 --- a/cpp/test/Slice/errorDetection/NotException.ice +++ b/cpp/test/Slice/errorDetection/NotException.ice @@ -15,7 +15,7 @@ module M { -class C { long l; }; +class C { long l; } sequence<int> S; dictionary<string, string> D; @@ -26,6 +26,6 @@ interface Bar void foo3() throws D; void foo4() throws int; void op(); -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/NotType.ice b/cpp/test/Slice/errorDetection/NotType.ice index 5335e9d3789..c28e978b552 100644 --- a/cpp/test/Slice/errorDetection/NotType.ice +++ b/cpp/test/Slice/errorDetection/NotType.ice @@ -12,32 +12,32 @@ module Test { -module Module1 { }; -module Module2 { }; -module Module3 { }; +module Module1 { } +module Module2 { } +module Module3 { } module Mod { sequence<Mod> Seq; dictionary<int, Mod> Dict; -interface BarIntf extends Mod { void op(); }; -class BarClass1 extends Mod { long l; }; -class BarClass2 implements Module1, Module2, Module3 { long l; }; -class BarClass3 extends Mod implements Module1, Module2, Module3 { long l; }; +interface BarIntf extends Mod { void op(); } +class BarClass1 extends Mod { long l; } +class BarClass2 implements Module1, Module2, Module3 { long l; } +class BarClass3 extends Mod implements Module1, Module2, Module3 { long l; } -}; +} -exception E { }; +exception E { } struct S { E e; -}; +} interface I { E foo(E e1; E e2); void op(); -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/OperationRedefinition.ice b/cpp/test/Slice/errorDetection/OperationRedefinition.ice index c517a71f45e..c4d63a19801 100644 --- a/cpp/test/Slice/errorDetection/OperationRedefinition.ice +++ b/cpp/test/Slice/errorDetection/OperationRedefinition.ice @@ -17,6 +17,6 @@ class C void operation(); void operation(); long l; -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/OptionalMembers.ice b/cpp/test/Slice/errorDetection/OptionalMembers.ice index 4b4ba802229..e6f89bdbe8e 100644 --- a/cpp/test/Slice/errorDetection/OptionalMembers.ice +++ b/cpp/test/Slice/errorDetection/OptionalMembers.ice @@ -17,9 +17,9 @@ const long C4 = 0x80000001; const float C5 = 1.1; const long C6 = 2; -enum E { e1, e2, e3 = 4 }; -enum Ebis { e2 }; -enum Eter { e2 }; +enum E { e1, e2, e3 = 4 } +enum Ebis { e2 } +enum Eter { e2 } class C { @@ -39,17 +39,17 @@ class C optional(e2) int m14; // ambiguous optional(e3) int m15; // ok optional(4) int m16; // duplicate tag -}; +} class Base { optional(E::e2) int b1; -}; +} class Derived extends Base { optional(1) int d1; -}; +} class Ex { @@ -69,22 +69,22 @@ class Ex optional(E::e2) int m14; // ok optional(e3) int m15; // ok optional(4) int m16; // duplicate tag -}; +} class BaseEx { optional(E::e2) int b1; -}; +} class DerivedEx extends BaseEx { optional(1) int d1; -}; +} struct S { optional(1) int m1; // not allowed in struct optional(2) int m2 = 2; // not allowed in struct -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/OptionalParams.ice b/cpp/test/Slice/errorDetection/OptionalParams.ice index 9a0b8e915e9..9d32e4b4cb7 100644 --- a/cpp/test/Slice/errorDetection/OptionalParams.ice +++ b/cpp/test/Slice/errorDetection/OptionalParams.ice @@ -17,8 +17,8 @@ const long C4 = 0x80000001; const float C5 = 1.1; const long C6 = 2; -enum E { e1, e2, e3 }; -enum Ebis { e1 }; +enum E { e1, e2, e3 } +enum Ebis { e1 } interface I { @@ -68,6 +68,6 @@ interface I optional(1) int io4(out optional(2) int p, out optional(2) int o); // duplicate tag optional(2) int io5(out optional(1) int p, out optional(2) int o); // duplicate tag optional(C1) int io6(optional(E::e2) int p, out optional(E::e1) int o); // duplicate tag -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice index 9cb1096ea93..8c6d2bdf97e 100644 --- a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice +++ b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice @@ -16,6 +16,6 @@ interface Foo { void bar(long l1, out long l2, long l3); void baz(out long l2, long l3); -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice index b7339a72069..03e3a40f6ce 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice @@ -16,6 +16,6 @@ sequence<int> Sequence1; class Sequence1; sequence<int> Sequence2; -class Sequence2 { }; +class Sequence2 { } -}; +} diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice index 9eb98fcf084..39de45d7a44 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice @@ -17,6 +17,6 @@ class C void operation(); int operation; long l; -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice index 05cec65a3b6..188d92e7df1 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice @@ -12,7 +12,7 @@ module Test { -class C { long l; }; +class C { long l; } dictionary<string, int> C; -}; +} diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice index 2d113ee5d01..4013039992d 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice @@ -12,7 +12,7 @@ module Test { -class C { long l; }; -enum C { A, B, C }; +class C { long l; } +enum C { A, B, C } -}; +} diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice index 87e1234c80d..44a78d9850c 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice @@ -16,6 +16,6 @@ sequence<int> Sequence1; interface Sequence1; sequence<int> Sequence2; -interface Sequence2 { }; +interface Sequence2 { } -}; +} diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice index 4025587c864..b1f19a3f06e 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice @@ -13,8 +13,8 @@ module Test { sequence<int> Seq; -module Seq { }; -module Mod { }; -module Mod { }; +module Seq { } +module Mod { } +module Mod { } -}; +} diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice index f2ad18fcda9..354bc7b8976 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice @@ -16,6 +16,6 @@ class C { int member; void member(); -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice index deb268e0ff3..3b0bdc6cdee 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice @@ -12,7 +12,7 @@ module Test { -class C { long l; }; +class C { long l; } sequence<int> C; -}; +} diff --git a/cpp/test/Slice/errorDetection/Reserved.ice b/cpp/test/Slice/errorDetection/Reserved.ice index 1370e2209e3..afb1fbbd897 100644 --- a/cpp/test/Slice/errorDetection/Reserved.ice +++ b/cpp/test/Slice/errorDetection/Reserved.ice @@ -25,7 +25,7 @@ const long PtrA = 0; const long HelperA = 0; const long HolderA = 0; const long aIce = 0; -}; +} module errors { @@ -45,7 +45,7 @@ const long IceFoo = 0; const long icecream = 0; const long ICEpick = 0; const long iCEaxe = 0; -}; +} -module Ice {}; -module IceFoo {}; +module Ice {} +module IceFoo {} diff --git a/cpp/test/Slice/errorDetection/SelfContainment.ice b/cpp/test/Slice/errorDetection/SelfContainment.ice index e4a3e91f2cf..2b6f5deb10d 100644 --- a/cpp/test/Slice/errorDetection/SelfContainment.ice +++ b/cpp/test/Slice/errorDetection/SelfContainment.ice @@ -16,12 +16,12 @@ struct x { int i; x j; // Error -}; +} class y { int i; y j; // OK -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice index bfa12b99297..8dc4d4ffb41 100644 --- a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice +++ b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice @@ -15,4 +15,4 @@ module Test sequence<int> Seq; sequence<int> Seq; -}; +} diff --git a/cpp/test/Slice/errorDetection/StructMembers.ice b/cpp/test/Slice/errorDetection/StructMembers.ice index 91daa7ff7ac..6a3e71a288b 100644 --- a/cpp/test/Slice/errorDetection/StructMembers.ice +++ b/cpp/test/Slice/errorDetection/StructMembers.ice @@ -14,54 +14,54 @@ module Test struct s1 // Illegal empty struct { -}; +} struct s2 { long l; // One member, OK -}; +} struct s4 { [ "Hi" ] long l; // One member with metadata, OK -}; +} struct s5 // Two members, OK { long l; byte b; -}; +} struct s6 { // Two members with metadata, OK [ "Hi" ] long l; byte b; -}; +} struct s7 // Two members with metadata, OK { [ "Hi" ] long l; [ "there" ] byte b; -}; +} struct s8 { [ "hi" ] long ; // Missing data member name -}; +} struct s9 { [ "there" ] long // Missing data member name -}; +} struct s10 { long ; // Missing data member name -}; +} struct s11 { long // Missing data member name -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/StructRedefinition.ice b/cpp/test/Slice/errorDetection/StructRedefinition.ice index bd0eaabe4a2..c61612e2ccb 100644 --- a/cpp/test/Slice/errorDetection/StructRedefinition.ice +++ b/cpp/test/Slice/errorDetection/StructRedefinition.ice @@ -10,7 +10,7 @@ module Test { -struct Struct1 { byte b; long l; }; -struct Struct1 { byte b; }; +struct Struct1 { byte b; long l; } +struct Struct1 { byte b; } -}; +} diff --git a/cpp/test/Slice/errorDetection/Undefined.ice b/cpp/test/Slice/errorDetection/Undefined.ice index 739b67ce140..fe7363dbdb8 100644 --- a/cpp/test/Slice/errorDetection/Undefined.ice +++ b/cpp/test/Slice/errorDetection/Undefined.ice @@ -14,9 +14,9 @@ module Test sequence<Foo> FooSequence; dictionary<Foo, Bar> FooBarDictionary; -interface BarIntf extends Foo { void op(); }; -class BarClass1 extends Foo { long l; }; -class BarClass2 implements Foo1, Foo2, Foo3 { long l; }; -class BarClass3 extends Foo implements Foo1, Foo2, Foo3 { long l; }; +interface BarIntf extends Foo { void op(); } +class BarClass1 extends Foo { long l; } +class BarClass2 implements Foo1, Foo2, Foo3 { long l; } +class BarClass3 extends Foo implements Foo1, Foo2, Foo3 { long l; } -}; +} diff --git a/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice b/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice index 7017e6db92e..7f219a7675d 100644 --- a/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice +++ b/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice @@ -47,22 +47,22 @@ interface I ["cpp:range"] void op4(); -}; +} ["cpp:class", "cpp:comparable"] class C { -}; +} ["cpp:const", "cpp:ice_print"] struct S { int i; -}; +} ["cpp:virtual"] exception E { -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice b/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice index 7659edae2b2..ce5de65e9a3 100644 --- a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice +++ b/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice @@ -49,22 +49,22 @@ interface I ["cpp:range"] void op4(); -}; +} ["cpp:class", "cpp:comparable"] class C { -}; +} ["cpp:const", "cpp:ice_print"] struct S { int i; -}; +} ["cpp:virtual"] exception E { -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/WrongProxyType.ice b/cpp/test/Slice/errorDetection/WrongProxyType.ice index 927ba7e8b56..21e1758840c 100644 --- a/cpp/test/Slice/errorDetection/WrongProxyType.ice +++ b/cpp/test/Slice/errorDetection/WrongProxyType.ice @@ -25,6 +25,6 @@ interface I void f5(Dict*); void f6(out Dict*); void op(); -}; +} -}; +} diff --git a/cpp/test/Slice/errorDetection/include/IcePrefix.ice b/cpp/test/Slice/errorDetection/include/IcePrefix.ice index 9e4dc484726..7859ce07c17 100644 --- a/cpp/test/Slice/errorDetection/include/IcePrefix.ice +++ b/cpp/test/Slice/errorDetection/include/IcePrefix.ice @@ -7,4 +7,4 @@ // // ********************************************************************** -module IceSomething {}; +module IceSomething {} diff --git a/cpp/test/Slice/escape/Clash.ice b/cpp/test/Slice/escape/Clash.ice index ec95676d7bc..ec19722f2d4 100644 --- a/cpp/test/Slice/escape/Clash.ice +++ b/cpp/test/Slice/escape/Clash.ice @@ -30,7 +30,7 @@ interface Intf void opOut(out string context, out string current, out string response, out string ex, out string sent, out string cookie, out string sync, out string result, out string istr, out string ostr, out optional(1) string proxy); -}; +} class Cls { @@ -49,7 +49,7 @@ class Cls string inS; string in; string proxy; -}; +} struct St { @@ -57,12 +57,12 @@ struct St short istr; int ostr; int rhs; -}; +} exception Ex { short istr; int ostr; -}; +} -}; +} diff --git a/cpp/test/Slice/escape/Key.ice b/cpp/test/Slice/escape/Key.ice index 700011e48d1..2806ec33e2e 100644 --- a/cpp/test/Slice/escape/Key.ice +++ b/cpp/test/Slice/escape/Key.ice @@ -15,38 +15,38 @@ module and enum continue { asm -}; +} struct auto { int default; -}; +} ["cpp:class"] struct delete { string else; -}; +} interface break { ["amd"] void case(int catch, out int try); -}; +} interface char { void explicit(); -}; +} class switch { int if; char* export; int volatile; -}; +} interface do extends char, break { -}; +} sequence<auto> extern; @@ -55,19 +55,19 @@ dictionary<string,auto> for; exception return { int signed; -}; +} exception sizeof extends return { int static; int switch; -}; +} local interface friend { auto goto(continue if, auto d, delete inline, switch private, do mutable, break* namespace, char* new, switch* not, do* operator, int or, int protected, int public, int register) throws return, sizeof; -}; +} const int template = 0; const int this = 0; @@ -83,4 +83,4 @@ const int while = 0; const int xor = 0; const int xor_eq = 0; -}; +} diff --git a/cpp/test/Slice/headers/slices/dir1/a1.ice b/cpp/test/Slice/headers/slices/dir1/a1.ice index 1cff57e19f5..0f5d2ea4943 100644 --- a/cpp/test/Slice/headers/slices/dir1/a1.ice +++ b/cpp/test/Slice/headers/slices/dir1/a1.ice @@ -5,6 +5,6 @@ module Test class A1 { -}; +} -}; +} diff --git a/cpp/test/Slice/headers/slices/dir1/a2.ice b/cpp/test/Slice/headers/slices/dir1/a2.ice index 8d42624e7f0..c584d117951 100644 --- a/cpp/test/Slice/headers/slices/dir1/a2.ice +++ b/cpp/test/Slice/headers/slices/dir1/a2.ice @@ -5,6 +5,6 @@ module Test class A2 { -}; +} -}; +} diff --git a/cpp/test/Slice/headers/slices/dir1/a3.ice b/cpp/test/Slice/headers/slices/dir1/a3.ice index 125ff330e8f..0bc9be4db07 100644 --- a/cpp/test/Slice/headers/slices/dir1/a3.ice +++ b/cpp/test/Slice/headers/slices/dir1/a3.ice @@ -5,6 +5,6 @@ module Test class A3 { -}; +} -}; +} diff --git a/cpp/test/Slice/macros/Test.ice b/cpp/test/Slice/macros/Test.ice index d95e8a389d8..a1d92092021 100644 --- a/cpp/test/Slice/macros/Test.ice +++ b/cpp/test/Slice/macros/Test.ice @@ -32,7 +32,7 @@ class Default { int x DEFAULT(10); int y DEFAULT(10); -}; +} // // This class is only defined when compiling with slice2cpp. @@ -42,7 +42,7 @@ class CppOnly { string lang DEFAULT("cpp"); int version DEFAULT(ICE_VERSION); -}; +} #endif -}; +} diff --git a/cpp/test/Slice/parser/CircularA.ice b/cpp/test/Slice/parser/CircularA.ice index f176923e79b..7d229254a39 100644 --- a/cpp/test/Slice/parser/CircularA.ice +++ b/cpp/test/Slice/parser/CircularA.ice @@ -17,6 +17,6 @@ module Test interface A { void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Slice/parser/CircularB.ice b/cpp/test/Slice/parser/CircularB.ice index 55ec490a8ca..de76b4d783c 100644 --- a/cpp/test/Slice/parser/CircularB.ice +++ b/cpp/test/Slice/parser/CircularB.ice @@ -17,6 +17,6 @@ module Test interface B { void shutdown(); -}; +} -}; +} diff --git a/cpp/test/Slice/structure/Test.ice b/cpp/test/Slice/structure/Test.ice index 6f21faf7b25..664083ea281 100644 --- a/cpp/test/Slice/structure/Test.ice +++ b/cpp/test/Slice/structure/Test.ice @@ -19,13 +19,13 @@ dictionary<string, string> StringDict; class C { int i; -}; +} ["cpp:class"] struct S1 { string name; -}; +} ["cpp:comparable"] struct S2 @@ -44,6 +44,6 @@ struct S2 S1 s; C cls; Object* prx; -}; +} -}; +} diff --git a/cpp/test/Slice/utf8BOM/Test.ice b/cpp/test/Slice/utf8BOM/Test.ice index 23ead41dbd3..5c53c8a2996 100644 --- a/cpp/test/Slice/utf8BOM/Test.ice +++ b/cpp/test/Slice/utf8BOM/Test.ice @@ -14,4 +14,4 @@ // module foo { -}; +} diff --git a/csharp/test/Glacier2/application/Callback.ice b/csharp/test/Glacier2/application/Callback.ice index 2696e04020c..2f4b8415922 100644 --- a/csharp/test/Glacier2/application/Callback.ice +++ b/csharp/test/Glacier2/application/Callback.ice @@ -16,13 +16,13 @@ module Test interface CallbackReceiver { void callback(); -}; +} interface Callback { void initiateCallback(CallbackReceiver* proxy); void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Glacier2/router/Callback.ice b/csharp/test/Glacier2/router/Callback.ice index 4bd4f9a9f16..d8d26b60a2d 100644 --- a/csharp/test/Glacier2/router/Callback.ice +++ b/csharp/test/Glacier2/router/Callback.ice @@ -16,7 +16,7 @@ exception CallbackException { double someValue; string someString; -}; +} interface CallbackReceiver { @@ -24,7 +24,7 @@ interface CallbackReceiver void callbackEx() throws CallbackException; -}; +} interface Callback { @@ -34,6 +34,6 @@ interface Callback throws CallbackException; void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Glacier2/sessionHelper/Callback.ice b/csharp/test/Glacier2/sessionHelper/Callback.ice index 52a500340d8..ec8c3ffe166 100644 --- a/csharp/test/Glacier2/sessionHelper/Callback.ice +++ b/csharp/test/Glacier2/sessionHelper/Callback.ice @@ -17,7 +17,7 @@ exception CallbackException { double someValue; string someString; -}; +} interface CallbackReceiver { @@ -25,7 +25,7 @@ interface CallbackReceiver void callbackEx() throws CallbackException; -}; +} interface Callback { @@ -35,6 +35,6 @@ interface Callback throws CallbackException; void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Ice/acm/Test.ice b/csharp/test/Ice/acm/Test.ice index 7018c9df821..520c551ce34 100644 --- a/csharp/test/Ice/acm/Test.ice +++ b/csharp/test/Ice/acm/Test.ice @@ -19,7 +19,7 @@ interface TestIntf void interruptSleep(); void startHeartbeatCount(); void waitForHeartbeatCount(int count); -}; +} interface RemoteObjectAdapter { @@ -27,13 +27,13 @@ interface RemoteObjectAdapter void activate(); void hold(); void deactivate(); -}; +} interface RemoteCommunicator { RemoteObjectAdapter* createObjectAdapter(int acmTimeout, int close, int heartbeat); void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Ice/adapterDeactivation/Test.ice b/csharp/test/Ice/adapterDeactivation/Test.ice index 386014c1f9c..646604f9d86 100644 --- a/csharp/test/Ice/adapterDeactivation/Test.ice +++ b/csharp/test/Ice/adapterDeactivation/Test.ice @@ -16,11 +16,11 @@ interface TestIntf { void transient(); void deactivate(); -}; +} local class Cookie { idempotent string message(); -}; +} -}; +} diff --git a/csharp/test/Ice/admin/Test.ice b/csharp/test/Ice/admin/Test.ice index e64651fd24f..cf1de74be1f 100644 --- a/csharp/test/Ice/admin/Test.ice +++ b/csharp/test/Ice/admin/Test.ice @@ -34,20 +34,20 @@ interface RemoteCommunicator void waitForShutdown(); void destroy(); -}; +} interface RemoteCommunicatorFactory { RemoteCommunicator* createCommunicator(Ice::PropertyDict props); void shutdown(); -}; +} interface TestFacet { void op(); -}; +} -}; +} #endif diff --git a/csharp/test/Ice/ami/Test.ice b/csharp/test/Ice/ami/Test.ice index 967dfc9b431..0ba929e94b9 100644 --- a/csharp/test/Ice/ami/Test.ice +++ b/csharp/test/Ice/ami/Test.ice @@ -17,19 +17,19 @@ module Test exception TestIntfException { -}; +} enum CloseMode { Forcefully, Gracefully, GracefullyWithWait -}; +} interface PingReply { void reply(); -}; +} interface TestIntf { @@ -56,12 +56,12 @@ interface TestIntf throws TestIntfException; void pingBiDir(Ice::Identity id); -}; +} interface TestIntfController { void holdAdapter(); void resumeAdapter(); -}; +} -}; +} diff --git a/csharp/test/Ice/assemblies/Core.ice b/csharp/test/Ice/assemblies/Core.ice index 50a22269c00..daaf496b2a4 100644 --- a/csharp/test/Ice/assemblies/Core.ice +++ b/csharp/test/Ice/assemblies/Core.ice @@ -3,6 +3,6 @@ module Core exception ArgumentException { -}; +} -};
\ No newline at end of file +} diff --git a/csharp/test/Ice/assemblies/User.ice b/csharp/test/Ice/assemblies/User.ice index 8f2efc12e09..b5d20a9214c 100644 --- a/csharp/test/Ice/assemblies/User.ice +++ b/csharp/test/Ice/assemblies/User.ice @@ -6,12 +6,12 @@ module User class UserInfo { -}; +} interface Registry { UserInfo getUserInfo(string id) throws Core::ArgumentException; -}; +} -}; +} diff --git a/csharp/test/Ice/background/Test.ice b/csharp/test/Ice/background/Test.ice index adf77c1af1d..ea5e8987cc6 100644 --- a/csharp/test/Ice/background/Test.ice +++ b/csharp/test/Ice/background/Test.ice @@ -20,7 +20,7 @@ interface Background void opWithPayload(Ice::ByteSeq seq); void shutdown(); -}; +} interface BackgroundController { @@ -39,7 +39,7 @@ interface BackgroundController void writeException(bool enable); void buffered(bool enable); -}; +} -}; +} diff --git a/csharp/test/Ice/binding/Test.ice b/csharp/test/Ice/binding/Test.ice index f23f3433258..de2937a32ce 100644 --- a/csharp/test/Ice/binding/Test.ice +++ b/csharp/test/Ice/binding/Test.ice @@ -15,14 +15,14 @@ module Test interface TestIntf { string getAdapterName(); -}; +} interface RemoteObjectAdapter { TestIntf* getTestIntf(); void deactivate(); -}; +} interface RemoteCommunicator { @@ -31,6 +31,6 @@ interface RemoteCommunicator void deactivateObjectAdapter(RemoteObjectAdapter* adapter); void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Ice/checksum/ClientTypes.ice b/csharp/test/Ice/checksum/ClientTypes.ice index d576d0b0fe0..131981ee2cc 100644 --- a/csharp/test/Ice/checksum/ClientTypes.ice +++ b/csharp/test/Ice/checksum/ClientTypes.ice @@ -30,42 +30,42 @@ const int IntConst3 = 100; // // TEST: Same // -enum Enum1 { Enum11, Enum12, Enum13 }; +enum Enum1 { Enum11, Enum12, Enum13 } // // TEST: Add enumerator // -enum Enum2 { Enum21, Enum22, Enum23 }; +enum Enum2 { Enum21, Enum22, Enum23 } // // TEST: Remove enumerator // -enum Enum3 { Enum31, Enum32, Enum33 }; +enum Enum3 { Enum31, Enum32, Enum33 } // // TEST: Change to a different type // -enum Enum4 { Enum41, Enum42, Enum43 }; +enum Enum4 { Enum41, Enum42, Enum43 } // // TEST: Enum with explicit values. // -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 }; +enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } // // TEST: Enum with same explicit values, different order. // -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 }; +enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } // // TEST: Enum with different explicit values. // -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3}; +enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} // // TEST: Enum with explicit values, removed enumerator. // -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3}; +enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} // // TEST: Same @@ -109,7 +109,7 @@ struct Struct1 { string str; bool b; -}; +} // // TEST: Add member @@ -118,7 +118,7 @@ struct Struct2 { string str; bool b; -}; +} // // TEST: Change member type @@ -127,7 +127,7 @@ struct Struct3 { string str; bool b; -}; +} // // TEST: Remove member @@ -136,7 +136,7 @@ struct Struct4 { string str; bool b; -}; +} // // TEST: Change to a different type @@ -145,70 +145,70 @@ struct Struct5 { string str; bool b; -}; +} // // TEST: Same // interface Interface1 { -}; +} // // TEST: Change interface to class // interface Interface2 { -}; +} // // TEST: Add base interface // interface Interface3 { -}; +} // // TEST: Add operation // interface Interface4 { -}; +} // // TEST: Same // class EmptyClass1 { -}; +} // // TEST: Add data member // class EmptyClass2 { -}; +} // // TEST: Add operation // class EmptyClass3 { -}; +} // // TEST: Add base class // class EmptyClass4 { -}; +} // // TEST: Add interface // class EmptyClass5 { -}; +} // // TEST: Same @@ -217,7 +217,7 @@ class SimpleClass1 { string str; float f; -}; +} // // TEST: Add operation @@ -226,7 +226,7 @@ class SimpleClass2 { string str; float f; -}; +} // // TEST: Rename member @@ -235,7 +235,7 @@ class SimpleClass3 { string str; float f; -}; +} // // TEST: Add member @@ -244,7 +244,7 @@ class SimpleClass4 { string str; float f; -}; +} // // TEST: Remove member @@ -253,7 +253,7 @@ class SimpleClass5 { string str; float f; -}; +} // // TEST: Reorder members @@ -262,7 +262,7 @@ class SimpleClass6 { string str; float f; -}; +} // // TEST: Change member type @@ -271,7 +271,7 @@ class SimpleClass7 { string str; float f; -}; +} // // TEST: Same @@ -280,7 +280,7 @@ exception Exception1 { string str; bool b; -}; +} // // TEST: Add member @@ -289,7 +289,7 @@ exception Exception2 { string str; bool b; -}; +} // // TEST: Change member type @@ -298,7 +298,7 @@ exception Exception3 { string str; bool b; -}; +} // // TEST: Remove member @@ -307,14 +307,14 @@ exception Exception4 { string str; bool b; -}; +} // // TEST: Add base exception // exception Exception5 { -}; +} // // TEST: Change to a different type @@ -323,7 +323,7 @@ exception Exception6 { string str; bool b; -}; +} // // TEST: Exception with optional members. @@ -333,7 +333,7 @@ exception OptionalEx0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members, different order, same tags. @@ -343,7 +343,7 @@ exception OptionalEx1 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -353,7 +353,7 @@ exception OptionalEx2 string firstName; string secondName; optional(1) string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -363,7 +363,7 @@ exception OptionalEx3 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members using different tags. @@ -373,7 +373,7 @@ exception OptionalEx4 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Same @@ -382,7 +382,7 @@ interface BaseInterface1 { void baseOp1(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change return type @@ -391,7 +391,7 @@ interface BaseInterface2 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add parameter @@ -400,7 +400,7 @@ interface BaseInterface3 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add exception @@ -409,7 +409,7 @@ interface BaseInterface4 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change out parameter to in parameter @@ -418,7 +418,7 @@ interface BaseInterface5 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove parameter @@ -427,7 +427,7 @@ interface BaseInterface6 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove exception @@ -436,7 +436,7 @@ interface BaseInterface7 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove operation @@ -445,7 +445,7 @@ interface BaseInterface8 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add base interface @@ -454,7 +454,7 @@ interface BaseInterface9 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add interface @@ -463,7 +463,7 @@ interface BaseInterface10 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Class with compact id @@ -471,14 +471,14 @@ interface BaseInterface10 class Compact1(1) { int id; -}; +} // // TEST: Derived from class with compact id // class Derived1 extends Compact1 { -}; +} // // TEST: Same class names but different compact id @@ -486,7 +486,7 @@ class Derived1 extends Compact1 class Compact2(2) { int id; -}; +} // // TEST: Class with optional members. @@ -496,7 +496,7 @@ class Optional0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members, different order, same tags. @@ -506,7 +506,7 @@ class Optional1 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -516,7 +516,7 @@ class Optional2 string firstName; string secondName; optional(1) string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -526,7 +526,7 @@ class Optional3 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members using different tags. @@ -536,7 +536,7 @@ class Optional4 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Interface with optional parameters. @@ -545,7 +545,7 @@ interface OptionalParameters0 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different order. @@ -554,7 +554,7 @@ interface OptionalParameters1 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different tags. @@ -563,7 +563,7 @@ interface OptionalParameters2 { void op1(string firstName, optional(1) string emailAddress, optional(2) string secondName); -}; +} // // TEST: Interface with different optional parameters. @@ -572,7 +572,7 @@ interface OptionalParameters3 { void op1(string firstName, optional(1) string emailAddress, string secondName); -}; +} // // TEST: Interface with optional return type. @@ -580,7 +580,7 @@ interface OptionalParameters3 interface OptionalReturn0 { optional(1) int op(); -}; +} // // TEST: Interface that changes optional return type. @@ -588,12 +588,12 @@ interface OptionalReturn0 interface OptionalReturn2 { optional(1) int op(); -}; +} // // TEST: Local // -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 }; +local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } // // TEST: Local @@ -611,13 +611,13 @@ local dictionary<string, string> LocalDictionary; local struct LocalStruct { string str; -}; +} // // TEST: Local // local class LocalClass { -}; +} -}; +} diff --git a/csharp/test/Ice/checksum/ServerTypes.ice b/csharp/test/Ice/checksum/ServerTypes.ice index 3ca209b135f..724c7b7e7c0 100644 --- a/csharp/test/Ice/checksum/ServerTypes.ice +++ b/csharp/test/Ice/checksum/ServerTypes.ice @@ -32,42 +32,42 @@ const short IntConst3 = 100; // // TEST: Same // -enum Enum1 { Enum11, Enum12, Enum13 }; +enum Enum1 { Enum11, Enum12, Enum13 } // // TEST: Add enumerator // -enum Enum2 { Enum21, Enum22, Enum23, Enum24 }; +enum Enum2 { Enum21, Enum22, Enum23, Enum24 } // // TEST: Remove enumerator // -enum Enum3 { Enum32, Enum33 }; +enum Enum3 { Enum32, Enum33 } // // TEST: Enum with explicit values. // -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 }; +enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } // // TEST: Enum with same explicit values, different order. // -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 }; +enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 } // // TEST: Enum with different explicit values. // -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 }; +enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 } // // TEST: Enum with explicit values, removed enumerator. // -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2}; +enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2} // // TEST: Change to a different type // -class Enum4 {}; +class Enum4 {} // // TEST: Same @@ -82,7 +82,7 @@ sequence<short> Sequence2; // // TEST: Change to a different type // -class Sequence3 {}; +class Sequence3 {} // // TEST: Same @@ -102,7 +102,7 @@ dictionary<string, bool> Dictionary3; // // TEST: Change to a different type // -class Dictionary4 {}; +class Dictionary4 {} // // TEST: Same @@ -111,7 +111,7 @@ struct Struct1 { string str; bool b; -}; +} // // TEST: Add member @@ -121,7 +121,7 @@ struct Struct2 string str; bool b; float f; -}; +} // // TEST: Change member type @@ -130,7 +130,7 @@ struct Struct3 { string str; double b; -}; +} // // TEST: Remove member @@ -138,33 +138,33 @@ struct Struct3 struct Struct4 { bool b; -}; +} // // TEST: Change to a different type // -class Struct5 {}; +class Struct5 {} // // TEST: Same // interface Interface1 { -}; +} // // TEST: Change interface to class // class Interface2 { -}; +} // // TEST: Add base interface // interface Interface3 extends Interface1 { -}; +} // // TEST: Add operation @@ -172,14 +172,14 @@ interface Interface3 extends Interface1 interface Interface4 { void opInterface4(); -}; +} // // TEST: Same // class EmptyClass1 { -}; +} // // TEST: Add data member @@ -187,7 +187,7 @@ class EmptyClass1 class EmptyClass2 { double d; -}; +} // // TEST: Add operation @@ -195,21 +195,21 @@ class EmptyClass2 class EmptyClass3 { void newOp(); -}; +} // // TEST: Add base class // class EmptyClass4 extends EmptyClass1 { -}; +} // // TEST: Add interface // class EmptyClass5 implements Interface1 { -}; +} // // TEST: Same @@ -218,7 +218,7 @@ class SimpleClass1 { string str; float f; -}; +} // // TEST: Add operation @@ -228,7 +228,7 @@ class SimpleClass2 string str; float f; void newOp(); -}; +} // // TEST: Rename member @@ -237,7 +237,7 @@ class SimpleClass3 { string str; float g; -}; +} // // TEST: Add member @@ -247,7 +247,7 @@ class SimpleClass4 string str; float f; bool b; -}; +} // // TEST: Remove member @@ -255,7 +255,7 @@ class SimpleClass4 class SimpleClass5 { string str; -}; +} // // TEST: Reorder members @@ -264,7 +264,7 @@ class SimpleClass6 { float f; string str; -}; +} // // TEST: Change member type @@ -273,7 +273,7 @@ class SimpleClass7 { string str; double f; -}; +} // // TEST: Same @@ -282,7 +282,7 @@ exception Exception1 { string str; bool b; -}; +} // // TEST: Add member @@ -292,7 +292,7 @@ exception Exception2 string str; bool b; float f; -}; +} // // TEST: Change member type @@ -301,7 +301,7 @@ exception Exception3 { string str; double b; -}; +} // // TEST: Remove member @@ -309,19 +309,19 @@ exception Exception3 exception Exception4 { bool b; -}; +} // // TEST: Add base exception // exception Exception5 extends Exception1 { -}; +} // // TEST: Change to a different type // -class Exception6 {}; +class Exception6 {} // // TEST: Exception with optional members. @@ -331,7 +331,7 @@ exception OptionalEx0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members, different order, same tags. @@ -341,7 +341,7 @@ exception OptionalEx1 string firstName; optional(2) string emailAddress; optional(1) string secondName; -}; +} // // TEST: Exception with different optional members. @@ -351,7 +351,7 @@ exception OptionalEx2 string firstName; optional(1) string secondName; string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -362,7 +362,7 @@ exception OptionalEx3 optional(1) string secondName; optional(2) string emailAddress; optional(3) string phoneNumber; -}; +} // // TEST: Exception with optional members using different tags. @@ -372,7 +372,7 @@ exception OptionalEx4 string firstName; optional(2) string secondName; optional(1) string emailAddress; -}; +} // // TEST: Same @@ -381,7 +381,7 @@ interface BaseInterface1 { void baseOp1(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change return type @@ -390,7 +390,7 @@ interface BaseInterface2 { int baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add parameter @@ -399,7 +399,7 @@ interface BaseInterface3 { void baseOp(Object o); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add exception @@ -408,7 +408,7 @@ interface BaseInterface4 { void baseOp(); void baseOp2(int i, out string s) throws Exception1, Exception2; -}; +} // // TEST: Change out parameter to in parameter @@ -417,7 +417,7 @@ interface BaseInterface5 { void baseOp(); void baseOp2(int i, string s) throws Exception1; -}; +} // // TEST: Remove parameter @@ -426,7 +426,7 @@ interface BaseInterface6 { void baseOp(); void baseOp2(out string s) throws Exception1; -}; +} // // TEST: Remove exception @@ -435,7 +435,7 @@ interface BaseInterface7 { void baseOp(); void baseOp2(int i, out string s); -}; +} // // TEST: Remove operation @@ -443,7 +443,7 @@ interface BaseInterface7 interface BaseInterface8 { void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add base interface @@ -452,7 +452,7 @@ interface BaseInterface9 extends Interface1 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add interface @@ -461,7 +461,7 @@ interface BaseInterface10 extends Interface1 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Class with compact id @@ -469,14 +469,14 @@ interface BaseInterface10 extends Interface1 class Compact1(1) { int id; -}; +} // // TEST: Derived from class with compact id // class Derived1 extends Compact1 { -}; +} // // TEST: Same class names but different compact id @@ -484,7 +484,7 @@ class Derived1 extends Compact1 class Compact2(3) { int id; -}; +} // // TEST: Class with optional members. @@ -494,7 +494,7 @@ class Optional0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members, different order, same tags. @@ -504,7 +504,7 @@ class Optional1 string firstName; optional(2) string emailAddress; optional(1) string secondName; -}; +} // // TEST: Class with different optional members. @@ -514,7 +514,7 @@ class Optional2 string firstName; optional(1) string secondName; string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -525,7 +525,7 @@ class Optional3 optional(1) string secondName; optional(2) string emailAddress; optional(3) string phoneNumber; -}; +} // // TEST: Class with optional members using different tags. @@ -535,7 +535,7 @@ class Optional4 string firstName; optional(2) string secondName; optional(1) string emailAddress; -}; +} // // TEST: Interface with optional parameters. @@ -544,7 +544,7 @@ interface OptionalParameters0 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different order. @@ -553,7 +553,7 @@ interface OptionalParameters1 { void op1(string firstName, optional(2) string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with optional parameters, different tags. @@ -562,7 +562,7 @@ interface OptionalParameters2 { void op1(string firstName, optional(2) string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with different optional parameters. @@ -571,7 +571,7 @@ interface OptionalParameters3 { void op1(string firstName, string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with optional return type. @@ -579,7 +579,7 @@ interface OptionalParameters3 interface OptionalReturn0 { optional(1) int op(); -}; +} // // TEST: Interface that changes optional return type. @@ -587,12 +587,12 @@ interface OptionalReturn0 interface OptionalReturn2 { int op(); -}; +} // // TEST: Local // -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 }; +local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } // // TEST: Local @@ -610,13 +610,13 @@ local dictionary<string, string> LocalDictionary; local struct LocalStruct { string str; -}; +} // // TEST: Local // local class LocalClass { -}; +} -}; +} diff --git a/csharp/test/Ice/checksum/Test.ice b/csharp/test/Ice/checksum/Test.ice index 2fc963eb1ca..3f3a3bf32b1 100644 --- a/csharp/test/Ice/checksum/Test.ice +++ b/csharp/test/Ice/checksum/Test.ice @@ -19,6 +19,6 @@ interface Checksum idempotent Ice::SliceChecksumDict getSliceChecksums(); void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Ice/defaultServant/Test.ice b/csharp/test/Ice/defaultServant/Test.ice index acf8e41550c..dab067ec07f 100644 --- a/csharp/test/Ice/defaultServant/Test.ice +++ b/csharp/test/Ice/defaultServant/Test.ice @@ -15,6 +15,6 @@ module Test interface MyObject { string getName(); -}; +} -}; +} diff --git a/csharp/test/Ice/defaultValue/Test.ice b/csharp/test/Ice/defaultValue/Test.ice index 7ed9fee8136..c68f32158fd 100644 --- a/csharp/test/Ice/defaultValue/Test.ice +++ b/csharp/test/Ice/defaultValue/Test.ice @@ -17,14 +17,14 @@ module Test { -enum Color { red, green, blue }; +enum Color { red, green, blue } module Nested { -enum Color { red, green, blue }; +enum Color { red, green, blue } -}; +} // // Struct1 maps to a C# class because it contains string members. @@ -53,7 +53,7 @@ struct Struct1 float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} const bool ConstBool = true; const byte ConstByte = 254; @@ -98,7 +98,7 @@ struct Struct2 float zeroDotF = ConstZeroDotF; double zeroD = ConstZeroD; double zeroDotD = ConstZeroDotD; -}; +} // // Struct3 would normally map to a C# struct because we have omitted @@ -130,7 +130,7 @@ struct Struct3 float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} // // Struct4 would normally map to a C# struct because we have omitted @@ -161,7 +161,7 @@ struct Struct4 float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} class Base { @@ -181,7 +181,7 @@ class Base float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} class Derived extends Base { @@ -192,7 +192,7 @@ class Derived extends Base Nested::Color nc1 = ::Test::Nested::Color::red; Nested::Color nc2 = Nested::green; Nested::Color nc3 = blue; -}; +} exception BaseEx { @@ -212,7 +212,7 @@ exception BaseEx float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} exception DerivedEx extends BaseEx { @@ -223,7 +223,7 @@ exception DerivedEx extends BaseEx Nested::Color nc1 = ConstNestedColor1; Nested::Color nc2 = ConstNestedColor2; Nested::Color nc3 = ConstNestedColor3; -}; +} ["clr:property"] class ClassProperty @@ -244,7 +244,7 @@ class ClassProperty float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} ["clr:property"] struct StructProperty @@ -265,7 +265,7 @@ struct StructProperty float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} // // Exceptions don't support "clr:property" metadata, but @@ -290,7 +290,7 @@ exception ExceptionProperty float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} sequence<byte> ByteSeq; sequence<int> IntSeq; @@ -299,12 +299,12 @@ dictionary<int, string> IntStringDict; struct InnerStruct { int a; -}; +} struct InnerStruct2 { string a; -}; +} struct StructNoDefaults { @@ -322,34 +322,34 @@ struct StructNoDefaults InnerStruct st; InnerStruct2 st2; IntStringDict dict; -}; +} exception ExceptionNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} exception ExceptionNoDefaults extends ExceptionNoDefaultsBase { InnerStruct st; InnerStruct2 st2; IntStringDict dict; -}; +} class ClassNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} class ClassNoDefaults extends ClassNoDefaultsBase { InnerStruct st; InnerStruct2 st2; IntStringDict dict; -}; +} -}; +} diff --git a/csharp/test/Ice/dictMapping/Test.ice b/csharp/test/Ice/dictMapping/Test.ice index b1180b93155..4093c134170 100644 --- a/csharp/test/Ice/dictMapping/Test.ice +++ b/csharp/test/Ice/dictMapping/Test.ice @@ -21,7 +21,7 @@ struct TEstNv { NV d; IntSeq s; -}; +} sequence<int> AIS; ["clr:generic:List"] sequence<int> GIS; @@ -49,6 +49,6 @@ interface MyClass NDASS opNDASS(NDASS i, out NDASS o); NDGSS opNDGSS(NDGSS i, out NDGSS o); -}; +} -}; +} diff --git a/csharp/test/Ice/dictMapping/TestAMD.ice b/csharp/test/Ice/dictMapping/TestAMD.ice index 578068cc097..2285fdeee31 100644 --- a/csharp/test/Ice/dictMapping/TestAMD.ice +++ b/csharp/test/Ice/dictMapping/TestAMD.ice @@ -43,6 +43,6 @@ dictionary<string, GSS> NDGSS; NDASS opNDASS(NDASS i, out NDASS o); NDGSS opNDGSS(NDGSS i, out NDGSS o); -}; +} -}; +} diff --git a/csharp/test/Ice/dispatcher/Test.ice b/csharp/test/Ice/dispatcher/Test.ice index 53e7d6ee031..262051819c3 100644 --- a/csharp/test/Ice/dispatcher/Test.ice +++ b/csharp/test/Ice/dispatcher/Test.ice @@ -20,12 +20,12 @@ interface TestIntf void sleep(int to); void opWithPayload(Ice::ByteSeq seq); void shutdown(); -}; +} interface TestIntfController { void holdAdapter(); void resumeAdapter(); -}; +} -}; +} diff --git a/csharp/test/Ice/echo/Test.ice b/csharp/test/Ice/echo/Test.ice index 57f7e92da21..a540854e923 100644 --- a/csharp/test/Ice/echo/Test.ice +++ b/csharp/test/Ice/echo/Test.ice @@ -20,6 +20,6 @@ interface Echo void startBatch(); void flushBatch(); void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Ice/enums/Test.ice b/csharp/test/Ice/enums/Test.ice index 9851ef668ce..1eaf84a017b 100644 --- a/csharp/test/Ice/enums/Test.ice +++ b/csharp/test/Ice/enums/Test.ice @@ -35,7 +35,7 @@ enum ByteEnum benum9 = LongConst1, benum10, benum11 = ByteConst2 -}; +} sequence<ByteEnum> ByteEnumSeq; enum ShortEnum @@ -51,7 +51,7 @@ enum ShortEnum senum9 = LongConst1, senum10, senum11 = ShortConst2 -}; +} sequence<ShortEnum> ShortEnumSeq; enum IntEnum @@ -68,7 +68,7 @@ enum IntEnum ienum10, ienum11 = IntConst2, ienum12 = LongConst2 -}; +} sequence<IntEnum> IntEnumSeq; enum SimpleEnum @@ -76,7 +76,7 @@ enum SimpleEnum red, green, blue -}; +} sequence<SimpleEnum> SimpleEnumSeq; interface TestIntf @@ -92,6 +92,6 @@ interface TestIntf SimpleEnumSeq opSimpleSeq(SimpleEnumSeq s1, out SimpleEnumSeq s2); void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Ice/exceptions/Test.ice b/csharp/test/Ice/exceptions/Test.ice index 869bc995f8f..d0af1aa24fe 100644 --- a/csharp/test/Ice/exceptions/Test.ice +++ b/csharp/test/Ice/exceptions/Test.ice @@ -16,29 +16,29 @@ module Test interface Empty { -}; +} interface Thrower; exception A { int aMem; -}; +} exception B extends A { int bMem; -}; +} exception C extends B { int cMem; -}; +} exception D { int dMem; -}; +} interface Thrower { @@ -65,11 +65,11 @@ interface Thrower void throwAfterResponse(); void throwAfterException() throws A; -}; +} interface WrongOperation { void noSuchOperation(); -}; +} -}; +} diff --git a/csharp/test/Ice/exceptions/TestAMD.ice b/csharp/test/Ice/exceptions/TestAMD.ice index fda6202b15f..48c201e9356 100644 --- a/csharp/test/Ice/exceptions/TestAMD.ice +++ b/csharp/test/Ice/exceptions/TestAMD.ice @@ -16,29 +16,29 @@ module Test interface Empty { -}; +} interface Thrower; exception A { int aMem; -}; +} exception B extends A { int bMem; -}; +} exception C extends B { int cMem; -}; +} exception D { int dMem; -}; +} ["amd"] interface Thrower { @@ -65,11 +65,11 @@ exception D void throwAfterResponse(); void throwAfterException() throws A; -}; +} ["amd"] interface WrongOperation { void noSuchOperation(); -}; +} -}; +} diff --git a/csharp/test/Ice/facets/Test.ice b/csharp/test/Ice/facets/Test.ice index 195bbe5e1a0..8a55ad38274 100644 --- a/csharp/test/Ice/facets/Test.ice +++ b/csharp/test/Ice/facets/Test.ice @@ -14,47 +14,47 @@ module Test interface Empty { -}; +} interface A { string callA(); -}; +} interface B extends A { string callB(); -}; +} interface C extends A { string callC(); -}; +} interface D extends B, C { string callD(); -}; +} interface E { string callE(); -}; +} interface F extends E { string callF(); -}; +} interface G { void shutdown(); string callG(); -}; +} interface H extends G { string callH(); -}; +} -}; +} diff --git a/csharp/test/Ice/faultTolerance/Test.ice b/csharp/test/Ice/faultTolerance/Test.ice index 6bd1a167329..8aff9e96e79 100644 --- a/csharp/test/Ice/faultTolerance/Test.ice +++ b/csharp/test/Ice/faultTolerance/Test.ice @@ -18,11 +18,11 @@ interface TestIntf void abort(); idempotent void idempotentAbort(); idempotent int pid(); -}; +} interface Cleaner { void cleanup(); -}; +} -}; +} diff --git a/csharp/test/Ice/hash/Test.ice b/csharp/test/Ice/hash/Test.ice index b3dd684d3e0..0bd1446b2c3 100644 --- a/csharp/test/Ice/hash/Test.ice +++ b/csharp/test/Ice/hash/Test.ice @@ -15,17 +15,17 @@ module Test exception BaseException { -}; +} exception InvalidPointException extends BaseException { int index; -}; +} exception InvalidLengthException extends BaseException { int length; -}; +} exception OtherException { @@ -33,7 +33,7 @@ exception OtherException int y; int z; bool b; -}; +} struct PointF @@ -41,26 +41,26 @@ struct PointF float x; float y; float z; -}; +} struct PointD { double x; double y; double z; -}; +} struct Point { int x; int y; -}; +} sequence<Point> Points; struct Polyline { Points vertices; -}; +} struct Color { @@ -68,7 +68,7 @@ struct Color int g; int b; int a; -}; +} dictionary<int, Color> StringColorMap; @@ -76,7 +76,7 @@ dictionary<int, Color> StringColorMap; struct ColorPalette { StringColorMap colors; -}; +} @@ -84,14 +84,14 @@ class Pen { int thickness; Test::Color color; -}; +} struct Draw { Test::Color backgroundColor; Test::Pen pen; bool shared; -}; +} -}; +} diff --git a/csharp/test/Ice/hold/Test.ice b/csharp/test/Ice/hold/Test.ice index 632b0c99179..398eee3508d 100644 --- a/csharp/test/Ice/hold/Test.ice +++ b/csharp/test/Ice/hold/Test.ice @@ -19,6 +19,6 @@ interface Hold int set(int value, int delay); void setOneway(int value, int expected); void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Ice/impl/Test.ice b/csharp/test/Ice/impl/Test.ice index fee3949a3f1..47b4f0202f1 100644 --- a/csharp/test/Ice/impl/Test.ice +++ b/csharp/test/Ice/impl/Test.ice @@ -19,21 +19,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -63,7 +63,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -91,7 +91,7 @@ dictionary<string, DoubleS> StringDoubleSD; dictionary<string, StringS> StringStringSD; dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; -exception SomeException {}; +exception SomeException {} interface MyClass { @@ -261,28 +261,28 @@ interface MyClass ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} ["cs:tie"] interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -352,4 +352,4 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} diff --git a/csharp/test/Ice/impl/TestAMD.ice b/csharp/test/Ice/impl/TestAMD.ice index 4c4e0beea40..0c3b091bbe3 100644 --- a/csharp/test/Ice/impl/TestAMD.ice +++ b/csharp/test/Ice/impl/TestAMD.ice @@ -19,21 +19,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -63,7 +63,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -259,28 +259,28 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} ["amd", "cs:tie"] interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -350,4 +350,4 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} diff --git a/csharp/test/Ice/info/Test.ice b/csharp/test/Ice/info/Test.ice index c518d54b867..6741d5348d4 100644 --- a/csharp/test/Ice/info/Test.ice +++ b/csharp/test/Ice/info/Test.ice @@ -21,6 +21,6 @@ interface TestIntf Ice::Context getEndpointInfoAsContext(); Ice::Context getConnectionInfoAsContext(); -}; +} -}; +} diff --git a/csharp/test/Ice/inheritance/Test.ice b/csharp/test/Ice/inheritance/Test.ice index 372dbcc414a..1bbd2255d80 100644 --- a/csharp/test/Ice/inheritance/Test.ice +++ b/csharp/test/Ice/inheritance/Test.ice @@ -20,14 +20,14 @@ module MA interface IA { IA* iaop(IA* p); -}; +} class CA { CA* caop(CA* p); -}; +} -}; +} module MB { @@ -35,19 +35,19 @@ module MB interface IB1 extends MA::IA { IB1* ib1op(IB1* p); -}; +} interface IB2 extends MA::IA { IB2* ib2op(IB2* p); -}; +} class CB extends MA::CA { CB* cbop(CB* p); -}; +} -}; +} module MA { @@ -55,19 +55,19 @@ module MA interface IC extends MB::IB1, MB::IB2 { IC* icop(IC* p); -}; +} class CC extends MB::CB { CC* ccop(CC* p); -}; +} class CD extends CC implements MB::IB1, MB::IB2 { CD* cdop(CD* p); -}; +} -}; +} interface Initial { @@ -80,6 +80,6 @@ interface Initial MB::IB1* ib1op(); MB::IB2* ib2op(); MA::IC* icop(); -}; +} -}; +} diff --git a/csharp/test/Ice/interceptor/Test.ice b/csharp/test/Ice/interceptor/Test.ice index 45cc36d5cc7..329f6593cdf 100644 --- a/csharp/test/Ice/interceptor/Test.ice +++ b/csharp/test/Ice/interceptor/Test.ice @@ -15,11 +15,11 @@ module Test exception InvalidInputException { string message; -}; +} local exception RetryException { -}; +} interface MyObject { @@ -77,7 +77,7 @@ interface MyObject // ["amd"] int amdBadSystemAdd(int x, int y); -}; +} -}; +} diff --git a/csharp/test/Ice/invoke/Test.ice b/csharp/test/Ice/invoke/Test.ice index 1f23be6f358..8448a46f23f 100644 --- a/csharp/test/Ice/invoke/Test.ice +++ b/csharp/test/Ice/invoke/Test.ice @@ -15,7 +15,7 @@ module Test exception MyException { -}; +} interface MyClass { @@ -26,6 +26,6 @@ interface MyClass void opException() throws MyException; void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Ice/location/Test.ice b/csharp/test/Ice/location/Test.ice index 5291d8f0dab..cd5afbb9171 100644 --- a/csharp/test/Ice/location/Test.ice +++ b/csharp/test/Ice/location/Test.ice @@ -20,7 +20,7 @@ interface TestLocatorRegistry extends ::Ice::LocatorRegistry // Allow remote addition of objects to the locator registry. // void addObject(Object* obj); -}; +} interface TestLocator extends ::Ice::Locator { @@ -28,18 +28,18 @@ interface TestLocator extends ::Ice::Locator // Returns the number of request on the locator interface. // idempotent int getRequestCount(); -}; +} interface ServerManager { void startServer(); void shutdown(); -}; +} interface Hello { void sayHello(); -}; +} interface TestIntf { @@ -50,6 +50,6 @@ interface TestIntf Hello* getReplicatedHello(); void migrateHello(); -}; +} -}; +} diff --git a/csharp/test/Ice/metrics/Test.ice b/csharp/test/Ice/metrics/Test.ice index a7aac6875b2..e0e07b9afca 100644 --- a/csharp/test/Ice/metrics/Test.ice +++ b/csharp/test/Ice/metrics/Test.ice @@ -15,7 +15,7 @@ module Test exception UserEx { -}; +} sequence<byte> ByteSeq; @@ -39,13 +39,13 @@ interface Metrics Object* getAdmin(); void shutdown(); -}; +} interface Controller { void hold(); void resume(); -}; +} -}; +} diff --git a/csharp/test/Ice/metrics/TestAMD.ice b/csharp/test/Ice/metrics/TestAMD.ice index ba885ae60f6..54ddb250199 100644 --- a/csharp/test/Ice/metrics/TestAMD.ice +++ b/csharp/test/Ice/metrics/TestAMD.ice @@ -14,7 +14,7 @@ module Test exception UserEx { -}; +} sequence<byte> ByteSeq; @@ -38,13 +38,13 @@ interface Metrics Object* getAdmin(); void shutdown(); -}; +} interface Controller { void hold(); void resume(); -}; +} -}; +} diff --git a/csharp/test/Ice/networkProxy/Test.ice b/csharp/test/Ice/networkProxy/Test.ice index efaa03d8366..e3a95f4cdfc 100644 --- a/csharp/test/Ice/networkProxy/Test.ice +++ b/csharp/test/Ice/networkProxy/Test.ice @@ -15,6 +15,6 @@ module Test interface TestIntf { void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Ice/objects/Test.ice b/csharp/test/Ice/objects/Test.ice index e33229ad4e9..8526225deb6 100644 --- a/csharp/test/Ice/objects/Test.ice +++ b/csharp/test/Ice/objects/Test.ice @@ -17,18 +17,18 @@ module Test struct S { string str; -}; +} class Base { S theS; string str; -}; +} class AbstractBase extends Base { void op(); -}; +} class B; class C; @@ -40,12 +40,12 @@ class A bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class B extends A { A theA; -}; +} class C { @@ -53,7 +53,7 @@ class C bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class D { @@ -63,31 +63,31 @@ class D bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} ["protected"] class E { int i; string s; -}; +} class F { ["protected"] E e1; E e2; -}; +} interface I { -}; +} interface J extends I { -}; +} class H implements I { -}; +} sequence<Base> BaseSeq; @@ -95,13 +95,13 @@ class CompactExt; class Compact(1) { -}; +} const int CompactExtId = 789; class CompactExt(CompactExtId) extends Compact { -}; +} module Inner { @@ -109,12 +109,12 @@ module Inner class A { ::Test::A theA; -}; +} exception Ex { string reason; -}; +} module Sub { @@ -122,50 +122,50 @@ module Sub class A { ::Test::Inner::A theA; -}; +} exception Ex { string reason; -}; +} -}; +} -}; +} class A1 { string name; -}; +} class B1 { A1 a1; A1 a2; -}; +} class D1 extends B1 { A1 a3; A1 a4; -}; +} exception EBase { A1 a1; A1 a2; -}; +} exception EDerived extends EBase { A1 a3; A1 a4; -}; +} class Recursive { Recursive v; -}; +} interface Initial { @@ -203,20 +203,20 @@ interface Initial void throwInnerEx() throws Inner::Ex; void throwInnerSubEx() throws Inner::Sub::Ex; -}; +} class Empty { -}; +} class AlsoEmpty { -}; +} interface UnexpectedObjectExceptionTest { Empty op(); -}; +} // // Remaining definitions are here to ensure that the generated code compiles. @@ -225,37 +225,37 @@ interface UnexpectedObjectExceptionTest class COneMember { Empty e; -}; +} class CTwoMembers { Empty e1; Empty e2; -}; +} exception EOneMember { Empty e; -}; +} exception ETwoMembers { Empty e1; Empty e2; -}; +} struct SOneMember { Empty e; -}; +} struct STwoMembers { Empty e1; Empty e2; -}; +} dictionary<int, COneMember> DOneMember; dictionary<int, CTwoMembers> DTwoMembers; -}; +} diff --git a/csharp/test/Ice/operations/Test.ice b/csharp/test/Ice/operations/Test.ice index 1410fa3036f..ae7d619caf2 100644 --- a/csharp/test/Ice/operations/Test.ice +++ b/csharp/test/Ice/operations/Test.ice @@ -19,21 +19,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -63,7 +63,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -91,7 +91,7 @@ dictionary<string, DoubleS> StringDoubleSD; dictionary<string, StringS> StringStringSD; dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; -exception SomeException {}; +exception SomeException {} interface MyClass { @@ -261,28 +261,28 @@ interface MyClass ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} ["cs:tie"] interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -352,7 +352,7 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} module Test2 { @@ -365,6 +365,6 @@ module Test2 **/ interface MyDerivedClass extends Test::MyClass { -}; +} -}; +} diff --git a/csharp/test/Ice/operations/TestAMD.ice b/csharp/test/Ice/operations/TestAMD.ice index 4c4e0beea40..0c3b091bbe3 100644 --- a/csharp/test/Ice/operations/TestAMD.ice +++ b/csharp/test/Ice/operations/TestAMD.ice @@ -19,21 +19,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -63,7 +63,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -259,28 +259,28 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} ["amd", "cs:tie"] interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -350,4 +350,4 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} diff --git a/csharp/test/Ice/optional/Test.ice b/csharp/test/Ice/optional/Test.ice index 44edf90847b..ab14aa7eb7c 100644 --- a/csharp/test/Ice/optional/Test.ice +++ b/csharp/test/Ice/optional/Test.ice @@ -15,33 +15,33 @@ module Test class OneOptional { optional(1) int a; -}; +} enum MyEnum { MyEnumMember -}; +} struct SmallStruct { byte m; -}; +} struct FixedStruct { int m; -}; +} struct VarStruct { string m; -}; +} ["clr:class"] struct ClassVarStruct { int a; -}; +} sequence<byte> ByteSeq; sequence<bool> BoolSeq; @@ -109,7 +109,7 @@ class MultiOptional optional(29) BoolSeq bos; optional(30) Serializable ser; -}; +} class A { @@ -117,26 +117,26 @@ class A optional(1) int ma; optional(50) int mb; optional(500) int mc; -}; +} ["preserve-slice"] class B extends A { int requiredB; optional(10) int md; -}; +} class C extends B { string ss; optional(890) string ms; -}; +} class WD { optional(1) int a = 5; optional(2) string s = "test"; -}; +} exception OptionalException { @@ -144,19 +144,19 @@ exception OptionalException optional(1) int a = 5; optional(2) string b; optional(50) OneOptional o; -}; +} exception DerivedException extends OptionalException { optional(600) string ss = "test"; optional(601) OneOptional o2; -}; +} exception RequiredException extends OptionalException { string ss = "test"; OneOptional o2; -}; +} ["clr:property"] class OptionalWithCustom @@ -164,27 +164,27 @@ class OptionalWithCustom optional(1) SmallStructList l; ["protected"] optional(2) SmallStructList lp; optional(3) ClassVarStruct s; -}; +} class E { A ae; -}; +} class F extends E { optional(1) A af; -}; +} class G1 { string a; -}; +} class G2 { long a; -}; +} class G { @@ -192,7 +192,7 @@ class G G2 gg2; optional(0) G2 gg2Opt; G1 gg1; -}; +} class Recursive; sequence<Recursive> RecursiveSeq; @@ -200,7 +200,7 @@ sequence<Recursive> RecursiveSeq; class Recursive { optional(0) RecursiveSeq value; -}; +} interface Initial { @@ -314,6 +314,6 @@ interface Initial bool supportsCppStringView(); bool supportsNullOptional(); -}; +} -}; +} diff --git a/csharp/test/Ice/optional/TestAMD.ice b/csharp/test/Ice/optional/TestAMD.ice index 3f8dee9342e..d2b20b21fce 100644 --- a/csharp/test/Ice/optional/TestAMD.ice +++ b/csharp/test/Ice/optional/TestAMD.ice @@ -15,33 +15,33 @@ module Test class OneOptional { optional(1) int a; -}; +} enum MyEnum { MyEnumMember -}; +} struct SmallStruct { byte m; -}; +} struct FixedStruct { int m; -}; +} struct VarStruct { string m; -}; +} ["clr:class"] struct ClassVarStruct { int a; -}; +} sequence<byte> ByteSeq; sequence<bool> BoolSeq; @@ -109,7 +109,7 @@ class MultiOptional optional(29) BoolSeq bos; optional(30) Serializable ser; -}; +} class A { @@ -117,26 +117,26 @@ class A optional(1) int ma; optional(50) int mb; optional(500) int mc; -}; +} ["preserve-slice"] class B extends A { int requiredB; optional(10) int md; -}; +} class C extends B { string ss; optional(890) string ms; -}; +} class WD { optional(1) int a = 5; optional(2) string s = "test"; -}; +} exception OptionalException { @@ -144,19 +144,19 @@ exception OptionalException optional(1) int a = 5; optional(2) string b; optional(50) OneOptional o; -}; +} exception DerivedException extends OptionalException { optional(600) string ss = "test"; optional(601) OneOptional o2; -}; +} exception RequiredException extends OptionalException { string ss = "test"; OneOptional o2; -}; +} ["clr:property"] class OptionalWithCustom @@ -164,27 +164,27 @@ class OptionalWithCustom optional(1) SmallStructList l; ["protected"] optional(2) SmallStructList lp; optional(3) ClassVarStruct s; -}; +} class E { A ae; -}; +} class F extends E { optional(1) A af; -}; +} class G1 { string a; -}; +} class G2 { long a; -}; +} class G { @@ -192,14 +192,14 @@ class G G2 gg2; optional(0) G2 gg2Opt; G1 gg1; -}; +} class Recursive; sequence<Recursive> RecursiveSeq; class Recursive { optional(0) RecursiveSeq value; -}; +} ["amd"] interface Initial @@ -314,6 +314,6 @@ interface Initial bool supportsCppStringView(); bool supportsNullOptional(); -}; +} -}; +} diff --git a/csharp/test/Ice/proxy/Test.ice b/csharp/test/Ice/proxy/Test.ice index beacc0084f1..7ad081172b2 100644 --- a/csharp/test/Ice/proxy/Test.ice +++ b/csharp/test/Ice/proxy/Test.ice @@ -20,11 +20,11 @@ interface MyClass void shutdown(); Ice::Context getContext(); -}; +} interface MyDerivedClass extends MyClass { Object* echo(Object* obj); -}; +} -}; +} diff --git a/csharp/test/Ice/proxy/TestAMD.ice b/csharp/test/Ice/proxy/TestAMD.ice index 8549676bc07..ab0cbeec7f2 100644 --- a/csharp/test/Ice/proxy/TestAMD.ice +++ b/csharp/test/Ice/proxy/TestAMD.ice @@ -20,11 +20,11 @@ module Test void shutdown(); Ice::Context getContext(); -}; +} ["amd"] interface MyDerivedClass extends MyClass { Object* echo(Object* obj); -}; +} -}; +} diff --git a/csharp/test/Ice/retry/Test.ice b/csharp/test/Ice/retry/Test.ice index 7df682dafca..abe9815da89 100644 --- a/csharp/test/Ice/retry/Test.ice +++ b/csharp/test/Ice/retry/Test.ice @@ -21,6 +21,6 @@ interface Retry void opSystemException(); idempotent void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Ice/seqMapping/Test.ice b/csharp/test/Ice/seqMapping/Test.ice index 11aab2aa19a..d7985722fbe 100644 --- a/csharp/test/Ice/seqMapping/Test.ice +++ b/csharp/test/Ice/seqMapping/Test.ice @@ -82,7 +82,7 @@ sequence<Object*> AObjectPrxS; struct S { int i; -}; +} sequence<S> AStructS; ["clr:generic:List"] sequence<S> LStructS; @@ -94,7 +94,7 @@ sequence<S> AStructS; struct SD { int i = 1; -}; +} sequence<SD> AStructSD; ["clr:generic:List"] sequence<SD> LStructSD; @@ -106,7 +106,7 @@ sequence<SD> AStructSD; class CV { int i; -}; +} sequence<CV> ACVS; ["clr:generic:List"] sequence<CV> LCVS; @@ -121,13 +121,13 @@ sequence<CV*> ACVPrxS; class CR { CV v; -}; +} sequence<CR> ACRS; ["clr:generic:List"] sequence<CR> LCRS; ["clr:generic:Custom"] sequence<CR> CCRS; -enum En { A, B, C }; +enum En { A, B, C } sequence<En> AEnS; ["clr:generic:List"] sequence<En> LEnS; @@ -245,7 +245,7 @@ interface MyClass SerialSmall opSerialSmallCSharp(SerialSmall i, out SerialSmall o); SerialLarge opSerialLargeCSharp(SerialLarge i, out SerialLarge o); SerialStruct opSerialStructCSharp(SerialStruct i, out SerialStruct o); -}; +} // Remaining type definitions are there to verify that the generated // code compiles correctly. @@ -257,18 +257,18 @@ struct Foo { SerialLarge SLmem; SLS SLSmem; -}; +} exception Bar { SerialLarge SLmem; SLS SLSmem; -}; +} class Baz { SerialLarge SLmem; SLS SLSmem; -}; +} -}; +} diff --git a/csharp/test/Ice/seqMapping/TestAMD.ice b/csharp/test/Ice/seqMapping/TestAMD.ice index ec05153d93d..73c76ab9faf 100644 --- a/csharp/test/Ice/seqMapping/TestAMD.ice +++ b/csharp/test/Ice/seqMapping/TestAMD.ice @@ -72,7 +72,7 @@ sequence<Object*> AObjectPrxS; struct S { int i; -}; +} sequence<S> AStructS; ["clr:generic:List"] sequence<S> LStructS; @@ -83,7 +83,7 @@ sequence<S> AStructS; struct SD { int i = 1; -}; +} sequence<SD> AStructSD; ["clr:generic:List"] sequence<SD> LStructSD; @@ -94,7 +94,7 @@ sequence<SD> AStructSD; class CV { int i; -}; +} sequence<CV> ACVS; ["clr:generic:List"] sequence<CV> LCVS; @@ -108,12 +108,12 @@ sequence<CV*> ACVPrxS; class CR { CV v; -}; +} sequence<CR> ACRS; ["clr:generic:List"] sequence<CR> LCRS; -enum En { A, B, C }; +enum En { A, B, C } sequence<En> AEnS; ["clr:generic:List"] sequence<En> LEnS; @@ -231,6 +231,6 @@ sequence<En> AEnS; SerialSmall opSerialSmallCSharp(SerialSmall i, out SerialSmall o); SerialLarge opSerialLargeCSharp(SerialLarge i, out SerialLarge o); SerialStruct opSerialStructCSharp(SerialStruct i, out SerialStruct o); -}; +} -}; +} diff --git a/csharp/test/Ice/serialize/Test.ice b/csharp/test/Ice/serialize/Test.ice index 02bbbc2fa87..e12a3748c19 100644 --- a/csharp/test/Ice/serialize/Test.ice +++ b/csharp/test/Ice/serialize/Test.ice @@ -19,7 +19,7 @@ enum MyEnum enum1, enum2, enum3 -}; +} class MyClass; @@ -31,7 +31,7 @@ struct ValStruct int i; long l; MyEnum e; -}; +} sequence<MyClass*> ProxySeq; @@ -42,7 +42,7 @@ struct RefStruct string sp; MyClass* p; ProxySeq seq; -}; +} sequence<ValStruct> ValStructS; ["clr:generic:List"] @@ -68,14 +68,14 @@ class Base int i; long l; MyEnum e; -}; +} class MyClass extends Base { MyClass c; Object o; ValStruct s; -}; +} exception MyException { @@ -105,6 +105,6 @@ exception MyException optional(4) RefStruct optRefStruct; optional(5) MyEnum optEnum; optional(6) MyClass* optProxy; -}; +} -}; +} diff --git a/csharp/test/Ice/servantLocator/Test.ice b/csharp/test/Ice/servantLocator/Test.ice index b14f8eefe0b..2067e552ded 100644 --- a/csharp/test/Ice/servantLocator/Test.ice +++ b/csharp/test/Ice/servantLocator/Test.ice @@ -14,11 +14,11 @@ module Test exception TestIntfUserException { -}; +} exception TestImpossibleException { -}; +} interface TestIntf { @@ -39,16 +39,16 @@ interface TestIntf void asyncException() throws TestIntfUserException, TestImpossibleException; void shutdown(); -}; +} local class Cookie { ["cpp:const"] string message(); -}; +} interface TestActivation { void activateServantLocator(bool activate); -}; +} -}; +} diff --git a/csharp/test/Ice/servantLocator/TestAMD.ice b/csharp/test/Ice/servantLocator/TestAMD.ice index 332de6b1a82..bc5c26c4481 100644 --- a/csharp/test/Ice/servantLocator/TestAMD.ice +++ b/csharp/test/Ice/servantLocator/TestAMD.ice @@ -14,11 +14,11 @@ module Test exception TestIntfUserException { -}; +} exception TestImpossibleException { -}; +} ["amd"] interface TestIntf { @@ -39,16 +39,16 @@ exception TestImpossibleException void asyncException() throws TestIntfUserException, TestImpossibleException; void shutdown(); -}; +} interface TestActivation { void activateServantLocator(bool activate); -}; +} local class Cookie { ["cpp:const"] string message(); -}; +} -}; +} diff --git a/csharp/test/Ice/slicing/exceptions/ClientPrivate.ice b/csharp/test/Ice/slicing/exceptions/ClientPrivate.ice index 47f9db97d22..eee256e04cd 100644 --- a/csharp/test/Ice/slicing/exceptions/ClientPrivate.ice +++ b/csharp/test/Ice/slicing/exceptions/ClientPrivate.ice @@ -17,16 +17,16 @@ module Test class PreservedClass extends BaseClass { string pc; -}; +} exception Preserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception Preserved2 extends Preserved1 { BaseClass p2; -}; +} -}; +} diff --git a/csharp/test/Ice/slicing/exceptions/ServerPrivate.ice b/csharp/test/Ice/slicing/exceptions/ServerPrivate.ice index 9c7d56ca391..d290938c3a2 100644 --- a/csharp/test/Ice/slicing/exceptions/ServerPrivate.ice +++ b/csharp/test/Ice/slicing/exceptions/ServerPrivate.ice @@ -17,36 +17,36 @@ module Test exception UnknownDerived extends Base { string ud; -}; +} exception UnknownIntermediate extends Base { string ui; -}; +} exception UnknownMostDerived1 extends KnownIntermediate { string umd1; -}; +} exception UnknownMostDerived2 extends UnknownIntermediate { string umd2; -}; +} class SPreservedClass extends BaseClass { string spc; -}; +} exception SPreserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception SPreserved2 extends SPreserved1 { BaseClass p2; -}; +} -}; +} diff --git a/csharp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/csharp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice index dade40f59b9..3ceb00da959 100644 --- a/csharp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice +++ b/csharp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice @@ -17,36 +17,36 @@ module Test exception UnknownDerived extends Base { string ud; -}; +} exception UnknownIntermediate extends Base { string ui; -}; +} exception UnknownMostDerived1 extends KnownIntermediate { string umd1; -}; +} exception UnknownMostDerived2 extends UnknownIntermediate { string umd2; -}; +} class SPreservedClass extends BaseClass { string spc; -}; +} exception SPreserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception SPreserved2 extends SPreserved1 { BaseClass p2; -}; +} -}; +} diff --git a/csharp/test/Ice/slicing/exceptions/Test.ice b/csharp/test/Ice/slicing/exceptions/Test.ice index 3ce6959161d..c6931b59a43 100644 --- a/csharp/test/Ice/slicing/exceptions/Test.ice +++ b/csharp/test/Ice/slicing/exceptions/Test.ice @@ -15,39 +15,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -57,7 +57,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["format:sliced"] interface TestIntf @@ -93,6 +93,6 @@ interface TestIntf void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Ice/slicing/exceptions/TestAMD.ice b/csharp/test/Ice/slicing/exceptions/TestAMD.ice index 18a20b1e0ac..79a4060e2d4 100644 --- a/csharp/test/Ice/slicing/exceptions/TestAMD.ice +++ b/csharp/test/Ice/slicing/exceptions/TestAMD.ice @@ -15,39 +15,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -57,7 +57,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["amd", "format:sliced"] interface TestIntf @@ -93,6 +93,6 @@ interface TestIntf void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Ice/slicing/objects/ClientPrivate.ice b/csharp/test/Ice/slicing/objects/ClientPrivate.ice index d8445516d19..e5be8a809aa 100644 --- a/csharp/test/Ice/slicing/objects/ClientPrivate.ice +++ b/csharp/test/Ice/slicing/objects/ClientPrivate.ice @@ -18,32 +18,32 @@ class D3 extends B { string sd3; B pd3; -}; +} ["preserve-slice"] class PCUnknown extends PBase { string pu; -}; +} class PCDerived extends PDerived { PBaseSeq pbs; -}; +} class PCDerived2 extends PCDerived { int pcd2; -}; +} class PCDerived3 extends PCDerived2 { Object pcd3; -}; +} class CompactPCDerived(57) extends CompactPDerived { PBaseSeq pbs; -}; +} -}; +} diff --git a/csharp/test/Ice/slicing/objects/ServerPrivate.ice b/csharp/test/Ice/slicing/objects/ServerPrivate.ice index 010e74801d8..be4a3b3f131 100644 --- a/csharp/test/Ice/slicing/objects/ServerPrivate.ice +++ b/csharp/test/Ice/slicing/objects/ServerPrivate.ice @@ -17,51 +17,51 @@ module Test class SBSUnknownDerived extends SBase { string sbsud; -}; +} class SUnknown { string su; -}; +} class D2 extends B { string sd2; B pd2; -}; +} class D4 extends B { B p1; B p2; -}; +} exception UnknownDerivedException extends BaseException { string sude; D2 pd2; -}; +} class MyClass { int i; -}; +} class PSUnknown extends Preserved { string psu; PNode graph; MyClass cl; -}; +} class PSUnknown2 extends Preserved { PBase pb; -}; +} exception PSUnknownException extends PreservedException { PSUnknown2 p; -}; +} -}; +} diff --git a/csharp/test/Ice/slicing/objects/ServerPrivateAMD.ice b/csharp/test/Ice/slicing/objects/ServerPrivateAMD.ice index 118dc768839..e23c09b68f6 100644 --- a/csharp/test/Ice/slicing/objects/ServerPrivateAMD.ice +++ b/csharp/test/Ice/slicing/objects/ServerPrivateAMD.ice @@ -17,51 +17,51 @@ module Test class SBSUnknownDerived extends SBase { string sbsud; -}; +} class SUnknown { string su; -}; +} class D2 extends B { string sd2; B pd2; -}; +} class D4 extends B { B p1; B p2; -}; +} exception UnknownDerivedException extends BaseException { string sude; D2 pd2; -}; +} class MyClass { int i; -}; +} class PSUnknown extends Preserved { string psu; PNode graph; MyClass cl; -}; +} class PSUnknown2 extends Preserved { PBase pb; -}; +} exception PSUnknownException extends PreservedException { PSUnknown2 p; -}; +} -}; +} diff --git a/csharp/test/Ice/slicing/objects/Test.ice b/csharp/test/Ice/slicing/objects/Test.ice index 89f2780c352..6c25277a348 100644 --- a/csharp/test/Ice/slicing/objects/Test.ice +++ b/csharp/test/Ice/slicing/objects/Test.ice @@ -15,42 +15,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS3 { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -58,20 +58,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -79,28 +79,28 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} class CompactPDerived(56) extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["format:sliced"] interface TestIntf @@ -158,17 +158,17 @@ interface TestIntf void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */ void shutdown(); -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} -}; +} diff --git a/csharp/test/Ice/slicing/objects/TestAMD.ice b/csharp/test/Ice/slicing/objects/TestAMD.ice index dc034da87ab..8fcace1b888 100644 --- a/csharp/test/Ice/slicing/objects/TestAMD.ice +++ b/csharp/test/Ice/slicing/objects/TestAMD.ice @@ -15,42 +15,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS3 { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -58,20 +58,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -79,23 +79,23 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["amd", "format:sliced"] interface TestIntf @@ -153,16 +153,16 @@ interface TestIntf void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */ void shutdown(); -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} -}; +} diff --git a/csharp/test/Ice/stream/Test.ice b/csharp/test/Ice/stream/Test.ice index 0ee127d861e..3ae9ec93cad 100644 --- a/csharp/test/Ice/stream/Test.ice +++ b/csharp/test/Ice/stream/Test.ice @@ -24,7 +24,7 @@ enum MyEnum enum1, enum2, enum3 -}; +} class MyClass; interface MyInterface; @@ -41,7 +41,7 @@ struct SmallStruct string str; MyEnum e; MyClass* p; -}; +} class OptionalClass { @@ -49,7 +49,7 @@ class OptionalClass byte by; optional(1) short sh; optional(2) int i; -}; +} sequence<MyEnum> MyEnumS; sequence<MyClass> MyClassS; @@ -168,15 +168,15 @@ class MyClass MyClassS seq10; StringMyClassD d; SerialSmall ss; -}; +} exception MyException { MyClass c; -}; +} interface MyInterface { -}; +} -}; +} diff --git a/csharp/test/Ice/threadPoolPriority/Test.ice b/csharp/test/Ice/threadPoolPriority/Test.ice index 415daa8fb9c..cd23c46afcf 100644 --- a/csharp/test/Ice/threadPoolPriority/Test.ice +++ b/csharp/test/Ice/threadPoolPriority/Test.ice @@ -16,7 +16,7 @@ interface Priority { void shutdown(); string getPriority(); -}; +} -}; +} diff --git a/csharp/test/Ice/timeout/Test.ice b/csharp/test/Ice/timeout/Test.ice index d34168a950a..aad831a9993 100644 --- a/csharp/test/Ice/timeout/Test.ice +++ b/csharp/test/Ice/timeout/Test.ice @@ -23,6 +23,6 @@ interface Timeout void holdAdapter(int to); void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Ice/udp/Test.ice b/csharp/test/Ice/udp/Test.ice index 3da4f01c23f..8c1602bda19 100644 --- a/csharp/test/Ice/udp/Test.ice +++ b/csharp/test/Ice/udp/Test.ice @@ -17,7 +17,7 @@ module Test interface PingReply { void reply(); -}; +} sequence<byte> ByteSeq; @@ -27,6 +27,6 @@ interface TestIntf void sendByteSeq(ByteSeq seq, PingReply* reply); void pingBiDir(Ice::Identity id); void shutdown(); -}; +} -}; +} diff --git a/csharp/test/IceBox/admin/Test.ice b/csharp/test/IceBox/admin/Test.ice index 13e3ca5660d..2113b0416f4 100644 --- a/csharp/test/IceBox/admin/Test.ice +++ b/csharp/test/IceBox/admin/Test.ice @@ -19,8 +19,8 @@ module Test interface TestFacet { Ice::PropertyDict getChanges(); -}; +} -}; +} #endif diff --git a/csharp/test/IceBox/configuration/Test.ice b/csharp/test/IceBox/configuration/Test.ice index 8f11f08148d..42ed1705bfe 100644 --- a/csharp/test/IceBox/configuration/Test.ice +++ b/csharp/test/IceBox/configuration/Test.ice @@ -19,6 +19,6 @@ interface TestIntf string getProperty(string name); Ice::StringSeq getArgs(); -}; +} -}; +} diff --git a/csharp/test/IceDiscovery/simple/Test.ice b/csharp/test/IceDiscovery/simple/Test.ice index d64cecf51f8..bcb14d687e7 100644 --- a/csharp/test/IceDiscovery/simple/Test.ice +++ b/csharp/test/IceDiscovery/simple/Test.ice @@ -17,7 +17,7 @@ module Test interface TestIntf { string getAdapterId(); -}; +} interface Controller { @@ -28,6 +28,6 @@ interface Controller void removeObject(string oaName, string id); void shutdown(); -}; +} -}; +} diff --git a/csharp/test/IceGrid/simple/Test.ice b/csharp/test/IceGrid/simple/Test.ice index efaa03d8366..e3a95f4cdfc 100644 --- a/csharp/test/IceGrid/simple/Test.ice +++ b/csharp/test/IceGrid/simple/Test.ice @@ -15,6 +15,6 @@ module Test interface TestIntf { void shutdown(); -}; +} -}; +} diff --git a/csharp/test/IceSSL/configuration/Test.ice b/csharp/test/IceSSL/configuration/Test.ice index fbe20c252c0..d5d5573a73e 100644 --- a/csharp/test/IceSSL/configuration/Test.ice +++ b/csharp/test/IceSSL/configuration/Test.ice @@ -17,7 +17,7 @@ interface Server void noCert(); void checkCert(string subjectDN, string issuerDN); void checkCipher(string cipher); -}; +} dictionary<string, string> Properties; @@ -26,6 +26,6 @@ interface ServerFactory Server* createServer(Properties props); void destroyServer(Server* srv); void shutdown(); -}; +} -}; +} diff --git a/csharp/test/Slice/escape/Clash.ice b/csharp/test/Slice/escape/Clash.ice index e43b01b4b6d..0778462b96b 100644 --- a/csharp/test/Slice/escape/Clash.ice +++ b/csharp/test/Slice/escape/Clash.ice @@ -30,7 +30,7 @@ interface Intf void opOut(out string context, out string current, out string response, out string ex, out string sent, out string cookie, out string sync, out string result, out string istr, out string ostr, out optional(1) string proxy, out optional(2) int obj); -}; +} class Cls { @@ -51,7 +51,7 @@ class Cls int obj; int getCookie; string clone; -}; +} struct St { @@ -61,13 +61,13 @@ struct St int rhs; string hashCode; int clone; -}; +} exception Ex { short istr; int ostr; string cause; -}; +} -}; +} diff --git a/csharp/test/Slice/escape/Key.ice b/csharp/test/Slice/escape/Key.ice index bf2dd452892..256e1e57096 100644 --- a/csharp/test/Slice/escape/Key.ice +++ b/csharp/test/Slice/escape/Key.ice @@ -15,33 +15,33 @@ module abstract enum as { base -}; +} struct break { int readonly; -}; +} interface case { ["amd"] void catch(int checked, out int continue); -}; +} interface decimal { void default(); -}; +} class delegate { int if; case* else; int event; -}; +} interface explicit extends decimal, case { -}; +} dictionary<string, break> while; @@ -53,7 +53,7 @@ class optionalMembers optional(5) while internal; optional(7) string namespace; optional(8) explicit* null; -}; +} interface optionalParams { @@ -82,18 +82,18 @@ interface optionalParams out optional(5) while internal, out optional(7) string namespace, out optional(8) explicit* null); -}; +} exception fixed { int for; -}; +} exception foreach extends fixed { int goto; int if; -}; +} exception BaseMethods { @@ -112,14 +112,14 @@ exception BaseMethods int GetType; int ReferenceEquals; int ToString; -}; +} local interface implicit { as in(break internal, delegate is, explicit lock, case* namespace, decimal* new, delegate null, explicit* operator, int override, int params, int private) throws fixed, foreach; -}; +} const int protected = 0; const int public = 0; @@ -133,11 +133,11 @@ module System interface Test { void op(); -}; +} -}; +} -}; +} // // System as outer module. @@ -148,6 +148,6 @@ module System interface Test { void op(); -}; +} -}; +} diff --git a/csharp/test/Slice/macros/Test.ice b/csharp/test/Slice/macros/Test.ice index f724687f713..b8da95b3543 100644 --- a/csharp/test/Slice/macros/Test.ice +++ b/csharp/test/Slice/macros/Test.ice @@ -32,13 +32,13 @@ class Default { int x DEFAULT(10); int y DEFAULT(10); -}; +} class NoDefault { int x NODEFAULT(10); int y NODEFAULT(10); -}; +} // // This class is only defined when compiling with slice2cs. @@ -48,7 +48,7 @@ class CsOnly { string lang DEFAULT("cs"); int version DEFAULT(ICE_VERSION); -}; +} #endif -}; +} diff --git a/csharp/test/Slice/structure/Test.ice b/csharp/test/Slice/structure/Test.ice index ecbe0e55f8a..767d5c42c16 100644 --- a/csharp/test/Slice/structure/Test.ice +++ b/csharp/test/Slice/structure/Test.ice @@ -17,13 +17,13 @@ dictionary<string, string> StringDict; class C { int i; -}; +} ["clr:class"] struct S1 { string name; -}; +} struct S2 { @@ -41,6 +41,6 @@ struct S2 S1 s; C cls; Object* prx; -}; +} -}; +} diff --git a/java-compat/test/Ice/translator/DoubleModuleNoPackage.ice b/java-compat/test/Ice/translator/DoubleModuleNoPackage.ice index 03c666c29bf..77c877e4baa 100644 --- a/java-compat/test/Ice/translator/DoubleModuleNoPackage.ice +++ b/java-compat/test/Ice/translator/DoubleModuleNoPackage.ice @@ -14,14 +14,14 @@ module M1 module M2 { -enum dmnpEnum { dmnpE1, dmnpE2 }; +enum dmnpEnum { dmnpE1, dmnpE2 } const dmnpEnum dmnpConstant = dmnpE2; struct dmnpStruct { dmnpEnum e; -}; +} sequence<dmnpStruct> dmnpStructSeq; @@ -30,12 +30,12 @@ dictionary<string, dmnpStruct> dmnpStringStructDict; interface dmnpBaseInterface { void dmnpBaseInterfaceOp(); -}; +} interface dmnpInterface extends dmnpBaseInterface { void dmnpInterfaceOp(); -}; +} class dmnpBaseClass { @@ -43,11 +43,11 @@ class dmnpBaseClass dmnpStruct s; dmnpStructSeq seq; dmnpStringStructDict dict; -}; +} class dmnpClass extends dmnpBaseClass implements dmnpInterface { -}; +} exception dmnpBaseException { @@ -56,11 +56,11 @@ exception dmnpBaseException dmnpStructSeq seq; dmnpStringStructDict dict; dmnpClass c; -}; +} exception dmnpException extends dmnpBaseException { -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/DoubleModuleWithPackage.ice b/java-compat/test/Ice/translator/DoubleModuleWithPackage.ice index d3748d4b511..672cf36092a 100644 --- a/java-compat/test/Ice/translator/DoubleModuleWithPackage.ice +++ b/java-compat/test/Ice/translator/DoubleModuleWithPackage.ice @@ -16,14 +16,14 @@ module M1 module M2 { -enum dmwpEnum { dmwpE1, dmwpE2 }; +enum dmwpEnum { dmwpE1, dmwpE2 } const dmwpEnum dmwpConstant = dmwpE2; struct dmwpStruct { dmwpEnum e; -}; +} sequence<dmwpStruct> dmwpStructSeq; @@ -32,12 +32,12 @@ dictionary<string, dmwpStruct> dmwpStringStructDict; interface dmwpBaseInterface { void dmwpBaseInterfaceOp(); -}; +} interface dmwpInterface extends dmwpBaseInterface { void dmwpInterfaceOp(); -}; +} class dmwpBaseClass { @@ -45,11 +45,11 @@ class dmwpBaseClass dmwpStruct s; dmwpStructSeq seq; dmwpStringStructDict dict; -}; +} class dmwpClass extends dmwpBaseClass implements dmwpInterface { -}; +} exception dmwpBaseException { @@ -58,11 +58,11 @@ exception dmwpBaseException dmwpStructSeq seq; dmwpStringStructDict dict; dmwpClass c; -}; +} exception dmwpException extends dmwpBaseException { -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/Metadata.ice b/java-compat/test/Ice/translator/Metadata.ice index 3993c2fdd6c..d5c75969e93 100644 --- a/java-compat/test/Ice/translator/Metadata.ice +++ b/java-compat/test/Ice/translator/Metadata.ice @@ -108,17 +108,17 @@ module MetadataTest ["amd", "java:type:java.util.ArrayList<Ice.Object>"] ObjectList opObjectList2AMD(["java:type:java.util.ArrayList<Ice.Object>"] ObjectList inArg, out ["java:type:Test.CustomList<Ice.Object>"] ObjectList outArg); - }; + } ["protected", "java:getset"] class C2 { IntSeq intSeqMember; ["java:type:java.util.ArrayList<Integer>"] IntSeq modifiedIntSeqMember; - }; + } class C3 { ["protected"] IntSeq intSeqMember; ["protected", "java:type:java.util.ArrayList<Integer>"] IntSeq modifiedIntSeqMember; - }; -}; + } +} diff --git a/java-compat/test/Ice/translator/SingleModuleNoPackage.ice b/java-compat/test/Ice/translator/SingleModuleNoPackage.ice index 08061beaadc..8a772923368 100644 --- a/java-compat/test/Ice/translator/SingleModuleNoPackage.ice +++ b/java-compat/test/Ice/translator/SingleModuleNoPackage.ice @@ -12,14 +12,14 @@ module M { -enum smnpEnum { smnpE1, smnpE2 }; +enum smnpEnum { smnpE1, smnpE2 } const smnpEnum smnpConstant = smnpE2; struct smnpStruct { smnpEnum e; -}; +} sequence<smnpStruct> smnpStructSeq; @@ -28,12 +28,12 @@ dictionary<string, smnpStruct> smnpStringStructDict; interface smnpBaseInterface { void smnpBaseInterfaceOp(); -}; +} interface smnpInterface extends smnpBaseInterface { void smnpInterfaceOp(); -}; +} class smnpBaseClass { @@ -41,11 +41,11 @@ class smnpBaseClass smnpStruct s; smnpStructSeq seq; smnpStringStructDict dict; -}; +} class smnpClass extends smnpBaseClass implements smnpInterface { -}; +} exception smnpBaseException { @@ -54,10 +54,10 @@ exception smnpBaseException smnpStructSeq seq; smnpStringStructDict dict; smnpClass c; -}; +} exception smnpException extends smnpBaseException { -}; +} -}; +} diff --git a/java-compat/test/Ice/translator/SingleModuleWithPackage.ice b/java-compat/test/Ice/translator/SingleModuleWithPackage.ice index 2e4b86b4e3a..186c4def746 100644 --- a/java-compat/test/Ice/translator/SingleModuleWithPackage.ice +++ b/java-compat/test/Ice/translator/SingleModuleWithPackage.ice @@ -14,14 +14,14 @@ module M { -enum smwpEnum { smwpE1, smwpE2 }; +enum smwpEnum { smwpE1, smwpE2 } const smwpEnum smwpConstant = smwpE2; struct smwpStruct { smwpEnum e; -}; +} sequence<smwpStruct> smwpStructSeq; @@ -30,12 +30,12 @@ dictionary<string, smwpStruct> smwpStringStructDict; interface smwpBaseInterface { void smwpBaseInterfaceOp(); -}; +} interface smwpInterface extends smwpBaseInterface { void smwpInterfaceOp(); -}; +} class smwpBaseClass { @@ -43,11 +43,11 @@ class smwpBaseClass smwpStruct s; smwpStructSeq seq; smwpStringStructDict dict; -}; +} class smwpClass extends smwpBaseClass implements smwpInterface { -}; +} exception smwpBaseException { @@ -56,10 +56,10 @@ exception smwpBaseException smwpStructSeq seq; smwpStringStructDict dict; smwpClass c; -}; +} exception smwpException extends smwpBaseException { -}; +} -}; +} diff --git a/java-compat/test/Ice/translator/TestDoubleModuleNoPackage4.ice b/java-compat/test/Ice/translator/TestDoubleModuleNoPackage4.ice index 5a7bd539448..4aca398e9f1 100644 --- a/java-compat/test/Ice/translator/TestDoubleModuleNoPackage4.ice +++ b/java-compat/test/Ice/translator/TestDoubleModuleNoPackage4.ice @@ -24,13 +24,13 @@ struct dmnpTest4Struct M1::M2::dmnpStringStructDict dict; M1::M2::dmnpClass c; M1::M2::dmnpInterface i; -}; +} sequence<M1::M2::dmnpStruct> dmnpTest4StructSeq; dictionary<M1::M2::dmnpStruct, M1::M2::dmnpBaseClass> dmnpTest4StructClassSeq; -interface dmnpTest4Interface extends M1::M2::dmnpInterface {}; +interface dmnpTest4Interface extends M1::M2::dmnpInterface {} exception dmnpTest4Exception extends M1::M2::dmnpException { @@ -40,7 +40,7 @@ exception dmnpTest4Exception extends M1::M2::dmnpException M1::M2::dmnpStringStructDict dict1; M1::M2::dmnpClass c1; M1::M2::dmnpInterface i1; -}; +} class dmnpTest4Class extends M1::M2::dmnpBaseClass implements M1::M2::dmnpBaseInterface { @@ -74,6 +74,6 @@ class dmnpTest4Class extends M1::M2::dmnpBaseClass implements M1::M2::dmnpBaseIn out M1::M2::dmnpInterface o5, out M1::M2::dmnpClass o6) throws M1::M2::dmnpException; -}; +} -}; +} diff --git a/java-compat/test/Ice/translator/TestDoubleModuleNoPackage5.ice b/java-compat/test/Ice/translator/TestDoubleModuleNoPackage5.ice index cc64c3c6415..3c144b4a4c2 100644 --- a/java-compat/test/Ice/translator/TestDoubleModuleNoPackage5.ice +++ b/java-compat/test/Ice/translator/TestDoubleModuleNoPackage5.ice @@ -26,13 +26,13 @@ struct dmnpTest5Struct ::M1::M2::dmnpStringStructDict dict; ::M1::M2::dmnpClass c; ::M1::M2::dmnpInterface i; -}; +} sequence<::M1::M2::dmnpStruct> dmnpTest5StructSeq; dictionary<::M1::M2::dmnpStruct, ::M1::M2::dmnpBaseClass> dmnpTest5StructClassSeq; -interface dmnpTest5Interface extends ::M1::M2::dmnpInterface {}; +interface dmnpTest5Interface extends ::M1::M2::dmnpInterface {} exception dmnpTest5Exception extends ::M1::M2::dmnpException { @@ -42,7 +42,7 @@ exception dmnpTest5Exception extends ::M1::M2::dmnpException ::M1::M2::dmnpStringStructDict dict1; ::M1::M2::dmnpClass c1; ::M1::M2::dmnpInterface i1; -}; +} class dmnpTest5Class extends ::M1::M2::dmnpBaseClass implements ::M1::M2::dmnpBaseInterface { @@ -76,7 +76,7 @@ class dmnpTest5Class extends ::M1::M2::dmnpBaseClass implements ::M1::M2::dmnpBa out ::M1::M2::dmnpInterface o5, out ::M1::M2::dmnpClass o6) throws ::M1::M2::dmnpException; -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/TestDoubleModuleNoPackage6.ice b/java-compat/test/Ice/translator/TestDoubleModuleNoPackage6.ice index c46eeda8d0a..da5e38b5531 100644 --- a/java-compat/test/Ice/translator/TestDoubleModuleNoPackage6.ice +++ b/java-compat/test/Ice/translator/TestDoubleModuleNoPackage6.ice @@ -26,13 +26,13 @@ struct dmnpTest6Struct dmnpStringStructDict dict; dmnpClass c; dmnpInterface i; -}; +} sequence<dmnpStruct> dmnpTest6StructSeq; dictionary<dmnpStruct, dmnpBaseClass> dmnpTest6StructClassSeq; -interface dmnpTest6Interface extends dmnpInterface {}; +interface dmnpTest6Interface extends dmnpInterface {} exception dmnpTest6Exception extends dmnpException { @@ -42,7 +42,7 @@ exception dmnpTest6Exception extends dmnpException dmnpStringStructDict dict1; dmnpClass c1; dmnpInterface i1; -}; +} class dmnpTest6Class extends dmnpBaseClass implements dmnpBaseInterface { @@ -76,7 +76,7 @@ class dmnpTest6Class extends dmnpBaseClass implements dmnpBaseInterface out dmnpInterface o5, out dmnpClass o6) throws dmnpException; -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/TestDoubleModuleNoPackage7.ice b/java-compat/test/Ice/translator/TestDoubleModuleNoPackage7.ice index 028de02d333..51442759ac4 100644 --- a/java-compat/test/Ice/translator/TestDoubleModuleNoPackage7.ice +++ b/java-compat/test/Ice/translator/TestDoubleModuleNoPackage7.ice @@ -28,13 +28,13 @@ struct dmnpTest7Struct dmnpStringStructDict dict; dmnpClass c; dmnpInterface i; -}; +} sequence<dmnpStruct> dmnpTest7StructSeq; dictionary<dmnpStruct, dmnpBaseClass> dmnpTest7StructClassSeq; -interface dmnpTest7Interface extends dmnpInterface {}; +interface dmnpTest7Interface extends dmnpInterface {} exception dmnpTest7Exception extends dmnpException { @@ -44,7 +44,7 @@ exception dmnpTest7Exception extends dmnpException dmnpStringStructDict dict1; dmnpClass c1; dmnpInterface i1; -}; +} class dmnpTest7Class extends dmnpBaseClass implements dmnpBaseInterface { @@ -78,7 +78,7 @@ class dmnpTest7Class extends dmnpBaseClass implements dmnpBaseInterface out dmnpInterface o5, out dmnpClass o6) throws dmnpException; -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage10.ice b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage10.ice index f306bdefe26..37e9ca961eb 100644 --- a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage10.ice +++ b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage10.ice @@ -28,13 +28,13 @@ struct dmwpTest10Struct dmwpStringStructDict dict; dmwpClass c; dmwpInterface i; -}; +} sequence<dmwpStruct> dmwpTest10StructSeq; dictionary<dmwpStruct, dmwpBaseClass> dmwpTest10StructClassSeq; -interface dmwpTest10Interface extends dmwpInterface {}; +interface dmwpTest10Interface extends dmwpInterface {} exception dmwpTest10Exception extends dmwpException { @@ -44,7 +44,7 @@ exception dmwpTest10Exception extends dmwpException dmwpStringStructDict dict1; dmwpClass c1; dmwpInterface i1; -}; +} class dmwpTest10Class extends dmwpBaseClass implements dmwpBaseInterface { @@ -78,7 +78,7 @@ class dmwpTest10Class extends dmwpBaseClass implements dmwpBaseInterface out dmwpInterface o5, out dmwpClass o6) throws dmwpException; -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage11.ice b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage11.ice index 5686dd44401..28e1b01e48e 100644 --- a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage11.ice +++ b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage11.ice @@ -28,13 +28,13 @@ struct dmwpTest10Struct dmwpStringStructDict dict; dmwpClass c; dmwpInterface i; -}; +} sequence<dmwpStruct> dmwpTest10StructSeq; dictionary<dmwpStruct, dmwpBaseClass> dmwpTest10StructClassSeq; -interface dmwpTest10Interface extends dmwpInterface {}; +interface dmwpTest10Interface extends dmwpInterface {} exception dmwpTest10Exception extends dmwpException { @@ -44,7 +44,7 @@ exception dmwpTest10Exception extends dmwpException dmwpStringStructDict dict1; dmwpClass c1; dmwpInterface i1; -}; +} class dmwpTest10Class extends dmwpBaseClass implements dmwpBaseInterface { @@ -78,7 +78,7 @@ class dmwpTest10Class extends dmwpBaseClass implements dmwpBaseInterface out dmwpInterface o5, out dmwpClass o6) throws dmwpException; -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage4.ice b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage4.ice index f34dc4bc1c3..8960031912f 100644 --- a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage4.ice +++ b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage4.ice @@ -24,13 +24,13 @@ struct dmwpTest4Struct ::M1::M2::dmwpStringStructDict dict; ::M1::M2::dmwpClass c; ::M1::M2::dmwpInterface i; -}; +} sequence<::M1::M2::dmwpStruct> dmwpTest4StructSeq; dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest4StructClassSeq; -interface dmwpTest4Interface extends ::M1::M2::dmwpInterface {}; +interface dmwpTest4Interface extends ::M1::M2::dmwpInterface {} exception dmwpTest4Exception extends ::M1::M2::dmwpException { @@ -40,7 +40,7 @@ exception dmwpTest4Exception extends ::M1::M2::dmwpException ::M1::M2::dmwpStringStructDict dict1; ::M1::M2::dmwpClass c1; ::M1::M2::dmwpInterface i1; -}; +} class dmwpTest4Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface { @@ -74,6 +74,6 @@ class dmwpTest4Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBa out ::M1::M2::dmwpInterface o5, out ::M1::M2::dmwpClass o6) throws ::M1::M2::dmwpException; -}; +} -}; +} diff --git a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage5.ice b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage5.ice index d94e9adacf2..27912f8edbf 100644 --- a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage5.ice +++ b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage5.ice @@ -24,13 +24,13 @@ struct dmwpTest5Struct ::M1::M2::dmwpStringStructDict dict; ::M1::M2::dmwpClass c; ::M1::M2::dmwpInterface i; -}; +} sequence<::M1::M2::dmwpStruct> dmwpTest5StructSeq; dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest5StructClassSeq; -interface dmwpTest5Interface extends ::M1::M2::dmwpInterface {}; +interface dmwpTest5Interface extends ::M1::M2::dmwpInterface {} exception dmwpTest5Exception extends ::M1::M2::dmwpException { @@ -40,7 +40,7 @@ exception dmwpTest5Exception extends ::M1::M2::dmwpException ::M1::M2::dmwpStringStructDict dict1; ::M1::M2::dmwpClass c1; ::M1::M2::dmwpInterface i1; -}; +} class dmwpTest5Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface { @@ -74,6 +74,6 @@ class dmwpTest5Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBa out ::M1::M2::dmwpInterface o5, out ::M1::M2::dmwpClass o6) throws ::M1::M2::dmwpException; -}; +} -}; +} diff --git a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage6.ice b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage6.ice index bc6cb6aa7ca..dabd693c8f0 100644 --- a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage6.ice +++ b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage6.ice @@ -26,13 +26,13 @@ struct dmwpTest6Struct ::M1::M2::dmwpStringStructDict dict; ::M1::M2::dmwpClass c; ::M1::M2::dmwpInterface i; -}; +} sequence<::M1::M2::dmwpStruct> dmwpTest6StructSeq; dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest6StructClassSeq; -interface dmwpTest6Interface extends ::M1::M2::dmwpInterface {}; +interface dmwpTest6Interface extends ::M1::M2::dmwpInterface {} exception dmwpTest6Exception extends ::M1::M2::dmwpException { @@ -42,7 +42,7 @@ exception dmwpTest6Exception extends ::M1::M2::dmwpException ::M1::M2::dmwpStringStructDict dict1; ::M1::M2::dmwpClass c1; ::M1::M2::dmwpInterface i1; -}; +} class dmwpTest6Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface { @@ -76,6 +76,6 @@ class dmwpTest6Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBa out ::M1::M2::dmwpInterface o5, out ::M1::M2::dmwpClass o6) throws ::M1::M2::dmwpException; -}; +} -}; +} diff --git a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage7.ice b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage7.ice index 9a854f6fa48..aedc462a6ea 100644 --- a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage7.ice +++ b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage7.ice @@ -26,13 +26,13 @@ struct dmwpTest7Struct ::M1::M2::dmwpStringStructDict dict; ::M1::M2::dmwpClass c; ::M1::M2::dmwpInterface i; -}; +} sequence<::M1::M2::dmwpStruct> dmwpTest7StructSeq; dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest7StructClassSeq; -interface dmwpTest7Interface extends ::M1::M2::dmwpInterface {}; +interface dmwpTest7Interface extends ::M1::M2::dmwpInterface {} exception dmwpTest7Exception extends ::M1::M2::dmwpException { @@ -42,7 +42,7 @@ exception dmwpTest7Exception extends ::M1::M2::dmwpException ::M1::M2::dmwpStringStructDict dict1; ::M1::M2::dmwpClass c1; ::M1::M2::dmwpInterface i1; -}; +} class dmwpTest7Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface { @@ -76,6 +76,6 @@ class dmwpTest7Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBa out ::M1::M2::dmwpInterface o5, out ::M1::M2::dmwpClass o6) throws ::M1::M2::dmwpException; -}; +} -}; +} diff --git a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage8.ice b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage8.ice index a1afbb4d505..b40444b888a 100644 --- a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage8.ice +++ b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage8.ice @@ -26,13 +26,13 @@ struct dmwpTest8Struct ::M1::M2::dmwpStringStructDict dict; ::M1::M2::dmwpClass c; ::M1::M2::dmwpInterface i; -}; +} sequence<::M1::M2::dmwpStruct> dmwpTest8StructSeq; dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest8StructClassSeq; -interface dmwpTest8Interface extends ::M1::M2::dmwpInterface {}; +interface dmwpTest8Interface extends ::M1::M2::dmwpInterface {} exception dmwpTest8Exception extends ::M1::M2::dmwpException { @@ -42,7 +42,7 @@ exception dmwpTest8Exception extends ::M1::M2::dmwpException ::M1::M2::dmwpStringStructDict dict1; ::M1::M2::dmwpClass c1; ::M1::M2::dmwpInterface i1; -}; +} class dmwpTest8Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface { @@ -76,7 +76,7 @@ class dmwpTest8Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBa out ::M1::M2::dmwpInterface o5, out ::M1::M2::dmwpClass o6) throws ::M1::M2::dmwpException; -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage9.ice b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage9.ice index d73d87758cf..9a34f94dda3 100644 --- a/java-compat/test/Ice/translator/TestDoubleModuleWithPackage9.ice +++ b/java-compat/test/Ice/translator/TestDoubleModuleWithPackage9.ice @@ -26,13 +26,13 @@ struct dmwpTest9Struct dmwpStringStructDict dict; dmwpClass c; dmwpInterface i; -}; +} sequence<dmwpStruct> dmwpTest9StructSeq; dictionary<dmwpStruct, dmwpBaseClass> dmwpTest9StructClassSeq; -interface dmwpTest9Interface extends dmwpInterface {}; +interface dmwpTest9Interface extends dmwpInterface {} exception dmwpTest9Exception extends dmwpException { @@ -42,7 +42,7 @@ exception dmwpTest9Exception extends dmwpException dmwpStringStructDict dict1; dmwpClass c1; dmwpInterface i1; -}; +} class dmwpTest9Class extends dmwpBaseClass implements dmwpBaseInterface { @@ -76,7 +76,7 @@ class dmwpTest9Class extends dmwpBaseClass implements dmwpBaseInterface out dmwpInterface o5, out dmwpClass o6) throws dmwpException; -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/TestSingleModuleNoPackage4.ice b/java-compat/test/Ice/translator/TestSingleModuleNoPackage4.ice index 453436e917d..d209dbdfa3a 100644 --- a/java-compat/test/Ice/translator/TestSingleModuleNoPackage4.ice +++ b/java-compat/test/Ice/translator/TestSingleModuleNoPackage4.ice @@ -24,13 +24,13 @@ struct smnpTest4Struct smnpStringStructDict dict; smnpClass c; smnpInterface i; -}; +} sequence<smnpStruct> smnpTest4StructSeq; dictionary<smnpStruct, smnpBaseClass> smnpTest4StructClassSeq; -interface smnpTest4Interface extends smnpInterface {}; +interface smnpTest4Interface extends smnpInterface {} exception smnpTest4Exception extends smnpException { @@ -40,7 +40,7 @@ exception smnpTest4Exception extends smnpException smnpStringStructDict dict1; smnpClass c1; smnpInterface i1; -}; +} class smnpTest4Class extends smnpBaseClass implements smnpBaseInterface { @@ -74,6 +74,6 @@ class smnpTest4Class extends smnpBaseClass implements smnpBaseInterface out smnpInterface o5, out smnpClass o6) throws smnpException; -}; +} -}; +} diff --git a/java-compat/test/Ice/translator/TestSingleModuleNoPackage6.ice b/java-compat/test/Ice/translator/TestSingleModuleNoPackage6.ice index 37914d1607c..854aa2661a8 100644 --- a/java-compat/test/Ice/translator/TestSingleModuleNoPackage6.ice +++ b/java-compat/test/Ice/translator/TestSingleModuleNoPackage6.ice @@ -26,13 +26,13 @@ struct smnpTest6Struct M::smnpStringStructDict dict; M::smnpClass c; M::smnpInterface i; -}; +} sequence<M::smnpStruct> smnpTest6StructSeq; dictionary<M::smnpStruct, M::smnpBaseClass> smnpTest6StructClassSeq; -interface smnpTest6Interface extends M::smnpInterface {}; +interface smnpTest6Interface extends M::smnpInterface {} exception smnpTest6Exception extends M::smnpException { @@ -42,7 +42,7 @@ exception smnpTest6Exception extends M::smnpException M::smnpStringStructDict dict1; M::smnpClass c1; M::smnpInterface i1; -}; +} class smnpTest6Class extends M::smnpBaseClass implements M::smnpBaseInterface { @@ -76,7 +76,7 @@ class smnpTest6Class extends M::smnpBaseClass implements M::smnpBaseInterface out M::smnpInterface o5, out M::smnpClass o6) throws M::smnpException; -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/TestSingleModuleNoPackage7.ice b/java-compat/test/Ice/translator/TestSingleModuleNoPackage7.ice index b929e3b3cca..59c47424142 100644 --- a/java-compat/test/Ice/translator/TestSingleModuleNoPackage7.ice +++ b/java-compat/test/Ice/translator/TestSingleModuleNoPackage7.ice @@ -26,13 +26,13 @@ struct smnpTest7Struct smnpStringStructDict dict; smnpClass c; smnpInterface i; -}; +} sequence<smnpStruct> smnpTest7StructSeq; dictionary<smnpStruct, smnpBaseClass> smnpTest7StructClassSeq; -interface smnpTest7Interface extends smnpInterface {}; +interface smnpTest7Interface extends smnpInterface {} exception smnpTest7Exception extends smnpException { @@ -42,7 +42,7 @@ exception smnpTest7Exception extends smnpException smnpStringStructDict dict1; smnpClass c1; smnpInterface i1; -}; +} class smnpTest7Class extends smnpBaseClass implements smnpBaseInterface { @@ -76,7 +76,7 @@ class smnpTest7Class extends smnpBaseClass implements smnpBaseInterface out smnpInterface o5, out smnpClass o6) throws smnpException; -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/TestSingleModuleWithPackage10.ice b/java-compat/test/Ice/translator/TestSingleModuleWithPackage10.ice index 23290d343af..ab433146cf6 100644 --- a/java-compat/test/Ice/translator/TestSingleModuleWithPackage10.ice +++ b/java-compat/test/Ice/translator/TestSingleModuleWithPackage10.ice @@ -26,13 +26,13 @@ struct smwpTest10Struct smwpStringStructDict dict; smwpClass c; smwpInterface i; -}; +} sequence<smwpStruct> smwpTest10StructSeq; dictionary<smwpStruct, smwpBaseClass> smwpTest10StructClassSeq; -interface smwpTest10Interface extends smwpInterface {}; +interface smwpTest10Interface extends smwpInterface {} exception smwpTest10Exception extends smwpException { @@ -42,7 +42,7 @@ exception smwpTest10Exception extends smwpException smwpStringStructDict dict1; smwpClass c1; smwpInterface i1; -}; +} class smwpTest10Class extends smwpBaseClass implements smwpBaseInterface { @@ -76,7 +76,7 @@ class smwpTest10Class extends smwpBaseClass implements smwpBaseInterface out smwpInterface o5, out smwpClass o6) throws smwpException; -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/TestSingleModuleWithPackage11.ice b/java-compat/test/Ice/translator/TestSingleModuleWithPackage11.ice index 73e9f859561..1e01eae1a57 100644 --- a/java-compat/test/Ice/translator/TestSingleModuleWithPackage11.ice +++ b/java-compat/test/Ice/translator/TestSingleModuleWithPackage11.ice @@ -28,13 +28,13 @@ struct smwpTest11Struct M::smwpStringStructDict dict; M::smwpClass c; M::smwpInterface i; -}; +} sequence<M::smwpStruct> smwpTest11StructSeq; dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest11StructClassSeq; -interface smwpTest11Interface extends M::smwpInterface {}; +interface smwpTest11Interface extends M::smwpInterface {} exception smwpTest11Exception extends M::smwpException { @@ -44,7 +44,7 @@ exception smwpTest11Exception extends M::smwpException M::smwpStringStructDict dict1; M::smwpClass c1; M::smwpInterface i1; -}; +} class smwpTest11Class extends M::smwpBaseClass implements M::smwpBaseInterface { @@ -78,7 +78,7 @@ class smwpTest11Class extends M::smwpBaseClass implements M::smwpBaseInterface out M::smwpInterface o5, out M::smwpClass o6) throws M::smwpException; -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/TestSingleModuleWithPackage12.ice b/java-compat/test/Ice/translator/TestSingleModuleWithPackage12.ice index 09739eeb4d6..1b2c8ae9ccd 100644 --- a/java-compat/test/Ice/translator/TestSingleModuleWithPackage12.ice +++ b/java-compat/test/Ice/translator/TestSingleModuleWithPackage12.ice @@ -28,13 +28,13 @@ struct smwpTest12Struct M::smwpStringStructDict dict; M::smwpClass c; M::smwpInterface i; -}; +} sequence<M::smwpStruct> smwpTest12StructSeq; dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest12StructClassSeq; -interface smwpTest12Interface extends M::smwpInterface {}; +interface smwpTest12Interface extends M::smwpInterface {} exception smwpTest12Exception extends M::smwpException { @@ -44,7 +44,7 @@ exception smwpTest12Exception extends M::smwpException M::smwpStringStructDict dict1; M::smwpClass c1; M::smwpInterface i1; -}; +} class smwpTest12Class extends M::smwpBaseClass implements M::smwpBaseInterface { @@ -78,7 +78,7 @@ class smwpTest12Class extends M::smwpBaseClass implements M::smwpBaseInterface out M::smwpInterface o5, out M::smwpClass o6) throws M::smwpException; -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/TestSingleModuleWithPackage13.ice b/java-compat/test/Ice/translator/TestSingleModuleWithPackage13.ice index 085d0cdaa98..c2658963fe5 100644 --- a/java-compat/test/Ice/translator/TestSingleModuleWithPackage13.ice +++ b/java-compat/test/Ice/translator/TestSingleModuleWithPackage13.ice @@ -28,13 +28,13 @@ struct smwpTest13Struct smwpStringStructDict dict; smwpClass c; smwpInterface i; -}; +} sequence<smwpStruct> smwpTest13StructSeq; dictionary<smwpStruct, smwpBaseClass> smwpTest13StructClassSeq; -interface smwpTest13Interface extends smwpInterface {}; +interface smwpTest13Interface extends smwpInterface {} exception smwpTest13Exception extends smwpException { @@ -44,7 +44,7 @@ exception smwpTest13Exception extends smwpException smwpStringStructDict dict1; smwpClass c1; smwpInterface i1; -}; +} class smwpTest13Class extends smwpBaseClass implements smwpBaseInterface { @@ -78,7 +78,7 @@ class smwpTest13Class extends smwpBaseClass implements smwpBaseInterface out smwpInterface o5, out smwpClass o6) throws smwpException; -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/TestSingleModuleWithPackage4.ice b/java-compat/test/Ice/translator/TestSingleModuleWithPackage4.ice index 77922ab9132..3d0bef3ea87 100644 --- a/java-compat/test/Ice/translator/TestSingleModuleWithPackage4.ice +++ b/java-compat/test/Ice/translator/TestSingleModuleWithPackage4.ice @@ -24,13 +24,13 @@ struct smwpTest4Struct M::smwpStringStructDict dict; M::smwpClass c; M::smwpInterface i; -}; +} sequence<M::smwpStruct> smwpTest4StructSeq; dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest4StructClassSeq; -interface smwpTest4Interface extends M::smwpInterface {}; +interface smwpTest4Interface extends M::smwpInterface {} exception smwpTest4Exception extends M::smwpException { @@ -40,7 +40,7 @@ exception smwpTest4Exception extends M::smwpException M::smwpStringStructDict dict1; M::smwpClass c1; M::smwpInterface i1; -}; +} class smwpTest4Class extends M::smwpBaseClass implements M::smwpBaseInterface { @@ -74,6 +74,6 @@ class smwpTest4Class extends M::smwpBaseClass implements M::smwpBaseInterface out M::smwpInterface o5, out M::smwpClass o6) throws M::smwpException; -}; +} -}; +} diff --git a/java-compat/test/Ice/translator/TestSingleModuleWithPackage5.ice b/java-compat/test/Ice/translator/TestSingleModuleWithPackage5.ice index 1cf7260042a..0da6a4c3773 100644 --- a/java-compat/test/Ice/translator/TestSingleModuleWithPackage5.ice +++ b/java-compat/test/Ice/translator/TestSingleModuleWithPackage5.ice @@ -24,13 +24,13 @@ struct smwpTest5Struct smwpStringStructDict dict; smwpClass c; smwpInterface i; -}; +} sequence<smwpStruct> smwpTest5StructSeq; dictionary<smwpStruct, smwpBaseClass> smwpTest5StructClassSeq; -interface smwpTest5Interface extends smwpInterface {}; +interface smwpTest5Interface extends smwpInterface {} exception smwpTest5Exception extends smwpException { @@ -40,7 +40,7 @@ exception smwpTest5Exception extends smwpException smwpStringStructDict dict1; smwpClass c1; smwpInterface i1; -}; +} class smwpTest5Class extends smwpBaseClass implements smwpBaseInterface { @@ -74,6 +74,6 @@ class smwpTest5Class extends smwpBaseClass implements smwpBaseInterface out smwpInterface o5, out smwpClass o6) throws smwpException; -}; +} -}; +} diff --git a/java-compat/test/Ice/translator/TestSingleModuleWithPackage6.ice b/java-compat/test/Ice/translator/TestSingleModuleWithPackage6.ice index 7c76d1c6337..c48c182a5c5 100644 --- a/java-compat/test/Ice/translator/TestSingleModuleWithPackage6.ice +++ b/java-compat/test/Ice/translator/TestSingleModuleWithPackage6.ice @@ -26,13 +26,13 @@ struct smwpTest6Struct M::smwpStringStructDict dict; M::smwpClass c; M::smwpInterface i; -}; +} sequence<M::smwpStruct> smwpTest6StructSeq; dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest6StructClassSeq; -interface smwpTest6Interface extends M::smwpInterface {}; +interface smwpTest6Interface extends M::smwpInterface {} exception smwpTest6Exception extends M::smwpException { @@ -42,7 +42,7 @@ exception smwpTest6Exception extends M::smwpException M::smwpStringStructDict dict1; M::smwpClass c1; M::smwpInterface i1; -}; +} class smwpTest6Class extends M::smwpBaseClass implements M::smwpBaseInterface { @@ -76,6 +76,6 @@ class smwpTest6Class extends M::smwpBaseClass implements M::smwpBaseInterface out M::smwpInterface o5, out M::smwpClass o6) throws M::smwpException; -}; +} -}; +} diff --git a/java-compat/test/Ice/translator/TestSingleModuleWithPackage7.ice b/java-compat/test/Ice/translator/TestSingleModuleWithPackage7.ice index 99e31cd5a0c..208b57dedbe 100644 --- a/java-compat/test/Ice/translator/TestSingleModuleWithPackage7.ice +++ b/java-compat/test/Ice/translator/TestSingleModuleWithPackage7.ice @@ -26,13 +26,13 @@ struct smwpTest7Struct M::smwpStringStructDict dict; M::smwpClass c; M::smwpInterface i; -}; +} sequence<M::smwpStruct> smwpTest7StructSeq; dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest7StructClassSeq; -interface smwpTest7Interface extends M::smwpInterface {}; +interface smwpTest7Interface extends M::smwpInterface {} exception smwpTest7Exception extends M::smwpException { @@ -42,7 +42,7 @@ exception smwpTest7Exception extends M::smwpException M::smwpStringStructDict dict1; M::smwpClass c1; M::smwpInterface i1; -}; +} class smwpTest7Class extends M::smwpBaseClass implements M::smwpBaseInterface { @@ -76,6 +76,6 @@ class smwpTest7Class extends M::smwpBaseClass implements M::smwpBaseInterface out M::smwpInterface o5, out M::smwpClass o6) throws M::smwpException; -}; +} -}; +} diff --git a/java-compat/test/Ice/translator/TestSingleModuleWithPackage9.ice b/java-compat/test/Ice/translator/TestSingleModuleWithPackage9.ice index 94e2008ec8e..d6ddedc5ed4 100644 --- a/java-compat/test/Ice/translator/TestSingleModuleWithPackage9.ice +++ b/java-compat/test/Ice/translator/TestSingleModuleWithPackage9.ice @@ -26,13 +26,13 @@ struct smwpTest9Struct ::M::smwpStringStructDict dict; ::M::smwpClass c; ::M::smwpInterface i; -}; +} sequence<::M::smwpStruct> smwpTest9StructSeq; dictionary<::M::smwpStruct, ::M::smwpBaseClass> smwpTest9StructClassSeq; -interface smwpTest9Interface extends ::M::smwpInterface {}; +interface smwpTest9Interface extends ::M::smwpInterface {} exception smwpTest9Exception extends ::M::smwpException { @@ -42,7 +42,7 @@ exception smwpTest9Exception extends ::M::smwpException ::M::smwpStringStructDict dict1; ::M::smwpClass c1; ::M::smwpInterface i1; -}; +} class smwpTest9Class extends ::M::smwpBaseClass implements ::M::smwpBaseInterface { @@ -76,7 +76,7 @@ class smwpTest9Class extends ::M::smwpBaseClass implements ::M::smwpBaseInterfac out ::M::smwpInterface o5, out ::M::smwpClass o6) throws ::M::smwpException; -}; +} -}; -}; +} +} diff --git a/java-compat/test/Ice/translator/Underscore.ice b/java-compat/test/Ice/translator/Underscore.ice index 37ca32b0809..54e630c0617 100644 --- a/java-compat/test/Ice/translator/Underscore.ice +++ b/java-compat/test/Ice/translator/Underscore.ice @@ -12,27 +12,27 @@ module Underscore_Test interface Test_Interface_A { void op_A(); - }; + } class Test_Class_B implements Test_Interface_A { void op_B(); int int_member; - }; + } struct Test_Struct { string string_member; - }; + } exception Test_Exception { short short_member; - }; + } sequence<string> String_Sequence; dictionary<string, string> String_Dictionary; const int Const_Int = 99; -}; +} diff --git a/java-compat/test/ejb/src/slice/common.ice b/java-compat/test/ejb/src/slice/common.ice index f4c6ee5a6ec..4ab346c2402 100644 --- a/java-compat/test/ejb/src/slice/common.ice +++ b/java-compat/test/ejb/src/slice/common.ice @@ -13,6 +13,6 @@ module Test class Base { -}; +} -}; +} diff --git a/java-compat/test/ejb/src/slice/ejb1.ice b/java-compat/test/ejb/src/slice/ejb1.ice index 45e66a054ca..98a04032392 100644 --- a/java-compat/test/ejb/src/slice/ejb1.ice +++ b/java-compat/test/ejb/src/slice/ejb1.ice @@ -15,12 +15,12 @@ module Test exception AccountNotExistException { -}; +} class Account extends Base { string id; -}; +} interface Database { @@ -28,13 +28,13 @@ interface Database Account getAccount(string id) throws AccountNotExistException; -}; +} interface Service { void addAccount(Account s); Account getAccount(string id); -}; +} -}; +} diff --git a/java-compat/test/ejb/src/slice/ejb2.ice b/java-compat/test/ejb/src/slice/ejb2.ice index 0dc5b2dd06b..19086cb9881 100644 --- a/java-compat/test/ejb/src/slice/ejb2.ice +++ b/java-compat/test/ejb/src/slice/ejb2.ice @@ -16,13 +16,13 @@ module Test exception AccountNotExistException { string id; -}; +} class Account extends Base { string id; string foo; -}; +} interface Database { @@ -30,13 +30,13 @@ interface Database Account getAccount(string id) throws AccountNotExistException; -}; +} interface Service { void addAccount(Account s); Account getAccount(string id); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Glacier2/application/Callback.ice b/java-compat/test/src/main/java/test/Glacier2/application/Callback.ice index c6d9a18fdf6..87c3fb0c6fd 100644 --- a/java-compat/test/src/main/java/test/Glacier2/application/Callback.ice +++ b/java-compat/test/src/main/java/test/Glacier2/application/Callback.ice @@ -16,13 +16,13 @@ module Test interface CallbackReceiver { void callback(); -}; +} interface Callback { void initiateCallback(CallbackReceiver* proxy); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Glacier2/router/Callback.ice b/java-compat/test/src/main/java/test/Glacier2/router/Callback.ice index 290aadd2444..fccaf41aa91 100644 --- a/java-compat/test/src/main/java/test/Glacier2/router/Callback.ice +++ b/java-compat/test/src/main/java/test/Glacier2/router/Callback.ice @@ -17,7 +17,7 @@ exception CallbackException { double someValue; string someString; -}; +} interface CallbackReceiver { @@ -25,7 +25,7 @@ interface CallbackReceiver void callbackEx() throws CallbackException; -}; +} interface Callback { @@ -35,6 +35,6 @@ interface Callback throws CallbackException; void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice b/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice index 2d4a0dd8ff3..da65e10827d 100644 --- a/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice +++ b/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice @@ -17,7 +17,7 @@ exception CallbackException { double someValue; string someString; -}; +} interface CallbackReceiver { @@ -25,7 +25,7 @@ interface CallbackReceiver void callbackEx() throws CallbackException; -}; +} interface Callback { @@ -35,7 +35,7 @@ interface Callback throws CallbackException; void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/acm/Test.ice b/java-compat/test/src/main/java/test/Ice/acm/Test.ice index 363bf199325..2f695d2c49d 100644 --- a/java-compat/test/src/main/java/test/Ice/acm/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/acm/Test.ice @@ -20,7 +20,7 @@ interface TestIntf void interruptSleep(); void startHeartbeatCount(); void waitForHeartbeatCount(int count); -}; +} interface RemoteObjectAdapter { @@ -28,13 +28,13 @@ interface RemoteObjectAdapter void activate(); void hold(); void deactivate(); -}; +} interface RemoteCommunicator { RemoteObjectAdapter* createObjectAdapter(int acmTimeout, int close, int heartbeat); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Test.ice b/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Test.ice index 998f6eed06f..40e649d0e68 100644 --- a/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Test.ice @@ -18,11 +18,11 @@ interface TestIntf void transient(); void deactivate(); -}; +} local class Cookie { idempotent string message(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/admin/Test.ice b/java-compat/test/src/main/java/test/Ice/admin/Test.ice index 39247b4b209..c568744c472 100644 --- a/java-compat/test/src/main/java/test/Ice/admin/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/admin/Test.ice @@ -35,20 +35,20 @@ interface RemoteCommunicator void waitForShutdown(); void destroy(); -}; +} interface RemoteCommunicatorFactory { RemoteCommunicator* createCommunicator(Ice::PropertyDict props); void shutdown(); -}; +} interface TestFacet { void op(); -}; +} -}; +} #endif diff --git a/java-compat/test/src/main/java/test/Ice/ami/Test.ice b/java-compat/test/src/main/java/test/Ice/ami/Test.ice index 2a0dbe027ca..15239f27288 100644 --- a/java-compat/test/src/main/java/test/Ice/ami/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/ami/Test.ice @@ -18,19 +18,19 @@ module Test exception TestIntfException { -}; +} enum CloseMode { Forcefully, Gracefully, GracefullyWithWait -}; +} interface PingReply { void reply(); -}; +} interface TestIntf { @@ -59,12 +59,12 @@ interface TestIntf double opDouble(double d); void pingBiDir(Ice::Identity id); -}; +} interface TestIntfController { void holdAdapter(); void resumeAdapter(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/background/Test.ice b/java-compat/test/src/main/java/test/Ice/background/Test.ice index 624200b8881..b8eeef6f6be 100644 --- a/java-compat/test/src/main/java/test/Ice/background/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/background/Test.ice @@ -21,7 +21,7 @@ interface Background void opWithPayload(Ice::ByteSeq seq); void shutdown(); -}; +} interface BackgroundController { @@ -41,6 +41,6 @@ interface BackgroundController void writeException(bool enable); void buffered(bool enable); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/binding/Test.ice b/java-compat/test/src/main/java/test/Ice/binding/Test.ice index 62664797a4f..9d1a3f9c894 100644 --- a/java-compat/test/src/main/java/test/Ice/binding/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/binding/Test.ice @@ -16,14 +16,14 @@ module Test interface TestIntf { string getAdapterName(); -}; +} interface RemoteObjectAdapter { TestIntf* getTestIntf(); void deactivate(); -}; +} interface RemoteCommunicator { @@ -32,6 +32,6 @@ interface RemoteCommunicator void deactivateObjectAdapter(RemoteObjectAdapter* adapter); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/checksum/Test.ice b/java-compat/test/src/main/java/test/Ice/checksum/Test.ice index 8f0e8a46339..b479af5c661 100644 --- a/java-compat/test/src/main/java/test/Ice/checksum/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/checksum/Test.ice @@ -20,6 +20,6 @@ interface Checksum idempotent Ice::SliceChecksumDict getSliceChecksums(); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice b/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice index 7d6cbbf0f9d..06b9fbbdab1 100644 --- a/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice +++ b/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice @@ -20,6 +20,6 @@ interface Checksum idempotent Ice::SliceChecksumDict getSliceChecksums(); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/checksum/Types.ice b/java-compat/test/src/main/java/test/Ice/checksum/Types.ice index 2f7ef550669..16b699169c8 100644 --- a/java-compat/test/src/main/java/test/Ice/checksum/Types.ice +++ b/java-compat/test/src/main/java/test/Ice/checksum/Types.ice @@ -31,42 +31,42 @@ const int IntConst3 = 100; // // TEST: Same // -enum Enum1 { Enum11, Enum12, Enum13 }; +enum Enum1 { Enum11, Enum12, Enum13 } // // TEST: Add enumerator // -enum Enum2 { Enum21, Enum22, Enum23 }; +enum Enum2 { Enum21, Enum22, Enum23 } // // TEST: Remove enumerator // -enum Enum3 { Enum31, Enum32, Enum33 }; +enum Enum3 { Enum31, Enum32, Enum33 } // // TEST: Change to a different type // -enum Enum4 { Enum41, Enum42, Enum43 }; +enum Enum4 { Enum41, Enum42, Enum43 } // // TEST: Enum with explicit values. // -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 }; +enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } // // TEST: Enum with same explicit values, different order. // -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 }; +enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } // // TEST: Enum with different explicit values. // -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3}; +enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} // // TEST: Enum with explicit values, removed enumerator. // -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3}; +enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} // // TEST: Same @@ -110,7 +110,7 @@ struct Struct1 { string str; bool b; -}; +} // // TEST: Add member @@ -119,7 +119,7 @@ struct Struct2 { string str; bool b; -}; +} // // TEST: Change member type @@ -128,7 +128,7 @@ struct Struct3 { string str; bool b; -}; +} // // TEST: Remove member @@ -137,7 +137,7 @@ struct Struct4 { string str; bool b; -}; +} // // TEST: Change to a different type @@ -146,70 +146,70 @@ struct Struct5 { string str; bool b; -}; +} // // TEST: Same // interface Interface1 { -}; +} // // TEST: Change interface to class // interface Interface2 { -}; +} // // TEST: Add base interface // interface Interface3 { -}; +} // // TEST: Add operation // interface Interface4 { -}; +} // // TEST: Same // class EmptyClass1 { -}; +} // // TEST: Add data member // class EmptyClass2 { -}; +} // // TEST: Add operation // class EmptyClass3 { -}; +} // // TEST: Add base class // class EmptyClass4 { -}; +} // // TEST: Add interface // class EmptyClass5 { -}; +} // // TEST: Same @@ -218,7 +218,7 @@ class SimpleClass1 { string str; float f; -}; +} // // TEST: Add operation @@ -227,7 +227,7 @@ class SimpleClass2 { string str; float f; -}; +} // // TEST: Rename member @@ -236,7 +236,7 @@ class SimpleClass3 { string str; float f; -}; +} // // TEST: Add member @@ -245,7 +245,7 @@ class SimpleClass4 { string str; float f; -}; +} // // TEST: Remove member @@ -254,7 +254,7 @@ class SimpleClass5 { string str; float f; -}; +} // // TEST: Reorder members @@ -263,7 +263,7 @@ class SimpleClass6 { string str; float f; -}; +} // // TEST: Change member type @@ -272,7 +272,7 @@ class SimpleClass7 { string str; float f; -}; +} // // TEST: Same @@ -281,7 +281,7 @@ exception Exception1 { string str; bool b; -}; +} // // TEST: Add member @@ -290,7 +290,7 @@ exception Exception2 { string str; bool b; -}; +} // // TEST: Change member type @@ -299,7 +299,7 @@ exception Exception3 { string str; bool b; -}; +} // // TEST: Remove member @@ -308,14 +308,14 @@ exception Exception4 { string str; bool b; -}; +} // // TEST: Add base exception // exception Exception5 { -}; +} // // TEST: Change to a different type @@ -324,7 +324,7 @@ exception Exception6 { string str; bool b; -}; +} // // TEST: Exception with optional members. @@ -334,7 +334,7 @@ exception OptionalEx0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members, different order, same tags. @@ -344,7 +344,7 @@ exception OptionalEx1 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -354,7 +354,7 @@ exception OptionalEx2 string firstName; string secondName; optional(1) string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -364,7 +364,7 @@ exception OptionalEx3 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members using different tags. @@ -374,7 +374,7 @@ exception OptionalEx4 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Same @@ -383,7 +383,7 @@ interface BaseInterface1 { void baseOp1(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change return type @@ -392,7 +392,7 @@ interface BaseInterface2 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add parameter @@ -401,7 +401,7 @@ interface BaseInterface3 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add exception @@ -410,7 +410,7 @@ interface BaseInterface4 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change out parameter to in parameter @@ -419,7 +419,7 @@ interface BaseInterface5 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove parameter @@ -428,7 +428,7 @@ interface BaseInterface6 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove exception @@ -437,7 +437,7 @@ interface BaseInterface7 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove operation @@ -446,7 +446,7 @@ interface BaseInterface8 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add base interface @@ -455,7 +455,7 @@ interface BaseInterface9 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Class with compact id @@ -463,14 +463,14 @@ interface BaseInterface9 class Compact1(1) { int id; -}; +} // // TEST: Derived from class with compact id // class Derived1 extends Compact1 { -}; +} // // TEST: Same class names but different compact id @@ -478,7 +478,7 @@ class Derived1 extends Compact1 class Compact2(2) { int id; -}; +} // // TEST: Class with optional members. @@ -488,7 +488,7 @@ class Optional0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members, different order, same tags. @@ -498,7 +498,7 @@ class Optional1 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -508,7 +508,7 @@ class Optional2 string firstName; string secondName; optional(1) string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -518,7 +518,7 @@ class Optional3 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members using different tags. @@ -528,7 +528,7 @@ class Optional4 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Interface with optional parameters. @@ -537,7 +537,7 @@ interface OptionalParameters0 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different order. @@ -546,7 +546,7 @@ interface OptionalParameters1 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different tags. @@ -555,7 +555,7 @@ interface OptionalParameters2 { void op1(string firstName, optional(1) string emailAddress, optional(2) string secondName); -}; +} // // TEST: Interface with different optional parameters. @@ -564,7 +564,7 @@ interface OptionalParameters3 { void op1(string firstName, optional(1) string emailAddress, string secondName); -}; +} // // TEST: Interface with optional return type. @@ -572,7 +572,7 @@ interface OptionalParameters3 interface OptionalReturn0 { optional(1) int op(); -}; +} // // TEST: Interface that changes optional return type. @@ -580,12 +580,12 @@ interface OptionalReturn0 interface OptionalReturn2 { optional(1) int op(); -}; +} // // TEST: Local // -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 }; +local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } // // TEST: Local @@ -603,13 +603,13 @@ local dictionary<string, string> LocalDictionary; local struct LocalStruct { string str; -}; +} // // TEST: Local // local class LocalClass { -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice b/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice index d4d9a4a488b..31c720e135a 100644 --- a/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice +++ b/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice @@ -32,42 +32,42 @@ const short IntConst3 = 100; // // TEST: Same // -enum Enum1 { Enum11, Enum12, Enum13 }; +enum Enum1 { Enum11, Enum12, Enum13 } // // TEST: Add enumerator // -enum Enum2 { Enum21, Enum22, Enum23, Enum24 }; +enum Enum2 { Enum21, Enum22, Enum23, Enum24 } // // TEST: Remove enumerator // -enum Enum3 { Enum32, Enum33 }; +enum Enum3 { Enum32, Enum33 } // // TEST: Enum with explicit values. // -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 }; +enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } // // TEST: Enum with same explicit values, different order. // -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 }; +enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 } // // TEST: Enum with different explicit values. // -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 }; +enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 } // // TEST: Enum with explicit values, removed enumerator. // -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2}; +enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2} // // TEST: Change to a different type // -class Enum4 {}; +class Enum4 {} // // TEST: Same @@ -82,7 +82,7 @@ sequence<short> Sequence2; // // TEST: Change to a different type // -class Sequence3 {}; +class Sequence3 {} // // TEST: Same @@ -102,7 +102,7 @@ dictionary<string, bool> Dictionary3; // // TEST: Change to a different type // -class Dictionary4 {}; +class Dictionary4 {} // // TEST: Same @@ -111,7 +111,7 @@ struct Struct1 { string str; bool b; -}; +} // // TEST: Add member @@ -121,7 +121,7 @@ struct Struct2 string str; bool b; float f; -}; +} // // TEST: Change member type @@ -130,7 +130,7 @@ struct Struct3 { string str; double b; -}; +} // // TEST: Remove member @@ -138,33 +138,33 @@ struct Struct3 struct Struct4 { bool b; -}; +} // // TEST: Change to a different type // -class Struct5 {}; +class Struct5 {} // // TEST: Same // interface Interface1 { -}; +} // // TEST: Change interface to class // class Interface2 { -}; +} // // TEST: Add base interface // interface Interface3 extends Interface1 { -}; +} // // TEST: Add operation @@ -172,14 +172,14 @@ interface Interface3 extends Interface1 interface Interface4 { void opInterface4(); -}; +} // // TEST: Same // class EmptyClass1 { -}; +} // // TEST: Add data member @@ -187,7 +187,7 @@ class EmptyClass1 class EmptyClass2 { double d; -}; +} // // TEST: Add operation @@ -195,21 +195,21 @@ class EmptyClass2 class EmptyClass3 { void newOp(); -}; +} // // TEST: Add base class // class EmptyClass4 extends EmptyClass1 { -}; +} // // TEST: Add interface // class EmptyClass5 implements Interface1 { -}; +} // // TEST: Same @@ -218,7 +218,7 @@ class SimpleClass1 { string str; float f; -}; +} // // TEST: Add operation @@ -228,7 +228,7 @@ class SimpleClass2 string str; float f; void newOp(); -}; +} // // TEST: Rename member @@ -237,7 +237,7 @@ class SimpleClass3 { string str; float g; -}; +} // // TEST: Add member @@ -247,7 +247,7 @@ class SimpleClass4 string str; float f; bool b; -}; +} // // TEST: Remove member @@ -255,7 +255,7 @@ class SimpleClass4 class SimpleClass5 { string str; -}; +} // // TEST: Reorder members @@ -264,7 +264,7 @@ class SimpleClass6 { float f; string str; -}; +} // // TEST: Change member type @@ -273,7 +273,7 @@ class SimpleClass7 { string str; double f; -}; +} // // TEST: Same @@ -282,7 +282,7 @@ exception Exception1 { string str; bool b; -}; +} // // TEST: Add member @@ -292,7 +292,7 @@ exception Exception2 string str; bool b; float f; -}; +} // // TEST: Change member type @@ -301,7 +301,7 @@ exception Exception3 { string str; double b; -}; +} // // TEST: Remove member @@ -309,19 +309,19 @@ exception Exception3 exception Exception4 { bool b; -}; +} // // TEST: Add base exception // exception Exception5 extends Exception1 { -}; +} // // TEST: Change to a different type // -class Exception6 {}; +class Exception6 {} // // TEST: Exception with optional members. @@ -331,7 +331,7 @@ exception OptionalEx0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members, different order, same tags. @@ -341,7 +341,7 @@ exception OptionalEx1 string firstName; optional(2) string emailAddress; optional(1) string secondName; -}; +} // // TEST: Exception with different optional members. @@ -351,7 +351,7 @@ exception OptionalEx2 string firstName; optional(1) string secondName; string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -362,7 +362,7 @@ exception OptionalEx3 optional(1) string secondName; optional(2) string emailAddress; optional(3) string phoneNumber; -}; +} // // TEST: Exception with optional members using different tags. @@ -372,7 +372,7 @@ exception OptionalEx4 string firstName; optional(2) string secondName; optional(1) string emailAddress; -}; +} // // TEST: Same @@ -381,7 +381,7 @@ interface BaseInterface1 { void baseOp1(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change return type @@ -390,7 +390,7 @@ interface BaseInterface2 { int baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add parameter @@ -399,7 +399,7 @@ interface BaseInterface3 { void baseOp(Object o); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add exception @@ -408,7 +408,7 @@ interface BaseInterface4 { void baseOp(); void baseOp2(int i, out string s) throws Exception1, Exception2; -}; +} // // TEST: Change out parameter to in parameter @@ -417,7 +417,7 @@ interface BaseInterface5 { void baseOp(); void baseOp2(int i, string s) throws Exception1; -}; +} // // TEST: Remove parameter @@ -426,7 +426,7 @@ interface BaseInterface6 { void baseOp(); void baseOp2(out string s) throws Exception1; -}; +} // // TEST: Remove exception @@ -435,7 +435,7 @@ interface BaseInterface7 { void baseOp(); void baseOp2(int i, out string s); -}; +} // // TEST: Remove operation @@ -443,7 +443,7 @@ interface BaseInterface7 interface BaseInterface8 { void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add base class @@ -452,7 +452,7 @@ interface BaseInterface9 extends Interface1 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Class with compact id @@ -460,14 +460,14 @@ interface BaseInterface9 extends Interface1 class Compact1(1) { int id; -}; +} // // TEST: Derived from class with compact id // class Derived1 extends Compact1 { -}; +} // // TEST: Same class names but different compact id @@ -475,7 +475,7 @@ class Derived1 extends Compact1 class Compact2(3) { int id; -}; +} // // TEST: Class with optional members. @@ -485,7 +485,7 @@ class Optional0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Interface with optional members, different order, same tags. @@ -495,7 +495,7 @@ class Optional1 string firstName; optional(2) string emailAddress; optional(1) string secondName; -}; +} // // TEST: Interface with different optional members. @@ -505,7 +505,7 @@ class Optional2 string firstName; optional(1) string secondName; string emailAddress; -}; +} // // TEST: Interface with different optional members. @@ -516,7 +516,7 @@ class Optional3 optional(1) string secondName; optional(2) string emailAddress; optional(3) string phoneNumber; -}; +} // // TEST: Interface with optional members using different tags. @@ -526,7 +526,7 @@ class Optional4 string firstName; optional(2) string secondName; optional(1) string emailAddress; -}; +} // // TEST: Interface with optional parameters. @@ -535,7 +535,7 @@ interface OptionalParameters0 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different order. @@ -544,7 +544,7 @@ interface OptionalParameters1 { void op1(string firstName, optional(2) string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with optional parameters, different tags. @@ -553,7 +553,7 @@ interface OptionalParameters2 { void op1(string firstName, optional(2) string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with different optional parameters. @@ -562,7 +562,7 @@ interface OptionalParameters3 { void op1(string firstName, string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with optional return type. @@ -570,7 +570,7 @@ interface OptionalParameters3 interface OptionalReturn0 { optional(1) int op(); -}; +} // // TEST: Interface that changes optional return type. @@ -578,12 +578,12 @@ interface OptionalReturn0 interface OptionalReturn2 { int op(); -}; +} // // TEST: Local // -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 }; +local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } // // TEST: Local @@ -601,13 +601,13 @@ local dictionary<string, string> LocalDictionary; local struct LocalStruct { string str; -}; +} // // TEST: Local // local class LocalClass { -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/classLoader/Test.ice b/java-compat/test/src/main/java/test/Ice/classLoader/Test.ice index c02b3ca67e6..0cf325328a1 100644 --- a/java-compat/test/src/main/java/test/Ice/classLoader/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/classLoader/Test.ice @@ -17,14 +17,14 @@ module Test class ConcreteClass { int i; -}; +} class AbstractClass { void op(); -}; +} -exception E {}; +exception E {} interface Initial { @@ -32,6 +32,6 @@ interface Initial AbstractClass getAbstractClass(); void throwException() throws E; void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/custom/Test.ice b/java-compat/test/src/main/java/test/Ice/custom/Test.ice index 5b042bb089b..92d9a49db47 100644 --- a/java-compat/test/src/main/java/test/Ice/custom/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/custom/Test.ice @@ -15,7 +15,7 @@ module Test { -class C {}; +class C {} sequence<C> CSeq; ["java:type:java.util.ArrayList<C>"] sequence<C> CArray; @@ -37,13 +37,13 @@ sequence<C> CSeq; ["java:buffer"] sequence<float> FloatBuffer; ["java:buffer"] sequence<double> DoubleBuffer; -enum E { E1, E2, E3 }; +enum E { E1, E2, E3 } ["java:type:java.util.ArrayList<E>"] sequence<E> ESeq; struct S { E en; -}; +} ["java:type:java.util.ArrayList<S>"] sequence<S> SSeq; dictionary<int, string> D; @@ -77,6 +77,6 @@ interface TestIntf DoubleBuffer opDoubleBufferSeq(DoubleBuffer inSeq, out DoubleBuffer outSeq); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/defaultServant/Test.ice b/java-compat/test/src/main/java/test/Ice/defaultServant/Test.ice index 92b5dbc7467..c30157ea6db 100644 --- a/java-compat/test/src/main/java/test/Ice/defaultServant/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/defaultServant/Test.ice @@ -16,6 +16,6 @@ module Test interface MyObject { string getName(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/defaultValue/Test.ice b/java-compat/test/src/main/java/test/Ice/defaultValue/Test.ice index 5ac010717cb..a1a48ae5da2 100644 --- a/java-compat/test/src/main/java/test/Ice/defaultValue/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/defaultValue/Test.ice @@ -14,14 +14,14 @@ module Test { -enum Color { red, green, blue }; +enum Color { red, green, blue } module Nested { -enum Color { red, green, blue }; +enum Color { red, green, blue } -}; +} struct Struct1 { @@ -47,7 +47,7 @@ struct Struct1 float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} const bool ConstBool = true; const byte ConstByte = 254; @@ -92,7 +92,7 @@ struct Struct2 float zeroDotF = ConstZeroDotF; double zeroD = ConstZeroD; double zeroDotD = ConstZeroDotD; -}; +} class Base { @@ -112,7 +112,7 @@ class Base float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} class Derived extends Base { @@ -122,7 +122,7 @@ class Derived extends Base Nested::Color nc1 = ::Test::Nested::Color::red; Nested::Color nc2 = Nested::green; Nested::Color nc3 = blue; -}; +} exception BaseEx { @@ -142,7 +142,7 @@ exception BaseEx float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} exception DerivedEx extends BaseEx { @@ -152,7 +152,7 @@ exception DerivedEx extends BaseEx Nested::Color nc1 = ConstNestedColor1; Nested::Color nc2 = ConstNestedColor2; Nested::Color nc3 = ConstNestedColor3; -}; +} sequence<byte> ByteSeq; sequence<int> IntSeq; @@ -161,7 +161,7 @@ dictionary<int, string> IntStringDict; struct InnerStruct { int a; -}; +} struct StructNoDefaults { @@ -178,32 +178,32 @@ struct StructNoDefaults IntSeq is; InnerStruct st; IntStringDict dict; -}; +} exception ExceptionNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} exception ExceptionNoDefaults extends ExceptionNoDefaultsBase { InnerStruct st; IntStringDict dict; -}; +} class ClassNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} class ClassNoDefaults extends ClassNoDefaultsBase { InnerStruct st; IntStringDict dict; -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/dispatcher/Test.ice b/java-compat/test/src/main/java/test/Ice/dispatcher/Test.ice index a495540826a..33c6bb3a75b 100644 --- a/java-compat/test/src/main/java/test/Ice/dispatcher/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/dispatcher/Test.ice @@ -21,12 +21,12 @@ interface TestIntf void sleep(int to); void opWithPayload(Ice::ByteSeq seq); void shutdown(); -}; +} interface TestIntfController { void holdAdapter(); void resumeAdapter(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/echo/Test.ice b/java-compat/test/src/main/java/test/Ice/echo/Test.ice index 814ef0d8a32..6f05e2a181f 100644 --- a/java-compat/test/src/main/java/test/Ice/echo/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/echo/Test.ice @@ -21,6 +21,6 @@ interface Echo void startBatch(); void flushBatch(); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/enums/Test.ice b/java-compat/test/src/main/java/test/Ice/enums/Test.ice index 6e677844bb3..ec0f8bc81c8 100644 --- a/java-compat/test/src/main/java/test/Ice/enums/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/enums/Test.ice @@ -36,7 +36,7 @@ enum ByteEnum benum9 = LongConst1, benum10, benum11 = ByteConst2 -}; +} sequence<ByteEnum> ByteEnumSeq; enum ShortEnum @@ -52,7 +52,7 @@ enum ShortEnum senum9 = LongConst1, senum10, senum11 = ShortConst2 -}; +} sequence<ShortEnum> ShortEnumSeq; enum IntEnum @@ -69,7 +69,7 @@ enum IntEnum ienum10, ienum11 = IntConst2, ienum12 = LongConst2 -}; +} sequence<IntEnum> IntEnumSeq; enum SimpleEnum @@ -77,7 +77,7 @@ enum SimpleEnum red, green, blue -}; +} sequence<SimpleEnum> SimpleEnumSeq; interface TestIntf @@ -93,6 +93,6 @@ interface TestIntf SimpleEnumSeq opSimpleSeq(SimpleEnumSeq s1, out SimpleEnumSeq s2); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/exceptions/Test.ice b/java-compat/test/src/main/java/test/Ice/exceptions/Test.ice index da535d38b89..02d87a2fd7c 100644 --- a/java-compat/test/src/main/java/test/Ice/exceptions/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/exceptions/Test.ice @@ -17,29 +17,29 @@ module Test interface Empty { -}; +} interface Thrower; exception A { int aMem; -}; +} exception B extends A { int bMem; -}; +} exception C extends B { int cMem; -}; +} exception D { int dMem; -}; +} interface Thrower { @@ -67,11 +67,11 @@ interface Thrower void throwAfterResponse(); void throwAfterException() throws A; -}; +} interface WrongOperation { void noSuchOperation(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/exceptions/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/exceptions/TestAMD.ice index a9bb589bc75..590d0f14945 100644 --- a/java-compat/test/src/main/java/test/Ice/exceptions/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/exceptions/TestAMD.ice @@ -20,22 +20,22 @@ interface Thrower; exception A { int aMem; -}; +} exception B extends A { int bMem; -}; +} exception C extends B { int cMem; -}; +} exception D { int dMem; -}; +} ["amd"] interface Thrower { @@ -62,11 +62,11 @@ exception D void throwAfterResponse(); void throwAfterException() throws A; -}; +} ["amd"] interface WrongOperation { void noSuchOperation(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/facets/Test.ice b/java-compat/test/src/main/java/test/Ice/facets/Test.ice index 9d596c5a4c5..bff9de11579 100644 --- a/java-compat/test/src/main/java/test/Ice/facets/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/facets/Test.ice @@ -15,47 +15,47 @@ module Test interface Empty { -}; +} interface A { string callA(); -}; +} interface B extends A { string callB(); -}; +} interface C extends A { string callC(); -}; +} interface D extends B, C { string callD(); -}; +} interface E { string callE(); -}; +} interface F extends E { string callF(); -}; +} interface G { void shutdown(); string callG(); -}; +} interface H extends G { string callH(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/faultTolerance/Test.ice b/java-compat/test/src/main/java/test/Ice/faultTolerance/Test.ice index 623de7377c2..b6617573689 100644 --- a/java-compat/test/src/main/java/test/Ice/faultTolerance/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/faultTolerance/Test.ice @@ -19,6 +19,6 @@ interface TestIntf void abort(); idempotent void idempotentAbort(); idempotent int pid(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/hash/Test.ice b/java-compat/test/src/main/java/test/Ice/hash/Test.ice index 3b757147251..58a6f78fe07 100644 --- a/java-compat/test/src/main/java/test/Ice/hash/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/hash/Test.ice @@ -18,26 +18,26 @@ struct PointF float x; float y; float z; -}; +} struct PointD { double x; double y; double z; -}; +} struct Point { int x; int y; -}; +} sequence<Point> Points; struct Polyline { Points vertices; -}; +} struct Color { @@ -45,7 +45,7 @@ struct Color int g; int b; int a; -}; +} dictionary<int, Color> StringColorMap; @@ -53,20 +53,20 @@ dictionary<int, Color> StringColorMap; struct ColorPalette { StringColorMap colors; -}; +} class Pen { int thickness; Test::Color color; -}; +} struct Draw { Test::Color backgroundColor; Test::Pen pen; bool shared; -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/hold/Test.ice b/java-compat/test/src/main/java/test/Ice/hold/Test.ice index 3179e4f1b75..b46bbfd47a4 100644 --- a/java-compat/test/src/main/java/test/Ice/hold/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/hold/Test.ice @@ -20,6 +20,6 @@ interface Hold int set(int value, int delay); void setOneway(int value, int expected); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/impl/Test.ice b/java-compat/test/src/main/java/test/Ice/impl/Test.ice index d5b3bc8672a..b05281bc0b4 100644 --- a/java-compat/test/src/main/java/test/Ice/impl/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/impl/Test.ice @@ -20,21 +20,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -64,7 +64,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -260,28 +260,28 @@ interface MyClass ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} ["java:tie"] interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -351,4 +351,4 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice index a27980e018c..7bdb98244b5 100644 --- a/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice @@ -20,21 +20,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -64,7 +64,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -260,28 +260,28 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} ["amd", "java:tie"] interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -351,4 +351,4 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/info/Test.ice b/java-compat/test/src/main/java/test/Ice/info/Test.ice index 24c11bc37b1..48e1614156f 100644 --- a/java-compat/test/src/main/java/test/Ice/info/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/info/Test.ice @@ -22,6 +22,6 @@ interface TestIntf Ice::Context getEndpointInfoAsContext(); Ice::Context getConnectionInfoAsContext(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/inheritance/Test.ice b/java-compat/test/src/main/java/test/Ice/inheritance/Test.ice index 6ba1a719040..d7ccd0adebc 100644 --- a/java-compat/test/src/main/java/test/Ice/inheritance/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/inheritance/Test.ice @@ -21,14 +21,14 @@ module MA interface IA { IA* iaop(IA* p); -}; +} class CA { CA* caop(CA* p); -}; +} -}; +} module MB { @@ -36,19 +36,19 @@ module MB interface IB1 extends MA::IA { IB1* ib1op(IB1* p); -}; +} interface IB2 extends MA::IA { IB2* ib2op(IB2* p); -}; +} class CB extends MA::CA { CB* cbop(CB* p); -}; +} -}; +} module MA { @@ -56,19 +56,19 @@ module MA interface IC extends MB::IB1, MB::IB2 { IC* icop(IC* p); -}; +} class CC extends MB::CB { CC* ccop(CC* p); -}; +} class CD extends CC implements MB::IB1, MB::IB2 { CD* cdop(CD* p); -}; +} -}; +} interface Initial { @@ -81,6 +81,6 @@ interface Initial MB::IB1* ib1op(); MB::IB2* ib2op(); MA::IC* icop(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice b/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice index 6576ff79c5d..b422c705821 100644 --- a/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice @@ -16,11 +16,11 @@ module Test exception InvalidInputException { string message; -}; +} local exception RetryException { -}; +} interface MyObject { @@ -78,7 +78,7 @@ interface MyObject // ["amd"] int amdBadSystemAdd(int x, int y); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/interrupt/Test.ice b/java-compat/test/src/main/java/test/Ice/interrupt/Test.ice index be62fea3210..967c208c9be 100644 --- a/java-compat/test/src/main/java/test/Ice/interrupt/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/interrupt/Test.ice @@ -17,7 +17,7 @@ module Test exception InterruptedException { -}; +} interface TestIntf { @@ -27,11 +27,11 @@ interface TestIntf throws InterruptedException; void opWithPayload(Ice::ByteSeq seq); void shutdown(); -}; +} exception CannotInterruptException { -}; +} interface TestIntfController { @@ -39,6 +39,6 @@ interface TestIntfController void resumeAdapter(); void interrupt() throws CannotInterruptException; -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/invoke/Test.ice b/java-compat/test/src/main/java/test/Ice/invoke/Test.ice index 1f23be6f358..8448a46f23f 100644 --- a/java-compat/test/src/main/java/test/Ice/invoke/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/invoke/Test.ice @@ -15,7 +15,7 @@ module Test exception MyException { -}; +} interface MyClass { @@ -26,6 +26,6 @@ interface MyClass void opException() throws MyException; void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/location/Test.ice b/java-compat/test/src/main/java/test/Ice/location/Test.ice index 093d4497bf7..bcef54cd081 100644 --- a/java-compat/test/src/main/java/test/Ice/location/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/location/Test.ice @@ -21,7 +21,7 @@ interface TestLocatorRegistry extends ::Ice::LocatorRegistry // Allow remote addition of objects to the locator registry. // void addObject(Object* obj); -}; +} interface TestLocator extends ::Ice::Locator { @@ -29,18 +29,18 @@ interface TestLocator extends ::Ice::Locator // Returns the number of request on the locator interface. // idempotent int getRequestCount(); -}; +} interface ServerManager { void startServer(); void shutdown(); -}; +} interface Hello { void sayHello(); -}; +} interface TestIntf { @@ -51,6 +51,6 @@ interface TestIntf Hello* getReplicatedHello(); void migrateHello(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/metrics/Test.ice b/java-compat/test/src/main/java/test/Ice/metrics/Test.ice index a7aac6875b2..e0e07b9afca 100644 --- a/java-compat/test/src/main/java/test/Ice/metrics/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/metrics/Test.ice @@ -15,7 +15,7 @@ module Test exception UserEx { -}; +} sequence<byte> ByteSeq; @@ -39,13 +39,13 @@ interface Metrics Object* getAdmin(); void shutdown(); -}; +} interface Controller { void hold(); void resume(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/metrics/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/metrics/TestAMD.ice index c5bf0d40d55..886c9cdc9fe 100644 --- a/java-compat/test/src/main/java/test/Ice/metrics/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/metrics/TestAMD.ice @@ -15,7 +15,7 @@ module Test exception UserEx { -}; +} sequence<byte> ByteSeq; @@ -39,13 +39,13 @@ interface Metrics Object* getAdmin(); void shutdown(); -}; +} interface Controller { void hold(); void resume(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/networkProxy/Test.ice b/java-compat/test/src/main/java/test/Ice/networkProxy/Test.ice index 08670037361..f14efbc2c0b 100644 --- a/java-compat/test/src/main/java/test/Ice/networkProxy/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/networkProxy/Test.ice @@ -16,6 +16,6 @@ module Test interface TestIntf { void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/objects/Test.ice b/java-compat/test/src/main/java/test/Ice/objects/Test.ice index 07cfcd797d4..47fa49c8bed 100644 --- a/java-compat/test/src/main/java/test/Ice/objects/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/objects/Test.ice @@ -18,18 +18,18 @@ module Test struct S { string str; -}; +} class Base { S theS; string str; -}; +} class AbstractBase extends Base { void op(); -}; +} class B; class C; @@ -41,12 +41,12 @@ class A bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class B extends A { A theA; -}; +} class C { @@ -54,7 +54,7 @@ class C bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class D { @@ -64,31 +64,31 @@ class D bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} ["protected"] class E { int i; string s; -}; +} class F { ["protected"] E e1; E e2; -}; +} interface I { -}; +} interface J extends I { -}; +} class H implements I { -}; +} sequence<Base> BaseSeq; @@ -96,13 +96,13 @@ class CompactExt; class Compact(1) { -}; +} const int CompactExtId = 789; class CompactExt(CompactExtId) extends Compact { -}; +} module Inner { @@ -110,12 +110,12 @@ module Inner class A { ::Test::A theA; -}; +} exception Ex { string reason; -}; +} module Sub { @@ -123,50 +123,50 @@ module Sub class A { ::Test::Inner::A theA; -}; +} exception Ex { string reason; -}; +} -}; +} -}; +} class A1 { string name; -}; +} class B1 { A1 a1; A1 a2; -}; +} class D1 extends B1 { A1 a3; A1 a4; -}; +} exception EBase { A1 a1; A1 a2; -}; +} exception EDerived extends EBase { A1 a3; A1 a4; -}; +} class Recursive { Recursive v; -}; +} class Initial { @@ -204,20 +204,20 @@ class Initial void throwInnerEx() throws Inner::Ex; void throwInnerSubEx() throws Inner::Sub::Ex; -}; +} class Empty { -}; +} class AlsoEmpty { -}; +} interface UnexpectedObjectExceptionTest { Empty op(); -}; +} // // Remaining definitions are here to ensure that the generated code compiles. @@ -226,37 +226,37 @@ interface UnexpectedObjectExceptionTest class COneMember { Empty e; -}; +} class CTwoMembers { Empty e1; Empty e2; -}; +} exception EOneMember { Empty e; -}; +} exception ETwoMembers { Empty e1; Empty e2; -}; +} struct SOneMember { Empty e; -}; +} struct STwoMembers { Empty e1; Empty e2; -}; +} dictionary<int, COneMember> DOneMember; dictionary<int, CTwoMembers> DTwoMembers; -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/operations/Test.ice b/java-compat/test/src/main/java/test/Ice/operations/Test.ice index c37de34be31..84db5658348 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/operations/Test.ice @@ -20,21 +20,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -64,7 +64,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -260,28 +260,28 @@ interface MyClass ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} ["java:tie"] interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -351,4 +351,4 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice index 765edffea1f..2e705f6fad8 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice @@ -20,21 +20,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -64,7 +64,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -260,28 +260,28 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} ["amd", "java:tie"] interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -351,4 +351,4 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/optional/Test.ice b/java-compat/test/src/main/java/test/Ice/optional/Test.ice index 1ca90f5fdff..3cbd11939b1 100644 --- a/java-compat/test/src/main/java/test/Ice/optional/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/optional/Test.ice @@ -16,32 +16,32 @@ module Test class OneOptional { optional(1) int a; -}; +} enum MyEnum { MyEnumMember -}; +} struct SmallStruct { byte m; -}; +} struct FixedStruct { int m; -}; +} struct VarStruct { string m; -}; +} struct ClassVarStruct { int a; -}; +} sequence<byte> ByteSeq; sequence<bool> BoolSeq; @@ -106,7 +106,7 @@ class MultiOptional optional(29) BoolSeq bos; optional(30) Serializable ser; -}; +} class A { @@ -114,26 +114,26 @@ class A optional(1) int ma; optional(50) int mb; optional(500) int mc; -}; +} ["preserve-slice"] class B extends A { int requiredB; optional(10) int md; -}; +} class C extends B { string ss; optional(890) string ms; -}; +} class WD { optional(1) int a = 5; optional(2) string s = "test"; -}; +} exception OptionalException { @@ -141,46 +141,46 @@ exception OptionalException optional(1) int a = 5; optional(2) string b; optional(50) OneOptional o; -}; +} exception DerivedException extends OptionalException { optional(600) string ss = "test"; optional(601) OneOptional o2; -}; +} exception RequiredException extends OptionalException { string ss = "test"; OneOptional o2; -}; +} class OptionalWithCustom { optional(1) SmallStructList l; ["protected"] optional(2) SmallStructList lp; optional(3) ClassVarStruct s; -}; +} class E { A ae; -}; +} class F extends E { optional(1) A af; -}; +} class G1 { string a; -}; +} class G2 { long a; -}; +} class G { @@ -188,14 +188,14 @@ class G G2 gg2; optional(0) G2 gg2Opt; G1 gg1; -}; +} class Recursive; sequence<Recursive> RecursiveSeq; class Recursive { optional(0) RecursiveSeq value; -}; +} interface Initial { @@ -351,6 +351,6 @@ interface Initial bool supportsCppStringView(); bool supportsNullOptional(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice index bf18b49d995..2c8da97f1b6 100644 --- a/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice @@ -16,32 +16,32 @@ module Test class OneOptional { optional(1) int a; -}; +} enum MyEnum { MyEnumMember -}; +} struct SmallStruct { byte m; -}; +} struct FixedStruct { int m; -}; +} struct VarStruct { string m; -}; +} struct ClassVarStruct { int a; -}; +} sequence<byte> ByteSeq; sequence<bool> BoolSeq; @@ -106,7 +106,7 @@ class MultiOptional optional(29) BoolSeq bos; optional(30) Serializable ser; -}; +} class A { @@ -114,26 +114,26 @@ class A optional(1) int ma; optional(50) int mb; optional(500) int mc; -}; +} ["preserve-slice"] class B extends A { int requiredB; optional(10) int md; -}; +} class C extends B { string ss; optional(890) string ms; -}; +} class WD { optional(1) int a = 5; optional(2) string s = "test"; -}; +} exception OptionalException { @@ -141,46 +141,46 @@ exception OptionalException optional(1) int a = 5; optional(2) string b; optional(50) OneOptional o; -}; +} exception DerivedException extends OptionalException { optional(600) string ss = "test"; optional(601) OneOptional o2; -}; +} exception RequiredException extends OptionalException { string ss = "test"; OneOptional o2; -}; +} class OptionalWithCustom { optional(1) SmallStructList l; ["protected"] optional(2) SmallStructList lp; optional(3) ClassVarStruct s; -}; +} class E { A ae; -}; +} class F extends E { optional(1) A af; -}; +} class G1 { string a; -}; +} class G2 { long a; -}; +} class G { @@ -188,7 +188,7 @@ class G G2 gg2; optional(0) G2 gg2Opt; G1 gg1; -}; +} class Recursive; sequence<Recursive> RecursiveSeq; @@ -196,7 +196,7 @@ sequence<Recursive> RecursiveSeq; class Recursive { optional(0) RecursiveSeq value; -}; +} ["amd"] interface Initial @@ -355,6 +355,6 @@ interface Initial bool supportsCppStringView(); bool supportsNullOptional(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/packagemd/NoPackage.ice b/java-compat/test/src/main/java/test/Ice/packagemd/NoPackage.ice index 51cf954095e..20ee98c30fb 100644 --- a/java-compat/test/src/main/java/test/Ice/packagemd/NoPackage.ice +++ b/java-compat/test/src/main/java/test/Ice/packagemd/NoPackage.ice @@ -15,25 +15,25 @@ module Test1 class C1 { int i; -}; +} class C2 extends C1 { long l; -}; +} exception E1 { int i; -}; +} exception E2 extends E1 { long l; -}; +} exception notify /* Test keyword escape. */ { int i; -}; -}; +} +} diff --git a/java-compat/test/src/main/java/test/Ice/packagemd/Package.ice b/java-compat/test/src/main/java/test/Ice/packagemd/Package.ice index 4be6c71f848..610179ecc81 100644 --- a/java-compat/test/src/main/java/test/Ice/packagemd/Package.ice +++ b/java-compat/test/src/main/java/test/Ice/packagemd/Package.ice @@ -15,43 +15,43 @@ module Test2 class C1 { int i; -}; +} class C2 extends C1 { long l; -}; +} exception E1 { int i; -}; +} exception E2 extends E1 { long l; -}; -}; +} +} module Test3 { class C1 { int i; -}; +} class C2 extends C1 { long l; -}; +} exception E1 { int i; -}; +} exception E2 extends E1 { long l; -}; -}; +} +} diff --git a/java-compat/test/src/main/java/test/Ice/packagemd/Test.ice b/java-compat/test/src/main/java/test/Ice/packagemd/Test.ice index 508dce88885..a05408bab6f 100644 --- a/java-compat/test/src/main/java/test/Ice/packagemd/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/packagemd/Test.ice @@ -35,6 +35,6 @@ interface Initial void throwTest3E2AsE2() throws Test3::E2; void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/proxy/Test.ice b/java-compat/test/src/main/java/test/Ice/proxy/Test.ice index 26c141ac251..991e39a3a41 100644 --- a/java-compat/test/src/main/java/test/Ice/proxy/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/proxy/Test.ice @@ -20,11 +20,11 @@ interface MyClass void shutdown(); Ice::Context getContext(); -}; +} interface MyDerivedClass extends MyClass { Object* echo(Object* obj); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/proxy/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/proxy/TestAMD.ice index c45426f176f..a39ccc8466a 100644 --- a/java-compat/test/src/main/java/test/Ice/proxy/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/proxy/TestAMD.ice @@ -20,11 +20,11 @@ module Test void shutdown(); Ice::Context getContext(); -}; +} ["amd"] interface MyDerivedClass extends MyClass { Object* echo(Object* obj); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/retry/Test.ice b/java-compat/test/src/main/java/test/Ice/retry/Test.ice index 60f79047a58..e97f4cca23f 100644 --- a/java-compat/test/src/main/java/test/Ice/retry/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/retry/Test.ice @@ -22,6 +22,6 @@ interface Retry void opSystemException(); idempotent void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/seqMapping/Test.ice b/java-compat/test/src/main/java/test/Ice/seqMapping/Test.ice index 97fbb376803..3f4c662934b 100644 --- a/java-compat/test/src/main/java/test/Ice/seqMapping/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/seqMapping/Test.ice @@ -24,7 +24,7 @@ interface MyClass SerialSmall opSerialSmallJava(SerialSmall i, out SerialSmall o); SerialLarge opSerialLargeJava(SerialLarge i, out SerialLarge o); SerialStruct opSerialStructJava(SerialStruct i, out SerialStruct o); -}; +} // Remaining type definitions are there to verify that the generated // code compiles correctly. @@ -37,18 +37,18 @@ struct Foo { SerialLarge SLmem; SLS SLSmem; -}; +} exception Bar { SerialLarge SLmem; SLS SLSmem; -}; +} class Baz { SerialLarge SLmem; SLS SLSmem; -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/seqMapping/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/seqMapping/TestAMD.ice index d3755b8b940..6a676a1d71e 100644 --- a/java-compat/test/src/main/java/test/Ice/seqMapping/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/seqMapping/TestAMD.ice @@ -24,7 +24,7 @@ module Test SerialSmall opSerialSmallJava(SerialSmall i, out SerialSmall o); SerialLarge opSerialLargeJava(SerialLarge i, out SerialLarge o); SerialStruct opSerialStructJava(SerialStruct i, out SerialStruct o); -}; +} // Remaining type definitions are there to verify that the generated // code compiles correctly. @@ -37,18 +37,18 @@ struct Foo { SerialLarge SLmem; SLS SLSmem; -}; +} exception Bar { SerialLarge SLmem; SLS SLSmem; -}; +} class Baz { SerialLarge SLmem; SLS SLSmem; -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/serialize/Test.ice b/java-compat/test/src/main/java/test/Ice/serialize/Test.ice index 267b60ab3be..9b0debae25e 100644 --- a/java-compat/test/src/main/java/test/Ice/serialize/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/serialize/Test.ice @@ -18,7 +18,7 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface Initial; class Base; @@ -35,7 +35,7 @@ struct Struct1 string str; MyEnum e; Initial* p; -}; +} sequence<byte> ByteS; sequence<int> IntS; @@ -60,18 +60,18 @@ class Base ShortIntD d2; StringMyEnumD d3; StringBaseD d4; -}; +} class Derived extends Base { Object* p; -}; +} exception Ex { Struct1 s; Base b; -}; +} interface Initial { @@ -79,6 +79,6 @@ interface Initial ByteS getBase(); ByteS getEx(); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/servantLocator/Test.ice b/java-compat/test/src/main/java/test/Ice/servantLocator/Test.ice index 4550fa5c340..f9c52a22613 100644 --- a/java-compat/test/src/main/java/test/Ice/servantLocator/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/servantLocator/Test.ice @@ -15,11 +15,11 @@ module Test exception TestIntfUserException { -}; +} exception TestImpossibleException { -}; +} interface TestIntf { @@ -40,16 +40,16 @@ interface TestIntf void asyncException() throws TestIntfUserException, TestImpossibleException; void shutdown(); -}; +} interface TestActivation { void activateServantLocator(bool activate); -}; +} local class Cookie { ["cpp:const"] string message(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/servantLocator/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/servantLocator/TestAMD.ice index 51dc837bf24..308a9705770 100644 --- a/java-compat/test/src/main/java/test/Ice/servantLocator/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/servantLocator/TestAMD.ice @@ -15,11 +15,11 @@ module Test exception TestIntfUserException { -}; +} exception TestImpossibleException { -}; +} ["amd"] interface TestIntf { @@ -40,16 +40,16 @@ exception TestImpossibleException void asyncException() throws TestIntfUserException, TestImpossibleException; void shutdown(); -}; +} interface TestActivation { void activateServantLocator(bool activate); -}; +} local class Cookie { ["cpp:const"] string message(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice b/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice index 80e8f150992..1215f5bf193 100644 --- a/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice +++ b/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice @@ -21,39 +21,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -63,7 +63,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["format:sliced"] interface TestIntf @@ -99,7 +99,7 @@ interface TestIntf void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} // // Types private to the client. @@ -108,16 +108,16 @@ interface TestIntf class PreservedClass extends BaseClass { string pc; -}; +} exception Preserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception Preserved2 extends Preserved1 { BaseClass p2; -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice b/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice index 6510e376eb0..c9ab7831266 100644 --- a/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice +++ b/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice @@ -21,39 +21,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -63,7 +63,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["format:sliced"] interface TestIntf @@ -99,7 +99,7 @@ interface TestIntf void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} // // Types private to the server. @@ -108,36 +108,36 @@ interface TestIntf exception UnknownDerived extends Base { string ud; -}; +} exception UnknownIntermediate extends Base { string ui; -}; +} exception UnknownMostDerived1 extends KnownIntermediate { string umd1; -}; +} exception UnknownMostDerived2 extends UnknownIntermediate { string umd2; -}; +} class SPreservedClass extends BaseClass { string spc; -}; +} exception SPreserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception SPreserved2 extends SPreserved1 { BaseClass p2; -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice index 05719e1bd96..708b74d8a57 100644 --- a/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice @@ -21,39 +21,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -63,7 +63,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["amd", "format:sliced"] interface TestIntf @@ -99,7 +99,7 @@ interface TestIntf void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} // // Types private to the server. @@ -108,36 +108,36 @@ interface TestIntf exception UnknownDerived extends Base { string ud; -}; +} exception UnknownIntermediate extends Base { string ui; -}; +} exception UnknownMostDerived1 extends KnownIntermediate { string umd1; -}; +} exception UnknownMostDerived2 extends UnknownIntermediate { string umd2; -}; +} class SPreservedClass extends BaseClass { string spc; -}; +} exception SPreserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception SPreserved2 extends SPreserved1 { BaseClass p2; -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice b/java-compat/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice index 033caffc8b5..2ba6cfd3d9b 100644 --- a/java-compat/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice +++ b/java-compat/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice @@ -21,42 +21,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS3 { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -64,20 +64,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -85,28 +85,28 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} class CompactPDerived(56) extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["format:sliced"] interface TestIntf @@ -164,7 +164,7 @@ interface TestIntf void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */ void shutdown(); -}; +} // // Types private to the client. @@ -174,42 +174,42 @@ class D3 extends B { string sd3; B pd3; -}; +} ["preserve-slice"] class PCUnknown extends PBase { string pu; -}; +} class PCDerived extends PDerived { PBaseSeq pbs; -}; +} class PCDerived2 extends PCDerived { int pcd2; -}; +} class PCDerived3 extends PCDerived2 { Object pcd3; -}; +} class CompactPCDerived(57) extends CompactPDerived { PBaseSeq pbs; -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice b/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice index f67f89a3350..b1c085fa70e 100644 --- a/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice +++ b/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice @@ -21,42 +21,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS3 { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -64,20 +64,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -85,28 +85,28 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} class CompactPDerived(56) extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["format:sliced"] interface TestIntf @@ -164,7 +164,7 @@ interface TestIntf void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */ void shutdown(); -}; +} // // Types private to the server. @@ -173,61 +173,61 @@ interface TestIntf class SBSUnknownDerived extends SBase { string sbsud; -}; +} class SUnknown { string su; -}; +} class D2 extends B { string sd2; B pd2; -}; +} class D4 extends B { B p1; B p2; -}; +} exception UnknownDerivedException extends BaseException { string sude; D2 pd2; -}; +} class MyClass { int i; -}; +} class PSUnknown extends Preserved { string psu; PNode graph; MyClass cl; -}; +} class PSUnknown2 extends Preserved { PBase pb; -}; +} exception PSUnknownException extends PreservedException { PSUnknown2 p; -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice b/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice index a1fb17ab1b1..a919113c025 100644 --- a/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice @@ -21,42 +21,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS3 { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -64,20 +64,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -85,23 +85,23 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["amd", "format:sliced"] interface TestIntf @@ -159,7 +159,7 @@ interface TestIntf void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */ void shutdown(); -}; +} // // Types private to the server. @@ -168,61 +168,61 @@ interface TestIntf class SBSUnknownDerived extends SBase { string sbsud; -}; +} class SUnknown { string su; -}; +} class D2 extends B { string sd2; B pd2; -}; +} class D4 extends B { B p1; B p2; -}; +} exception UnknownDerivedException extends BaseException { string sude; D2 pd2; -}; +} class MyClass { int i; -}; +} class PSUnknown extends Preserved { string psu; PNode graph; MyClass cl; -}; +} class PSUnknown2 extends Preserved { PBase pb; -}; +} exception PSUnknownException extends PreservedException { PSUnknown2 p; -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/stream/Test.ice b/java-compat/test/src/main/java/test/Ice/stream/Test.ice index 2672c627f64..11977f8558f 100644 --- a/java-compat/test/src/main/java/test/Ice/stream/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/stream/Test.ice @@ -20,7 +20,7 @@ enum MyEnum enum1, enum2, enum3 -}; +} class MyClass; @@ -39,13 +39,13 @@ struct SmallStruct MyEnum e; MyClass* p; SerialSmall ss; -}; +} struct Point { int x; int y; -}; +} sequence<MyEnum> MyEnumS; sequence<MyClass> MyClassS; @@ -74,7 +74,7 @@ class OptionalClass optional(13) Ice::ByteSeq byteSeq13; optional(14) Ice::StringSeq stringSeq14; optional(15) Point p15; -}; +} sequence<Ice::BoolSeq> BoolSS; sequence<Ice::ByteSeq> ByteSS; @@ -109,15 +109,15 @@ class MyClass MyEnumS seq9; MyClassS seq10; StringMyClassD d; -}; +} interface MyInterface { -}; +} exception MyException { MyClass c; -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Test.ice b/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Test.ice index 240c7bc5f16..86906aa7f2d 100644 --- a/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Test.ice @@ -17,6 +17,6 @@ interface Priority { void shutdown(); int getPriority(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/throughput/Throughput.ice b/java-compat/test/src/main/java/test/Ice/throughput/Throughput.ice index aaca70ee59f..80dc7f7b5ed 100644 --- a/java-compat/test/src/main/java/test/Ice/throughput/Throughput.ice +++ b/java-compat/test/src/main/java/test/Ice/throughput/Throughput.ice @@ -24,7 +24,7 @@ struct StringDouble { string s; double d; -}; +} sequence<StringDouble> StringDoubleSeq; const int StringDoubleSeqSize = 50000; @@ -33,7 +33,7 @@ struct Fixed int i; int j; double d; -}; +} sequence<Fixed> FixedSeq; const int FixedSeqSize = 50000; @@ -60,7 +60,7 @@ interface Throughput FixedSeq echoFixedSeq(FixedSeq seq); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/timeout/Test.ice b/java-compat/test/src/main/java/test/Ice/timeout/Test.ice index 2d87386374c..93b88a53f06 100644 --- a/java-compat/test/src/main/java/test/Ice/timeout/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/timeout/Test.ice @@ -24,6 +24,6 @@ interface Timeout void holdAdapter(int to); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Ice/udp/Test.ice b/java-compat/test/src/main/java/test/Ice/udp/Test.ice index fc700157ae0..ec1b7f52c5b 100644 --- a/java-compat/test/src/main/java/test/Ice/udp/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/udp/Test.ice @@ -17,7 +17,7 @@ module Test interface PingReply { void reply(); -}; +} sequence<byte> ByteSeq; @@ -27,6 +27,6 @@ interface TestIntf void sendByteSeq(ByteSeq seq, PingReply* reply); void pingBiDir(Ice::Identity id); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/IceBox/admin/Test.ice b/java-compat/test/src/main/java/test/IceBox/admin/Test.ice index 13e3ca5660d..2113b0416f4 100644 --- a/java-compat/test/src/main/java/test/IceBox/admin/Test.ice +++ b/java-compat/test/src/main/java/test/IceBox/admin/Test.ice @@ -19,8 +19,8 @@ module Test interface TestFacet { Ice::PropertyDict getChanges(); -}; +} -}; +} #endif diff --git a/java-compat/test/src/main/java/test/IceBox/configuration/Test.ice b/java-compat/test/src/main/java/test/IceBox/configuration/Test.ice index d4a0543ae06..eccf3b1d60b 100644 --- a/java-compat/test/src/main/java/test/IceBox/configuration/Test.ice +++ b/java-compat/test/src/main/java/test/IceBox/configuration/Test.ice @@ -20,6 +20,6 @@ interface TestIntf string getProperty(string name); Ice::StringSeq getArgs(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/IceDiscovery/simple/Test.ice b/java-compat/test/src/main/java/test/IceDiscovery/simple/Test.ice index d64cecf51f8..bcb14d687e7 100644 --- a/java-compat/test/src/main/java/test/IceDiscovery/simple/Test.ice +++ b/java-compat/test/src/main/java/test/IceDiscovery/simple/Test.ice @@ -17,7 +17,7 @@ module Test interface TestIntf { string getAdapterId(); -}; +} interface Controller { @@ -28,6 +28,6 @@ interface Controller void removeObject(string oaName, string id); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/IceGrid/simple/Test.ice b/java-compat/test/src/main/java/test/IceGrid/simple/Test.ice index 94d58ffaeaf..947893d2533 100644 --- a/java-compat/test/src/main/java/test/IceGrid/simple/Test.ice +++ b/java-compat/test/src/main/java/test/IceGrid/simple/Test.ice @@ -16,6 +16,6 @@ module Test interface TestIntf { void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/IceSSL/configuration/Test.ice b/java-compat/test/src/main/java/test/IceSSL/configuration/Test.ice index 5fc576c71e2..9c4de6e7d39 100644 --- a/java-compat/test/src/main/java/test/IceSSL/configuration/Test.ice +++ b/java-compat/test/src/main/java/test/IceSSL/configuration/Test.ice @@ -18,7 +18,7 @@ interface Server void noCert(); void checkCert(string subjectDN, string issuerDN); void checkCipher(string cipher); -}; +} dictionary<string, string> Properties; @@ -27,6 +27,6 @@ interface ServerFactory Server* createServer(Properties props); void destroyServer(Server* srv); void shutdown(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Slice/escape/Clash.ice b/java-compat/test/src/main/java/test/Slice/escape/Clash.ice index 01b6dd0d9f9..75cdb571143 100644 --- a/java-compat/test/src/main/java/test/Slice/escape/Clash.ice +++ b/java-compat/test/src/main/java/test/Slice/escape/Clash.ice @@ -31,7 +31,7 @@ interface Intf void opOut(out string context, out string current, out string response, out string ex, out string sent, out string cookie, out string sync, out string result, out string istr, out string ostr, out optional(1) string proxy, out optional(2) int obj); -}; +} class Cls { @@ -52,7 +52,7 @@ class Cls int obj; int getCookie; string clone; -}; +} struct St { @@ -62,13 +62,13 @@ struct St int rhs; string hashCode; int clone; -}; +} exception Ex { short istr; int ostr; string cause; -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Slice/escape/Key.ice b/java-compat/test/src/main/java/test/Slice/escape/Key.ice index 7df74b27ae9..32a10166bff 100644 --- a/java-compat/test/src/main/java/test/Slice/escape/Key.ice +++ b/java-compat/test/src/main/java/test/Slice/escape/Key.ice @@ -16,53 +16,53 @@ module abstract enum assert { boolean -}; +} struct break { int case; -}; +} interface catch { ["amd"] void checkedCast(int clone, out int continue); -}; +} interface default { void do(); -}; +} class else { int if; default* equals; int final; -}; +} interface finalize extends default, catch { -}; +} sequence<assert> for; dictionary<string, assert> goto; exception hashCode { int if; -}; +} exception import extends hashCode { int instanceof; int native; -}; +} local interface new { assert notify( break notifyAll, else null, finalize package, else* private, finalize * protected, catch* public, default* return, int static, int strictfp, int super) throws hashCode, import; -}; +} const int switch = 0; const int synchronized = 0; @@ -77,4 +77,4 @@ const int while = 0; const int finally = 0; const int getClass = 0; -}; +} diff --git a/java-compat/test/src/main/java/test/Slice/generation/File1.ice b/java-compat/test/src/main/java/test/Slice/generation/File1.ice index d737a6d468e..30da534aebe 100644 --- a/java-compat/test/src/main/java/test/Slice/generation/File1.ice +++ b/java-compat/test/src/main/java/test/Slice/generation/File1.ice @@ -16,6 +16,6 @@ module Test interface Interface1 { void method(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Slice/generation/File2.ice b/java-compat/test/src/main/java/test/Slice/generation/File2.ice index 17e566d49ac..8554fcef01e 100644 --- a/java-compat/test/src/main/java/test/Slice/generation/File2.ice +++ b/java-compat/test/src/main/java/test/Slice/generation/File2.ice @@ -16,6 +16,6 @@ module Test interface Interface2 { void method(); -}; +} -}; +} diff --git a/java-compat/test/src/main/java/test/Slice/macros/Test.ice b/java-compat/test/src/main/java/test/Slice/macros/Test.ice index 11f8acaa826..50daed0f914 100644 --- a/java-compat/test/src/main/java/test/Slice/macros/Test.ice +++ b/java-compat/test/src/main/java/test/Slice/macros/Test.ice @@ -36,13 +36,13 @@ class Default { int x DEFAULT(10); int y DEFAULT(10); -}; +} class NoDefault { int x NODEFAULT(10); int y NODEFAULT(10); -}; +} // // This class is only defined when compiling with slice2java. @@ -52,7 +52,7 @@ class JavaOnly { string lang DEFAULT("java"); int version DEFAULT(ICE_VERSION); -}; +} #endif -}; +} diff --git a/java-compat/test/src/main/java/test/Slice/structure/Test.ice b/java-compat/test/src/main/java/test/Slice/structure/Test.ice index 96893ef5491..38e3d0784a9 100644 --- a/java-compat/test/src/main/java/test/Slice/structure/Test.ice +++ b/java-compat/test/src/main/java/test/Slice/structure/Test.ice @@ -20,12 +20,12 @@ dictionary<string, string> StringDict; class C { int i; -}; +} struct S1 { string name; -}; +} struct S2 { @@ -43,6 +43,6 @@ struct S2 S1 s; C cls; Object* prx; -}; +} -}; +} diff --git a/java/test/Ice/translator/DoubleModuleNoPackage.ice b/java/test/Ice/translator/DoubleModuleNoPackage.ice index 03c666c29bf..77c877e4baa 100644 --- a/java/test/Ice/translator/DoubleModuleNoPackage.ice +++ b/java/test/Ice/translator/DoubleModuleNoPackage.ice @@ -14,14 +14,14 @@ module M1 module M2 { -enum dmnpEnum { dmnpE1, dmnpE2 }; +enum dmnpEnum { dmnpE1, dmnpE2 } const dmnpEnum dmnpConstant = dmnpE2; struct dmnpStruct { dmnpEnum e; -}; +} sequence<dmnpStruct> dmnpStructSeq; @@ -30,12 +30,12 @@ dictionary<string, dmnpStruct> dmnpStringStructDict; interface dmnpBaseInterface { void dmnpBaseInterfaceOp(); -}; +} interface dmnpInterface extends dmnpBaseInterface { void dmnpInterfaceOp(); -}; +} class dmnpBaseClass { @@ -43,11 +43,11 @@ class dmnpBaseClass dmnpStruct s; dmnpStructSeq seq; dmnpStringStructDict dict; -}; +} class dmnpClass extends dmnpBaseClass implements dmnpInterface { -}; +} exception dmnpBaseException { @@ -56,11 +56,11 @@ exception dmnpBaseException dmnpStructSeq seq; dmnpStringStructDict dict; dmnpClass c; -}; +} exception dmnpException extends dmnpBaseException { -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/DoubleModuleWithPackage.ice b/java/test/Ice/translator/DoubleModuleWithPackage.ice index d3748d4b511..672cf36092a 100644 --- a/java/test/Ice/translator/DoubleModuleWithPackage.ice +++ b/java/test/Ice/translator/DoubleModuleWithPackage.ice @@ -16,14 +16,14 @@ module M1 module M2 { -enum dmwpEnum { dmwpE1, dmwpE2 }; +enum dmwpEnum { dmwpE1, dmwpE2 } const dmwpEnum dmwpConstant = dmwpE2; struct dmwpStruct { dmwpEnum e; -}; +} sequence<dmwpStruct> dmwpStructSeq; @@ -32,12 +32,12 @@ dictionary<string, dmwpStruct> dmwpStringStructDict; interface dmwpBaseInterface { void dmwpBaseInterfaceOp(); -}; +} interface dmwpInterface extends dmwpBaseInterface { void dmwpInterfaceOp(); -}; +} class dmwpBaseClass { @@ -45,11 +45,11 @@ class dmwpBaseClass dmwpStruct s; dmwpStructSeq seq; dmwpStringStructDict dict; -}; +} class dmwpClass extends dmwpBaseClass implements dmwpInterface { -}; +} exception dmwpBaseException { @@ -58,11 +58,11 @@ exception dmwpBaseException dmwpStructSeq seq; dmwpStringStructDict dict; dmwpClass c; -}; +} exception dmwpException extends dmwpBaseException { -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/Metadata.ice b/java/test/Ice/translator/Metadata.ice index 3993c2fdd6c..d5c75969e93 100644 --- a/java/test/Ice/translator/Metadata.ice +++ b/java/test/Ice/translator/Metadata.ice @@ -108,17 +108,17 @@ module MetadataTest ["amd", "java:type:java.util.ArrayList<Ice.Object>"] ObjectList opObjectList2AMD(["java:type:java.util.ArrayList<Ice.Object>"] ObjectList inArg, out ["java:type:Test.CustomList<Ice.Object>"] ObjectList outArg); - }; + } ["protected", "java:getset"] class C2 { IntSeq intSeqMember; ["java:type:java.util.ArrayList<Integer>"] IntSeq modifiedIntSeqMember; - }; + } class C3 { ["protected"] IntSeq intSeqMember; ["protected", "java:type:java.util.ArrayList<Integer>"] IntSeq modifiedIntSeqMember; - }; -}; + } +} diff --git a/java/test/Ice/translator/SingleModuleNoPackage.ice b/java/test/Ice/translator/SingleModuleNoPackage.ice index 08061beaadc..8a772923368 100644 --- a/java/test/Ice/translator/SingleModuleNoPackage.ice +++ b/java/test/Ice/translator/SingleModuleNoPackage.ice @@ -12,14 +12,14 @@ module M { -enum smnpEnum { smnpE1, smnpE2 }; +enum smnpEnum { smnpE1, smnpE2 } const smnpEnum smnpConstant = smnpE2; struct smnpStruct { smnpEnum e; -}; +} sequence<smnpStruct> smnpStructSeq; @@ -28,12 +28,12 @@ dictionary<string, smnpStruct> smnpStringStructDict; interface smnpBaseInterface { void smnpBaseInterfaceOp(); -}; +} interface smnpInterface extends smnpBaseInterface { void smnpInterfaceOp(); -}; +} class smnpBaseClass { @@ -41,11 +41,11 @@ class smnpBaseClass smnpStruct s; smnpStructSeq seq; smnpStringStructDict dict; -}; +} class smnpClass extends smnpBaseClass implements smnpInterface { -}; +} exception smnpBaseException { @@ -54,10 +54,10 @@ exception smnpBaseException smnpStructSeq seq; smnpStringStructDict dict; smnpClass c; -}; +} exception smnpException extends smnpBaseException { -}; +} -}; +} diff --git a/java/test/Ice/translator/SingleModuleWithPackage.ice b/java/test/Ice/translator/SingleModuleWithPackage.ice index 2e4b86b4e3a..186c4def746 100644 --- a/java/test/Ice/translator/SingleModuleWithPackage.ice +++ b/java/test/Ice/translator/SingleModuleWithPackage.ice @@ -14,14 +14,14 @@ module M { -enum smwpEnum { smwpE1, smwpE2 }; +enum smwpEnum { smwpE1, smwpE2 } const smwpEnum smwpConstant = smwpE2; struct smwpStruct { smwpEnum e; -}; +} sequence<smwpStruct> smwpStructSeq; @@ -30,12 +30,12 @@ dictionary<string, smwpStruct> smwpStringStructDict; interface smwpBaseInterface { void smwpBaseInterfaceOp(); -}; +} interface smwpInterface extends smwpBaseInterface { void smwpInterfaceOp(); -}; +} class smwpBaseClass { @@ -43,11 +43,11 @@ class smwpBaseClass smwpStruct s; smwpStructSeq seq; smwpStringStructDict dict; -}; +} class smwpClass extends smwpBaseClass implements smwpInterface { -}; +} exception smwpBaseException { @@ -56,10 +56,10 @@ exception smwpBaseException smwpStructSeq seq; smwpStringStructDict dict; smwpClass c; -}; +} exception smwpException extends smwpBaseException { -}; +} -}; +} diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice index 5a7bd539448..4aca398e9f1 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice @@ -24,13 +24,13 @@ struct dmnpTest4Struct M1::M2::dmnpStringStructDict dict; M1::M2::dmnpClass c; M1::M2::dmnpInterface i; -}; +} sequence<M1::M2::dmnpStruct> dmnpTest4StructSeq; dictionary<M1::M2::dmnpStruct, M1::M2::dmnpBaseClass> dmnpTest4StructClassSeq; -interface dmnpTest4Interface extends M1::M2::dmnpInterface {}; +interface dmnpTest4Interface extends M1::M2::dmnpInterface {} exception dmnpTest4Exception extends M1::M2::dmnpException { @@ -40,7 +40,7 @@ exception dmnpTest4Exception extends M1::M2::dmnpException M1::M2::dmnpStringStructDict dict1; M1::M2::dmnpClass c1; M1::M2::dmnpInterface i1; -}; +} class dmnpTest4Class extends M1::M2::dmnpBaseClass implements M1::M2::dmnpBaseInterface { @@ -74,6 +74,6 @@ class dmnpTest4Class extends M1::M2::dmnpBaseClass implements M1::M2::dmnpBaseIn out M1::M2::dmnpInterface o5, out M1::M2::dmnpClass o6) throws M1::M2::dmnpException; -}; +} -}; +} diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice index cc64c3c6415..3c144b4a4c2 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice @@ -26,13 +26,13 @@ struct dmnpTest5Struct ::M1::M2::dmnpStringStructDict dict; ::M1::M2::dmnpClass c; ::M1::M2::dmnpInterface i; -}; +} sequence<::M1::M2::dmnpStruct> dmnpTest5StructSeq; dictionary<::M1::M2::dmnpStruct, ::M1::M2::dmnpBaseClass> dmnpTest5StructClassSeq; -interface dmnpTest5Interface extends ::M1::M2::dmnpInterface {}; +interface dmnpTest5Interface extends ::M1::M2::dmnpInterface {} exception dmnpTest5Exception extends ::M1::M2::dmnpException { @@ -42,7 +42,7 @@ exception dmnpTest5Exception extends ::M1::M2::dmnpException ::M1::M2::dmnpStringStructDict dict1; ::M1::M2::dmnpClass c1; ::M1::M2::dmnpInterface i1; -}; +} class dmnpTest5Class extends ::M1::M2::dmnpBaseClass implements ::M1::M2::dmnpBaseInterface { @@ -76,7 +76,7 @@ class dmnpTest5Class extends ::M1::M2::dmnpBaseClass implements ::M1::M2::dmnpBa out ::M1::M2::dmnpInterface o5, out ::M1::M2::dmnpClass o6) throws ::M1::M2::dmnpException; -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice index c46eeda8d0a..da5e38b5531 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice @@ -26,13 +26,13 @@ struct dmnpTest6Struct dmnpStringStructDict dict; dmnpClass c; dmnpInterface i; -}; +} sequence<dmnpStruct> dmnpTest6StructSeq; dictionary<dmnpStruct, dmnpBaseClass> dmnpTest6StructClassSeq; -interface dmnpTest6Interface extends dmnpInterface {}; +interface dmnpTest6Interface extends dmnpInterface {} exception dmnpTest6Exception extends dmnpException { @@ -42,7 +42,7 @@ exception dmnpTest6Exception extends dmnpException dmnpStringStructDict dict1; dmnpClass c1; dmnpInterface i1; -}; +} class dmnpTest6Class extends dmnpBaseClass implements dmnpBaseInterface { @@ -76,7 +76,7 @@ class dmnpTest6Class extends dmnpBaseClass implements dmnpBaseInterface out dmnpInterface o5, out dmnpClass o6) throws dmnpException; -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice index 028de02d333..51442759ac4 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice @@ -28,13 +28,13 @@ struct dmnpTest7Struct dmnpStringStructDict dict; dmnpClass c; dmnpInterface i; -}; +} sequence<dmnpStruct> dmnpTest7StructSeq; dictionary<dmnpStruct, dmnpBaseClass> dmnpTest7StructClassSeq; -interface dmnpTest7Interface extends dmnpInterface {}; +interface dmnpTest7Interface extends dmnpInterface {} exception dmnpTest7Exception extends dmnpException { @@ -44,7 +44,7 @@ exception dmnpTest7Exception extends dmnpException dmnpStringStructDict dict1; dmnpClass c1; dmnpInterface i1; -}; +} class dmnpTest7Class extends dmnpBaseClass implements dmnpBaseInterface { @@ -78,7 +78,7 @@ class dmnpTest7Class extends dmnpBaseClass implements dmnpBaseInterface out dmnpInterface o5, out dmnpClass o6) throws dmnpException; -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice index f306bdefe26..37e9ca961eb 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice @@ -28,13 +28,13 @@ struct dmwpTest10Struct dmwpStringStructDict dict; dmwpClass c; dmwpInterface i; -}; +} sequence<dmwpStruct> dmwpTest10StructSeq; dictionary<dmwpStruct, dmwpBaseClass> dmwpTest10StructClassSeq; -interface dmwpTest10Interface extends dmwpInterface {}; +interface dmwpTest10Interface extends dmwpInterface {} exception dmwpTest10Exception extends dmwpException { @@ -44,7 +44,7 @@ exception dmwpTest10Exception extends dmwpException dmwpStringStructDict dict1; dmwpClass c1; dmwpInterface i1; -}; +} class dmwpTest10Class extends dmwpBaseClass implements dmwpBaseInterface { @@ -78,7 +78,7 @@ class dmwpTest10Class extends dmwpBaseClass implements dmwpBaseInterface out dmwpInterface o5, out dmwpClass o6) throws dmwpException; -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice index 5686dd44401..28e1b01e48e 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice @@ -28,13 +28,13 @@ struct dmwpTest10Struct dmwpStringStructDict dict; dmwpClass c; dmwpInterface i; -}; +} sequence<dmwpStruct> dmwpTest10StructSeq; dictionary<dmwpStruct, dmwpBaseClass> dmwpTest10StructClassSeq; -interface dmwpTest10Interface extends dmwpInterface {}; +interface dmwpTest10Interface extends dmwpInterface {} exception dmwpTest10Exception extends dmwpException { @@ -44,7 +44,7 @@ exception dmwpTest10Exception extends dmwpException dmwpStringStructDict dict1; dmwpClass c1; dmwpInterface i1; -}; +} class dmwpTest10Class extends dmwpBaseClass implements dmwpBaseInterface { @@ -78,7 +78,7 @@ class dmwpTest10Class extends dmwpBaseClass implements dmwpBaseInterface out dmwpInterface o5, out dmwpClass o6) throws dmwpException; -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice index f34dc4bc1c3..8960031912f 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice @@ -24,13 +24,13 @@ struct dmwpTest4Struct ::M1::M2::dmwpStringStructDict dict; ::M1::M2::dmwpClass c; ::M1::M2::dmwpInterface i; -}; +} sequence<::M1::M2::dmwpStruct> dmwpTest4StructSeq; dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest4StructClassSeq; -interface dmwpTest4Interface extends ::M1::M2::dmwpInterface {}; +interface dmwpTest4Interface extends ::M1::M2::dmwpInterface {} exception dmwpTest4Exception extends ::M1::M2::dmwpException { @@ -40,7 +40,7 @@ exception dmwpTest4Exception extends ::M1::M2::dmwpException ::M1::M2::dmwpStringStructDict dict1; ::M1::M2::dmwpClass c1; ::M1::M2::dmwpInterface i1; -}; +} class dmwpTest4Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface { @@ -74,6 +74,6 @@ class dmwpTest4Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBa out ::M1::M2::dmwpInterface o5, out ::M1::M2::dmwpClass o6) throws ::M1::M2::dmwpException; -}; +} -}; +} diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice index d94e9adacf2..27912f8edbf 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice @@ -24,13 +24,13 @@ struct dmwpTest5Struct ::M1::M2::dmwpStringStructDict dict; ::M1::M2::dmwpClass c; ::M1::M2::dmwpInterface i; -}; +} sequence<::M1::M2::dmwpStruct> dmwpTest5StructSeq; dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest5StructClassSeq; -interface dmwpTest5Interface extends ::M1::M2::dmwpInterface {}; +interface dmwpTest5Interface extends ::M1::M2::dmwpInterface {} exception dmwpTest5Exception extends ::M1::M2::dmwpException { @@ -40,7 +40,7 @@ exception dmwpTest5Exception extends ::M1::M2::dmwpException ::M1::M2::dmwpStringStructDict dict1; ::M1::M2::dmwpClass c1; ::M1::M2::dmwpInterface i1; -}; +} class dmwpTest5Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface { @@ -74,6 +74,6 @@ class dmwpTest5Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBa out ::M1::M2::dmwpInterface o5, out ::M1::M2::dmwpClass o6) throws ::M1::M2::dmwpException; -}; +} -}; +} diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice index bc6cb6aa7ca..dabd693c8f0 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice @@ -26,13 +26,13 @@ struct dmwpTest6Struct ::M1::M2::dmwpStringStructDict dict; ::M1::M2::dmwpClass c; ::M1::M2::dmwpInterface i; -}; +} sequence<::M1::M2::dmwpStruct> dmwpTest6StructSeq; dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest6StructClassSeq; -interface dmwpTest6Interface extends ::M1::M2::dmwpInterface {}; +interface dmwpTest6Interface extends ::M1::M2::dmwpInterface {} exception dmwpTest6Exception extends ::M1::M2::dmwpException { @@ -42,7 +42,7 @@ exception dmwpTest6Exception extends ::M1::M2::dmwpException ::M1::M2::dmwpStringStructDict dict1; ::M1::M2::dmwpClass c1; ::M1::M2::dmwpInterface i1; -}; +} class dmwpTest6Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface { @@ -76,6 +76,6 @@ class dmwpTest6Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBa out ::M1::M2::dmwpInterface o5, out ::M1::M2::dmwpClass o6) throws ::M1::M2::dmwpException; -}; +} -}; +} diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice index 9a854f6fa48..aedc462a6ea 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice @@ -26,13 +26,13 @@ struct dmwpTest7Struct ::M1::M2::dmwpStringStructDict dict; ::M1::M2::dmwpClass c; ::M1::M2::dmwpInterface i; -}; +} sequence<::M1::M2::dmwpStruct> dmwpTest7StructSeq; dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest7StructClassSeq; -interface dmwpTest7Interface extends ::M1::M2::dmwpInterface {}; +interface dmwpTest7Interface extends ::M1::M2::dmwpInterface {} exception dmwpTest7Exception extends ::M1::M2::dmwpException { @@ -42,7 +42,7 @@ exception dmwpTest7Exception extends ::M1::M2::dmwpException ::M1::M2::dmwpStringStructDict dict1; ::M1::M2::dmwpClass c1; ::M1::M2::dmwpInterface i1; -}; +} class dmwpTest7Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface { @@ -76,6 +76,6 @@ class dmwpTest7Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBa out ::M1::M2::dmwpInterface o5, out ::M1::M2::dmwpClass o6) throws ::M1::M2::dmwpException; -}; +} -}; +} diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice index a1afbb4d505..b40444b888a 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice @@ -26,13 +26,13 @@ struct dmwpTest8Struct ::M1::M2::dmwpStringStructDict dict; ::M1::M2::dmwpClass c; ::M1::M2::dmwpInterface i; -}; +} sequence<::M1::M2::dmwpStruct> dmwpTest8StructSeq; dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest8StructClassSeq; -interface dmwpTest8Interface extends ::M1::M2::dmwpInterface {}; +interface dmwpTest8Interface extends ::M1::M2::dmwpInterface {} exception dmwpTest8Exception extends ::M1::M2::dmwpException { @@ -42,7 +42,7 @@ exception dmwpTest8Exception extends ::M1::M2::dmwpException ::M1::M2::dmwpStringStructDict dict1; ::M1::M2::dmwpClass c1; ::M1::M2::dmwpInterface i1; -}; +} class dmwpTest8Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface { @@ -76,7 +76,7 @@ class dmwpTest8Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBa out ::M1::M2::dmwpInterface o5, out ::M1::M2::dmwpClass o6) throws ::M1::M2::dmwpException; -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice index d73d87758cf..9a34f94dda3 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice @@ -26,13 +26,13 @@ struct dmwpTest9Struct dmwpStringStructDict dict; dmwpClass c; dmwpInterface i; -}; +} sequence<dmwpStruct> dmwpTest9StructSeq; dictionary<dmwpStruct, dmwpBaseClass> dmwpTest9StructClassSeq; -interface dmwpTest9Interface extends dmwpInterface {}; +interface dmwpTest9Interface extends dmwpInterface {} exception dmwpTest9Exception extends dmwpException { @@ -42,7 +42,7 @@ exception dmwpTest9Exception extends dmwpException dmwpStringStructDict dict1; dmwpClass c1; dmwpInterface i1; -}; +} class dmwpTest9Class extends dmwpBaseClass implements dmwpBaseInterface { @@ -76,7 +76,7 @@ class dmwpTest9Class extends dmwpBaseClass implements dmwpBaseInterface out dmwpInterface o5, out dmwpClass o6) throws dmwpException; -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage4.ice b/java/test/Ice/translator/TestSingleModuleNoPackage4.ice index 453436e917d..d209dbdfa3a 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage4.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage4.ice @@ -24,13 +24,13 @@ struct smnpTest4Struct smnpStringStructDict dict; smnpClass c; smnpInterface i; -}; +} sequence<smnpStruct> smnpTest4StructSeq; dictionary<smnpStruct, smnpBaseClass> smnpTest4StructClassSeq; -interface smnpTest4Interface extends smnpInterface {}; +interface smnpTest4Interface extends smnpInterface {} exception smnpTest4Exception extends smnpException { @@ -40,7 +40,7 @@ exception smnpTest4Exception extends smnpException smnpStringStructDict dict1; smnpClass c1; smnpInterface i1; -}; +} class smnpTest4Class extends smnpBaseClass implements smnpBaseInterface { @@ -74,6 +74,6 @@ class smnpTest4Class extends smnpBaseClass implements smnpBaseInterface out smnpInterface o5, out smnpClass o6) throws smnpException; -}; +} -}; +} diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage6.ice b/java/test/Ice/translator/TestSingleModuleNoPackage6.ice index 37914d1607c..854aa2661a8 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage6.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage6.ice @@ -26,13 +26,13 @@ struct smnpTest6Struct M::smnpStringStructDict dict; M::smnpClass c; M::smnpInterface i; -}; +} sequence<M::smnpStruct> smnpTest6StructSeq; dictionary<M::smnpStruct, M::smnpBaseClass> smnpTest6StructClassSeq; -interface smnpTest6Interface extends M::smnpInterface {}; +interface smnpTest6Interface extends M::smnpInterface {} exception smnpTest6Exception extends M::smnpException { @@ -42,7 +42,7 @@ exception smnpTest6Exception extends M::smnpException M::smnpStringStructDict dict1; M::smnpClass c1; M::smnpInterface i1; -}; +} class smnpTest6Class extends M::smnpBaseClass implements M::smnpBaseInterface { @@ -76,7 +76,7 @@ class smnpTest6Class extends M::smnpBaseClass implements M::smnpBaseInterface out M::smnpInterface o5, out M::smnpClass o6) throws M::smnpException; -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage7.ice b/java/test/Ice/translator/TestSingleModuleNoPackage7.ice index b929e3b3cca..59c47424142 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage7.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage7.ice @@ -26,13 +26,13 @@ struct smnpTest7Struct smnpStringStructDict dict; smnpClass c; smnpInterface i; -}; +} sequence<smnpStruct> smnpTest7StructSeq; dictionary<smnpStruct, smnpBaseClass> smnpTest7StructClassSeq; -interface smnpTest7Interface extends smnpInterface {}; +interface smnpTest7Interface extends smnpInterface {} exception smnpTest7Exception extends smnpException { @@ -42,7 +42,7 @@ exception smnpTest7Exception extends smnpException smnpStringStructDict dict1; smnpClass c1; smnpInterface i1; -}; +} class smnpTest7Class extends smnpBaseClass implements smnpBaseInterface { @@ -76,7 +76,7 @@ class smnpTest7Class extends smnpBaseClass implements smnpBaseInterface out smnpInterface o5, out smnpClass o6) throws smnpException; -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage10.ice b/java/test/Ice/translator/TestSingleModuleWithPackage10.ice index 23290d343af..ab433146cf6 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage10.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage10.ice @@ -26,13 +26,13 @@ struct smwpTest10Struct smwpStringStructDict dict; smwpClass c; smwpInterface i; -}; +} sequence<smwpStruct> smwpTest10StructSeq; dictionary<smwpStruct, smwpBaseClass> smwpTest10StructClassSeq; -interface smwpTest10Interface extends smwpInterface {}; +interface smwpTest10Interface extends smwpInterface {} exception smwpTest10Exception extends smwpException { @@ -42,7 +42,7 @@ exception smwpTest10Exception extends smwpException smwpStringStructDict dict1; smwpClass c1; smwpInterface i1; -}; +} class smwpTest10Class extends smwpBaseClass implements smwpBaseInterface { @@ -76,7 +76,7 @@ class smwpTest10Class extends smwpBaseClass implements smwpBaseInterface out smwpInterface o5, out smwpClass o6) throws smwpException; -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage11.ice b/java/test/Ice/translator/TestSingleModuleWithPackage11.ice index 73e9f859561..1e01eae1a57 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage11.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage11.ice @@ -28,13 +28,13 @@ struct smwpTest11Struct M::smwpStringStructDict dict; M::smwpClass c; M::smwpInterface i; -}; +} sequence<M::smwpStruct> smwpTest11StructSeq; dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest11StructClassSeq; -interface smwpTest11Interface extends M::smwpInterface {}; +interface smwpTest11Interface extends M::smwpInterface {} exception smwpTest11Exception extends M::smwpException { @@ -44,7 +44,7 @@ exception smwpTest11Exception extends M::smwpException M::smwpStringStructDict dict1; M::smwpClass c1; M::smwpInterface i1; -}; +} class smwpTest11Class extends M::smwpBaseClass implements M::smwpBaseInterface { @@ -78,7 +78,7 @@ class smwpTest11Class extends M::smwpBaseClass implements M::smwpBaseInterface out M::smwpInterface o5, out M::smwpClass o6) throws M::smwpException; -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage12.ice b/java/test/Ice/translator/TestSingleModuleWithPackage12.ice index 09739eeb4d6..1b2c8ae9ccd 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage12.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage12.ice @@ -28,13 +28,13 @@ struct smwpTest12Struct M::smwpStringStructDict dict; M::smwpClass c; M::smwpInterface i; -}; +} sequence<M::smwpStruct> smwpTest12StructSeq; dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest12StructClassSeq; -interface smwpTest12Interface extends M::smwpInterface {}; +interface smwpTest12Interface extends M::smwpInterface {} exception smwpTest12Exception extends M::smwpException { @@ -44,7 +44,7 @@ exception smwpTest12Exception extends M::smwpException M::smwpStringStructDict dict1; M::smwpClass c1; M::smwpInterface i1; -}; +} class smwpTest12Class extends M::smwpBaseClass implements M::smwpBaseInterface { @@ -78,7 +78,7 @@ class smwpTest12Class extends M::smwpBaseClass implements M::smwpBaseInterface out M::smwpInterface o5, out M::smwpClass o6) throws M::smwpException; -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage13.ice b/java/test/Ice/translator/TestSingleModuleWithPackage13.ice index 085d0cdaa98..c2658963fe5 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage13.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage13.ice @@ -28,13 +28,13 @@ struct smwpTest13Struct smwpStringStructDict dict; smwpClass c; smwpInterface i; -}; +} sequence<smwpStruct> smwpTest13StructSeq; dictionary<smwpStruct, smwpBaseClass> smwpTest13StructClassSeq; -interface smwpTest13Interface extends smwpInterface {}; +interface smwpTest13Interface extends smwpInterface {} exception smwpTest13Exception extends smwpException { @@ -44,7 +44,7 @@ exception smwpTest13Exception extends smwpException smwpStringStructDict dict1; smwpClass c1; smwpInterface i1; -}; +} class smwpTest13Class extends smwpBaseClass implements smwpBaseInterface { @@ -78,7 +78,7 @@ class smwpTest13Class extends smwpBaseClass implements smwpBaseInterface out smwpInterface o5, out smwpClass o6) throws smwpException; -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage4.ice b/java/test/Ice/translator/TestSingleModuleWithPackage4.ice index 77922ab9132..3d0bef3ea87 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage4.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage4.ice @@ -24,13 +24,13 @@ struct smwpTest4Struct M::smwpStringStructDict dict; M::smwpClass c; M::smwpInterface i; -}; +} sequence<M::smwpStruct> smwpTest4StructSeq; dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest4StructClassSeq; -interface smwpTest4Interface extends M::smwpInterface {}; +interface smwpTest4Interface extends M::smwpInterface {} exception smwpTest4Exception extends M::smwpException { @@ -40,7 +40,7 @@ exception smwpTest4Exception extends M::smwpException M::smwpStringStructDict dict1; M::smwpClass c1; M::smwpInterface i1; -}; +} class smwpTest4Class extends M::smwpBaseClass implements M::smwpBaseInterface { @@ -74,6 +74,6 @@ class smwpTest4Class extends M::smwpBaseClass implements M::smwpBaseInterface out M::smwpInterface o5, out M::smwpClass o6) throws M::smwpException; -}; +} -}; +} diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage5.ice b/java/test/Ice/translator/TestSingleModuleWithPackage5.ice index 1cf7260042a..0da6a4c3773 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage5.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage5.ice @@ -24,13 +24,13 @@ struct smwpTest5Struct smwpStringStructDict dict; smwpClass c; smwpInterface i; -}; +} sequence<smwpStruct> smwpTest5StructSeq; dictionary<smwpStruct, smwpBaseClass> smwpTest5StructClassSeq; -interface smwpTest5Interface extends smwpInterface {}; +interface smwpTest5Interface extends smwpInterface {} exception smwpTest5Exception extends smwpException { @@ -40,7 +40,7 @@ exception smwpTest5Exception extends smwpException smwpStringStructDict dict1; smwpClass c1; smwpInterface i1; -}; +} class smwpTest5Class extends smwpBaseClass implements smwpBaseInterface { @@ -74,6 +74,6 @@ class smwpTest5Class extends smwpBaseClass implements smwpBaseInterface out smwpInterface o5, out smwpClass o6) throws smwpException; -}; +} -}; +} diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage6.ice b/java/test/Ice/translator/TestSingleModuleWithPackage6.ice index 7c76d1c6337..c48c182a5c5 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage6.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage6.ice @@ -26,13 +26,13 @@ struct smwpTest6Struct M::smwpStringStructDict dict; M::smwpClass c; M::smwpInterface i; -}; +} sequence<M::smwpStruct> smwpTest6StructSeq; dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest6StructClassSeq; -interface smwpTest6Interface extends M::smwpInterface {}; +interface smwpTest6Interface extends M::smwpInterface {} exception smwpTest6Exception extends M::smwpException { @@ -42,7 +42,7 @@ exception smwpTest6Exception extends M::smwpException M::smwpStringStructDict dict1; M::smwpClass c1; M::smwpInterface i1; -}; +} class smwpTest6Class extends M::smwpBaseClass implements M::smwpBaseInterface { @@ -76,6 +76,6 @@ class smwpTest6Class extends M::smwpBaseClass implements M::smwpBaseInterface out M::smwpInterface o5, out M::smwpClass o6) throws M::smwpException; -}; +} -}; +} diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage7.ice b/java/test/Ice/translator/TestSingleModuleWithPackage7.ice index 99e31cd5a0c..208b57dedbe 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage7.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage7.ice @@ -26,13 +26,13 @@ struct smwpTest7Struct M::smwpStringStructDict dict; M::smwpClass c; M::smwpInterface i; -}; +} sequence<M::smwpStruct> smwpTest7StructSeq; dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest7StructClassSeq; -interface smwpTest7Interface extends M::smwpInterface {}; +interface smwpTest7Interface extends M::smwpInterface {} exception smwpTest7Exception extends M::smwpException { @@ -42,7 +42,7 @@ exception smwpTest7Exception extends M::smwpException M::smwpStringStructDict dict1; M::smwpClass c1; M::smwpInterface i1; -}; +} class smwpTest7Class extends M::smwpBaseClass implements M::smwpBaseInterface { @@ -76,6 +76,6 @@ class smwpTest7Class extends M::smwpBaseClass implements M::smwpBaseInterface out M::smwpInterface o5, out M::smwpClass o6) throws M::smwpException; -}; +} -}; +} diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage9.ice b/java/test/Ice/translator/TestSingleModuleWithPackage9.ice index 94e2008ec8e..d6ddedc5ed4 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage9.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage9.ice @@ -26,13 +26,13 @@ struct smwpTest9Struct ::M::smwpStringStructDict dict; ::M::smwpClass c; ::M::smwpInterface i; -}; +} sequence<::M::smwpStruct> smwpTest9StructSeq; dictionary<::M::smwpStruct, ::M::smwpBaseClass> smwpTest9StructClassSeq; -interface smwpTest9Interface extends ::M::smwpInterface {}; +interface smwpTest9Interface extends ::M::smwpInterface {} exception smwpTest9Exception extends ::M::smwpException { @@ -42,7 +42,7 @@ exception smwpTest9Exception extends ::M::smwpException ::M::smwpStringStructDict dict1; ::M::smwpClass c1; ::M::smwpInterface i1; -}; +} class smwpTest9Class extends ::M::smwpBaseClass implements ::M::smwpBaseInterface { @@ -76,7 +76,7 @@ class smwpTest9Class extends ::M::smwpBaseClass implements ::M::smwpBaseInterfac out ::M::smwpInterface o5, out ::M::smwpClass o6) throws ::M::smwpException; -}; +} -}; -}; +} +} diff --git a/java/test/Ice/translator/Underscore.ice b/java/test/Ice/translator/Underscore.ice index 37ca32b0809..54e630c0617 100644 --- a/java/test/Ice/translator/Underscore.ice +++ b/java/test/Ice/translator/Underscore.ice @@ -12,27 +12,27 @@ module Underscore_Test interface Test_Interface_A { void op_A(); - }; + } class Test_Class_B implements Test_Interface_A { void op_B(); int int_member; - }; + } struct Test_Struct { string string_member; - }; + } exception Test_Exception { short short_member; - }; + } sequence<string> String_Sequence; dictionary<string, string> String_Dictionary; const int Const_Int = 99; -}; +} diff --git a/java/test/src/main/java/test/Glacier2/application/Callback.ice b/java/test/src/main/java/test/Glacier2/application/Callback.ice index c6d9a18fdf6..87c3fb0c6fd 100644 --- a/java/test/src/main/java/test/Glacier2/application/Callback.ice +++ b/java/test/src/main/java/test/Glacier2/application/Callback.ice @@ -16,13 +16,13 @@ module Test interface CallbackReceiver { void callback(); -}; +} interface Callback { void initiateCallback(CallbackReceiver* proxy); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Glacier2/router/Callback.ice b/java/test/src/main/java/test/Glacier2/router/Callback.ice index 290aadd2444..fccaf41aa91 100644 --- a/java/test/src/main/java/test/Glacier2/router/Callback.ice +++ b/java/test/src/main/java/test/Glacier2/router/Callback.ice @@ -17,7 +17,7 @@ exception CallbackException { double someValue; string someString; -}; +} interface CallbackReceiver { @@ -25,7 +25,7 @@ interface CallbackReceiver void callbackEx() throws CallbackException; -}; +} interface Callback { @@ -35,6 +35,6 @@ interface Callback throws CallbackException; void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice b/java/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice index 2d4a0dd8ff3..da65e10827d 100644 --- a/java/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice @@ -17,7 +17,7 @@ exception CallbackException { double someValue; string someString; -}; +} interface CallbackReceiver { @@ -25,7 +25,7 @@ interface CallbackReceiver void callbackEx() throws CallbackException; -}; +} interface Callback { @@ -35,7 +35,7 @@ interface Callback throws CallbackException; void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/acm/Test.ice b/java/test/src/main/java/test/Ice/acm/Test.ice index 363bf199325..2f695d2c49d 100644 --- a/java/test/src/main/java/test/Ice/acm/Test.ice +++ b/java/test/src/main/java/test/Ice/acm/Test.ice @@ -20,7 +20,7 @@ interface TestIntf void interruptSleep(); void startHeartbeatCount(); void waitForHeartbeatCount(int count); -}; +} interface RemoteObjectAdapter { @@ -28,13 +28,13 @@ interface RemoteObjectAdapter void activate(); void hold(); void deactivate(); -}; +} interface RemoteCommunicator { RemoteObjectAdapter* createObjectAdapter(int acmTimeout, int close, int heartbeat); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/adapterDeactivation/Test.ice b/java/test/src/main/java/test/Ice/adapterDeactivation/Test.ice index 998f6eed06f..40e649d0e68 100644 --- a/java/test/src/main/java/test/Ice/adapterDeactivation/Test.ice +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Test.ice @@ -18,11 +18,11 @@ interface TestIntf void transient(); void deactivate(); -}; +} local class Cookie { idempotent string message(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/admin/Test.ice b/java/test/src/main/java/test/Ice/admin/Test.ice index 39247b4b209..c568744c472 100644 --- a/java/test/src/main/java/test/Ice/admin/Test.ice +++ b/java/test/src/main/java/test/Ice/admin/Test.ice @@ -35,20 +35,20 @@ interface RemoteCommunicator void waitForShutdown(); void destroy(); -}; +} interface RemoteCommunicatorFactory { RemoteCommunicator* createCommunicator(Ice::PropertyDict props); void shutdown(); -}; +} interface TestFacet { void op(); -}; +} -}; +} #endif diff --git a/java/test/src/main/java/test/Ice/ami/Test.ice b/java/test/src/main/java/test/Ice/ami/Test.ice index 2a0dbe027ca..15239f27288 100644 --- a/java/test/src/main/java/test/Ice/ami/Test.ice +++ b/java/test/src/main/java/test/Ice/ami/Test.ice @@ -18,19 +18,19 @@ module Test exception TestIntfException { -}; +} enum CloseMode { Forcefully, Gracefully, GracefullyWithWait -}; +} interface PingReply { void reply(); -}; +} interface TestIntf { @@ -59,12 +59,12 @@ interface TestIntf double opDouble(double d); void pingBiDir(Ice::Identity id); -}; +} interface TestIntfController { void holdAdapter(); void resumeAdapter(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/background/Test.ice b/java/test/src/main/java/test/Ice/background/Test.ice index 624200b8881..b8eeef6f6be 100644 --- a/java/test/src/main/java/test/Ice/background/Test.ice +++ b/java/test/src/main/java/test/Ice/background/Test.ice @@ -21,7 +21,7 @@ interface Background void opWithPayload(Ice::ByteSeq seq); void shutdown(); -}; +} interface BackgroundController { @@ -41,6 +41,6 @@ interface BackgroundController void writeException(bool enable); void buffered(bool enable); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/binding/Test.ice b/java/test/src/main/java/test/Ice/binding/Test.ice index 62664797a4f..9d1a3f9c894 100644 --- a/java/test/src/main/java/test/Ice/binding/Test.ice +++ b/java/test/src/main/java/test/Ice/binding/Test.ice @@ -16,14 +16,14 @@ module Test interface TestIntf { string getAdapterName(); -}; +} interface RemoteObjectAdapter { TestIntf* getTestIntf(); void deactivate(); -}; +} interface RemoteCommunicator { @@ -32,6 +32,6 @@ interface RemoteCommunicator void deactivateObjectAdapter(RemoteObjectAdapter* adapter); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/checksum/Test.ice b/java/test/src/main/java/test/Ice/checksum/Test.ice index 8f0e8a46339..b479af5c661 100644 --- a/java/test/src/main/java/test/Ice/checksum/Test.ice +++ b/java/test/src/main/java/test/Ice/checksum/Test.ice @@ -20,6 +20,6 @@ interface Checksum idempotent Ice::SliceChecksumDict getSliceChecksums(); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/checksum/TestServer.ice b/java/test/src/main/java/test/Ice/checksum/TestServer.ice index d68d1365974..3760c1d63ea 100644 --- a/java/test/src/main/java/test/Ice/checksum/TestServer.ice +++ b/java/test/src/main/java/test/Ice/checksum/TestServer.ice @@ -21,6 +21,6 @@ interface Checksum idempotent Ice::SliceChecksumDict getSliceChecksums(); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/checksum/Types.ice b/java/test/src/main/java/test/Ice/checksum/Types.ice index 2f7ef550669..16b699169c8 100644 --- a/java/test/src/main/java/test/Ice/checksum/Types.ice +++ b/java/test/src/main/java/test/Ice/checksum/Types.ice @@ -31,42 +31,42 @@ const int IntConst3 = 100; // // TEST: Same // -enum Enum1 { Enum11, Enum12, Enum13 }; +enum Enum1 { Enum11, Enum12, Enum13 } // // TEST: Add enumerator // -enum Enum2 { Enum21, Enum22, Enum23 }; +enum Enum2 { Enum21, Enum22, Enum23 } // // TEST: Remove enumerator // -enum Enum3 { Enum31, Enum32, Enum33 }; +enum Enum3 { Enum31, Enum32, Enum33 } // // TEST: Change to a different type // -enum Enum4 { Enum41, Enum42, Enum43 }; +enum Enum4 { Enum41, Enum42, Enum43 } // // TEST: Enum with explicit values. // -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 }; +enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } // // TEST: Enum with same explicit values, different order. // -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 }; +enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } // // TEST: Enum with different explicit values. // -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3}; +enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} // // TEST: Enum with explicit values, removed enumerator. // -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3}; +enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} // // TEST: Same @@ -110,7 +110,7 @@ struct Struct1 { string str; bool b; -}; +} // // TEST: Add member @@ -119,7 +119,7 @@ struct Struct2 { string str; bool b; -}; +} // // TEST: Change member type @@ -128,7 +128,7 @@ struct Struct3 { string str; bool b; -}; +} // // TEST: Remove member @@ -137,7 +137,7 @@ struct Struct4 { string str; bool b; -}; +} // // TEST: Change to a different type @@ -146,70 +146,70 @@ struct Struct5 { string str; bool b; -}; +} // // TEST: Same // interface Interface1 { -}; +} // // TEST: Change interface to class // interface Interface2 { -}; +} // // TEST: Add base interface // interface Interface3 { -}; +} // // TEST: Add operation // interface Interface4 { -}; +} // // TEST: Same // class EmptyClass1 { -}; +} // // TEST: Add data member // class EmptyClass2 { -}; +} // // TEST: Add operation // class EmptyClass3 { -}; +} // // TEST: Add base class // class EmptyClass4 { -}; +} // // TEST: Add interface // class EmptyClass5 { -}; +} // // TEST: Same @@ -218,7 +218,7 @@ class SimpleClass1 { string str; float f; -}; +} // // TEST: Add operation @@ -227,7 +227,7 @@ class SimpleClass2 { string str; float f; -}; +} // // TEST: Rename member @@ -236,7 +236,7 @@ class SimpleClass3 { string str; float f; -}; +} // // TEST: Add member @@ -245,7 +245,7 @@ class SimpleClass4 { string str; float f; -}; +} // // TEST: Remove member @@ -254,7 +254,7 @@ class SimpleClass5 { string str; float f; -}; +} // // TEST: Reorder members @@ -263,7 +263,7 @@ class SimpleClass6 { string str; float f; -}; +} // // TEST: Change member type @@ -272,7 +272,7 @@ class SimpleClass7 { string str; float f; -}; +} // // TEST: Same @@ -281,7 +281,7 @@ exception Exception1 { string str; bool b; -}; +} // // TEST: Add member @@ -290,7 +290,7 @@ exception Exception2 { string str; bool b; -}; +} // // TEST: Change member type @@ -299,7 +299,7 @@ exception Exception3 { string str; bool b; -}; +} // // TEST: Remove member @@ -308,14 +308,14 @@ exception Exception4 { string str; bool b; -}; +} // // TEST: Add base exception // exception Exception5 { -}; +} // // TEST: Change to a different type @@ -324,7 +324,7 @@ exception Exception6 { string str; bool b; -}; +} // // TEST: Exception with optional members. @@ -334,7 +334,7 @@ exception OptionalEx0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members, different order, same tags. @@ -344,7 +344,7 @@ exception OptionalEx1 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -354,7 +354,7 @@ exception OptionalEx2 string firstName; string secondName; optional(1) string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -364,7 +364,7 @@ exception OptionalEx3 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members using different tags. @@ -374,7 +374,7 @@ exception OptionalEx4 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Same @@ -383,7 +383,7 @@ interface BaseInterface1 { void baseOp1(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change return type @@ -392,7 +392,7 @@ interface BaseInterface2 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add parameter @@ -401,7 +401,7 @@ interface BaseInterface3 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add exception @@ -410,7 +410,7 @@ interface BaseInterface4 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change out parameter to in parameter @@ -419,7 +419,7 @@ interface BaseInterface5 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove parameter @@ -428,7 +428,7 @@ interface BaseInterface6 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove exception @@ -437,7 +437,7 @@ interface BaseInterface7 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove operation @@ -446,7 +446,7 @@ interface BaseInterface8 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add base interface @@ -455,7 +455,7 @@ interface BaseInterface9 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Class with compact id @@ -463,14 +463,14 @@ interface BaseInterface9 class Compact1(1) { int id; -}; +} // // TEST: Derived from class with compact id // class Derived1 extends Compact1 { -}; +} // // TEST: Same class names but different compact id @@ -478,7 +478,7 @@ class Derived1 extends Compact1 class Compact2(2) { int id; -}; +} // // TEST: Class with optional members. @@ -488,7 +488,7 @@ class Optional0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members, different order, same tags. @@ -498,7 +498,7 @@ class Optional1 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -508,7 +508,7 @@ class Optional2 string firstName; string secondName; optional(1) string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -518,7 +518,7 @@ class Optional3 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members using different tags. @@ -528,7 +528,7 @@ class Optional4 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Interface with optional parameters. @@ -537,7 +537,7 @@ interface OptionalParameters0 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different order. @@ -546,7 +546,7 @@ interface OptionalParameters1 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different tags. @@ -555,7 +555,7 @@ interface OptionalParameters2 { void op1(string firstName, optional(1) string emailAddress, optional(2) string secondName); -}; +} // // TEST: Interface with different optional parameters. @@ -564,7 +564,7 @@ interface OptionalParameters3 { void op1(string firstName, optional(1) string emailAddress, string secondName); -}; +} // // TEST: Interface with optional return type. @@ -572,7 +572,7 @@ interface OptionalParameters3 interface OptionalReturn0 { optional(1) int op(); -}; +} // // TEST: Interface that changes optional return type. @@ -580,12 +580,12 @@ interface OptionalReturn0 interface OptionalReturn2 { optional(1) int op(); -}; +} // // TEST: Local // -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 }; +local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } // // TEST: Local @@ -603,13 +603,13 @@ local dictionary<string, string> LocalDictionary; local struct LocalStruct { string str; -}; +} // // TEST: Local // local class LocalClass { -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/checksum/TypesServer.ice b/java/test/src/main/java/test/Ice/checksum/TypesServer.ice index 72c8ac28c40..96a8a1d7431 100644 --- a/java/test/src/main/java/test/Ice/checksum/TypesServer.ice +++ b/java/test/src/main/java/test/Ice/checksum/TypesServer.ice @@ -33,42 +33,42 @@ const short IntConst3 = 100; // // TEST: Same // -enum Enum1 { Enum11, Enum12, Enum13 }; +enum Enum1 { Enum11, Enum12, Enum13 } // // TEST: Add enumerator // -enum Enum2 { Enum21, Enum22, Enum23, Enum24 }; +enum Enum2 { Enum21, Enum22, Enum23, Enum24 } // // TEST: Remove enumerator // -enum Enum3 { Enum32, Enum33 }; +enum Enum3 { Enum32, Enum33 } // // TEST: Enum with explicit values. // -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 }; +enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } // // TEST: Enum with same explicit values, different order. // -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 }; +enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 } // // TEST: Enum with different explicit values. // -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 }; +enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 } // // TEST: Enum with explicit values, removed enumerator. // -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2}; +enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2} // // TEST: Change to a different type // -class Enum4 {}; +class Enum4 {} // // TEST: Same @@ -83,7 +83,7 @@ sequence<short> Sequence2; // // TEST: Change to a different type // -class Sequence3 {}; +class Sequence3 {} // // TEST: Same @@ -103,7 +103,7 @@ dictionary<string, bool> Dictionary3; // // TEST: Change to a different type // -class Dictionary4 {}; +class Dictionary4 {} // // TEST: Same @@ -112,7 +112,7 @@ struct Struct1 { string str; bool b; -}; +} // // TEST: Add member @@ -122,7 +122,7 @@ struct Struct2 string str; bool b; float f; -}; +} // // TEST: Change member type @@ -131,7 +131,7 @@ struct Struct3 { string str; double b; -}; +} // // TEST: Remove member @@ -139,33 +139,33 @@ struct Struct3 struct Struct4 { bool b; -}; +} // // TEST: Change to a different type // -class Struct5 {}; +class Struct5 {} // // TEST: Same // interface Interface1 { -}; +} // // TEST: Change interface to class // class Interface2 { -}; +} // // TEST: Add base interface // interface Interface3 extends Interface1 { -}; +} // // TEST: Add operation @@ -173,14 +173,14 @@ interface Interface3 extends Interface1 interface Interface4 { void opInterface4(); -}; +} // // TEST: Same // class EmptyClass1 { -}; +} // // TEST: Add data member @@ -188,7 +188,7 @@ class EmptyClass1 class EmptyClass2 { double d; -}; +} // // TEST: Add operation @@ -196,21 +196,21 @@ class EmptyClass2 class EmptyClass3 { void newOp(); -}; +} // // TEST: Add base class // class EmptyClass4 extends EmptyClass1 { -}; +} // // TEST: Add interface // class EmptyClass5 implements Interface1 { -}; +} // // TEST: Same @@ -219,7 +219,7 @@ class SimpleClass1 { string str; float f; -}; +} // // TEST: Add operation @@ -229,7 +229,7 @@ class SimpleClass2 string str; float f; void newOp(); -}; +} // // TEST: Rename member @@ -238,7 +238,7 @@ class SimpleClass3 { string str; float g; -}; +} // // TEST: Add member @@ -248,7 +248,7 @@ class SimpleClass4 string str; float f; bool b; -}; +} // // TEST: Remove member @@ -256,7 +256,7 @@ class SimpleClass4 class SimpleClass5 { string str; -}; +} // // TEST: Reorder members @@ -265,7 +265,7 @@ class SimpleClass6 { float f; string str; -}; +} // // TEST: Change member type @@ -274,7 +274,7 @@ class SimpleClass7 { string str; double f; -}; +} // // TEST: Same @@ -283,7 +283,7 @@ exception Exception1 { string str; bool b; -}; +} // // TEST: Add member @@ -293,7 +293,7 @@ exception Exception2 string str; bool b; float f; -}; +} // // TEST: Change member type @@ -302,7 +302,7 @@ exception Exception3 { string str; double b; -}; +} // // TEST: Remove member @@ -310,19 +310,19 @@ exception Exception3 exception Exception4 { bool b; -}; +} // // TEST: Add base exception // exception Exception5 extends Exception1 { -}; +} // // TEST: Change to a different type // -class Exception6 {}; +class Exception6 {} // // TEST: Exception with optional members. @@ -332,7 +332,7 @@ exception OptionalEx0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members, different order, same tags. @@ -342,7 +342,7 @@ exception OptionalEx1 string firstName; optional(2) string emailAddress; optional(1) string secondName; -}; +} // // TEST: Exception with different optional members. @@ -352,7 +352,7 @@ exception OptionalEx2 string firstName; optional(1) string secondName; string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -363,7 +363,7 @@ exception OptionalEx3 optional(1) string secondName; optional(2) string emailAddress; optional(3) string phoneNumber; -}; +} // // TEST: Exception with optional members using different tags. @@ -373,7 +373,7 @@ exception OptionalEx4 string firstName; optional(2) string secondName; optional(1) string emailAddress; -}; +} // // TEST: Same @@ -382,7 +382,7 @@ interface BaseInterface1 { void baseOp1(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change return type @@ -391,7 +391,7 @@ interface BaseInterface2 { int baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add parameter @@ -400,7 +400,7 @@ interface BaseInterface3 { void baseOp(Object o); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add exception @@ -409,7 +409,7 @@ interface BaseInterface4 { void baseOp(); void baseOp2(int i, out string s) throws Exception1, Exception2; -}; +} // // TEST: Change out parameter to in parameter @@ -418,7 +418,7 @@ interface BaseInterface5 { void baseOp(); void baseOp2(int i, string s) throws Exception1; -}; +} // // TEST: Remove parameter @@ -427,7 +427,7 @@ interface BaseInterface6 { void baseOp(); void baseOp2(out string s) throws Exception1; -}; +} // // TEST: Remove exception @@ -436,7 +436,7 @@ interface BaseInterface7 { void baseOp(); void baseOp2(int i, out string s); -}; +} // // TEST: Remove operation @@ -444,7 +444,7 @@ interface BaseInterface7 interface BaseInterface8 { void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add base class @@ -453,7 +453,7 @@ interface BaseInterface9 extends Interface1 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Class with compact id @@ -461,14 +461,14 @@ interface BaseInterface9 extends Interface1 class Compact1(1) { int id; -}; +} // // TEST: Derived from class with compact id // class Derived1 extends Compact1 { -}; +} // // TEST: Same class names but different compact id @@ -476,7 +476,7 @@ class Derived1 extends Compact1 class Compact2(3) { int id; -}; +} // // TEST: Class with optional members. @@ -486,7 +486,7 @@ class Optional0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members, different order, same tags. @@ -496,7 +496,7 @@ class Optional1 string firstName; optional(2) string emailAddress; optional(1) string secondName; -}; +} // // TEST: Class with different optional members. @@ -506,7 +506,7 @@ class Optional2 string firstName; optional(1) string secondName; string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -517,7 +517,7 @@ class Optional3 optional(1) string secondName; optional(2) string emailAddress; optional(3) string phoneNumber; -}; +} // // TEST: Class with optional members using different tags. @@ -527,7 +527,7 @@ class Optional4 string firstName; optional(2) string secondName; optional(1) string emailAddress; -}; +} // // TEST: Interface with optional parameters. @@ -536,7 +536,7 @@ interface OptionalParameters0 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different order. @@ -545,7 +545,7 @@ interface OptionalParameters1 { void op1(string firstName, optional(2) string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with optional parameters, different tags. @@ -554,7 +554,7 @@ interface OptionalParameters2 { void op1(string firstName, optional(2) string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with different optional parameters. @@ -563,7 +563,7 @@ interface OptionalParameters3 { void op1(string firstName, string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with optional return type. @@ -571,7 +571,7 @@ interface OptionalParameters3 interface OptionalReturn0 { optional(1) int op(); -}; +} // // TEST: Interface that changes optional return type. @@ -579,12 +579,12 @@ interface OptionalReturn0 interface OptionalReturn2 { int op(); -}; +} // // TEST: Local // -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 }; +local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } // // TEST: Local @@ -602,13 +602,13 @@ local dictionary<string, string> LocalDictionary; local struct LocalStruct { string str; -}; +} // // TEST: Local // local class LocalClass { -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/classLoader/Test.ice b/java/test/src/main/java/test/Ice/classLoader/Test.ice index ac900ed8398..bdaaba04c47 100644 --- a/java/test/src/main/java/test/Ice/classLoader/Test.ice +++ b/java/test/src/main/java/test/Ice/classLoader/Test.ice @@ -16,15 +16,15 @@ module Test class ConcreteClass { int i; -}; +} -exception E {}; +exception E {} interface Initial { ConcreteClass getConcreteClass(); void throwException() throws E; void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/custom/Test.ice b/java/test/src/main/java/test/Ice/custom/Test.ice index 31ee3f6c132..5d41bfd9db7 100644 --- a/java/test/src/main/java/test/Ice/custom/Test.ice +++ b/java/test/src/main/java/test/Ice/custom/Test.ice @@ -15,7 +15,7 @@ module Test { -class C {}; +class C {} sequence<C> CSeq; ["java:type:java.util.ArrayList<C>"] sequence<C> CArray; @@ -37,13 +37,13 @@ sequence<C> CSeq; ["java:buffer"] sequence<float> FloatBuffer; ["java:buffer"] sequence<double> DoubleBuffer; -enum E { E1, E2, E3 }; +enum E { E1, E2, E3 } ["java:type:java.util.ArrayList<E>"] sequence<E> ESeq; struct S { E en; -}; +} ["java:type:java.util.ArrayList<S>"] sequence<S> SSeq; dictionary<int, string> D; @@ -100,6 +100,6 @@ interface TestIntf optional(1) DoubleBuffer opOptDoubleBufferSeq(optional(2) DoubleBuffer inSeq, out optional(3) DoubleBuffer outSeq); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/defaultServant/Test.ice b/java/test/src/main/java/test/Ice/defaultServant/Test.ice index 92b5dbc7467..c30157ea6db 100644 --- a/java/test/src/main/java/test/Ice/defaultServant/Test.ice +++ b/java/test/src/main/java/test/Ice/defaultServant/Test.ice @@ -16,6 +16,6 @@ module Test interface MyObject { string getName(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/defaultValue/Test.ice b/java/test/src/main/java/test/Ice/defaultValue/Test.ice index 46900d0ab8e..442b6750ea3 100644 --- a/java/test/src/main/java/test/Ice/defaultValue/Test.ice +++ b/java/test/src/main/java/test/Ice/defaultValue/Test.ice @@ -16,14 +16,14 @@ module Test { -enum Color { red, green, blue }; +enum Color { red, green, blue } module Nested { -enum Color { red, green, blue }; +enum Color { red, green, blue } -}; +} struct Struct1 { @@ -49,7 +49,7 @@ struct Struct1 float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} const bool ConstBool = true; const byte ConstByte = 254; @@ -94,7 +94,7 @@ struct Struct2 float zeroDotF = ConstZeroDotF; double zeroD = ConstZeroD; double zeroDotD = ConstZeroDotD; -}; +} class Base { @@ -114,7 +114,7 @@ class Base float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} class Derived extends Base { @@ -124,7 +124,7 @@ class Derived extends Base Nested::Color nc1 = ::Test::Nested::Color::red; Nested::Color nc2 = Nested::green; Nested::Color nc3 = blue; -}; +} exception BaseEx { @@ -144,7 +144,7 @@ exception BaseEx float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} exception DerivedEx extends BaseEx { @@ -154,7 +154,7 @@ exception DerivedEx extends BaseEx Nested::Color nc1 = ConstNestedColor1; Nested::Color nc2 = ConstNestedColor2; Nested::Color nc3 = ConstNestedColor3; -}; +} sequence<byte> ByteSeq; sequence<int> IntSeq; @@ -163,7 +163,7 @@ dictionary<int, string> IntStringDict; struct InnerStruct { int a; -}; +} struct StructNoDefaults { @@ -180,32 +180,32 @@ struct StructNoDefaults IntSeq is; InnerStruct st; IntStringDict dict; -}; +} exception ExceptionNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} exception ExceptionNoDefaults extends ExceptionNoDefaultsBase { InnerStruct st; IntStringDict dict; -}; +} class ClassNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} class ClassNoDefaults extends ClassNoDefaultsBase { InnerStruct st; IntStringDict dict; -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/dispatcher/Test.ice b/java/test/src/main/java/test/Ice/dispatcher/Test.ice index a495540826a..33c6bb3a75b 100644 --- a/java/test/src/main/java/test/Ice/dispatcher/Test.ice +++ b/java/test/src/main/java/test/Ice/dispatcher/Test.ice @@ -21,12 +21,12 @@ interface TestIntf void sleep(int to); void opWithPayload(Ice::ByteSeq seq); void shutdown(); -}; +} interface TestIntfController { void holdAdapter(); void resumeAdapter(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/echo/Test.ice b/java/test/src/main/java/test/Ice/echo/Test.ice index 814ef0d8a32..6f05e2a181f 100644 --- a/java/test/src/main/java/test/Ice/echo/Test.ice +++ b/java/test/src/main/java/test/Ice/echo/Test.ice @@ -21,6 +21,6 @@ interface Echo void startBatch(); void flushBatch(); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/enums/Test.ice b/java/test/src/main/java/test/Ice/enums/Test.ice index 6e677844bb3..ec0f8bc81c8 100644 --- a/java/test/src/main/java/test/Ice/enums/Test.ice +++ b/java/test/src/main/java/test/Ice/enums/Test.ice @@ -36,7 +36,7 @@ enum ByteEnum benum9 = LongConst1, benum10, benum11 = ByteConst2 -}; +} sequence<ByteEnum> ByteEnumSeq; enum ShortEnum @@ -52,7 +52,7 @@ enum ShortEnum senum9 = LongConst1, senum10, senum11 = ShortConst2 -}; +} sequence<ShortEnum> ShortEnumSeq; enum IntEnum @@ -69,7 +69,7 @@ enum IntEnum ienum10, ienum11 = IntConst2, ienum12 = LongConst2 -}; +} sequence<IntEnum> IntEnumSeq; enum SimpleEnum @@ -77,7 +77,7 @@ enum SimpleEnum red, green, blue -}; +} sequence<SimpleEnum> SimpleEnumSeq; interface TestIntf @@ -93,6 +93,6 @@ interface TestIntf SimpleEnumSeq opSimpleSeq(SimpleEnumSeq s1, out SimpleEnumSeq s2); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/exceptions/Test.ice b/java/test/src/main/java/test/Ice/exceptions/Test.ice index da535d38b89..02d87a2fd7c 100644 --- a/java/test/src/main/java/test/Ice/exceptions/Test.ice +++ b/java/test/src/main/java/test/Ice/exceptions/Test.ice @@ -17,29 +17,29 @@ module Test interface Empty { -}; +} interface Thrower; exception A { int aMem; -}; +} exception B extends A { int bMem; -}; +} exception C extends B { int cMem; -}; +} exception D { int dMem; -}; +} interface Thrower { @@ -67,11 +67,11 @@ interface Thrower void throwAfterResponse(); void throwAfterException() throws A; -}; +} interface WrongOperation { void noSuchOperation(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/exceptions/TestAMD.ice b/java/test/src/main/java/test/Ice/exceptions/TestAMD.ice index a9bb589bc75..590d0f14945 100644 --- a/java/test/src/main/java/test/Ice/exceptions/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/exceptions/TestAMD.ice @@ -20,22 +20,22 @@ interface Thrower; exception A { int aMem; -}; +} exception B extends A { int bMem; -}; +} exception C extends B { int cMem; -}; +} exception D { int dMem; -}; +} ["amd"] interface Thrower { @@ -62,11 +62,11 @@ exception D void throwAfterResponse(); void throwAfterException() throws A; -}; +} ["amd"] interface WrongOperation { void noSuchOperation(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/facets/Test.ice b/java/test/src/main/java/test/Ice/facets/Test.ice index 9d596c5a4c5..bff9de11579 100644 --- a/java/test/src/main/java/test/Ice/facets/Test.ice +++ b/java/test/src/main/java/test/Ice/facets/Test.ice @@ -15,47 +15,47 @@ module Test interface Empty { -}; +} interface A { string callA(); -}; +} interface B extends A { string callB(); -}; +} interface C extends A { string callC(); -}; +} interface D extends B, C { string callD(); -}; +} interface E { string callE(); -}; +} interface F extends E { string callF(); -}; +} interface G { void shutdown(); string callG(); -}; +} interface H extends G { string callH(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/faultTolerance/Test.ice b/java/test/src/main/java/test/Ice/faultTolerance/Test.ice index 623de7377c2..b6617573689 100644 --- a/java/test/src/main/java/test/Ice/faultTolerance/Test.ice +++ b/java/test/src/main/java/test/Ice/faultTolerance/Test.ice @@ -19,6 +19,6 @@ interface TestIntf void abort(); idempotent void idempotentAbort(); idempotent int pid(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/hash/Test.ice b/java/test/src/main/java/test/Ice/hash/Test.ice index 3b757147251..58a6f78fe07 100644 --- a/java/test/src/main/java/test/Ice/hash/Test.ice +++ b/java/test/src/main/java/test/Ice/hash/Test.ice @@ -18,26 +18,26 @@ struct PointF float x; float y; float z; -}; +} struct PointD { double x; double y; double z; -}; +} struct Point { int x; int y; -}; +} sequence<Point> Points; struct Polyline { Points vertices; -}; +} struct Color { @@ -45,7 +45,7 @@ struct Color int g; int b; int a; -}; +} dictionary<int, Color> StringColorMap; @@ -53,20 +53,20 @@ dictionary<int, Color> StringColorMap; struct ColorPalette { StringColorMap colors; -}; +} class Pen { int thickness; Test::Color color; -}; +} struct Draw { Test::Color backgroundColor; Test::Pen pen; bool shared; -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/hold/Test.ice b/java/test/src/main/java/test/Ice/hold/Test.ice index 3179e4f1b75..b46bbfd47a4 100644 --- a/java/test/src/main/java/test/Ice/hold/Test.ice +++ b/java/test/src/main/java/test/Ice/hold/Test.ice @@ -20,6 +20,6 @@ interface Hold int set(int value, int delay); void setOneway(int value, int expected); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/impl/Test.ice b/java/test/src/main/java/test/Ice/impl/Test.ice index c2c7d7d4998..0640b19ce84 100644 --- a/java/test/src/main/java/test/Ice/impl/Test.ice +++ b/java/test/src/main/java/test/Ice/impl/Test.ice @@ -20,21 +20,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -64,7 +64,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -260,28 +260,28 @@ interface MyClass ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -351,4 +351,4 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} diff --git a/java/test/src/main/java/test/Ice/impl/TestAMD.ice b/java/test/src/main/java/test/Ice/impl/TestAMD.ice index 537ae4dea96..df6d9e43dca 100644 --- a/java/test/src/main/java/test/Ice/impl/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/impl/TestAMD.ice @@ -20,21 +20,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -64,7 +64,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -260,28 +260,28 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} ["amd"] interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -351,4 +351,4 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} diff --git a/java/test/src/main/java/test/Ice/info/Test.ice b/java/test/src/main/java/test/Ice/info/Test.ice index 24c11bc37b1..48e1614156f 100644 --- a/java/test/src/main/java/test/Ice/info/Test.ice +++ b/java/test/src/main/java/test/Ice/info/Test.ice @@ -22,6 +22,6 @@ interface TestIntf Ice::Context getEndpointInfoAsContext(); Ice::Context getConnectionInfoAsContext(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/inheritance/Test.ice b/java/test/src/main/java/test/Ice/inheritance/Test.ice index 6ba1a719040..d7ccd0adebc 100644 --- a/java/test/src/main/java/test/Ice/inheritance/Test.ice +++ b/java/test/src/main/java/test/Ice/inheritance/Test.ice @@ -21,14 +21,14 @@ module MA interface IA { IA* iaop(IA* p); -}; +} class CA { CA* caop(CA* p); -}; +} -}; +} module MB { @@ -36,19 +36,19 @@ module MB interface IB1 extends MA::IA { IB1* ib1op(IB1* p); -}; +} interface IB2 extends MA::IA { IB2* ib2op(IB2* p); -}; +} class CB extends MA::CA { CB* cbop(CB* p); -}; +} -}; +} module MA { @@ -56,19 +56,19 @@ module MA interface IC extends MB::IB1, MB::IB2 { IC* icop(IC* p); -}; +} class CC extends MB::CB { CC* ccop(CC* p); -}; +} class CD extends CC implements MB::IB1, MB::IB2 { CD* cdop(CD* p); -}; +} -}; +} interface Initial { @@ -81,6 +81,6 @@ interface Initial MB::IB1* ib1op(); MB::IB2* ib2op(); MA::IC* icop(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/interceptor/Test.ice b/java/test/src/main/java/test/Ice/interceptor/Test.ice index 6576ff79c5d..b422c705821 100644 --- a/java/test/src/main/java/test/Ice/interceptor/Test.ice +++ b/java/test/src/main/java/test/Ice/interceptor/Test.ice @@ -16,11 +16,11 @@ module Test exception InvalidInputException { string message; -}; +} local exception RetryException { -}; +} interface MyObject { @@ -78,7 +78,7 @@ interface MyObject // ["amd"] int amdBadSystemAdd(int x, int y); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/interrupt/Test.ice b/java/test/src/main/java/test/Ice/interrupt/Test.ice index be62fea3210..967c208c9be 100644 --- a/java/test/src/main/java/test/Ice/interrupt/Test.ice +++ b/java/test/src/main/java/test/Ice/interrupt/Test.ice @@ -17,7 +17,7 @@ module Test exception InterruptedException { -}; +} interface TestIntf { @@ -27,11 +27,11 @@ interface TestIntf throws InterruptedException; void opWithPayload(Ice::ByteSeq seq); void shutdown(); -}; +} exception CannotInterruptException { -}; +} interface TestIntfController { @@ -39,6 +39,6 @@ interface TestIntfController void resumeAdapter(); void interrupt() throws CannotInterruptException; -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/invoke/Test.ice b/java/test/src/main/java/test/Ice/invoke/Test.ice index 1f23be6f358..8448a46f23f 100644 --- a/java/test/src/main/java/test/Ice/invoke/Test.ice +++ b/java/test/src/main/java/test/Ice/invoke/Test.ice @@ -15,7 +15,7 @@ module Test exception MyException { -}; +} interface MyClass { @@ -26,6 +26,6 @@ interface MyClass void opException() throws MyException; void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/location/Test.ice b/java/test/src/main/java/test/Ice/location/Test.ice index 093d4497bf7..bcef54cd081 100644 --- a/java/test/src/main/java/test/Ice/location/Test.ice +++ b/java/test/src/main/java/test/Ice/location/Test.ice @@ -21,7 +21,7 @@ interface TestLocatorRegistry extends ::Ice::LocatorRegistry // Allow remote addition of objects to the locator registry. // void addObject(Object* obj); -}; +} interface TestLocator extends ::Ice::Locator { @@ -29,18 +29,18 @@ interface TestLocator extends ::Ice::Locator // Returns the number of request on the locator interface. // idempotent int getRequestCount(); -}; +} interface ServerManager { void startServer(); void shutdown(); -}; +} interface Hello { void sayHello(); -}; +} interface TestIntf { @@ -51,6 +51,6 @@ interface TestIntf Hello* getReplicatedHello(); void migrateHello(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/metrics/Test.ice b/java/test/src/main/java/test/Ice/metrics/Test.ice index a7aac6875b2..e0e07b9afca 100644 --- a/java/test/src/main/java/test/Ice/metrics/Test.ice +++ b/java/test/src/main/java/test/Ice/metrics/Test.ice @@ -15,7 +15,7 @@ module Test exception UserEx { -}; +} sequence<byte> ByteSeq; @@ -39,13 +39,13 @@ interface Metrics Object* getAdmin(); void shutdown(); -}; +} interface Controller { void hold(); void resume(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/metrics/TestAMD.ice b/java/test/src/main/java/test/Ice/metrics/TestAMD.ice index c5bf0d40d55..886c9cdc9fe 100644 --- a/java/test/src/main/java/test/Ice/metrics/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/metrics/TestAMD.ice @@ -15,7 +15,7 @@ module Test exception UserEx { -}; +} sequence<byte> ByteSeq; @@ -39,13 +39,13 @@ interface Metrics Object* getAdmin(); void shutdown(); -}; +} interface Controller { void hold(); void resume(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/networkProxy/Test.ice b/java/test/src/main/java/test/Ice/networkProxy/Test.ice index 08670037361..f14efbc2c0b 100644 --- a/java/test/src/main/java/test/Ice/networkProxy/Test.ice +++ b/java/test/src/main/java/test/Ice/networkProxy/Test.ice @@ -16,6 +16,6 @@ module Test interface TestIntf { void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/objects/Test.ice b/java/test/src/main/java/test/Ice/objects/Test.ice index 173d3e50d97..79f88961441 100644 --- a/java/test/src/main/java/test/Ice/objects/Test.ice +++ b/java/test/src/main/java/test/Ice/objects/Test.ice @@ -18,18 +18,18 @@ module Test struct S { string str; -}; +} class Base { S theS; string str; -}; +} class AbstractBase extends Base { void op(); -}; +} class B; class C; @@ -41,12 +41,12 @@ class A bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class B extends A { A theA; -}; +} class C { @@ -54,7 +54,7 @@ class C bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class D { @@ -64,31 +64,31 @@ class D bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} ["protected"] class E { int i; string s; -}; +} class F { ["protected"] E e1; E e2; -}; +} interface I { -}; +} interface J extends I { -}; +} class H implements I { -}; +} sequence<Base> BaseSeq; @@ -96,13 +96,13 @@ class CompactExt; class Compact(1) { -}; +} const int CompactExtId = 789; class CompactExt(CompactExtId) extends Compact { -}; +} module Inner { @@ -110,12 +110,12 @@ module Inner class A { ::Test::A theA; -}; +} exception Ex { string reason; -}; +} module Sub { @@ -123,50 +123,50 @@ module Sub class A { ::Test::Inner::A theA; -}; +} exception Ex { string reason; -}; +} -}; +} -}; +} class A1 { string name; -}; +} class B1 { A1 a1; A1 a2; -}; +} class D1 extends B1 { A1 a3; A1 a4; -}; +} exception EBase { A1 a1; A1 a2; -}; +} exception EDerived extends EBase { A1 a3; A1 a4; -}; +} class Recursive { Recursive v; -}; +} interface Initial { @@ -204,20 +204,20 @@ interface Initial void throwInnerEx() throws Inner::Ex; void throwInnerSubEx() throws Inner::Sub::Ex; -}; +} class Empty { -}; +} class AlsoEmpty { -}; +} interface UnexpectedObjectExceptionTest { Empty op(); -}; +} // // Remaining definitions are here to ensure that the generated code compiles. @@ -226,37 +226,37 @@ interface UnexpectedObjectExceptionTest class COneMember { Empty e; -}; +} class CTwoMembers { Empty e1; Empty e2; -}; +} exception EOneMember { Empty e; -}; +} exception ETwoMembers { Empty e1; Empty e2; -}; +} struct SOneMember { Empty e; -}; +} struct STwoMembers { Empty e1; Empty e2; -}; +} dictionary<int, COneMember> DOneMember; dictionary<int, CTwoMembers> DTwoMembers; -}; +} diff --git a/java/test/src/main/java/test/Ice/operations/Test.ice b/java/test/src/main/java/test/Ice/operations/Test.ice index ac57b8901c9..c5c81a1b441 100644 --- a/java/test/src/main/java/test/Ice/operations/Test.ice +++ b/java/test/src/main/java/test/Ice/operations/Test.ice @@ -20,21 +20,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -64,7 +64,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -260,28 +260,28 @@ interface MyClass ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -351,7 +351,7 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} module Test2 { @@ -364,6 +364,6 @@ module Test2 **/ interface MyDerivedClass extends Test::MyClass { -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/operations/TestAMD.ice b/java/test/src/main/java/test/Ice/operations/TestAMD.ice index 5914dfc75fd..383e932d873 100644 --- a/java/test/src/main/java/test/Ice/operations/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/operations/TestAMD.ice @@ -20,21 +20,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -64,7 +64,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -260,28 +260,28 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} ["amd"] interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -351,4 +351,4 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} diff --git a/java/test/src/main/java/test/Ice/optional/Test.ice b/java/test/src/main/java/test/Ice/optional/Test.ice index 16e51255b93..96df8e694bb 100644 --- a/java/test/src/main/java/test/Ice/optional/Test.ice +++ b/java/test/src/main/java/test/Ice/optional/Test.ice @@ -16,32 +16,32 @@ module Test class OneOptional { optional(1) int a; -}; +} enum MyEnum { MyEnumMember -}; +} struct SmallStruct { byte m; -}; +} struct FixedStruct { int m; -}; +} struct VarStruct { string m; -}; +} struct ClassVarStruct { int a; -}; +} sequence<byte> ByteSeq; sequence<bool> BoolSeq; @@ -106,7 +106,7 @@ class MultiOptional optional(29) BoolSeq bos; optional(30) Serializable ser; -}; +} class A { @@ -114,26 +114,26 @@ class A optional(1) int ma; optional(50) int mb; optional(500) int mc; -}; +} ["preserve-slice"] class B extends A { int requiredB; optional(10) int md; -}; +} class C extends B { string ss; optional(890) string ms; -}; +} class WD { optional(1) int a = 5; optional(2) string s = "test"; -}; +} exception OptionalException { @@ -141,46 +141,46 @@ exception OptionalException optional(1) int a = 5; optional(2) string b; optional(50) OneOptional o; -}; +} exception DerivedException extends OptionalException { optional(600) string ss = "test"; optional(601) OneOptional o2; -}; +} exception RequiredException extends OptionalException { string ss = "test"; OneOptional o2; -}; +} class OptionalWithCustom { optional(1) SmallStructList l; ["protected"] optional(2) SmallStructList lp; optional(3) ClassVarStruct s; -}; +} class E { A ae; -}; +} class F extends E { optional(1) A af; -}; +} class G1 { string a; -}; +} class G2 { long a; -}; +} class G { @@ -188,14 +188,14 @@ class G G2 gg2; optional(0) G2 gg2Opt; G1 gg1; -}; +} class Recursive; sequence<Recursive> RecursiveSeq; class Recursive { optional(0) RecursiveSeq value; -}; +} interface Initial { @@ -353,6 +353,6 @@ interface Initial bool supportsCppStringView(); bool supportsNullOptional(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/optional/TestAMD.ice b/java/test/src/main/java/test/Ice/optional/TestAMD.ice index 863179dc0c2..c21ede7338a 100644 --- a/java/test/src/main/java/test/Ice/optional/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/optional/TestAMD.ice @@ -16,32 +16,32 @@ module Test class OneOptional { optional(1) int a; -}; +} enum MyEnum { MyEnumMember -}; +} struct SmallStruct { byte m; -}; +} struct FixedStruct { int m; -}; +} struct VarStruct { string m; -}; +} struct ClassVarStruct { int a; -}; +} sequence<byte> ByteSeq; sequence<bool> BoolSeq; @@ -106,7 +106,7 @@ class MultiOptional optional(29) BoolSeq bos; optional(30) Serializable ser; -}; +} class A { @@ -114,26 +114,26 @@ class A optional(1) int ma; optional(50) int mb; optional(500) int mc; -}; +} ["preserve-slice"] class B extends A { int requiredB; optional(10) int md; -}; +} class C extends B { string ss; optional(890) string ms; -}; +} class WD { optional(1) int a = 5; optional(2) string s = "test"; -}; +} exception OptionalException { @@ -141,46 +141,46 @@ exception OptionalException optional(1) int a = 5; optional(2) string b; optional(50) OneOptional o; -}; +} exception DerivedException extends OptionalException { optional(600) string ss = "test"; optional(601) OneOptional o2; -}; +} exception RequiredException extends OptionalException { string ss = "test"; OneOptional o2; -}; +} class OptionalWithCustom { optional(1) SmallStructList l; ["protected"] optional(2) SmallStructList lp; optional(3) ClassVarStruct s; -}; +} class E { A ae; -}; +} class F extends E { optional(1) A af; -}; +} class G1 { string a; -}; +} class G2 { long a; -}; +} class G { @@ -188,14 +188,14 @@ class G G2 gg2; optional(0) G2 gg2Opt; G1 gg1; -}; +} class Recursive; sequence<Recursive> RecursiveSeq; class Recursive { optional(0) RecursiveSeq value; -}; +} ["amd"] interface Initial @@ -354,6 +354,6 @@ interface Initial bool supportsCppStringView(); bool supportsNullOptional(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/packagemd/NoPackage.ice b/java/test/src/main/java/test/Ice/packagemd/NoPackage.ice index 51cf954095e..20ee98c30fb 100644 --- a/java/test/src/main/java/test/Ice/packagemd/NoPackage.ice +++ b/java/test/src/main/java/test/Ice/packagemd/NoPackage.ice @@ -15,25 +15,25 @@ module Test1 class C1 { int i; -}; +} class C2 extends C1 { long l; -}; +} exception E1 { int i; -}; +} exception E2 extends E1 { long l; -}; +} exception notify /* Test keyword escape. */ { int i; -}; -}; +} +} diff --git a/java/test/src/main/java/test/Ice/packagemd/Package.ice b/java/test/src/main/java/test/Ice/packagemd/Package.ice index 4be6c71f848..610179ecc81 100644 --- a/java/test/src/main/java/test/Ice/packagemd/Package.ice +++ b/java/test/src/main/java/test/Ice/packagemd/Package.ice @@ -15,43 +15,43 @@ module Test2 class C1 { int i; -}; +} class C2 extends C1 { long l; -}; +} exception E1 { int i; -}; +} exception E2 extends E1 { long l; -}; -}; +} +} module Test3 { class C1 { int i; -}; +} class C2 extends C1 { long l; -}; +} exception E1 { int i; -}; +} exception E2 extends E1 { long l; -}; -}; +} +} diff --git a/java/test/src/main/java/test/Ice/packagemd/Test.ice b/java/test/src/main/java/test/Ice/packagemd/Test.ice index 508dce88885..a05408bab6f 100644 --- a/java/test/src/main/java/test/Ice/packagemd/Test.ice +++ b/java/test/src/main/java/test/Ice/packagemd/Test.ice @@ -35,6 +35,6 @@ interface Initial void throwTest3E2AsE2() throws Test3::E2; void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/proxy/Test.ice b/java/test/src/main/java/test/Ice/proxy/Test.ice index 26c141ac251..991e39a3a41 100644 --- a/java/test/src/main/java/test/Ice/proxy/Test.ice +++ b/java/test/src/main/java/test/Ice/proxy/Test.ice @@ -20,11 +20,11 @@ interface MyClass void shutdown(); Ice::Context getContext(); -}; +} interface MyDerivedClass extends MyClass { Object* echo(Object* obj); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/proxy/TestAMD.ice b/java/test/src/main/java/test/Ice/proxy/TestAMD.ice index c45426f176f..a39ccc8466a 100644 --- a/java/test/src/main/java/test/Ice/proxy/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/proxy/TestAMD.ice @@ -20,11 +20,11 @@ module Test void shutdown(); Ice::Context getContext(); -}; +} ["amd"] interface MyDerivedClass extends MyClass { Object* echo(Object* obj); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/retry/Test.ice b/java/test/src/main/java/test/Ice/retry/Test.ice index 60f79047a58..e97f4cca23f 100644 --- a/java/test/src/main/java/test/Ice/retry/Test.ice +++ b/java/test/src/main/java/test/Ice/retry/Test.ice @@ -22,6 +22,6 @@ interface Retry void opSystemException(); idempotent void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/seqMapping/Test.ice b/java/test/src/main/java/test/Ice/seqMapping/Test.ice index 97fbb376803..3f4c662934b 100644 --- a/java/test/src/main/java/test/Ice/seqMapping/Test.ice +++ b/java/test/src/main/java/test/Ice/seqMapping/Test.ice @@ -24,7 +24,7 @@ interface MyClass SerialSmall opSerialSmallJava(SerialSmall i, out SerialSmall o); SerialLarge opSerialLargeJava(SerialLarge i, out SerialLarge o); SerialStruct opSerialStructJava(SerialStruct i, out SerialStruct o); -}; +} // Remaining type definitions are there to verify that the generated // code compiles correctly. @@ -37,18 +37,18 @@ struct Foo { SerialLarge SLmem; SLS SLSmem; -}; +} exception Bar { SerialLarge SLmem; SLS SLSmem; -}; +} class Baz { SerialLarge SLmem; SLS SLSmem; -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/seqMapping/TestAMD.ice b/java/test/src/main/java/test/Ice/seqMapping/TestAMD.ice index d3755b8b940..6a676a1d71e 100644 --- a/java/test/src/main/java/test/Ice/seqMapping/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/seqMapping/TestAMD.ice @@ -24,7 +24,7 @@ module Test SerialSmall opSerialSmallJava(SerialSmall i, out SerialSmall o); SerialLarge opSerialLargeJava(SerialLarge i, out SerialLarge o); SerialStruct opSerialStructJava(SerialStruct i, out SerialStruct o); -}; +} // Remaining type definitions are there to verify that the generated // code compiles correctly. @@ -37,18 +37,18 @@ struct Foo { SerialLarge SLmem; SLS SLSmem; -}; +} exception Bar { SerialLarge SLmem; SLS SLSmem; -}; +} class Baz { SerialLarge SLmem; SLS SLSmem; -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/serialize/Test.ice b/java/test/src/main/java/test/Ice/serialize/Test.ice index 267b60ab3be..9b0debae25e 100644 --- a/java/test/src/main/java/test/Ice/serialize/Test.ice +++ b/java/test/src/main/java/test/Ice/serialize/Test.ice @@ -18,7 +18,7 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface Initial; class Base; @@ -35,7 +35,7 @@ struct Struct1 string str; MyEnum e; Initial* p; -}; +} sequence<byte> ByteS; sequence<int> IntS; @@ -60,18 +60,18 @@ class Base ShortIntD d2; StringMyEnumD d3; StringBaseD d4; -}; +} class Derived extends Base { Object* p; -}; +} exception Ex { Struct1 s; Base b; -}; +} interface Initial { @@ -79,6 +79,6 @@ interface Initial ByteS getBase(); ByteS getEx(); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/servantLocator/Test.ice b/java/test/src/main/java/test/Ice/servantLocator/Test.ice index 4550fa5c340..f9c52a22613 100644 --- a/java/test/src/main/java/test/Ice/servantLocator/Test.ice +++ b/java/test/src/main/java/test/Ice/servantLocator/Test.ice @@ -15,11 +15,11 @@ module Test exception TestIntfUserException { -}; +} exception TestImpossibleException { -}; +} interface TestIntf { @@ -40,16 +40,16 @@ interface TestIntf void asyncException() throws TestIntfUserException, TestImpossibleException; void shutdown(); -}; +} interface TestActivation { void activateServantLocator(bool activate); -}; +} local class Cookie { ["cpp:const"] string message(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/servantLocator/TestAMD.ice b/java/test/src/main/java/test/Ice/servantLocator/TestAMD.ice index 51dc837bf24..308a9705770 100644 --- a/java/test/src/main/java/test/Ice/servantLocator/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/servantLocator/TestAMD.ice @@ -15,11 +15,11 @@ module Test exception TestIntfUserException { -}; +} exception TestImpossibleException { -}; +} ["amd"] interface TestIntf { @@ -40,16 +40,16 @@ exception TestImpossibleException void asyncException() throws TestIntfUserException, TestImpossibleException; void shutdown(); -}; +} interface TestActivation { void activateServantLocator(bool activate); -}; +} local class Cookie { ["cpp:const"] string message(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice b/java/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice index 80e8f150992..1215f5bf193 100644 --- a/java/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice @@ -21,39 +21,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -63,7 +63,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["format:sliced"] interface TestIntf @@ -99,7 +99,7 @@ interface TestIntf void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} // // Types private to the client. @@ -108,16 +108,16 @@ interface TestIntf class PreservedClass extends BaseClass { string pc; -}; +} exception Preserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception Preserved2 extends Preserved1 { BaseClass p2; -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice index 6510e376eb0..c9ab7831266 100644 --- a/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice @@ -21,39 +21,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -63,7 +63,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["format:sliced"] interface TestIntf @@ -99,7 +99,7 @@ interface TestIntf void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} // // Types private to the server. @@ -108,36 +108,36 @@ interface TestIntf exception UnknownDerived extends Base { string ud; -}; +} exception UnknownIntermediate extends Base { string ui; -}; +} exception UnknownMostDerived1 extends KnownIntermediate { string umd1; -}; +} exception UnknownMostDerived2 extends UnknownIntermediate { string umd2; -}; +} class SPreservedClass extends BaseClass { string spc; -}; +} exception SPreserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception SPreserved2 extends SPreserved1 { BaseClass p2; -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice index 05719e1bd96..708b74d8a57 100644 --- a/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice @@ -21,39 +21,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -63,7 +63,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["amd", "format:sliced"] interface TestIntf @@ -99,7 +99,7 @@ interface TestIntf void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} // // Types private to the server. @@ -108,36 +108,36 @@ interface TestIntf exception UnknownDerived extends Base { string ud; -}; +} exception UnknownIntermediate extends Base { string ui; -}; +} exception UnknownMostDerived1 extends KnownIntermediate { string umd1; -}; +} exception UnknownMostDerived2 extends UnknownIntermediate { string umd2; -}; +} class SPreservedClass extends BaseClass { string spc; -}; +} exception SPreserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception SPreserved2 extends SPreserved1 { BaseClass p2; -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice b/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice index 033caffc8b5..2ba6cfd3d9b 100644 --- a/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice +++ b/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice @@ -21,42 +21,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS3 { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -64,20 +64,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -85,28 +85,28 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} class CompactPDerived(56) extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["format:sliced"] interface TestIntf @@ -164,7 +164,7 @@ interface TestIntf void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */ void shutdown(); -}; +} // // Types private to the client. @@ -174,42 +174,42 @@ class D3 extends B { string sd3; B pd3; -}; +} ["preserve-slice"] class PCUnknown extends PBase { string pu; -}; +} class PCDerived extends PDerived { PBaseSeq pbs; -}; +} class PCDerived2 extends PCDerived { int pcd2; -}; +} class PCDerived3 extends PCDerived2 { Object pcd3; -}; +} class CompactPCDerived(57) extends CompactPDerived { PBaseSeq pbs; -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice index f67f89a3350..b1c085fa70e 100644 --- a/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice +++ b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice @@ -21,42 +21,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS3 { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -64,20 +64,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -85,28 +85,28 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} class CompactPDerived(56) extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["format:sliced"] interface TestIntf @@ -164,7 +164,7 @@ interface TestIntf void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */ void shutdown(); -}; +} // // Types private to the server. @@ -173,61 +173,61 @@ interface TestIntf class SBSUnknownDerived extends SBase { string sbsud; -}; +} class SUnknown { string su; -}; +} class D2 extends B { string sd2; B pd2; -}; +} class D4 extends B { B p1; B p2; -}; +} exception UnknownDerivedException extends BaseException { string sude; D2 pd2; -}; +} class MyClass { int i; -}; +} class PSUnknown extends Preserved { string psu; PNode graph; MyClass cl; -}; +} class PSUnknown2 extends Preserved { PBase pb; -}; +} exception PSUnknownException extends PreservedException { PSUnknown2 p; -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice index a1fb17ab1b1..a919113c025 100644 --- a/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice +++ b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice @@ -21,42 +21,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS3 { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -64,20 +64,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -85,23 +85,23 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["amd", "format:sliced"] interface TestIntf @@ -159,7 +159,7 @@ interface TestIntf void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */ void shutdown(); -}; +} // // Types private to the server. @@ -168,61 +168,61 @@ interface TestIntf class SBSUnknownDerived extends SBase { string sbsud; -}; +} class SUnknown { string su; -}; +} class D2 extends B { string sd2; B pd2; -}; +} class D4 extends B { B p1; B p2; -}; +} exception UnknownDerivedException extends BaseException { string sude; D2 pd2; -}; +} class MyClass { int i; -}; +} class PSUnknown extends Preserved { string psu; PNode graph; MyClass cl; -}; +} class PSUnknown2 extends Preserved { PBase pb; -}; +} exception PSUnknownException extends PreservedException { PSUnknown2 p; -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/stream/Test.ice b/java/test/src/main/java/test/Ice/stream/Test.ice index c1e2e8bce6c..be82338035e 100644 --- a/java/test/src/main/java/test/Ice/stream/Test.ice +++ b/java/test/src/main/java/test/Ice/stream/Test.ice @@ -20,7 +20,7 @@ enum MyEnum enum1, enum2, enum3 -}; +} class MyClass; @@ -39,13 +39,13 @@ struct SmallStruct MyEnum e; MyClass* p; SerialSmall ss; -}; +} struct Point { int x; int y; -}; +} sequence<MyEnum> MyEnumS; sequence<MyClass> MyClassS; @@ -74,7 +74,7 @@ class OptionalClass optional(13) Ice::ByteSeq byteSeq13; optional(14) Ice::StringSeq stringSeq14; optional(15) Point p15; -}; +} sequence<Ice::BoolSeq> BoolSS; sequence<Ice::ByteSeq> ByteSS; @@ -109,11 +109,11 @@ class MyClass MyEnumS seq9; MyClassS seq10; StringMyClassD d; -}; +} exception MyException { MyClass c; -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/threadPoolPriority/Test.ice b/java/test/src/main/java/test/Ice/threadPoolPriority/Test.ice index 240c7bc5f16..86906aa7f2d 100644 --- a/java/test/src/main/java/test/Ice/threadPoolPriority/Test.ice +++ b/java/test/src/main/java/test/Ice/threadPoolPriority/Test.ice @@ -17,6 +17,6 @@ interface Priority { void shutdown(); int getPriority(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/throughput/Throughput.ice b/java/test/src/main/java/test/Ice/throughput/Throughput.ice index aaca70ee59f..80dc7f7b5ed 100644 --- a/java/test/src/main/java/test/Ice/throughput/Throughput.ice +++ b/java/test/src/main/java/test/Ice/throughput/Throughput.ice @@ -24,7 +24,7 @@ struct StringDouble { string s; double d; -}; +} sequence<StringDouble> StringDoubleSeq; const int StringDoubleSeqSize = 50000; @@ -33,7 +33,7 @@ struct Fixed int i; int j; double d; -}; +} sequence<Fixed> FixedSeq; const int FixedSeqSize = 50000; @@ -60,7 +60,7 @@ interface Throughput FixedSeq echoFixedSeq(FixedSeq seq); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/timeout/Test.ice b/java/test/src/main/java/test/Ice/timeout/Test.ice index 2d87386374c..93b88a53f06 100644 --- a/java/test/src/main/java/test/Ice/timeout/Test.ice +++ b/java/test/src/main/java/test/Ice/timeout/Test.ice @@ -24,6 +24,6 @@ interface Timeout void holdAdapter(int to); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Ice/udp/Test.ice b/java/test/src/main/java/test/Ice/udp/Test.ice index fc700157ae0..ec1b7f52c5b 100644 --- a/java/test/src/main/java/test/Ice/udp/Test.ice +++ b/java/test/src/main/java/test/Ice/udp/Test.ice @@ -17,7 +17,7 @@ module Test interface PingReply { void reply(); -}; +} sequence<byte> ByteSeq; @@ -27,6 +27,6 @@ interface TestIntf void sendByteSeq(ByteSeq seq, PingReply* reply); void pingBiDir(Ice::Identity id); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/IceBox/admin/Test.ice b/java/test/src/main/java/test/IceBox/admin/Test.ice index 13e3ca5660d..2113b0416f4 100644 --- a/java/test/src/main/java/test/IceBox/admin/Test.ice +++ b/java/test/src/main/java/test/IceBox/admin/Test.ice @@ -19,8 +19,8 @@ module Test interface TestFacet { Ice::PropertyDict getChanges(); -}; +} -}; +} #endif diff --git a/java/test/src/main/java/test/IceBox/configuration/Test.ice b/java/test/src/main/java/test/IceBox/configuration/Test.ice index d4a0543ae06..eccf3b1d60b 100644 --- a/java/test/src/main/java/test/IceBox/configuration/Test.ice +++ b/java/test/src/main/java/test/IceBox/configuration/Test.ice @@ -20,6 +20,6 @@ interface TestIntf string getProperty(string name); Ice::StringSeq getArgs(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/IceDiscovery/simple/Test.ice b/java/test/src/main/java/test/IceDiscovery/simple/Test.ice index d64cecf51f8..bcb14d687e7 100644 --- a/java/test/src/main/java/test/IceDiscovery/simple/Test.ice +++ b/java/test/src/main/java/test/IceDiscovery/simple/Test.ice @@ -17,7 +17,7 @@ module Test interface TestIntf { string getAdapterId(); -}; +} interface Controller { @@ -28,6 +28,6 @@ interface Controller void removeObject(string oaName, string id); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/IceGrid/simple/Test.ice b/java/test/src/main/java/test/IceGrid/simple/Test.ice index 94d58ffaeaf..947893d2533 100644 --- a/java/test/src/main/java/test/IceGrid/simple/Test.ice +++ b/java/test/src/main/java/test/IceGrid/simple/Test.ice @@ -16,6 +16,6 @@ module Test interface TestIntf { void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/IceSSL/configuration/Test.ice b/java/test/src/main/java/test/IceSSL/configuration/Test.ice index 5fc576c71e2..9c4de6e7d39 100644 --- a/java/test/src/main/java/test/IceSSL/configuration/Test.ice +++ b/java/test/src/main/java/test/IceSSL/configuration/Test.ice @@ -18,7 +18,7 @@ interface Server void noCert(); void checkCert(string subjectDN, string issuerDN); void checkCipher(string cipher); -}; +} dictionary<string, string> Properties; @@ -27,6 +27,6 @@ interface ServerFactory Server* createServer(Properties props); void destroyServer(Server* srv); void shutdown(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Slice/escape/Clash.ice b/java/test/src/main/java/test/Slice/escape/Clash.ice index 01b6dd0d9f9..75cdb571143 100644 --- a/java/test/src/main/java/test/Slice/escape/Clash.ice +++ b/java/test/src/main/java/test/Slice/escape/Clash.ice @@ -31,7 +31,7 @@ interface Intf void opOut(out string context, out string current, out string response, out string ex, out string sent, out string cookie, out string sync, out string result, out string istr, out string ostr, out optional(1) string proxy, out optional(2) int obj); -}; +} class Cls { @@ -52,7 +52,7 @@ class Cls int obj; int getCookie; string clone; -}; +} struct St { @@ -62,13 +62,13 @@ struct St int rhs; string hashCode; int clone; -}; +} exception Ex { short istr; int ostr; string cause; -}; +} -}; +} diff --git a/java/test/src/main/java/test/Slice/escape/Key.ice b/java/test/src/main/java/test/Slice/escape/Key.ice index 7e469c8426f..02c18be17dc 100644 --- a/java/test/src/main/java/test/Slice/escape/Key.ice +++ b/java/test/src/main/java/test/Slice/escape/Key.ice @@ -16,53 +16,53 @@ module abstract enum assert { boolean -}; +} struct break { int case; -}; +} interface catch { ["amd"] void checkedCast(int clone, out int continue); -}; +} interface default { void do(); -}; +} class else { int if; default* equals; int final; -}; +} interface finalize extends default, catch { -}; +} sequence<assert> for; dictionary<string, assert> goto; exception hashCode { int if; -}; +} exception import extends hashCode { int instanceof; int native; -}; +} local interface new { assert notify(break notifyAll, else null, finalize package, else* private, finalize* protected, catch* public, default* return, int static, int strictfp, int super) throws hashCode, import; -}; +} const int switch = 0; const int synchronized = 0; @@ -77,4 +77,4 @@ const int while = 0; const int finally = 0; const int getClass = 0; -}; +} diff --git a/java/test/src/main/java/test/Slice/generation/File1.ice b/java/test/src/main/java/test/Slice/generation/File1.ice index d737a6d468e..30da534aebe 100644 --- a/java/test/src/main/java/test/Slice/generation/File1.ice +++ b/java/test/src/main/java/test/Slice/generation/File1.ice @@ -16,6 +16,6 @@ module Test interface Interface1 { void method(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Slice/generation/File2.ice b/java/test/src/main/java/test/Slice/generation/File2.ice index 17e566d49ac..8554fcef01e 100644 --- a/java/test/src/main/java/test/Slice/generation/File2.ice +++ b/java/test/src/main/java/test/Slice/generation/File2.ice @@ -16,6 +16,6 @@ module Test interface Interface2 { void method(); -}; +} -}; +} diff --git a/java/test/src/main/java/test/Slice/macros/Test.ice b/java/test/src/main/java/test/Slice/macros/Test.ice index 11f8acaa826..50daed0f914 100644 --- a/java/test/src/main/java/test/Slice/macros/Test.ice +++ b/java/test/src/main/java/test/Slice/macros/Test.ice @@ -36,13 +36,13 @@ class Default { int x DEFAULT(10); int y DEFAULT(10); -}; +} class NoDefault { int x NODEFAULT(10); int y NODEFAULT(10); -}; +} // // This class is only defined when compiling with slice2java. @@ -52,7 +52,7 @@ class JavaOnly { string lang DEFAULT("java"); int version DEFAULT(ICE_VERSION); -}; +} #endif -}; +} diff --git a/java/test/src/main/java/test/Slice/structure/Test.ice b/java/test/src/main/java/test/Slice/structure/Test.ice index 96893ef5491..38e3d0784a9 100644 --- a/java/test/src/main/java/test/Slice/structure/Test.ice +++ b/java/test/src/main/java/test/Slice/structure/Test.ice @@ -20,12 +20,12 @@ dictionary<string, string> StringDict; class C { int i; -}; +} struct S1 { string name; -}; +} struct S2 { @@ -43,6 +43,6 @@ struct S2 S1 s; C cls; Object* prx; -}; +} -}; +} diff --git a/js/test/Glacier2/router/Callback.ice b/js/test/Glacier2/router/Callback.ice index 4bd4f9a9f16..d8d26b60a2d 100644 --- a/js/test/Glacier2/router/Callback.ice +++ b/js/test/Glacier2/router/Callback.ice @@ -16,7 +16,7 @@ exception CallbackException { double someValue; string someString; -}; +} interface CallbackReceiver { @@ -24,7 +24,7 @@ interface CallbackReceiver void callbackEx() throws CallbackException; -}; +} interface Callback { @@ -34,6 +34,6 @@ interface Callback throws CallbackException; void shutdown(); -}; +} -}; +} diff --git a/js/test/Ice/acm/Test.ice b/js/test/Ice/acm/Test.ice index 363bf199325..2f695d2c49d 100644 --- a/js/test/Ice/acm/Test.ice +++ b/js/test/Ice/acm/Test.ice @@ -20,7 +20,7 @@ interface TestIntf void interruptSleep(); void startHeartbeatCount(); void waitForHeartbeatCount(int count); -}; +} interface RemoteObjectAdapter { @@ -28,13 +28,13 @@ interface RemoteObjectAdapter void activate(); void hold(); void deactivate(); -}; +} interface RemoteCommunicator { RemoteObjectAdapter* createObjectAdapter(int acmTimeout, int close, int heartbeat); void shutdown(); -}; +} -}; +} diff --git a/js/test/Ice/ami/Test.ice b/js/test/Ice/ami/Test.ice index 434381a3815..2f49a2f747c 100644 --- a/js/test/Ice/ami/Test.ice +++ b/js/test/Ice/ami/Test.ice @@ -17,19 +17,19 @@ module Test exception TestIntfException { -}; +} enum CloseMode { Forcefully, Gracefully, GracefullyWithWait -}; +} interface PingReply { void reply(); -}; +} interface TestIntf { @@ -51,12 +51,12 @@ interface TestIntf bool supportsFunctionalTests(); void pingBidDir(Ice::Identity id); -}; +} interface TestIntfController { void holdAdapter(); void resumeAdapter(); -}; +} -}; +} diff --git a/js/test/Ice/binding/Test.ice b/js/test/Ice/binding/Test.ice index 732aef3be4b..32929b4d959 100644 --- a/js/test/Ice/binding/Test.ice +++ b/js/test/Ice/binding/Test.ice @@ -15,14 +15,14 @@ module Test interface TestIntf { string getAdapterName(); -}; +} interface RemoteObjectAdapter { TestIntf* getTestIntf(); void deactivate(); -}; +} interface RemoteCommunicator { @@ -31,7 +31,7 @@ interface RemoteCommunicator void deactivateObjectAdapter(RemoteObjectAdapter* adapter); void shutdown(); -}; +} -}; +} diff --git a/js/test/Ice/defaultValue/Test.ice b/js/test/Ice/defaultValue/Test.ice index b042c081413..faaaaf2f475 100644 --- a/js/test/Ice/defaultValue/Test.ice +++ b/js/test/Ice/defaultValue/Test.ice @@ -14,14 +14,14 @@ module Test { -enum Color { red, green, blue }; +enum Color { red, green, blue } module Nested { -enum Color { red, green, blue }; +enum Color { red, green, blue } -}; +} struct Struct1 { @@ -47,7 +47,7 @@ struct Struct1 float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} const bool ConstBool = true; const byte ConstByte = 254; @@ -92,7 +92,7 @@ struct Struct2 float zeroDotF = ConstZeroDotF; double zeroD = ConstZeroD; double zeroDotD = ConstZeroDotD; -}; +} ["cpp:class"] struct Struct3 @@ -119,7 +119,7 @@ struct Struct3 float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} class Base { @@ -139,7 +139,7 @@ class Base float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} class Derived extends Base { @@ -149,7 +149,7 @@ class Derived extends Base Nested::Color nc1 = ::Test::Nested::Color::red; Nested::Color nc2 = Nested::green; Nested::Color nc3 = blue; -}; +} exception BaseEx { @@ -169,7 +169,7 @@ exception BaseEx float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} exception DerivedEx extends BaseEx { @@ -179,7 +179,7 @@ exception DerivedEx extends BaseEx Nested::Color nc1 = ConstNestedColor1; Nested::Color nc2 = ConstNestedColor2; Nested::Color nc3 = ConstNestedColor3; -}; +} sequence<byte> ByteSeq; sequence<int> IntSeq; @@ -188,7 +188,7 @@ dictionary<int, string> IntStringDict; struct InnerStruct { int a; -}; +} struct StructNoDefaults { @@ -205,32 +205,32 @@ struct StructNoDefaults IntSeq is; InnerStruct st; IntStringDict dict; -}; +} exception ExceptionNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} exception ExceptionNoDefaults extends ExceptionNoDefaultsBase { InnerStruct st; IntStringDict dict; -}; +} class ClassNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} class ClassNoDefaults extends ClassNoDefaultsBase { InnerStruct st; IntStringDict dict; -}; +} -}; +} diff --git a/js/test/Ice/enums/Test.ice b/js/test/Ice/enums/Test.ice index 420b8cf6623..8b50132427b 100644 --- a/js/test/Ice/enums/Test.ice +++ b/js/test/Ice/enums/Test.ice @@ -35,7 +35,7 @@ enum ByteEnum benum9 = LongConst1, benum10, benum11 = ByteConst2 -}; +} enum ShortEnum { @@ -50,7 +50,7 @@ enum ShortEnum senum9 = LongConst1, senum10, senum11 = ShortConst2 -}; +} enum IntEnum { @@ -66,14 +66,14 @@ enum IntEnum ienum10, ienum11 = IntConst2, ienum12 = LongConst2 -}; +} enum SimpleEnum { red, green, blue -}; +} interface TestIntf { @@ -83,6 +83,6 @@ interface TestIntf SimpleEnum opSimple(SimpleEnum s1, out SimpleEnum s2); void shutdown(); -}; +} -}; +} diff --git a/js/test/Ice/exceptions/Test.ice b/js/test/Ice/exceptions/Test.ice index 1b3c3a49425..4102b502e23 100644 --- a/js/test/Ice/exceptions/Test.ice +++ b/js/test/Ice/exceptions/Test.ice @@ -16,29 +16,29 @@ module Test interface Empty { -}; +} interface Thrower; exception A { int aMem; -}; +} exception B extends A { int bMem; -}; +} exception C extends B { int cMem; -}; +} exception D { int dMem; -}; +} interface Thrower { @@ -66,12 +66,12 @@ interface Thrower void throwAfterResponse(); void throwAfterException() throws A; -}; +} interface WrongOperation { void noSuchOperation(); -}; +} interface Echo { @@ -79,6 +79,6 @@ interface Echo void startBatch(); void flushBatch(); void shutdown(); -}; +} -}; +} diff --git a/js/test/Ice/facets/Test.ice b/js/test/Ice/facets/Test.ice index 319b12bced0..1b95318374d 100644 --- a/js/test/Ice/facets/Test.ice +++ b/js/test/Ice/facets/Test.ice @@ -14,48 +14,48 @@ module Test interface Empty { -}; +} interface A { string callA(); -}; +} interface B extends A { string callB(); -}; +} interface C extends A { string callC(); -}; +} interface D extends B, C { string callD(); -}; +} interface E { string callE(); -}; +} interface F extends E { string callF(); -}; +} interface G { void shutdown(); string callG(); -}; +} interface H extends G { string callH(); -}; +} interface Echo { @@ -63,7 +63,7 @@ interface Echo void startBatch(); void flushBatch(); void shutdown(); -}; +} -}; +} diff --git a/js/test/Ice/hold/Test.ice b/js/test/Ice/hold/Test.ice index 3d18b9e1631..0e450781798 100644 --- a/js/test/Ice/hold/Test.ice +++ b/js/test/Ice/hold/Test.ice @@ -19,6 +19,6 @@ interface Hold void setOneway(int value, int expected); int set(int value, int delay); void shutdown(); -}; +} -}; +} diff --git a/js/test/Ice/import/Demo/Canvas.ice b/js/test/Ice/import/Demo/Canvas.ice index 92ffbe013f9..2b4bcb543df 100644 --- a/js/test/Ice/import/Demo/Canvas.ice +++ b/js/test/Ice/import/Demo/Canvas.ice @@ -18,13 +18,13 @@ interface Canvas void paintSquare(Square square); void paintCircle(Circle circle); -}; +} interface Session extends Glacier2::Session { void destroySession(); -}; +} -}; +} -};
\ No newline at end of file +} diff --git a/js/test/Ice/import/Demo/Circle.ice b/js/test/Ice/import/Demo/Circle.ice index 82ab52cd93a..8b494163123 100644 --- a/js/test/Ice/import/Demo/Circle.ice +++ b/js/test/Ice/import/Demo/Circle.ice @@ -15,8 +15,8 @@ struct Circle { Point center; long radius; -}; +} -}; +} -};
\ No newline at end of file +} diff --git a/js/test/Ice/import/Demo/Point.ice b/js/test/Ice/import/Demo/Point.ice index 26f0afd581e..17ba0af3eeb 100644 --- a/js/test/Ice/import/Demo/Point.ice +++ b/js/test/Ice/import/Demo/Point.ice @@ -13,9 +13,9 @@ struct Point { int x; int y; -}; +} -}; +} -};
\ No newline at end of file +} diff --git a/js/test/Ice/import/Demo/Square.ice b/js/test/Ice/import/Demo/Square.ice index b2c1cba6cf7..77326b945d4 100644 --- a/js/test/Ice/import/Demo/Square.ice +++ b/js/test/Ice/import/Demo/Square.ice @@ -17,9 +17,9 @@ struct Square Point p2; Point p3; Point p4; -}; +} -}; +} -};
\ No newline at end of file +} diff --git a/js/test/Ice/info/Test.ice b/js/test/Ice/info/Test.ice index c518d54b867..6741d5348d4 100644 --- a/js/test/Ice/info/Test.ice +++ b/js/test/Ice/info/Test.ice @@ -21,6 +21,6 @@ interface TestIntf Ice::Context getEndpointInfoAsContext(); Ice::Context getConnectionInfoAsContext(); -}; +} -}; +} diff --git a/js/test/Ice/inheritance/Test.ice b/js/test/Ice/inheritance/Test.ice index b0924bb8cdd..4e7df94a481 100644 --- a/js/test/Ice/inheritance/Test.ice +++ b/js/test/Ice/inheritance/Test.ice @@ -20,14 +20,14 @@ module MA interface IA { IA* iaop(IA* p); -}; +} class CA { CA* caop(CA* p); -}; +} -}; +} module MB { @@ -35,19 +35,19 @@ module MB interface IB1 extends MA::IA { IB1* ib1op(IB1* p); -}; +} interface IB2 extends MA::IA { IB2* ib2op(IB2* p); -}; +} class CB extends MA::CA { CB* cbop(CB* p); -}; +} -}; +} module MA { @@ -55,19 +55,19 @@ module MA interface IC extends MB::IB1, MB::IB2 { IC* icop(IC* p); -}; +} class CC extends MB::CB { CC* ccop(CC* p); -}; +} class CD extends CC implements MB::IB1, MB::IB2 { CD* cdop(CD* p); -}; +} -}; +} interface Initial { @@ -80,7 +80,7 @@ interface Initial MB::IB1* ib1op(); MB::IB2* ib2op(); MA::IC* icop(); -}; +} module MC @@ -89,24 +89,24 @@ module MC class A { int aA; -}; +} class B extends A { int bB; -}; +} class C extends B { int cC; -}; +} class D extends C { int dD; -}; +} -}; +} module MD { @@ -114,24 +114,24 @@ module MD class A { int aA; -}; +} class B extends A { int bB; -}; +} class C extends B { int cC; -}; +} class D extends C { int dD; -}; +} -}; +} module ME { @@ -139,24 +139,24 @@ module ME class A { int aA; -}; +} class B extends A { int bB; -}; +} class C extends B { int cC; -}; +} class D extends C { int dD; -}; +} -}; +} module MF { @@ -164,24 +164,24 @@ module MF class A { int aA; -}; +} class B extends A { int bB; -}; +} class C extends B { int cC; -}; +} class D extends C { int dD; -}; +} -}; +} module MG { @@ -189,24 +189,24 @@ module MG class A { int aA; -}; +} class B extends A { int bB; -}; +} class C extends B { int cC; -}; +} class D extends C { int dD; -}; +} -}; +} module MH { @@ -214,24 +214,24 @@ module MH class A { int aA; -}; +} class B extends A { int bB; -}; +} class C extends B { int cC; -}; +} class D extends C { int dD; -}; +} -}; +} interface Echo { @@ -239,6 +239,6 @@ interface Echo void startBatch(); void flushBatch(); void shutdown(); -}; +} -}; +} diff --git a/js/test/Ice/location/Test.ice b/js/test/Ice/location/Test.ice index 5291d8f0dab..cd5afbb9171 100644 --- a/js/test/Ice/location/Test.ice +++ b/js/test/Ice/location/Test.ice @@ -20,7 +20,7 @@ interface TestLocatorRegistry extends ::Ice::LocatorRegistry // Allow remote addition of objects to the locator registry. // void addObject(Object* obj); -}; +} interface TestLocator extends ::Ice::Locator { @@ -28,18 +28,18 @@ interface TestLocator extends ::Ice::Locator // Returns the number of request on the locator interface. // idempotent int getRequestCount(); -}; +} interface ServerManager { void startServer(); void shutdown(); -}; +} interface Hello { void sayHello(); -}; +} interface TestIntf { @@ -50,6 +50,6 @@ interface TestIntf Hello* getReplicatedHello(); void migrateHello(); -}; +} -}; +} diff --git a/js/test/Ice/objects/Test.ice b/js/test/Ice/objects/Test.ice index 3bc810f5848..d7e55ca15de 100644 --- a/js/test/Ice/objects/Test.ice +++ b/js/test/Ice/objects/Test.ice @@ -17,18 +17,18 @@ module Test struct S { string str; -}; +} class Base { S theS; string str; -}; +} class AbstractBase extends Base { void op(); -}; +} class B; class C; @@ -40,12 +40,12 @@ class A bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class B extends A { A theA; -}; +} class C { @@ -53,7 +53,7 @@ class C bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class D { @@ -63,35 +63,35 @@ class D bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} ["protected"] class E { int i; string s; -}; +} class F { ["protected"] E e1; E e2; -}; +} interface I { void doI(); -}; +} interface J extends I { void doJ(); -}; +} class H implements I { void doH(); void doH2(); -}; +} sequence<Base> BaseSeq; @@ -99,43 +99,43 @@ class CompactExt; class Compact(1) { -}; +} const int CompactExtId = 789; class CompactExt(CompactExtId) extends Compact { -}; +} class A1 { string name; -}; +} class B1 { A1 a1; A1 a2; -}; +} class D1 extends B1 { A1 a3; A1 a4; -}; +} exception EBase { A1 a1; A1 a2; -}; +} exception EDerived extends EBase { A1 a3; A1 a4; -}; +} module Inner { @@ -143,12 +143,12 @@ module Inner class A { ::Test::A theA; -}; +} exception Ex { string reason; -}; +} module Sub { @@ -156,21 +156,21 @@ module Sub class A { ::Test::Inner::A theA; -}; +} exception Ex { string reason; -}; +} -}; +} -}; +} class Recursive { Recursive v; -}; +} interface Initial { @@ -208,20 +208,20 @@ interface Initial void throwInnerEx() throws Inner::Ex; void throwInnerSubEx() throws Inner::Sub::Ex; -}; +} class Empty { -}; +} class AlsoEmpty { -}; +} interface UnexpectedObjectExceptionTest { Empty op(); -}; +} // // Remaining definitions are here to ensure that the generated code compiles. @@ -230,35 +230,35 @@ interface UnexpectedObjectExceptionTest class COneMember { Empty e; -}; +} class CTwoMembers { Empty e1; Empty e2; -}; +} exception EOneMember { Empty e; -}; +} exception ETwoMembers { Empty e1; Empty e2; -}; +} struct SOneMember { Empty e; -}; +} struct STwoMembers { Empty e1; Empty e2; -}; +} dictionary<int, COneMember> DOneMember; dictionary<int, CTwoMembers> DTwoMembers; @@ -267,6 +267,6 @@ interface Echo { void setConnection(); void shutdown(); -}; +} -}; +} diff --git a/js/test/Ice/operations/Test.ice b/js/test/Ice/operations/Test.ice index b987365c00f..cdc3ffeec66 100644 --- a/js/test/Ice/operations/Test.ice +++ b/js/test/Ice/operations/Test.ice @@ -19,21 +19,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -64,7 +64,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -259,28 +259,28 @@ interface MyClass ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} interface Echo { @@ -288,7 +288,7 @@ interface Echo void startBatch(); void flushBatch(); void shutdown(); -}; +} // // String literals @@ -358,7 +358,7 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} module Test2 { @@ -371,6 +371,6 @@ module Test2 **/ interface MyDerivedClass extends Test::MyClass { -}; +} -}; +} diff --git a/js/test/Ice/optional/ClientPrivate.ice b/js/test/Ice/optional/ClientPrivate.ice index ea6072ee803..dbe5467fc07 100644 --- a/js/test/Ice/optional/ClientPrivate.ice +++ b/js/test/Ice/optional/ClientPrivate.ice @@ -26,7 +26,7 @@ module Test // string ds; // optional(990) StringSeq seq; // optional(1000) A ao; -// }; +// } // // This class is a hack that allows us to invoke the opClassAndUnknownOptional operation @@ -38,6 +38,6 @@ interface Initial2 void opClassAndUnknownOptional(A p, optional(1) Object o); void opVoid(optional(1) int a, optional(2) string v); -}; +} -}; +} diff --git a/js/test/Ice/optional/Test.ice b/js/test/Ice/optional/Test.ice index 4c206934991..ec08f154f3a 100644 --- a/js/test/Ice/optional/Test.ice +++ b/js/test/Ice/optional/Test.ice @@ -15,32 +15,32 @@ module Test class OneOptional { optional(1) int a; -}; +} enum MyEnum { MyEnumMember -}; +} struct SmallStruct { byte m; -}; +} struct FixedStruct { int m; -}; +} struct VarStruct { string m; -}; +} struct ClassVarStruct { int a; -}; +} sequence<byte> ByteSeq; sequence<bool> BoolSeq; @@ -105,7 +105,7 @@ class MultiOptional optional(29) BoolSeq bos; optional(30) Serializable ser; -}; +} class A { @@ -113,26 +113,26 @@ class A optional(1) int ma; optional(50) int mb; optional(500) int mc; -}; +} ["preserve-slice"] class B extends A { int requiredB; optional(10) int md; -}; +} class C extends B { string ss; optional(890) string ms; -}; +} class WD { optional(1) int a = 5; optional(2) string s = "test"; -}; +} exception OptionalException { @@ -140,46 +140,46 @@ exception OptionalException optional(1) int a = 5; optional(2) string b; optional(50) OneOptional o; -}; +} exception DerivedException extends OptionalException { optional(600) string ss = "test"; optional(601) OneOptional o2; -}; +} exception RequiredException extends OptionalException { string ss = "test"; OneOptional o2; -}; +} class OptionalWithCustom { optional(1) SmallStructList l; ["protected"] optional(2) SmallStructList lp; optional(3) ClassVarStruct s; -}; +} class E { A ae; -}; +} class F extends E { optional(1) A af; -}; +} class G1 { string a; -}; +} class G2 { long a; -}; +} class G { @@ -187,7 +187,7 @@ class G G2 gg2; optional(0) G2 gg2Opt; G1 gg1; -}; +} class Recursive; sequence<Recursive> RecursiveSeq; @@ -195,7 +195,7 @@ sequence<Recursive> RecursiveSeq; class Recursive { optional(0) RecursiveSeq value; -}; +} interface Initial { @@ -309,7 +309,7 @@ interface Initial bool supportsCppStringView(); bool supportsNullOptional(); -}; +} interface Echo { @@ -317,6 +317,6 @@ interface Echo void startBatch(); void flushBatch(); void shutdown(); -}; +} -}; +} diff --git a/js/test/Ice/proxy/Test.ice b/js/test/Ice/proxy/Test.ice index f98d7dbcb3d..711ed0289f1 100644 --- a/js/test/Ice/proxy/Test.ice +++ b/js/test/Ice/proxy/Test.ice @@ -19,11 +19,11 @@ interface MyClass void shutdown(); Ice::Context getContext(); -}; +} interface MyDerivedClass extends MyClass { Object* echo(Object* obj); -}; +} -}; +} diff --git a/js/test/Ice/retry/Test.ice b/js/test/Ice/retry/Test.ice index 7df682dafca..abe9815da89 100644 --- a/js/test/Ice/retry/Test.ice +++ b/js/test/Ice/retry/Test.ice @@ -21,6 +21,6 @@ interface Retry void opSystemException(); idempotent void shutdown(); -}; +} -}; +} diff --git a/js/test/Ice/slicing/exceptions/Test.ice b/js/test/Ice/slicing/exceptions/Test.ice index 3ce6959161d..c6931b59a43 100644 --- a/js/test/Ice/slicing/exceptions/Test.ice +++ b/js/test/Ice/slicing/exceptions/Test.ice @@ -15,39 +15,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -57,7 +57,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["format:sliced"] interface TestIntf @@ -93,6 +93,6 @@ interface TestIntf void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} -}; +} diff --git a/js/test/Ice/slicing/objects/Test.ice b/js/test/Ice/slicing/objects/Test.ice index da0c65be8b7..b171771baa6 100644 --- a/js/test/Ice/slicing/objects/Test.ice +++ b/js/test/Ice/slicing/objects/Test.ice @@ -20,42 +20,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS3 { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -63,20 +63,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -84,28 +84,28 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} class CompactPDerived(56) extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["format:sliced"] interface TestIntf @@ -163,7 +163,7 @@ interface TestIntf void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */ void shutdown(); -}; +} // // Types private to the client. @@ -173,42 +173,42 @@ class D3 extends B { string sd3; B pd3; -}; +} ["preserve-slice"] class PCUnknown extends PBase { string pu; -}; +} class PCDerived extends PDerived { PBaseSeq pbs; -}; +} class PCDerived2 extends PCDerived { int pcd2; -}; +} class PCDerived3 extends PCDerived2 { Object pcd3; -}; +} class CompactPCDerived(57) extends CompactPDerived { PBaseSeq pbs; -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} -}; +} diff --git a/js/test/Ice/timeout/Test.ice b/js/test/Ice/timeout/Test.ice index d34168a950a..aad831a9993 100644 --- a/js/test/Ice/timeout/Test.ice +++ b/js/test/Ice/timeout/Test.ice @@ -23,6 +23,6 @@ interface Timeout void holdAdapter(int to); void shutdown(); -}; +} -}; +} diff --git a/js/test/Slice/escape/Clash.ice b/js/test/Slice/escape/Clash.ice index e43b01b4b6d..0778462b96b 100644 --- a/js/test/Slice/escape/Clash.ice +++ b/js/test/Slice/escape/Clash.ice @@ -30,7 +30,7 @@ interface Intf void opOut(out string context, out string current, out string response, out string ex, out string sent, out string cookie, out string sync, out string result, out string istr, out string ostr, out optional(1) string proxy, out optional(2) int obj); -}; +} class Cls { @@ -51,7 +51,7 @@ class Cls int obj; int getCookie; string clone; -}; +} struct St { @@ -61,13 +61,13 @@ struct St int rhs; string hashCode; int clone; -}; +} exception Ex { short istr; int ostr; string cause; -}; +} -}; +} diff --git a/js/test/Slice/escape/Key.ice b/js/test/Slice/escape/Key.ice index 032a1c0096f..7d6615b0e00 100644 --- a/js/test/Slice/escape/Key.ice +++ b/js/test/Slice/escape/Key.ice @@ -15,33 +15,33 @@ module await enum var { base -}; +} struct break { int while; -}; +} interface case { ["amd"] void catch(int checked, out int continue); -}; +} interface typeof { void default(); -}; +} class delete { int if; case* else; int export; -}; +} interface explicit extends typeof, case { -}; +} dictionary<string, break> while; @@ -53,7 +53,7 @@ class package optional(5) while internal; optional(7) string debugger; optional(8) explicit* null; -}; +} interface optionalParams { @@ -82,18 +82,18 @@ interface optionalParams out optional(5) while internal, out optional(7) string namespace, out optional(8) explicit* null); -}; +} exception fixed { int for; -}; +} exception foreach extends fixed { int goto; int if; -}; +} exception BaseMethods { @@ -112,14 +112,14 @@ exception BaseMethods int GetType; int ReferenceEquals; int ToString; -}; +} local interface implicit { var in(break internal, delete is, explicit lock, case* namespace, typeof* new, delete null, explicit* operator, int override, int params, int private) throws fixed, foreach; -}; +} const int protected = 0; const int public = 0; @@ -133,11 +133,11 @@ module System interface Test { void op(); -}; +} -}; +} -}; +} // // System as outer module. @@ -148,6 +148,6 @@ module System interface Test { void op(); -}; +} -}; +} diff --git a/js/test/Slice/macros/Test.ice b/js/test/Slice/macros/Test.ice index 0ee978ebe0b..21460f11831 100644 --- a/js/test/Slice/macros/Test.ice +++ b/js/test/Slice/macros/Test.ice @@ -32,13 +32,13 @@ class Default { int x DEFAULT(10); int y DEFAULT(10); -}; +} class NoDefault { int x NODEFAULT(10); int y NODEFAULT(10); -}; +} // // This class is only defined when compiling with slice2js. @@ -48,7 +48,7 @@ class JsOnly { string lang DEFAULT("js"); int version DEFAULT(ICE_VERSION); -}; +} #endif -}; +} diff --git a/objective-c/test/Ice/acm/ACMTest.ice b/objective-c/test/Ice/acm/ACMTest.ice index 3af340f03fa..ffddab8a53b 100644 --- a/objective-c/test/Ice/acm/ACMTest.ice +++ b/objective-c/test/Ice/acm/ACMTest.ice @@ -20,7 +20,7 @@ interface TestIntf void interruptSleep(); void startHeartbeatCount(); void waitForHeartbeatCount(int count); -}; +} interface RemoteObjectAdapter { @@ -28,12 +28,12 @@ interface RemoteObjectAdapter void activate(); void hold(); void deactivate(); -}; +} interface RemoteCommunicator { RemoteObjectAdapter* createObjectAdapter(int acmTimeout, int close, int heartbeat); void shutdown(); -}; +} -}; +} diff --git a/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice b/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice index 320af282283..2d764b7419c 100644 --- a/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice +++ b/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice @@ -18,6 +18,6 @@ interface TestIntf void transient(); void deactivate(); -}; +} -}; +} diff --git a/objective-c/test/Ice/admin/AdminTest.ice b/objective-c/test/Ice/admin/AdminTest.ice index f6d7317b290..71d0d94e5c0 100644 --- a/objective-c/test/Ice/admin/AdminTest.ice +++ b/objective-c/test/Ice/admin/AdminTest.ice @@ -34,18 +34,18 @@ interface RemoteCommunicator void waitForShutdown(); void destroy(); -}; +} interface RemoteCommunicatorFactory { RemoteCommunicator* createCommunicator(Ice::PropertyDict props); void shutdown(); -}; +} interface TestFacet { void op(); -}; +} -}; +} diff --git a/objective-c/test/Ice/ami/AMITest.ice b/objective-c/test/Ice/ami/AMITest.ice index ccad46cfd8a..2c47356f107 100644 --- a/objective-c/test/Ice/ami/AMITest.ice +++ b/objective-c/test/Ice/ami/AMITest.ice @@ -18,7 +18,7 @@ module Test exception TestIntfException { -}; +} ["objc:scoped"] enum CloseMode @@ -26,12 +26,12 @@ enum CloseMode Forcefully, Gracefully, GracefullyWithWait -}; +} interface PingReply { void reply(); -}; +} interface TestIntf { @@ -53,12 +53,12 @@ interface TestIntf bool supportsFunctionalTests(); void pingBiDir(Ice::Identity id); -}; +} interface TestIntfController { void holdAdapter(); void resumeAdapter(); -}; +} -}; +} diff --git a/objective-c/test/Ice/binding/BindingTest.ice b/objective-c/test/Ice/binding/BindingTest.ice index 8b73fd44db1..8ab3b9ed78a 100644 --- a/objective-c/test/Ice/binding/BindingTest.ice +++ b/objective-c/test/Ice/binding/BindingTest.ice @@ -16,14 +16,14 @@ module Test interface TestIntf { string getAdapterName(); -}; +} interface RemoteObjectAdapter { TestIntf* getTestIntf(); void deactivate(); -}; +} interface RemoteCommunicator { @@ -32,6 +32,6 @@ interface RemoteCommunicator void deactivateObjectAdapter(RemoteObjectAdapter* adapter); void shutdown(); -}; +} -}; +} diff --git a/objective-c/test/Ice/defaultServant/DefaultServantTest.ice b/objective-c/test/Ice/defaultServant/DefaultServantTest.ice index 789accb8f18..af2b64c4345 100644 --- a/objective-c/test/Ice/defaultServant/DefaultServantTest.ice +++ b/objective-c/test/Ice/defaultServant/DefaultServantTest.ice @@ -16,6 +16,6 @@ module Test interface MyObject { string getName(); -}; +} -}; +} diff --git a/objective-c/test/Ice/defaultValue/DefaultValueTest.ice b/objective-c/test/Ice/defaultValue/DefaultValueTest.ice index eea2b0d2090..6d90eeb36e0 100644 --- a/objective-c/test/Ice/defaultValue/DefaultValueTest.ice +++ b/objective-c/test/Ice/defaultValue/DefaultValueTest.ice @@ -13,7 +13,7 @@ module Test { -enum Color { red, green, blue }; +enum Color { red, green, blue } struct Struct1 { @@ -28,7 +28,7 @@ struct Struct1 string str = "foo bar"; Color c = red; string noDefault; -}; +} ["cpp:class"] struct Struct2 @@ -44,7 +44,7 @@ struct Struct2 string str = "foo bar"; Color c = blue; string noDefault; -}; +} class Base { @@ -58,12 +58,12 @@ class Base double d = 6.0; string str = "foo bar"; string noDefault; -}; +} class Derived extends Base { Color c = green; -}; +} exception BaseEx { @@ -77,12 +77,12 @@ exception BaseEx double d = 6.0; string str = "foo bar"; string noDefault; -}; +} exception DerivedEx extends BaseEx { Color c = green; -}; +} sequence<byte> ByteSeq; sequence<int> IntSeq; @@ -91,7 +91,7 @@ dictionary<int, string> IntStringDict; struct InnerStruct { int a; -}; +} struct StructNoDefaults { @@ -108,32 +108,32 @@ struct StructNoDefaults IntSeq is; InnerStruct st; IntStringDict dict; -}; +} exception ExceptionNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} exception ExceptionNoDefaults extends ExceptionNoDefaultsBase { InnerStruct st; IntStringDict dict; -}; +} class ClassNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} class ClassNoDefaults extends ClassNoDefaultsBase { InnerStruct st; IntStringDict dict; -}; +} -}; +} diff --git a/objective-c/test/Ice/dispatcher/DispatcherTest.ice b/objective-c/test/Ice/dispatcher/DispatcherTest.ice index 411db56418e..716cb70b861 100644 --- a/objective-c/test/Ice/dispatcher/DispatcherTest.ice +++ b/objective-c/test/Ice/dispatcher/DispatcherTest.ice @@ -21,12 +21,12 @@ interface TestIntf void sleep(int to); void opWithPayload(Ice::ByteSeq seq); void shutdown(); -}; +} interface TestIntfController { void holdAdapter(); void resumeAdapter(); -}; +} -}; +} diff --git a/objective-c/test/Ice/enums/EnumTest.ice b/objective-c/test/Ice/enums/EnumTest.ice index a25c25cc249..c11e4b00af2 100644 --- a/objective-c/test/Ice/enums/EnumTest.ice +++ b/objective-c/test/Ice/enums/EnumTest.ice @@ -36,7 +36,7 @@ enum ByteEnum benum9 = LongConst1, benum10, benum11 = ByteConst2 -}; +} sequence<ByteEnum> ByteEnumSeq; enum ShortEnum @@ -52,7 +52,7 @@ enum ShortEnum senum9 = LongConst1, senum10, senum11 = ShortConst2 -}; +} sequence<ShortEnum> ShortEnumSeq; enum IntEnum @@ -69,7 +69,7 @@ enum IntEnum ienum10, ienum11 = IntConst2, ienum12 = LongConst2 -}; +} sequence<IntEnum> IntEnumSeq; enum SimpleEnum @@ -77,7 +77,7 @@ enum SimpleEnum red, green, blue -}; +} sequence<SimpleEnum> SimpleEnumSeq; interface TestIntf @@ -93,6 +93,6 @@ interface TestIntf SimpleEnumSeq opSimpleSeq(SimpleEnumSeq s1, out SimpleEnumSeq s2); void shutdown(); -}; +} -}; +} diff --git a/objective-c/test/Ice/exceptions/ExceptionsTest.ice b/objective-c/test/Ice/exceptions/ExceptionsTest.ice index 307ed42cdf7..2379abe52a3 100644 --- a/objective-c/test/Ice/exceptions/ExceptionsTest.ice +++ b/objective-c/test/Ice/exceptions/ExceptionsTest.ice @@ -17,29 +17,29 @@ module Test interface Empty { -}; +} interface Thrower; exception A { int aMem; -}; +} exception B extends A { int bMem; -}; +} exception C extends B { int cMem; -}; +} exception D { int dMem; -}; +} ["objc:prefix:TestExceptionsMod"] module Mod @@ -47,8 +47,8 @@ module Mod exception A extends ::Test::A { int a2Mem; - }; -}; + } +} interface Thrower @@ -78,11 +78,11 @@ interface Thrower void throwAfterResponse(); void throwAfterException() throws A; -}; +} interface WrongOperation { void noSuchOperation(); -}; +} -}; +} diff --git a/objective-c/test/Ice/facets/FacetsTest.ice b/objective-c/test/Ice/facets/FacetsTest.ice index 1fa33db50a1..780e7cd9889 100644 --- a/objective-c/test/Ice/facets/FacetsTest.ice +++ b/objective-c/test/Ice/facets/FacetsTest.ice @@ -15,47 +15,47 @@ module Test interface Empty { -}; +} interface A { string callA(); -}; +} interface B extends A { string callB(); -}; +} interface C extends A { string callC(); -}; +} interface D extends B, C { string callD(); -}; +} interface E { string callE(); -}; +} interface F extends E { string callF(); -}; +} interface G { void shutdown(); string callG(); -}; +} interface H extends G { string callH(); -}; +} -}; +} diff --git a/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice b/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice index 2eb092e5203..a9e41465f35 100644 --- a/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice +++ b/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice @@ -18,6 +18,6 @@ interface TestIntf void abort(); idempotent void idempotentAbort(); idempotent int pid(); -}; +} -}; +} diff --git a/objective-c/test/Ice/hash/HashTest.ice b/objective-c/test/Ice/hash/HashTest.ice index b51afb8c183..9b666914c28 100644 --- a/objective-c/test/Ice/hash/HashTest.ice +++ b/objective-c/test/Ice/hash/HashTest.ice @@ -16,17 +16,17 @@ module Test exception BaseException { -}; +} exception InvalidPointException extends BaseException { int index; -}; +} exception InvalidLengthException extends BaseException { int length; -}; +} exception OtherException { @@ -34,7 +34,7 @@ exception OtherException int y; int z; bool b; -}; +} struct PointF @@ -42,26 +42,26 @@ struct PointF float x; float y; float z; -}; +} struct PointD { double x; double y; double z; -}; +} struct Point { int x; int y; -}; +} sequence<Point> Points; struct Polyline { Points vertices; -}; +} struct Color { @@ -69,25 +69,25 @@ struct Color int g; int b; int a; -}; +} dictionary<int, Color> StringColorMap; struct ColorPalette { StringColorMap colors; -}; +} class Pen { int thickness; Test::Color color; -}; +} struct Draw { Test::Color backgroundColor; Test::Pen pen; bool shared; -}; +} -}; +} diff --git a/objective-c/test/Ice/hold/HoldTest.ice b/objective-c/test/Ice/hold/HoldTest.ice index 1aed0fcc640..b4103332195 100644 --- a/objective-c/test/Ice/hold/HoldTest.ice +++ b/objective-c/test/Ice/hold/HoldTest.ice @@ -20,6 +20,6 @@ interface Hold int set(int value, int delay); void setOneway(int value, int expected); void shutdown(); -}; +} -}; +} diff --git a/objective-c/test/Ice/info/InfoTest.ice b/objective-c/test/Ice/info/InfoTest.ice index 297a327d6dc..ba9980f182f 100644 --- a/objective-c/test/Ice/info/InfoTest.ice +++ b/objective-c/test/Ice/info/InfoTest.ice @@ -22,6 +22,6 @@ interface TestIntf Ice::Context getEndpointInfoAsContext(); Ice::Context getConnectionInfoAsContext(); -}; +} -}; +} diff --git a/objective-c/test/Ice/inheritance/InheritanceTest.ice b/objective-c/test/Ice/inheritance/InheritanceTest.ice index 9d0b5aa2743..abfedba3734 100644 --- a/objective-c/test/Ice/inheritance/InheritanceTest.ice +++ b/objective-c/test/Ice/inheritance/InheritanceTest.ice @@ -22,14 +22,14 @@ module MA interface IA { IA* iaop(IA* p); -}; +} class CA { CA* caop(CA* p); -}; +} -}; +} ["objc:prefix:TestInheritanceMB"] module MB @@ -38,19 +38,19 @@ module MB interface IB1 extends MA::IA { IB1* ib1op(IB1* p); -}; +} interface IB2 extends MA::IA { IB2* ib2op(IB2* p); -}; +} class CB extends MA::CA { CB* cbop(CB* p); -}; +} -}; +} ["objc:prefix:TestInheritanceMA"] module MA @@ -59,19 +59,19 @@ module MA interface IC extends MB::IB1, MB::IB2 { IC* icop(IC* p); -}; +} class CC extends MB::CB { CC* ccop(CC* p); -}; +} class CD extends CC implements MB::IB1, MB::IB2 { CD* cdop(CD* p); -}; +} -}; +} interface Initial { @@ -84,6 +84,6 @@ interface Initial MB::IB1* ib1op(); MB::IB2* ib2op(); MA::IC* icop(); -}; +} -}; +} diff --git a/objective-c/test/Ice/interceptor/InterceptorTest.ice b/objective-c/test/Ice/interceptor/InterceptorTest.ice index 9dbe6b92e7c..90cc95e94d1 100644 --- a/objective-c/test/Ice/interceptor/InterceptorTest.ice +++ b/objective-c/test/Ice/interceptor/InterceptorTest.ice @@ -16,11 +16,11 @@ module Test exception InvalidInputException { string reason; -}; +} local exception RetryException { -}; +} interface MyObject { @@ -48,6 +48,6 @@ interface MyObject // Raise system exception // int badSystemAdd(int x, int y); -}; +} -}; +} diff --git a/objective-c/test/Ice/invoke/InvokeTest.ice b/objective-c/test/Ice/invoke/InvokeTest.ice index 30f8216ef06..187be5132ba 100644 --- a/objective-c/test/Ice/invoke/InvokeTest.ice +++ b/objective-c/test/Ice/invoke/InvokeTest.ice @@ -15,7 +15,7 @@ module Test exception MyException { -}; +} interface MyClass { @@ -26,6 +26,6 @@ interface MyClass void opException() throws MyException; void shutdown(); -}; +} -}; +} diff --git a/objective-c/test/Ice/location/LocationTest.ice b/objective-c/test/Ice/location/LocationTest.ice index d22e4082a4f..88b2656f164 100644 --- a/objective-c/test/Ice/location/LocationTest.ice +++ b/objective-c/test/Ice/location/LocationTest.ice @@ -21,7 +21,7 @@ interface TestLocatorRegistry extends ::Ice::LocatorRegistry // Allow remote addition of objects to the locator registry. // void addObject(Object* obj); -}; +} interface TestLocator extends ::Ice::Locator { @@ -29,18 +29,18 @@ interface TestLocator extends ::Ice::Locator // Returns the number of request on the locator interface. // ["cpp:const"] idempotent int getRequestCount(); -}; +} interface ServerManager { void startServer(); void shutdown(); -}; +} interface Hello { void sayHello(); -}; +} interface TestIntf { @@ -51,6 +51,6 @@ interface TestIntf Hello* getReplicatedHello(); void migrateHello(); -}; +} -}; +} diff --git a/objective-c/test/Ice/metrics/MetricsTest.ice b/objective-c/test/Ice/metrics/MetricsTest.ice index c8f8e02eed3..6fb9b6e570e 100644 --- a/objective-c/test/Ice/metrics/MetricsTest.ice +++ b/objective-c/test/Ice/metrics/MetricsTest.ice @@ -15,7 +15,7 @@ module Test exception UserEx { -}; +} sequence<byte> ByteSeq; @@ -39,13 +39,13 @@ interface Metrics Object* getAdmin(); void shutdown(); -}; +} interface Controller { void hold(); void resume(); -}; +} -}; +} diff --git a/objective-c/test/Ice/objects/ObjectsDerived.ice b/objective-c/test/Ice/objects/ObjectsDerived.ice index 9b2ac8704a2..ccaa818f674 100644 --- a/objective-c/test/Ice/objects/ObjectsDerived.ice +++ b/objective-c/test/Ice/objects/ObjectsDerived.ice @@ -18,6 +18,6 @@ module Test class Derived extends Base { string b; -}; +} -}; +} diff --git a/objective-c/test/Ice/objects/ObjectsDerivedEx.ice b/objective-c/test/Ice/objects/ObjectsDerivedEx.ice index 8db5fc0681f..8b514060c26 100644 --- a/objective-c/test/Ice/objects/ObjectsDerivedEx.ice +++ b/objective-c/test/Ice/objects/ObjectsDerivedEx.ice @@ -17,6 +17,6 @@ module Test exception DerivedEx extends BaseEx { -}; +} -}; +} diff --git a/objective-c/test/Ice/objects/ObjectsTest.ice b/objective-c/test/Ice/objects/ObjectsTest.ice index 4feb80d45e4..06ebcd245bc 100644 --- a/objective-c/test/Ice/objects/ObjectsTest.ice +++ b/objective-c/test/Ice/objects/ObjectsTest.ice @@ -19,23 +19,23 @@ module Test struct S { string str; -}; +} class Base { S theS; string str; -}; +} exception BaseEx { string reason; -}; +} class AbstractBase extends Base { void op(); -}; +} class B; @@ -48,12 +48,12 @@ class A bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class B extends A { A theA; -}; +} class C { @@ -61,7 +61,7 @@ class C bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class D { @@ -71,43 +71,43 @@ class D bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} ["protected"] class E { int i; string s; -}; +} class F { ["protected"] E e1; E e2; -}; +} interface I { -}; +} interface J extends I { -}; +} class H implements I { -}; +} class CompactExt; class Compact(1) { -}; +} const int CompactExtId = 789; class CompactExt(CompactExtId) extends Compact { -}; +} module Inner { @@ -115,12 +115,12 @@ module Inner class A { ::Test::A theA; -}; +} exception Ex { string reason; -}; +} module Sub { @@ -128,45 +128,45 @@ module Sub class A { ::Test::Inner::A theA; -}; +} exception Ex { string reason; -}; +} -}; +} -}; +} class A1 { string name; -}; +} class B1 { A1 a1; A1 a2; -}; +} class D1 extends B1 { A1 a3; A1 a4; -}; +} exception EBase { A1 a1; A1 a2; -}; +} exception EDerived extends EBase { A1 a3; A1 a4; -}; +} sequence<Object> ObjectSeq; // For Objective-C only sequence<Object*> ObjectPrxSeq; // For Objective-C only @@ -181,7 +181,7 @@ dictionary<string, Base*> BasePrxDict; // For Objective-C only class Recursive { Recursive v; -}; +} class Initial { @@ -232,26 +232,26 @@ class Initial ObjectPrxDict getObjectPrxDict(ObjectPrxDict d); BaseDict getBaseDict(BaseDict d); BasePrxDict getBasePrxDict(BasePrxDict d); -}; +} interface TestIntf { Base opDerived(); void throwDerived() throws BaseEx; -}; +} class Empty { -}; +} class AlsoEmpty { -}; +} interface UnexpectedObjectExceptionTest { Empty op(); -}; +} // // Remaining definitions are here to ensure that the generated code compiles. @@ -260,37 +260,37 @@ interface UnexpectedObjectExceptionTest class COneMember { Empty e; -}; +} class CTwoMembers { Empty e1; Empty e2; -}; +} exception EOneMember { Empty e; -}; +} exception ETwoMembers { Empty e1; Empty e2; -}; +} struct SOneMember { Empty e; -}; +} struct STwoMembers { Empty e1; Empty e2; -}; +} dictionary<int, COneMember> DOneMember; dictionary<int, CTwoMembers> DTwoMembers; -}; +} diff --git a/objective-c/test/Ice/operations/OperationsTest.ice b/objective-c/test/Ice/operations/OperationsTest.ice index f1705ab34d5..6029218c450 100644 --- a/objective-c/test/Ice/operations/OperationsTest.ice +++ b/objective-c/test/Ice/operations/OperationsTest.ice @@ -20,21 +20,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -64,7 +64,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -106,12 +106,12 @@ struct Struct2 // Ensures the generated code for this struct compiles StructS ss; ByteBoolD dict; MyEnumSS seq; -}; +} class A // Used Objective-C test only. { int i; -}; +} sequence<A> AS; // Used by Objective-C test only. @@ -303,28 +303,28 @@ interface MyClass void putNSNullStringStringDict(StringStringD d); void putNSNullShortIntDict(ShortIntD d); void putNSNullStringMyEnumDict(StringMyEnumD d); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 c); MyStruct1 opMyStruct1(MyStruct1 c); -}; +} // @@ -395,7 +395,7 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} module Test2 { @@ -408,6 +408,6 @@ module Test2 **/ interface MyDerivedClass extends Test::MyClass { -}; +} -}; +} diff --git a/objective-c/test/Ice/optional/OptionalTest.ice b/objective-c/test/Ice/optional/OptionalTest.ice index caa6ba56cd0..339c33d579c 100644 --- a/objective-c/test/Ice/optional/OptionalTest.ice +++ b/objective-c/test/Ice/optional/OptionalTest.ice @@ -18,32 +18,32 @@ module Test class OneOptional { optional(1) int a; -}; +} enum MyEnum { MyEnumMember -}; +} struct SmallStruct { byte m; -}; +} struct FixedStruct { int m; -}; +} struct VarStruct { string m; -}; +} ["cpp:class"] struct ClassVarStruct { int a; -}; +} sequence<byte> ByteSeq; sequence<bool> BoolSeq; @@ -108,7 +108,7 @@ class MultiOptional optional(29) BoolSeq bos; optional(30) Serializable ser; -}; +} class A { @@ -116,26 +116,26 @@ class A optional(500) int mc; optional(50) int mb; optional(1) int ma; -}; +} ["preserve-slice"] class B extends A { int requiredB = 0; optional(10) int md; -}; +} class C extends B { string ss; optional(890) string ms; -}; +} class WD { optional(1) int a = 5; optional(2) string s = "test"; -}; +} exception OptionalException { @@ -143,46 +143,46 @@ exception OptionalException optional(1) int a = 5; optional(2) string b; optional(50) OneOptional o; -}; +} exception DerivedException extends OptionalException { optional(600) string ss = "test"; optional(601) OneOptional o2; -}; +} exception RequiredException extends OptionalException { string ss = "test"; OneOptional o2; -}; +} class OptionalWithCustom { optional(1) SmallStructList l; ["protected"] optional(2) SmallStructList lp; optional(3) ClassVarStruct s; -}; +} class E { A ae; -}; +} class F extends E { optional(1) A af; -}; +} class G1 { string a; -}; +} class G2 { long a; -}; +} class G { @@ -190,7 +190,7 @@ class G G2 gg2; optional(0) G2 gg2Opt; G1 gg1; -}; +} class Recursive; sequence<Recursive> RecursiveSeq; @@ -198,7 +198,7 @@ sequence<Recursive> RecursiveSeq; class Recursive { optional(0) RecursiveSeq value; -}; +} interface Initial { @@ -325,6 +325,6 @@ interface Initial bool supportsCppStringView(); bool supportsNullOptional(); -}; +} -}; +} diff --git a/objective-c/test/Ice/proxy/ProxyTest.ice b/objective-c/test/Ice/proxy/ProxyTest.ice index b8de17198f8..56a1634f1ff 100644 --- a/objective-c/test/Ice/proxy/ProxyTest.ice +++ b/objective-c/test/Ice/proxy/ProxyTest.ice @@ -20,11 +20,11 @@ interface MyClass void shutdown(); Ice::Context getContext(); -}; +} interface MyDerivedClass extends MyClass { Object* echo(Object* obj); -}; +} -}; +} diff --git a/objective-c/test/Ice/retry/RetryTest.ice b/objective-c/test/Ice/retry/RetryTest.ice index 49e1891dca2..608dc2380e4 100644 --- a/objective-c/test/Ice/retry/RetryTest.ice +++ b/objective-c/test/Ice/retry/RetryTest.ice @@ -22,6 +22,6 @@ interface Retry void opSystemException(); idempotent void shutdown(); -}; +} -}; +} diff --git a/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice b/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice index 858280de0ae..f342c650675 100644 --- a/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice +++ b/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice @@ -15,11 +15,11 @@ module Test exception TestIntfUserException { -}; +} exception TestImpossibleException { -}; +} interface TestIntf { @@ -40,16 +40,16 @@ interface TestIntf void asyncException() throws TestIntfUserException, TestImpossibleException; void shutdown(); -}; +} local class Cookie { ["cpp:const"] string message(); -}; +} interface TestActivation { void activateServantLocator(bool activate); -}; +} -}; +} diff --git a/objective-c/test/Ice/services/ServicesTest.ice b/objective-c/test/Ice/services/ServicesTest.ice index 6bee318324f..9034cccb2ee 100644 --- a/objective-c/test/Ice/services/ServicesTest.ice +++ b/objective-c/test/Ice/services/ServicesTest.ice @@ -16,6 +16,6 @@ module Test interface Clock { void tick(string time); -}; +} -}; +} diff --git a/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice index 105fa019994..e23edd9e865 100644 --- a/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice +++ b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice @@ -16,54 +16,54 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} class PreservedClass extends BaseClass { string pc; -}; +} exception Preserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception Preserved2 extends Preserved1 { BaseClass p2; -}; +} ["format:sliced"] interface Relay @@ -73,7 +73,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["format:sliced"] interface TestIntf { @@ -108,6 +108,6 @@ interface Relay void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} -}; +} diff --git a/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice index abea9c5f14e..623f774c192 100644 --- a/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice +++ b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice @@ -16,39 +16,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -58,7 +58,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["format:sliced"] interface TestIntf { @@ -93,42 +93,42 @@ interface Relay void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} // Stuff present in the server, not present in the client. exception UnknownDerived extends Base { string ud; -}; +} exception UnknownIntermediate extends Base { string ui; -}; +} exception UnknownMostDerived1 extends KnownIntermediate { string umd1; -}; +} exception UnknownMostDerived2 extends UnknownIntermediate { string umd2; -}; +} class SPreservedClass extends BaseClass { string spc; -}; +} exception SPreserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception SPreserved2 extends SPreserved1 { BaseClass p2; -}; +} -}; +} diff --git a/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice index d5f1f748757..a47bdd0e690 100644 --- a/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice +++ b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice @@ -16,42 +16,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -59,20 +59,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -80,54 +80,54 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} class CompactPDerived(56) extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["preserve-slice"] class PCUnknown extends PBase { string pu; -}; +} class PCDerived extends PDerived { PBaseSeq pbs; -}; +} class PCDerived2 extends PCDerived { int pcd2; -}; +} class PCDerived3 extends PCDerived2 { Object pcd3; -}; +} class CompactPCDerived(57) extends CompactPDerived { PBaseSeq pbs; -}; +} ["format:sliced"] interface TestIntf { @@ -183,17 +183,17 @@ class CompactPCDerived(57) extends CompactPDerived void useForward(out Forward f); // Use of forward-declared class to verify that code is generated correctly. void shutdown(); -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} // Things private to the client. @@ -201,6 +201,6 @@ class D3 extends B { string sd3; B pd3; -}; +} -}; +} diff --git a/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice index 1684651a0c7..286d46bc70f 100644 --- a/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice +++ b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice @@ -16,42 +16,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -59,20 +59,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -80,50 +80,50 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} class CompactPDerived(56) extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} class MyClass { int i; -}; +} class PSUnknown extends Preserved { string psu; PNode graph; MyClass cl; -}; +} class PSUnknown2 extends Preserved { PBase pb; -}; +} ["preserve-slice"] exception PreservedException { -}; +} exception PSUnknownException extends PreservedException { PSUnknown2 p; -}; +} ["format:sliced"] interface TestIntf { @@ -179,46 +179,46 @@ exception PSUnknownException extends PreservedException void useForward(out Forward f); // Use of forward-declared class to verify that code is generated correctly. void shutdown(); -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} // Things private to the server. class SBSUnknownDerived extends SBase { string sbsud; -}; +} class SUnknown { string su; -}; +} class D2 extends B { string sd2; B pd2; -}; +} class D4 extends B { B p1; B p2; -}; +} exception UnknownDerivedException extends BaseException { string sude; D2 pd2; -}; +} -}; +} diff --git a/objective-c/test/Ice/stream/StreamTest.ice b/objective-c/test/Ice/stream/StreamTest.ice index c717be5d79f..20b18e7af7f 100644 --- a/objective-c/test/Ice/stream/StreamTest.ice +++ b/objective-c/test/Ice/stream/StreamTest.ice @@ -20,7 +20,7 @@ enum MyEnum enum1, enum2, enum3 -}; +} class MyClass; @@ -36,12 +36,12 @@ class MyClass; string str; MyEnum e; MyClass* p; -}; +} ["cpp:class"] struct ClassStruct { int i; -}; +} class OptionalClass { @@ -49,7 +49,7 @@ class OptionalClass byte by; optional(1) short sh; optional(2) int i; -}; +} sequence<MyEnum> MyEnumS; sequence<SmallStruct> SmallStructS; @@ -89,16 +89,16 @@ class MyClass MyEnumS seq9; MyClassS seq10; StringMyClassD d; -}; +} interface MyInterface { -}; +} exception MyException { MyClass c; -}; +} ["objc:prefix:TestStreamSub"] module Sub @@ -108,7 +108,7 @@ module Sub nestedEnum1, nestedEnum2, nestedEnum3 - }; + } ["cpp:comparable"] struct NestedStruct { @@ -121,19 +121,19 @@ module Sub double d; string str; NestedEnum e; - }; + } ["cpp:class"] struct NestedClassStruct { int i; - }; + } exception NestedException { string str; - }; -}; -}; + } +} +} ["objc:prefix:TestStream2"] module Test2 @@ -146,7 +146,7 @@ module Sub2 nestedEnum4, nestedEnum5, nestedEnum6 - }; + } ["cpp:comparable"] struct NestedStruct2 { @@ -159,17 +159,17 @@ module Sub2 double d; string str; NestedEnum2 e; - }; + } ["cpp:class"] struct NestedClassStruct2 { int i; - }; + } exception NestedException2 { string str; - }; -}; -}; + } +} +} diff --git a/objective-c/test/Ice/timeout/TimeoutTest.ice b/objective-c/test/Ice/timeout/TimeoutTest.ice index 891a0dd8e34..93beab7d52d 100644 --- a/objective-c/test/Ice/timeout/TimeoutTest.ice +++ b/objective-c/test/Ice/timeout/TimeoutTest.ice @@ -24,6 +24,6 @@ interface Timeout void holdAdapter(int to); void shutdown(); -}; +} -}; +} diff --git a/objective-c/test/Slice/escape/Clash.ice b/objective-c/test/Slice/escape/Clash.ice index 48bd9ee5114..a9a618382b6 100644 --- a/objective-c/test/Slice/escape/Clash.ice +++ b/objective-c/test/Slice/escape/Clash.ice @@ -32,7 +32,7 @@ interface Intf void opOut(out string context, out string current, out string response, out string ex, out string sent, out string cookie, out string sync, out string result, out string istr, out string ostr, out string target, out optional(1) string proxy, out optional(2) string ok); -}; +} class Cls { @@ -53,7 +53,7 @@ class Cls string proxy; optional(2) int stream; string target; -}; +} struct St { @@ -61,12 +61,12 @@ struct St short istr; int ostr; int rhs; -}; +} exception Ex { short istr; int ostr; -}; +} -}; +} diff --git a/objective-c/test/Slice/escape/Inherit.ice b/objective-c/test/Slice/escape/Inherit.ice index 3d63a3c5134..e16777db905 100644 --- a/objective-c/test/Slice/escape/Inherit.ice +++ b/objective-c/test/Slice/escape/Inherit.ice @@ -15,7 +15,7 @@ struct Struct1 { int isa; int retainCount; -}; +} exception Exception1 { @@ -26,7 +26,7 @@ exception Exception1 int callStackReturnAddresses; int userInfo; int reserved; -}; +} class Class1 { @@ -48,7 +48,7 @@ class Class1 int self; int superclass; int zone; -}; +} interface Intf1 { @@ -69,7 +69,7 @@ interface Intf1 void self(); void superclass(); void zone(); -}; +} interface Intf2 { @@ -90,6 +90,6 @@ interface Intf2 void self(int a); void superclass(int a); void zone(int a); -}; +} -}; +} diff --git a/objective-c/test/Slice/escape/Key.ice b/objective-c/test/Slice/escape/Key.ice index a31a09a8d38..5353ee4082c 100644 --- a/objective-c/test/Slice/escape/Key.ice +++ b/objective-c/test/Slice/escape/Key.ice @@ -15,39 +15,39 @@ module and enum continue { asm -}; +} struct auto { int default; -}; +} ["cpp:class"] struct delete { string else; -}; +} interface break { void case(int catch, out int try); -}; +} interface char { void explicit(); -}; +} interface switch { void foo(char* export, out int volatile); void foo2(char* export, ["objc:param:y"] int YES, out ["objc:param:nil2"] int nil); void foo3(char* export, out int nil); -}; +} class do implements char, break, switch { int if; -}; +} sequence<auto> extern; @@ -56,13 +56,13 @@ dictionary<string,auto> for; exception return { int signed; -}; +} exception sizeof extends return { int static; int switch; -}; +} local interface friend { @@ -72,7 +72,7 @@ local interface friend void objc(int bycopy, int byref, int id, int IMP, int in, int inout, int nil, int NO, int oneway, int SEL, int super, int YES); -}; +} const int template = 0; const int this = 0; @@ -87,4 +87,4 @@ const int virtual = 0; const int while = 0; const int xor = 0; -}; +} diff --git a/php/test/Ice/acm/Test.ice b/php/test/Ice/acm/Test.ice index 7018c9df821..520c551ce34 100644 --- a/php/test/Ice/acm/Test.ice +++ b/php/test/Ice/acm/Test.ice @@ -19,7 +19,7 @@ interface TestIntf void interruptSleep(); void startHeartbeatCount(); void waitForHeartbeatCount(int count); -}; +} interface RemoteObjectAdapter { @@ -27,13 +27,13 @@ interface RemoteObjectAdapter void activate(); void hold(); void deactivate(); -}; +} interface RemoteCommunicator { RemoteObjectAdapter* createObjectAdapter(int acmTimeout, int close, int heartbeat); void shutdown(); -}; +} -}; +} diff --git a/php/test/Ice/binding/Test.ice b/php/test/Ice/binding/Test.ice index f23f3433258..de2937a32ce 100644 --- a/php/test/Ice/binding/Test.ice +++ b/php/test/Ice/binding/Test.ice @@ -15,14 +15,14 @@ module Test interface TestIntf { string getAdapterName(); -}; +} interface RemoteObjectAdapter { TestIntf* getTestIntf(); void deactivate(); -}; +} interface RemoteCommunicator { @@ -31,6 +31,6 @@ interface RemoteCommunicator void deactivateObjectAdapter(RemoteObjectAdapter* adapter); void shutdown(); -}; +} -}; +} diff --git a/php/test/Ice/checksum/CTypes.ice b/php/test/Ice/checksum/CTypes.ice index 90d57195d43..1f6cf84813c 100644 --- a/php/test/Ice/checksum/CTypes.ice +++ b/php/test/Ice/checksum/CTypes.ice @@ -30,42 +30,42 @@ const int IntConst3 = 100; // // TEST: Same // -enum Enum1 { Enum11, Enum12, Enum13 }; +enum Enum1 { Enum11, Enum12, Enum13 } // // TEST: Add enumerator // -enum Enum2 { Enum21, Enum22, Enum23 }; +enum Enum2 { Enum21, Enum22, Enum23 } // // TEST: Remove enumerator // -enum Enum3 { Enum31, Enum32, Enum33 }; +enum Enum3 { Enum31, Enum32, Enum33 } // // TEST: Change to a different type // -enum Enum4 { Enum41, Enum42, Enum43 }; +enum Enum4 { Enum41, Enum42, Enum43 } // // TEST: Enum with explicit values. // -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 }; +enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } // // TEST: Enum with same explicit values, different order. // -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 }; +enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } // // TEST: Enum with different explicit values. // -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3}; +enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} // // TEST: Enum with explicit values, removed enumerator. // -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3}; +enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} // // TEST: Same @@ -109,7 +109,7 @@ struct Struct1 { string str; bool b; -}; +} // // TEST: Add member @@ -118,7 +118,7 @@ struct Struct2 { string str; bool b; -}; +} // // TEST: Change member type @@ -127,7 +127,7 @@ struct Struct3 { string str; bool b; -}; +} // // TEST: Remove member @@ -136,7 +136,7 @@ struct Struct4 { string str; bool b; -}; +} // // TEST: Change to a different type @@ -145,70 +145,70 @@ struct Struct5 { string str; bool b; -}; +} // // TEST: Same // interface Interface1 { -}; +} // // TEST: Change interface to class // interface Interface2 { -}; +} // // TEST: Add base interface // interface Interface3 { -}; +} // // TEST: Add operation // interface Interface4 { -}; +} // // TEST: Same // class EmptyClass1 { -}; +} // // TEST: Add data member // class EmptyClass2 { -}; +} // // TEST: Add operation // class EmptyClass3 { -}; +} // // TEST: Add base class // class EmptyClass4 { -}; +} // // TEST: Add interface // class EmptyClass5 { -}; +} // // TEST: Same @@ -217,7 +217,7 @@ class SimpleClass1 { string str; float f; -}; +} // // TEST: Add operation @@ -226,7 +226,7 @@ class SimpleClass2 { string str; float f; -}; +} // // TEST: Rename member @@ -235,7 +235,7 @@ class SimpleClass3 { string str; float f; -}; +} // // TEST: Add member @@ -244,7 +244,7 @@ class SimpleClass4 { string str; float f; -}; +} // // TEST: Remove member @@ -253,7 +253,7 @@ class SimpleClass5 { string str; float f; -}; +} // // TEST: Reorder members @@ -262,7 +262,7 @@ class SimpleClass6 { string str; float f; -}; +} // // TEST: Change member type @@ -271,7 +271,7 @@ class SimpleClass7 { string str; float f; -}; +} // // TEST: Same @@ -280,7 +280,7 @@ exception Exception1 { string str; bool b; -}; +} // // TEST: Add member @@ -289,7 +289,7 @@ exception Exception2 { string str; bool b; -}; +} // // TEST: Change member type @@ -298,7 +298,7 @@ exception Exception3 { string str; bool b; -}; +} // // TEST: Remove member @@ -307,14 +307,14 @@ exception Exception4 { string str; bool b; -}; +} // // TEST: Add base exception // exception Exception5 { -}; +} // // TEST: Change to a different type @@ -323,7 +323,7 @@ exception Exception6 { string str; bool b; -}; +} // // TEST: Exception with optional members. @@ -333,7 +333,7 @@ exception OptionalEx0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members, different order, same tags. @@ -343,7 +343,7 @@ exception OptionalEx1 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -353,7 +353,7 @@ exception OptionalEx2 string firstName; string secondName; optional(1) string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -363,7 +363,7 @@ exception OptionalEx3 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members using different tags. @@ -373,7 +373,7 @@ exception OptionalEx4 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Same @@ -382,7 +382,7 @@ interface BaseInterface1 { void baseOp1(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change return type @@ -391,7 +391,7 @@ interface BaseInterface2 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add parameter @@ -400,7 +400,7 @@ interface BaseInterface3 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add exception @@ -409,7 +409,7 @@ interface BaseInterface4 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change out parameter to in parameter @@ -418,7 +418,7 @@ interface BaseInterface5 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove parameter @@ -427,7 +427,7 @@ interface BaseInterface6 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove exception @@ -436,7 +436,7 @@ interface BaseInterface7 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove operation @@ -445,7 +445,7 @@ interface BaseInterface8 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add base class @@ -454,7 +454,7 @@ interface BaseInterface9 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add interface @@ -463,7 +463,7 @@ interface BaseInterface10 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add base class and interface @@ -472,7 +472,7 @@ interface BaseInterface11 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Class with compact id @@ -480,14 +480,14 @@ interface BaseInterface11 class Compact1(1) { int id; -}; +} // // TEST: Derived from class with compact id // class Derived1 extends Compact1 { -}; +} // // TEST: Same class names but different compact id @@ -495,7 +495,7 @@ class Derived1 extends Compact1 class Compact2(2) { int id; -}; +} // // TEST: Class with optional members. @@ -505,7 +505,7 @@ class Optional0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members, different order, same tags. @@ -515,7 +515,7 @@ class Optional1 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -525,7 +525,7 @@ class Optional2 string firstName; string secondName; optional(1) string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -535,7 +535,7 @@ class Optional3 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members using different tags. @@ -545,7 +545,7 @@ class Optional4 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Interface with optional parameters. @@ -554,7 +554,7 @@ interface OptionalParameters0 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different order. @@ -563,7 +563,7 @@ interface OptionalParameters1 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different tags. @@ -572,7 +572,7 @@ interface OptionalParameters2 { void op1(string firstName, optional(1) string emailAddress, optional(2) string secondName); -}; +} // // TEST: Interface with different optional parameters. @@ -581,7 +581,7 @@ interface OptionalParameters3 { void op1(string firstName, optional(1) string emailAddress, string secondName); -}; +} // // TEST: Interface with optional return type. @@ -589,7 +589,7 @@ interface OptionalParameters3 interface OptionalReturn0 { optional(1) int op(); -}; +} // // TEST: Interface that changes optional return type. @@ -597,12 +597,12 @@ interface OptionalReturn0 interface OptionalReturn2 { optional(1) int op(); -}; +} // // TEST: Local // -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 }; +local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } // // TEST: Local @@ -620,13 +620,13 @@ local dictionary<string, string> LocalDictionary; local struct LocalStruct { string str; -}; +} // // TEST: Local // local class LocalClass { -}; +} -}; +} diff --git a/php/test/Ice/checksum/Test.ice b/php/test/Ice/checksum/Test.ice index 2fc963eb1ca..3f3a3bf32b1 100644 --- a/php/test/Ice/checksum/Test.ice +++ b/php/test/Ice/checksum/Test.ice @@ -19,6 +19,6 @@ interface Checksum idempotent Ice::SliceChecksumDict getSliceChecksums(); void shutdown(); -}; +} -}; +} diff --git a/php/test/Ice/defaultValue/Test.ice b/php/test/Ice/defaultValue/Test.ice index d1bf947804a..35bde4d76ce 100644 --- a/php/test/Ice/defaultValue/Test.ice +++ b/php/test/Ice/defaultValue/Test.ice @@ -14,14 +14,14 @@ module Test { -enum Color { red, green, blue }; +enum Color { red, green, blue } module Nested { -enum Color { red, green, blue }; +enum Color { red, green, blue } -}; +} struct Struct1 { @@ -47,7 +47,7 @@ struct Struct1 float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} const bool ConstBool = true; const byte ConstByte = 254; @@ -92,7 +92,7 @@ struct Struct2 float zeroDotF = ConstZeroDotF; double zeroD = ConstZeroD; double zeroDotD = ConstZeroDotD; -}; +} class Base { @@ -112,7 +112,7 @@ class Base float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} class Derived extends Base { @@ -122,7 +122,7 @@ class Derived extends Base Nested::Color nc1 = ::Test::Nested::Color::red; Nested::Color nc2 = Nested::green; Nested::Color nc3 = blue; -}; +} exception BaseEx { @@ -142,7 +142,7 @@ exception BaseEx float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} exception DerivedEx extends BaseEx { @@ -152,7 +152,7 @@ exception DerivedEx extends BaseEx Nested::Color nc1 = ConstNestedColor1; Nested::Color nc2 = ConstNestedColor2; Nested::Color nc3 = ConstNestedColor3; -}; +} sequence<byte> ByteSeq; sequence<int> IntSeq; @@ -161,7 +161,7 @@ dictionary<int, string> IntStringDict; struct InnerStruct { int a; -}; +} struct StructNoDefaults { @@ -178,32 +178,32 @@ struct StructNoDefaults IntSeq is; InnerStruct st; IntStringDict dict; -}; +} exception ExceptionNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} exception ExceptionNoDefaults extends ExceptionNoDefaultsBase { InnerStruct st; IntStringDict dict; -}; +} class ClassNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} class ClassNoDefaults extends ClassNoDefaultsBase { InnerStruct st; IntStringDict dict; -}; +} -}; +} diff --git a/php/test/Ice/enums/Test.ice b/php/test/Ice/enums/Test.ice index 420b8cf6623..8b50132427b 100644 --- a/php/test/Ice/enums/Test.ice +++ b/php/test/Ice/enums/Test.ice @@ -35,7 +35,7 @@ enum ByteEnum benum9 = LongConst1, benum10, benum11 = ByteConst2 -}; +} enum ShortEnum { @@ -50,7 +50,7 @@ enum ShortEnum senum9 = LongConst1, senum10, senum11 = ShortConst2 -}; +} enum IntEnum { @@ -66,14 +66,14 @@ enum IntEnum ienum10, ienum11 = IntConst2, ienum12 = LongConst2 -}; +} enum SimpleEnum { red, green, blue -}; +} interface TestIntf { @@ -83,6 +83,6 @@ interface TestIntf SimpleEnum opSimple(SimpleEnum s1, out SimpleEnum s2); void shutdown(); -}; +} -}; +} diff --git a/php/test/Ice/exceptions/Test.ice b/php/test/Ice/exceptions/Test.ice index e9d5b58fd0d..3f710030ce2 100644 --- a/php/test/Ice/exceptions/Test.ice +++ b/php/test/Ice/exceptions/Test.ice @@ -16,29 +16,29 @@ module Test interface Empty { -}; +} interface Thrower; exception A { int aMem; -}; +} exception B extends A { int bMem; -}; +} exception C extends B { int cMem; -}; +} exception D { int dMem; -}; +} interface Thrower { @@ -60,11 +60,11 @@ interface Thrower Ice::ByteSeq throwMemoryLimitException(Ice::ByteSeq seq); idempotent void throwLocalExceptionIdempotent(); -}; +} interface WrongOperation { void noSuchOperation(); -}; +} -}; +} diff --git a/php/test/Ice/facets/Test.ice b/php/test/Ice/facets/Test.ice index 195bbe5e1a0..8a55ad38274 100644 --- a/php/test/Ice/facets/Test.ice +++ b/php/test/Ice/facets/Test.ice @@ -14,47 +14,47 @@ module Test interface Empty { -}; +} interface A { string callA(); -}; +} interface B extends A { string callB(); -}; +} interface C extends A { string callC(); -}; +} interface D extends B, C { string callD(); -}; +} interface E { string callE(); -}; +} interface F extends E { string callF(); -}; +} interface G { void shutdown(); string callG(); -}; +} interface H extends G { string callH(); -}; +} -}; +} diff --git a/php/test/Ice/info/Test.ice b/php/test/Ice/info/Test.ice index c518d54b867..6741d5348d4 100644 --- a/php/test/Ice/info/Test.ice +++ b/php/test/Ice/info/Test.ice @@ -21,6 +21,6 @@ interface TestIntf Ice::Context getEndpointInfoAsContext(); Ice::Context getConnectionInfoAsContext(); -}; +} -}; +} diff --git a/php/test/Ice/inheritance/Test.ice b/php/test/Ice/inheritance/Test.ice index 372dbcc414a..1bbd2255d80 100644 --- a/php/test/Ice/inheritance/Test.ice +++ b/php/test/Ice/inheritance/Test.ice @@ -20,14 +20,14 @@ module MA interface IA { IA* iaop(IA* p); -}; +} class CA { CA* caop(CA* p); -}; +} -}; +} module MB { @@ -35,19 +35,19 @@ module MB interface IB1 extends MA::IA { IB1* ib1op(IB1* p); -}; +} interface IB2 extends MA::IA { IB2* ib2op(IB2* p); -}; +} class CB extends MA::CA { CB* cbop(CB* p); -}; +} -}; +} module MA { @@ -55,19 +55,19 @@ module MA interface IC extends MB::IB1, MB::IB2 { IC* icop(IC* p); -}; +} class CC extends MB::CB { CC* ccop(CC* p); -}; +} class CD extends CC implements MB::IB1, MB::IB2 { CD* cdop(CD* p); -}; +} -}; +} interface Initial { @@ -80,6 +80,6 @@ interface Initial MB::IB1* ib1op(); MB::IB2* ib2op(); MA::IC* icop(); -}; +} -}; +} diff --git a/php/test/Ice/objects/Test.ice b/php/test/Ice/objects/Test.ice index 05076845442..bf36c51a856 100644 --- a/php/test/Ice/objects/Test.ice +++ b/php/test/Ice/objects/Test.ice @@ -17,18 +17,18 @@ module Test struct S { string str; -}; +} class Base { S theS; string str; -}; +} class AbstractBase extends Base { void op(); -}; +} class B; class C; @@ -40,12 +40,12 @@ class A bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class B extends A { A theA; -}; +} class C { @@ -53,7 +53,7 @@ class C bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class D { @@ -63,31 +63,31 @@ class D bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} ["protected"] class E { int i; string s; -}; +} class F { ["protected"] E e1; E e2; -}; +} interface I { -}; +} interface J extends I { -}; +} class H implements I { -}; +} sequence<Base> BaseSeq; @@ -95,47 +95,47 @@ class CompactExt; class Compact(1) { -}; +} const int CompactExtId = 789; class CompactExt(CompactExtId) extends Compact { -}; +} class A1 { string name; -}; +} class B1 { A1 a1; A1 a2; -}; +} class D1 extends B1 { A1 a3; A1 a4; -}; +} exception EBase { A1 a1; A1 a2; -}; +} exception EDerived extends EBase { A1 a3; A1 a4; -}; +} class Recursive { Recursive v; -}; +} interface Initial { @@ -167,20 +167,20 @@ interface Initial BaseSeq opBaseSeq(BaseSeq inSeq, out BaseSeq outSeq); Compact getCompact(); -}; +} class Empty { -}; +} class AlsoEmpty { -}; +} interface UnexpectedObjectExceptionTest { Empty op(); -}; +} // // Remaining definitions are here to ensure that the generated code compiles. @@ -189,37 +189,37 @@ interface UnexpectedObjectExceptionTest class COneMember { Empty e; -}; +} class CTwoMembers { Empty e1; Empty e2; -}; +} exception EOneMember { Empty e; -}; +} exception ETwoMembers { Empty e1; Empty e2; -}; +} struct SOneMember { Empty e; -}; +} struct STwoMembers { Empty e1; Empty e2; -}; +} dictionary<int, COneMember> DOneMember; dictionary<int, CTwoMembers> DTwoMembers; -}; +} diff --git a/php/test/Ice/operations/Test.ice b/php/test/Ice/operations/Test.ice index f12eb01bc5a..9e16e25a89e 100644 --- a/php/test/Ice/operations/Test.ice +++ b/php/test/Ice/operations/Test.ice @@ -17,21 +17,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -235,7 +235,7 @@ interface MyClass ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} // Test data member with same name as class @@ -244,21 +244,21 @@ struct MyStruct1 string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} interface MyDerivedClass extends MyClass { void opDerived(); MyStruct1 opMyStruct1(MyStruct1 s); MyClass1 opMyClass1(MyClass1 c); -}; +} // // String literals @@ -328,7 +328,7 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} module Test2 { @@ -341,6 +341,6 @@ module Test2 **/ interface MyDerivedClass extends Test::MyClass { -}; +} -}; +} diff --git a/php/test/Ice/optional/ClientPrivate.ice b/php/test/Ice/optional/ClientPrivate.ice index ddb03cd4aa5..e35c0d87ef8 100644 --- a/php/test/Ice/optional/ClientPrivate.ice +++ b/php/test/Ice/optional/ClientPrivate.ice @@ -22,7 +22,7 @@ class D extends B string ds; optional(990) StringSeq seq; optional(1000) A ao; -}; +} // // This class is a hack that allows us to invoke the opClassAndUnknownOptional operation @@ -34,6 +34,6 @@ interface Initial2 void opClassAndUnknownOptional(A p, optional(1) Object o); void opVoid(optional(1) int a, optional(2) string v); -}; +} -}; +} diff --git a/php/test/Ice/optional/Test.ice b/php/test/Ice/optional/Test.ice index 1263f971a9e..973fe23c962 100644 --- a/php/test/Ice/optional/Test.ice +++ b/php/test/Ice/optional/Test.ice @@ -15,32 +15,32 @@ module Test class OneOptional { optional(1) int a; -}; +} enum MyEnum { MyEnumMember -}; +} struct SmallStruct { byte m; -}; +} struct FixedStruct { int m; -}; +} struct VarStruct { string m; -}; +} struct ClassVarStruct { int a; -}; +} sequence<byte> ByteSeq; sequence<bool> BoolSeq; @@ -105,7 +105,7 @@ class MultiOptional optional(29) BoolSeq bos; optional(30) Serializable ser; -}; +} class A { @@ -113,26 +113,26 @@ class A optional(1) int ma; optional(50) int mb; optional(500) int mc; -}; +} ["preserve-slice"] class B extends A { int requiredB; optional(10) int md; -}; +} class C extends B { string ss; optional(890) string ms; -}; +} class WD { optional(1) int a = 5; optional(2) string s = "test"; -}; +} exception OptionalException { @@ -140,46 +140,46 @@ exception OptionalException optional(1) int a = 5; optional(2) string b; optional(50) OneOptional o; -}; +} exception DerivedException extends OptionalException { optional(600) string ss = "test"; optional(601) OneOptional o2; -}; +} exception RequiredException extends OptionalException { string ss = "test"; OneOptional o2; -}; +} class OptionalWithCustom { optional(1) SmallStructList l; ["protected"] optional(2) SmallStructList lp; optional(3) ClassVarStruct s; -}; +} class E { A ae; -}; +} class F extends E { optional(1) A af; -}; +} class G1 { string a; -}; +} class G2 { long a; -}; +} class G { @@ -187,7 +187,7 @@ class G G2 gg2; optional(0) G2 gg2Opt; G1 gg1; -}; +} interface Initial { @@ -299,6 +299,6 @@ interface Initial bool supportsCppStringView(); bool supportsNullOptional(); -}; +} -}; +} diff --git a/php/test/Ice/proxy/Test.ice b/php/test/Ice/proxy/Test.ice index 365f7bffd81..d0705f3c3ed 100644 --- a/php/test/Ice/proxy/Test.ice +++ b/php/test/Ice/proxy/Test.ice @@ -19,11 +19,11 @@ interface MyClass void shutdown(); Context getContext(); -}; +} interface MyDerivedClass extends MyClass { Object* echo(Object* obj); -}; +} -}; +} diff --git a/php/test/Ice/slicing/exceptions/Test.ice b/php/test/Ice/slicing/exceptions/Test.ice index 3ce6959161d..c6931b59a43 100644 --- a/php/test/Ice/slicing/exceptions/Test.ice +++ b/php/test/Ice/slicing/exceptions/Test.ice @@ -15,39 +15,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -57,7 +57,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["format:sliced"] interface TestIntf @@ -93,6 +93,6 @@ interface TestIntf void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} -}; +} diff --git a/php/test/Ice/slicing/objects/ClientPrivate.ice b/php/test/Ice/slicing/objects/ClientPrivate.ice index d8445516d19..e5be8a809aa 100644 --- a/php/test/Ice/slicing/objects/ClientPrivate.ice +++ b/php/test/Ice/slicing/objects/ClientPrivate.ice @@ -18,32 +18,32 @@ class D3 extends B { string sd3; B pd3; -}; +} ["preserve-slice"] class PCUnknown extends PBase { string pu; -}; +} class PCDerived extends PDerived { PBaseSeq pbs; -}; +} class PCDerived2 extends PCDerived { int pcd2; -}; +} class PCDerived3 extends PCDerived2 { Object pcd3; -}; +} class CompactPCDerived(57) extends CompactPDerived { PBaseSeq pbs; -}; +} -}; +} diff --git a/php/test/Ice/slicing/objects/Test.ice b/php/test/Ice/slicing/objects/Test.ice index 89f2780c352..6c25277a348 100644 --- a/php/test/Ice/slicing/objects/Test.ice +++ b/php/test/Ice/slicing/objects/Test.ice @@ -15,42 +15,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS3 { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -58,20 +58,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -79,28 +79,28 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} class CompactPDerived(56) extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["format:sliced"] interface TestIntf @@ -158,17 +158,17 @@ interface TestIntf void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */ void shutdown(); -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} -}; +} diff --git a/php/test/Ice/timeout/Test.ice b/php/test/Ice/timeout/Test.ice index d34168a950a..aad831a9993 100644 --- a/php/test/Ice/timeout/Test.ice +++ b/php/test/Ice/timeout/Test.ice @@ -23,6 +23,6 @@ interface Timeout void holdAdapter(int to); void shutdown(); -}; +} -}; +} diff --git a/php/test/Slice/escape/Clash.ice b/php/test/Slice/escape/Clash.ice index 2fa00947309..3839df1875c 100644 --- a/php/test/Slice/escape/Clash.ice +++ b/php/test/Slice/escape/Clash.ice @@ -30,7 +30,7 @@ interface Intf void opOut(out string context, out string current, out string response, out string ex, out string sent, out string cookie, out string sync, out string result, out string istr, out string ostr, out optional(1) string proxy); -}; +} class Cls { @@ -49,7 +49,7 @@ class Cls string inS; string in; string proxy; -}; +} struct St { @@ -58,12 +58,12 @@ struct St int ostr; int rhs; string other; -}; +} exception Ex { short istr; int ostr; -}; +} -}; +} diff --git a/php/test/Slice/escape/Key.ice b/php/test/Slice/escape/Key.ice index 717970ea7ff..5f6abae15c1 100644 --- a/php/test/Slice/escape/Key.ice +++ b/php/test/Slice/escape/Key.ice @@ -14,7 +14,7 @@ module and enum array { as - }; + } struct xor { @@ -27,22 +27,22 @@ module and int throw; int use; int var; - }; + } interface break { void case(int catch, out int try); - }; + } interface function { void continue(int declare, int default); - }; + } interface die { void do(); - }; + } class echo { @@ -50,32 +50,32 @@ module and int else; die* elseif; int empty; - }; + } interface enddeclare extends die, function { - }; + } sequence<array> endfor; dictionary<string,array> endforeach; exception endif { int endswitch; - }; + } exception endwhile extends endif { int eval; int exit; - }; + } local interface for { array foreach(break if, echo global, enddeclare require, function* include, die* return, echo* isset, enddeclare* list, int new, int static) throws endif, endwhile; - }; + } const int or = 0; const int print = 0; const int require_once = 0; -}; +} diff --git a/php/test/Slice/macros/Test.ice b/php/test/Slice/macros/Test.ice index f86a762ab00..5fa827ebd8f 100644 --- a/php/test/Slice/macros/Test.ice +++ b/php/test/Slice/macros/Test.ice @@ -32,13 +32,13 @@ class Default { int x DEFAULT(10); int y DEFAULT(10); -}; +} class NoDefault { int x NODEFAULT(10); int y NODEFAULT(10); -}; +} // // This class is only defined when compiling with slice2php. @@ -48,7 +48,7 @@ class PhpOnly { string lang DEFAULT("php"); int version DEFAULT(ICE_VERSION); -}; +} #endif -}; +} diff --git a/php/test/Slice/structure/Test.ice b/php/test/Slice/structure/Test.ice index 79940e1c2d8..4790ff8eba3 100644 --- a/php/test/Slice/structure/Test.ice +++ b/php/test/Slice/structure/Test.ice @@ -18,12 +18,12 @@ dictionary<string, string> StringDict; class C { int i; -}; +} struct S1 { string name; -}; +} struct S2 { @@ -40,6 +40,6 @@ struct S2 S1 s; C cls; Object* prx; -}; +} -}; +} diff --git a/python/test/Glacier2/application/Callback.ice b/python/test/Glacier2/application/Callback.ice index bc89faf6f81..8a16bb84c4c 100644 --- a/python/test/Glacier2/application/Callback.ice +++ b/python/test/Glacier2/application/Callback.ice @@ -15,14 +15,14 @@ module Test interface CallbackReceiver { void callback(); -}; +} interface Callback { void initiateCallback(CallbackReceiver* proxy); void shutdown(); -}; +} -}; +} diff --git a/python/test/Ice/acm/Test.ice b/python/test/Ice/acm/Test.ice index 7018c9df821..520c551ce34 100644 --- a/python/test/Ice/acm/Test.ice +++ b/python/test/Ice/acm/Test.ice @@ -19,7 +19,7 @@ interface TestIntf void interruptSleep(); void startHeartbeatCount(); void waitForHeartbeatCount(int count); -}; +} interface RemoteObjectAdapter { @@ -27,13 +27,13 @@ interface RemoteObjectAdapter void activate(); void hold(); void deactivate(); -}; +} interface RemoteCommunicator { RemoteObjectAdapter* createObjectAdapter(int acmTimeout, int close, int heartbeat); void shutdown(); -}; +} -}; +} diff --git a/python/test/Ice/adapterDeactivation/Test.ice b/python/test/Ice/adapterDeactivation/Test.ice index 88cab97a616..b86adeb0c7c 100644 --- a/python/test/Ice/adapterDeactivation/Test.ice +++ b/python/test/Ice/adapterDeactivation/Test.ice @@ -17,11 +17,11 @@ interface TestIntf void transient(); void deactivate(); -}; +} local class Cookie { idempotent string message(); -}; +} -}; +} diff --git a/python/test/Ice/admin/Test.ice b/python/test/Ice/admin/Test.ice index 7089848a091..d285240e63e 100644 --- a/python/test/Ice/admin/Test.ice +++ b/python/test/Ice/admin/Test.ice @@ -26,20 +26,20 @@ interface RemoteCommunicator void waitForShutdown(); void destroy(); -}; +} interface RemoteCommunicatorFactory { RemoteCommunicator* createCommunicator(Ice::PropertyDict props); void shutdown(); -}; +} interface TestFacet { void op(); -}; +} -}; +} #endif diff --git a/python/test/Ice/ami/Test.ice b/python/test/Ice/ami/Test.ice index fabe188f8a8..1b7852dc1df 100644 --- a/python/test/Ice/ami/Test.ice +++ b/python/test/Ice/ami/Test.ice @@ -17,19 +17,19 @@ module Test exception TestIntfException { -}; +} enum CloseMode { Forcefully, Gracefully, GracefullyWithWait -}; +} interface PingReply { void reply(); -}; +} interface TestIntf { @@ -51,12 +51,12 @@ interface TestIntf bool supportsFunctionalTests(); void pingBiDir(Ice::Identity id); -}; +} interface TestIntfController { void holdAdapter(); void resumeAdapter(); -}; +} -}; +} diff --git a/python/test/Ice/binding/Test.ice b/python/test/Ice/binding/Test.ice index f23f3433258..de2937a32ce 100644 --- a/python/test/Ice/binding/Test.ice +++ b/python/test/Ice/binding/Test.ice @@ -15,14 +15,14 @@ module Test interface TestIntf { string getAdapterName(); -}; +} interface RemoteObjectAdapter { TestIntf* getTestIntf(); void deactivate(); -}; +} interface RemoteCommunicator { @@ -31,6 +31,6 @@ interface RemoteCommunicator void deactivateObjectAdapter(RemoteObjectAdapter* adapter); void shutdown(); -}; +} -}; +} diff --git a/python/test/Ice/blobject/Test.ice b/python/test/Ice/blobject/Test.ice index c1e3598ad7a..e507da2fb07 100644 --- a/python/test/Ice/blobject/Test.ice +++ b/python/test/Ice/blobject/Test.ice @@ -14,7 +14,7 @@ module Test exception UE { -}; +} interface Hello { @@ -23,6 +23,6 @@ interface Hello void raiseUE() throws UE; void shutdown(); -}; +} -}; +} diff --git a/python/test/Ice/checksum/CTypes.ice b/python/test/Ice/checksum/CTypes.ice index c15d5c94633..1ed68f50407 100644 --- a/python/test/Ice/checksum/CTypes.ice +++ b/python/test/Ice/checksum/CTypes.ice @@ -30,42 +30,42 @@ const int IntConst3 = 100; // // TEST: Same // -enum Enum1 { Enum11, Enum12, Enum13 }; +enum Enum1 { Enum11, Enum12, Enum13 } // // TEST: Add enumerator // -enum Enum2 { Enum21, Enum22, Enum23 }; +enum Enum2 { Enum21, Enum22, Enum23 } // // TEST: Remove enumerator // -enum Enum3 { Enum31, Enum32, Enum33 }; +enum Enum3 { Enum31, Enum32, Enum33 } // // TEST: Change to a different type // -enum Enum4 { Enum41, Enum42, Enum43 }; +enum Enum4 { Enum41, Enum42, Enum43 } // // TEST: Enum with explicit values. // -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 }; +enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } // // TEST: Enum with same explicit values, different order. // -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 }; +enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } // // TEST: Enum with different explicit values. // -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3}; +enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} // // TEST: Enum with explicit values, removed enumerator. // -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3}; +enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} // // TEST: Same @@ -109,7 +109,7 @@ struct Struct1 { string str; bool b; -}; +} // // TEST: Add member @@ -118,7 +118,7 @@ struct Struct2 { string str; bool b; -}; +} // // TEST: Change member type @@ -127,7 +127,7 @@ struct Struct3 { string str; bool b; -}; +} // // TEST: Remove member @@ -136,7 +136,7 @@ struct Struct4 { string str; bool b; -}; +} // // TEST: Change to a different type @@ -145,70 +145,70 @@ struct Struct5 { string str; bool b; -}; +} // // TEST: Same // interface Interface1 { -}; +} // // TEST: Change interface to class // interface Interface2 { -}; +} // // TEST: Add base interface // interface Interface3 { -}; +} // // TEST: Add operation // interface Interface4 { -}; +} // // TEST: Same // class EmptyClass1 { -}; +} // // TEST: Add data member // class EmptyClass2 { -}; +} // // TEST: Add operation // class EmptyClass3 { -}; +} // // TEST: Add base class // class EmptyClass4 { -}; +} // // TEST: Add interface // class EmptyClass5 { -}; +} // // TEST: Same @@ -217,7 +217,7 @@ class SimpleClass1 { string str; float f; -}; +} // // TEST: Add operation @@ -226,7 +226,7 @@ class SimpleClass2 { string str; float f; -}; +} // // TEST: Rename member @@ -235,7 +235,7 @@ class SimpleClass3 { string str; float f; -}; +} // // TEST: Add member @@ -244,7 +244,7 @@ class SimpleClass4 { string str; float f; -}; +} // // TEST: Remove member @@ -253,7 +253,7 @@ class SimpleClass5 { string str; float f; -}; +} // // TEST: Reorder members @@ -262,7 +262,7 @@ class SimpleClass6 { string str; float f; -}; +} // // TEST: Change member type @@ -271,7 +271,7 @@ class SimpleClass7 { string str; float f; -}; +} // // TEST: Same @@ -280,7 +280,7 @@ exception Exception1 { string str; bool b; -}; +} // // TEST: Add member @@ -289,7 +289,7 @@ exception Exception2 { string str; bool b; -}; +} // // TEST: Change member type @@ -298,7 +298,7 @@ exception Exception3 { string str; bool b; -}; +} // // TEST: Remove member @@ -307,14 +307,14 @@ exception Exception4 { string str; bool b; -}; +} // // TEST: Add base exception // exception Exception5 { -}; +} // // TEST: Change to a different type @@ -323,7 +323,7 @@ exception Exception6 { string str; bool b; -}; +} // // TEST: Exception with optional members. @@ -333,7 +333,7 @@ exception OptionalEx0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members, different order, same tags. @@ -343,7 +343,7 @@ exception OptionalEx1 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -353,7 +353,7 @@ exception OptionalEx2 string firstName; string secondName; optional(1) string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -363,7 +363,7 @@ exception OptionalEx3 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members using different tags. @@ -373,7 +373,7 @@ exception OptionalEx4 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Same @@ -382,7 +382,7 @@ interface BaseInterface1 { void baseOp1(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change return type @@ -391,7 +391,7 @@ interface BaseInterface2 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add parameter @@ -400,7 +400,7 @@ interface BaseInterface3 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add exception @@ -409,7 +409,7 @@ interface BaseInterface4 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change out parameter to in parameter @@ -418,7 +418,7 @@ interface BaseInterface5 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove parameter @@ -427,7 +427,7 @@ interface BaseInterface6 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove exception @@ -436,7 +436,7 @@ interface BaseInterface7 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove operation @@ -445,7 +445,7 @@ interface BaseInterface8 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add base interface @@ -454,7 +454,7 @@ interface BaseInterface9 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Class with compact id @@ -462,14 +462,14 @@ interface BaseInterface9 class Compact1(1) { int id; -}; +} // // TEST: Derived from class with compact id // class Derived1 extends Compact1 { -}; +} // // TEST: Same class names but different compact id @@ -477,7 +477,7 @@ class Derived1 extends Compact1 class Compact2(2) { int id; -}; +} // // TEST: Class with optional members. @@ -487,7 +487,7 @@ class Optional0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members, different order, same tags. @@ -497,7 +497,7 @@ class Optional1 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -507,7 +507,7 @@ class Optional2 string firstName; string secondName; optional(1) string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -517,7 +517,7 @@ class Optional3 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members using different tags. @@ -527,7 +527,7 @@ class Optional4 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Interface with optional parameters. @@ -536,7 +536,7 @@ interface OptionalParameters0 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different order. @@ -545,7 +545,7 @@ interface OptionalParameters1 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different tags. @@ -554,7 +554,7 @@ interface OptionalParameters2 { void op1(string firstName, optional(1) string emailAddress, optional(2) string secondName); -}; +} // // TEST: Interface with different optional parameters. @@ -563,7 +563,7 @@ interface OptionalParameters3 { void op1(string firstName, optional(1) string emailAddress, string secondName); -}; +} // // TEST: Interface with optional return type. @@ -571,7 +571,7 @@ interface OptionalParameters3 interface OptionalReturn0 { optional(1) int op(); -}; +} // // TEST: Interface that changes optional return type. @@ -579,12 +579,12 @@ interface OptionalReturn0 interface OptionalReturn2 { optional(1) int op(); -}; +} // // TEST: Local // -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 }; +local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } // // TEST: Local @@ -602,13 +602,13 @@ local dictionary<string, string> LocalDictionary; local struct LocalStruct { string str; -}; +} // // TEST: Local // local class LocalClass { -}; +} -}; +} diff --git a/python/test/Ice/checksum/STypes.ice b/python/test/Ice/checksum/STypes.ice index 98c5e37f143..9b2d9e18244 100644 --- a/python/test/Ice/checksum/STypes.ice +++ b/python/test/Ice/checksum/STypes.ice @@ -30,42 +30,42 @@ const short IntConst3 = 100; // // TEST: Same // -enum Enum1 { Enum11, Enum12, Enum13 }; +enum Enum1 { Enum11, Enum12, Enum13 } // // TEST: Add enumerator // -enum Enum2 { Enum21, Enum22, Enum23, Enum24 }; +enum Enum2 { Enum21, Enum22, Enum23, Enum24 } // // TEST: Remove enumerator // -enum Enum3 { Enum32, Enum33 }; +enum Enum3 { Enum32, Enum33 } // // TEST: Enum with explicit values. // -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 }; +enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } // // TEST: Enum with same explicit values, different order. // -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 }; +enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 } // // TEST: Enum with different explicit values. // -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 }; +enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 } // // TEST: Enum with explicit values, removed enumerator. // -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2}; +enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2} // // TEST: Change to a different type // -class Enum4 {}; +class Enum4 {} // // TEST: Same @@ -80,7 +80,7 @@ sequence<short> Sequence2; // // TEST: Change to a different type // -class Sequence3 {}; +class Sequence3 {} // // TEST: Same @@ -100,7 +100,7 @@ dictionary<string, bool> Dictionary3; // // TEST: Change to a different type // -class Dictionary4 {}; +class Dictionary4 {} // // TEST: Same @@ -109,7 +109,7 @@ struct Struct1 { string str; bool b; -}; +} // // TEST: Add member @@ -119,7 +119,7 @@ struct Struct2 string str; bool b; float f; -}; +} // // TEST: Change member type @@ -128,7 +128,7 @@ struct Struct3 { string str; double b; -}; +} // // TEST: Remove member @@ -136,33 +136,33 @@ struct Struct3 struct Struct4 { bool b; -}; +} // // TEST: Change to a different type // -class Struct5 {}; +class Struct5 {} // // TEST: Same // interface Interface1 { -}; +} // // TEST: Change interface to class // class Interface2 { -}; +} // // TEST: Add base interface // interface Interface3 extends Interface1 { -}; +} // // TEST: Add operation @@ -170,14 +170,14 @@ interface Interface3 extends Interface1 interface Interface4 { void opInterface4(); -}; +} // // TEST: Same // class EmptyClass1 { -}; +} // // TEST: Add data member @@ -185,7 +185,7 @@ class EmptyClass1 class EmptyClass2 { double d; -}; +} // // TEST: Add operation @@ -193,21 +193,21 @@ class EmptyClass2 class EmptyClass3 { void newOp(); -}; +} // // TEST: Add base class // class EmptyClass4 extends EmptyClass1 { -}; +} // // TEST: Add interface // class EmptyClass5 implements Interface1 { -}; +} // // TEST: Same @@ -216,7 +216,7 @@ class SimpleClass1 { string str; float f; -}; +} // // TEST: Add operation @@ -226,7 +226,7 @@ class SimpleClass2 string str; float f; void newOp(); -}; +} // // TEST: Rename member @@ -235,7 +235,7 @@ class SimpleClass3 { string str; float g; -}; +} // // TEST: Add member @@ -245,7 +245,7 @@ class SimpleClass4 string str; float f; bool b; -}; +} // // TEST: Remove member @@ -253,7 +253,7 @@ class SimpleClass4 class SimpleClass5 { string str; -}; +} // // TEST: Reorder members @@ -262,7 +262,7 @@ class SimpleClass6 { float f; string str; -}; +} // // TEST: Change member type @@ -271,7 +271,7 @@ class SimpleClass7 { string str; double f; -}; +} // // TEST: Same @@ -280,7 +280,7 @@ exception Exception1 { string str; bool b; -}; +} // // TEST: Add member @@ -290,7 +290,7 @@ exception Exception2 string str; bool b; float f; -}; +} // // TEST: Change member type @@ -299,7 +299,7 @@ exception Exception3 { string str; double b; -}; +} // // TEST: Remove member @@ -307,19 +307,19 @@ exception Exception3 exception Exception4 { bool b; -}; +} // // TEST: Add base exception // exception Exception5 extends Exception1 { -}; +} // // TEST: Change to a different type // -class Exception6 {}; +class Exception6 {} // // TEST: Exception with optional members. @@ -329,7 +329,7 @@ exception OptionalEx0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members, different order, same tags. @@ -339,7 +339,7 @@ exception OptionalEx1 string firstName; optional(2) string emailAddress; optional(1) string secondName; -}; +} // // TEST: Exception with different optional members. @@ -349,7 +349,7 @@ exception OptionalEx2 string firstName; optional(1) string secondName; string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -360,7 +360,7 @@ exception OptionalEx3 optional(1) string secondName; optional(2) string emailAddress; optional(3) string phoneNumber; -}; +} // // TEST: Exception with optional members using different tags. @@ -370,7 +370,7 @@ exception OptionalEx4 string firstName; optional(2) string secondName; optional(1) string emailAddress; -}; +} // // TEST: Same @@ -379,7 +379,7 @@ interface BaseInterface1 { void baseOp1(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change return type @@ -388,7 +388,7 @@ interface BaseInterface2 { int baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add parameter @@ -397,7 +397,7 @@ interface BaseInterface3 { void baseOp(Object o); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add exception @@ -406,7 +406,7 @@ interface BaseInterface4 { void baseOp(); void baseOp2(int i, out string s) throws Exception1, Exception2; -}; +} // // TEST: Change out parameter to in parameter @@ -415,7 +415,7 @@ interface BaseInterface5 { void baseOp(); void baseOp2(int i, string s) throws Exception1; -}; +} // // TEST: Remove parameter @@ -424,7 +424,7 @@ interface BaseInterface6 { void baseOp(); void baseOp2(out string s) throws Exception1; -}; +} // // TEST: Remove exception @@ -433,7 +433,7 @@ interface BaseInterface7 { void baseOp(); void baseOp2(int i, out string s); -}; +} // // TEST: Remove operation @@ -441,7 +441,7 @@ interface BaseInterface7 interface BaseInterface8 { void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add base class @@ -450,7 +450,7 @@ interface BaseInterface9 extends Interface1 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Class with compact id @@ -458,14 +458,14 @@ interface BaseInterface9 extends Interface1 class Compact1(1) { int id; -}; +} // // TEST: Derived from class with compact id // class Derived1 extends Compact1 { -}; +} // // TEST: Same class names but different compact id @@ -473,7 +473,7 @@ class Derived1 extends Compact1 class Compact2(3) { int id; -}; +} // // TEST: Class with optional members. @@ -483,7 +483,7 @@ class Optional0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members, different order, same tags. @@ -493,7 +493,7 @@ class Optional1 string firstName; optional(2) string emailAddress; optional(1) string secondName; -}; +} // // TEST: Class with different optional members. @@ -503,7 +503,7 @@ class Optional2 string firstName; optional(1) string secondName; string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -514,7 +514,7 @@ class Optional3 optional(1) string secondName; optional(2) string emailAddress; optional(3) string phoneNumber; -}; +} // // TEST: Class with optional members using different tags. @@ -524,7 +524,7 @@ class Optional4 string firstName; optional(2) string secondName; optional(1) string emailAddress; -}; +} // // TEST: Interface with optional parameters. @@ -533,7 +533,7 @@ interface OptionalParameters0 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different order. @@ -542,7 +542,7 @@ interface OptionalParameters1 { void op1(string firstName, optional(2) string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with optional parameters, different tags. @@ -551,7 +551,7 @@ interface OptionalParameters2 { void op1(string firstName, optional(2) string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with different optional parameters. @@ -560,7 +560,7 @@ interface OptionalParameters3 { void op1(string firstName, string emailAddress, optional(1) string secondName); -}; +} // // TEST: Interface with optional return type. @@ -568,7 +568,7 @@ interface OptionalParameters3 interface OptionalReturn0 { optional(1) int op(); -}; +} // // TEST: Interface that changes optional return type. @@ -576,12 +576,12 @@ interface OptionalReturn0 interface OptionalReturn2 { int op(); -}; +} // // TEST: Local // -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 }; +local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } // // TEST: Local @@ -599,13 +599,13 @@ local dictionary<string, string> LocalDictionary; local struct LocalStruct { string str; -}; +} // // TEST: Local // local class LocalClass { -}; +} -}; +} diff --git a/python/test/Ice/checksum/Test.ice b/python/test/Ice/checksum/Test.ice index 2fc963eb1ca..3f3a3bf32b1 100644 --- a/python/test/Ice/checksum/Test.ice +++ b/python/test/Ice/checksum/Test.ice @@ -19,6 +19,6 @@ interface Checksum idempotent Ice::SliceChecksumDict getSliceChecksums(); void shutdown(); -}; +} -}; +} diff --git a/python/test/Ice/custom/Test.ice b/python/test/Ice/custom/Test.ice index 3f6d5db741e..c12afb83c1f 100644 --- a/python/test/Ice/custom/Test.ice +++ b/python/test/Ice/custom/Test.ice @@ -27,7 +27,7 @@ module Test ["python:seq:tuple"] StringList s2; StringTuple s3; ["python:seq:default"] StringTuple s4; - }; + } class C { @@ -39,7 +39,7 @@ module Test ["python:seq:tuple"] StringList s2; StringTuple s3; ["python:seq:default"] StringTuple s4; - }; + } interface Custom { @@ -63,5 +63,5 @@ module Test void sendC(C val); void shutdown(); - }; -}; + } +} diff --git a/python/test/Ice/defaultServant/Test.ice b/python/test/Ice/defaultServant/Test.ice index acf8e41550c..dab067ec07f 100644 --- a/python/test/Ice/defaultServant/Test.ice +++ b/python/test/Ice/defaultServant/Test.ice @@ -15,6 +15,6 @@ module Test interface MyObject { string getName(); -}; +} -}; +} diff --git a/python/test/Ice/defaultValue/Test.ice b/python/test/Ice/defaultValue/Test.ice index c29b88c956c..64021441f21 100644 --- a/python/test/Ice/defaultValue/Test.ice +++ b/python/test/Ice/defaultValue/Test.ice @@ -14,14 +14,14 @@ module Test { -enum Color { red, green, blue }; +enum Color { red, green, blue } module Nested { -enum Color { red, green, blue }; +enum Color { red, green, blue } -}; +} struct Struct1 @@ -48,7 +48,7 @@ struct Struct1 float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} const bool ConstBool = true; const byte ConstByte = 254; @@ -93,7 +93,7 @@ struct Struct2 float zeroDotF = ConstZeroDotF; double zeroD = ConstZeroD; double zeroDotD = ConstZeroDotD; -}; +} class Base { @@ -113,7 +113,7 @@ class Base float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} class Derived extends Base { @@ -123,7 +123,7 @@ class Derived extends Base Nested::Color nc1 = ::Test::Nested::Color::red; Nested::Color nc2 = Nested::green; Nested::Color nc3 = blue; -}; +} exception BaseEx { @@ -143,7 +143,7 @@ exception BaseEx float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} exception DerivedEx extends BaseEx { @@ -153,7 +153,7 @@ exception DerivedEx extends BaseEx Nested::Color nc1 = ConstNestedColor1; Nested::Color nc2 = ConstNestedColor2; Nested::Color nc3 = ConstNestedColor3; -}; +} sequence<byte> ByteSeq; sequence<int> IntSeq; @@ -162,7 +162,7 @@ dictionary<int, string> IntStringDict; struct InnerStruct { int a; -}; +} struct StructNoDefaults { @@ -179,32 +179,32 @@ struct StructNoDefaults IntSeq iseq; IntStringDict dict; InnerStruct st; -}; +} exception ExceptionNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} exception ExceptionNoDefaults extends ExceptionNoDefaultsBase { InnerStruct st; IntStringDict dict; -}; +} class ClassNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} class ClassNoDefaults extends ClassNoDefaultsBase { InnerStruct st; IntStringDict dict; -}; +} -}; +} diff --git a/python/test/Ice/dispatcher/Test.ice b/python/test/Ice/dispatcher/Test.ice index 53e7d6ee031..262051819c3 100644 --- a/python/test/Ice/dispatcher/Test.ice +++ b/python/test/Ice/dispatcher/Test.ice @@ -20,12 +20,12 @@ interface TestIntf void sleep(int to); void opWithPayload(Ice::ByteSeq seq); void shutdown(); -}; +} interface TestIntfController { void holdAdapter(); void resumeAdapter(); -}; +} -}; +} diff --git a/python/test/Ice/enums/Test.ice b/python/test/Ice/enums/Test.ice index 9851ef668ce..1eaf84a017b 100644 --- a/python/test/Ice/enums/Test.ice +++ b/python/test/Ice/enums/Test.ice @@ -35,7 +35,7 @@ enum ByteEnum benum9 = LongConst1, benum10, benum11 = ByteConst2 -}; +} sequence<ByteEnum> ByteEnumSeq; enum ShortEnum @@ -51,7 +51,7 @@ enum ShortEnum senum9 = LongConst1, senum10, senum11 = ShortConst2 -}; +} sequence<ShortEnum> ShortEnumSeq; enum IntEnum @@ -68,7 +68,7 @@ enum IntEnum ienum10, ienum11 = IntConst2, ienum12 = LongConst2 -}; +} sequence<IntEnum> IntEnumSeq; enum SimpleEnum @@ -76,7 +76,7 @@ enum SimpleEnum red, green, blue -}; +} sequence<SimpleEnum> SimpleEnumSeq; interface TestIntf @@ -92,6 +92,6 @@ interface TestIntf SimpleEnumSeq opSimpleSeq(SimpleEnumSeq s1, out SimpleEnumSeq s2); void shutdown(); -}; +} -}; +} diff --git a/python/test/Ice/exceptions/Test.ice b/python/test/Ice/exceptions/Test.ice index 67c59c2b5af..c38abb37bc0 100644 --- a/python/test/Ice/exceptions/Test.ice +++ b/python/test/Ice/exceptions/Test.ice @@ -16,37 +16,37 @@ module Test interface Empty { -}; +} interface Thrower; exception A { int aMem; -}; +} exception B extends A { int bMem; -}; +} exception C extends B { int cMem; -}; +} exception D { int dMem; -}; +} module Mod { exception A extends ::Test::A { int a2Mem; - }; -}; + } +} interface Thrower { @@ -76,11 +76,11 @@ interface Thrower void throwAfterResponse(); void throwAfterException() throws A; -}; +} interface WrongOperation { void noSuchOperation(); -}; +} -}; +} diff --git a/python/test/Ice/facets/Test.ice b/python/test/Ice/facets/Test.ice index 195bbe5e1a0..8a55ad38274 100644 --- a/python/test/Ice/facets/Test.ice +++ b/python/test/Ice/facets/Test.ice @@ -14,47 +14,47 @@ module Test interface Empty { -}; +} interface A { string callA(); -}; +} interface B extends A { string callB(); -}; +} interface C extends A { string callC(); -}; +} interface D extends B, C { string callD(); -}; +} interface E { string callE(); -}; +} interface F extends E { string callF(); -}; +} interface G { void shutdown(); string callG(); -}; +} interface H extends G { string callH(); -}; +} -}; +} diff --git a/python/test/Ice/faultTolerance/Test.ice b/python/test/Ice/faultTolerance/Test.ice index 2eb092e5203..a9e41465f35 100644 --- a/python/test/Ice/faultTolerance/Test.ice +++ b/python/test/Ice/faultTolerance/Test.ice @@ -18,6 +18,6 @@ interface TestIntf void abort(); idempotent void idempotentAbort(); idempotent int pid(); -}; +} -}; +} diff --git a/python/test/Ice/info/Test.ice b/python/test/Ice/info/Test.ice index c518d54b867..6741d5348d4 100644 --- a/python/test/Ice/info/Test.ice +++ b/python/test/Ice/info/Test.ice @@ -21,6 +21,6 @@ interface TestIntf Ice::Context getEndpointInfoAsContext(); Ice::Context getConnectionInfoAsContext(); -}; +} -}; +} diff --git a/python/test/Ice/inheritance/Test.ice b/python/test/Ice/inheritance/Test.ice index 372dbcc414a..1bbd2255d80 100644 --- a/python/test/Ice/inheritance/Test.ice +++ b/python/test/Ice/inheritance/Test.ice @@ -20,14 +20,14 @@ module MA interface IA { IA* iaop(IA* p); -}; +} class CA { CA* caop(CA* p); -}; +} -}; +} module MB { @@ -35,19 +35,19 @@ module MB interface IB1 extends MA::IA { IB1* ib1op(IB1* p); -}; +} interface IB2 extends MA::IA { IB2* ib2op(IB2* p); -}; +} class CB extends MA::CA { CB* cbop(CB* p); -}; +} -}; +} module MA { @@ -55,19 +55,19 @@ module MA interface IC extends MB::IB1, MB::IB2 { IC* icop(IC* p); -}; +} class CC extends MB::CB { CC* ccop(CC* p); -}; +} class CD extends CC implements MB::IB1, MB::IB2 { CD* cdop(CD* p); -}; +} -}; +} interface Initial { @@ -80,6 +80,6 @@ interface Initial MB::IB1* ib1op(); MB::IB2* ib2op(); MA::IC* icop(); -}; +} -}; +} diff --git a/python/test/Ice/location/Test.ice b/python/test/Ice/location/Test.ice index d3f656f69d4..e69636b2724 100644 --- a/python/test/Ice/location/Test.ice +++ b/python/test/Ice/location/Test.ice @@ -20,7 +20,7 @@ interface TestLocatorRegistry extends ::Ice::LocatorRegistry // Allow remote addition of objects to the locator registry. // void addObject(Object* obj); -}; +} interface TestLocator extends ::Ice::Locator { @@ -28,18 +28,18 @@ interface TestLocator extends ::Ice::Locator // Returns the number of request on the locator interface. // ["cpp:const"] idempotent int getRequestCount(); -}; +} interface ServerManager { void startServer(); void shutdown(); -}; +} interface Hello { void sayHello(); -}; +} interface TestIntf { @@ -50,6 +50,6 @@ interface TestIntf Hello* getReplicatedHello(); void migrateHello(); -}; +} -}; +} diff --git a/python/test/Ice/objects/ClientPrivate.ice b/python/test/Ice/objects/ClientPrivate.ice index 719b6a4d8a2..8e989ba2923 100644 --- a/python/test/Ice/objects/ClientPrivate.ice +++ b/python/test/Ice/objects/ClientPrivate.ice @@ -14,16 +14,16 @@ module Test class Empty { -}; +} class AlsoEmpty { -}; +} interface UnexpectedObjectExceptionTest { Empty op(); -}; +} // // Remaining definitions are here to ensure that the generated code compiles. @@ -32,37 +32,37 @@ interface UnexpectedObjectExceptionTest class COneMember { Empty e; -}; +} class CTwoMembers { Empty e1; Empty e2; -}; +} exception EOneMember { Empty e; -}; +} exception ETwoMembers { Empty e1; Empty e2; -}; +} struct SOneMember { Empty e; -}; +} struct STwoMembers { Empty e1; Empty e2; -}; +} dictionary<int, COneMember> DOneMember; dictionary<int, CTwoMembers> DTwoMembers; -}; +} diff --git a/python/test/Ice/objects/ServerPrivate.ice b/python/test/Ice/objects/ServerPrivate.ice index 2b1a53ed18f..f771cc65f19 100644 --- a/python/test/Ice/objects/ServerPrivate.ice +++ b/python/test/Ice/objects/ServerPrivate.ice @@ -14,16 +14,16 @@ module Test class Empty { -}; +} class AlsoEmpty { -}; +} interface UnexpectedObjectExceptionTest { AlsoEmpty op(); -}; +} // // Remaining definitions are here to ensure that the generated code compiles. @@ -32,37 +32,37 @@ interface UnexpectedObjectExceptionTest class COneMember { Empty e; -}; +} class CTwoMembers { Empty e1; Empty e2; -}; +} exception EOneMember { Empty e; -}; +} exception ETwoMembers { Empty e1; Empty e2; -}; +} struct SOneMember { Empty e; -}; +} struct STwoMembers { Empty e1; Empty e2; -}; +} dictionary<int, COneMember> DOneMember; dictionary<int, CTwoMembers> DTwoMembers; -}; +} diff --git a/python/test/Ice/objects/Test.ice b/python/test/Ice/objects/Test.ice index 7d9cdba97c9..77d0e49e56c 100644 --- a/python/test/Ice/objects/Test.ice +++ b/python/test/Ice/objects/Test.ice @@ -17,18 +17,18 @@ module Test struct S { string str; -}; +} class Base { S theS; string str; -}; +} class AbstractBase extends Base { void op(); -}; +} class B; class C; @@ -40,12 +40,12 @@ class A bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class B extends A { A theA; -}; +} class C { @@ -53,7 +53,7 @@ class C bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class D { @@ -63,31 +63,31 @@ class D bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} ["protected"] class E { int i; string s; -}; +} class F { ["protected"] E e1; E e2; -}; +} interface I { -}; +} interface J extends I { -}; +} class H implements I { -}; +} sequence<Base> BaseSeq; @@ -95,42 +95,42 @@ class CompactExt; class Compact(1) { -}; +} const int CompactExtId = 789; class CompactExt(CompactExtId) extends Compact { -}; +} class A1 { string name; -}; +} class B1 { A1 a1; A1 a2; -}; +} class D1 extends B1 { A1 a3; A1 a4; -}; +} exception EBase { A1 a1; A1 a2; -}; +} exception EDerived extends EBase { A1 a3; A1 a4; -}; +} module Inner { @@ -138,12 +138,12 @@ module Inner class A { ::Test::A theA; -}; +} exception Ex { string reason; -}; +} module Sub { @@ -151,21 +151,21 @@ module Sub class A { ::Test::Inner::A theA; -}; +} exception Ex { string reason; -}; +} -}; +} -}; +} class Recursive { Recursive v; -}; +} interface Initial { @@ -203,6 +203,6 @@ interface Initial void throwInnerEx() throws Inner::Ex; void throwInnerSubEx() throws Inner::Sub::Ex; -}; +} -}; +} diff --git a/python/test/Ice/operations/Test.ice b/python/test/Ice/operations/Test.ice index 19227daa12c..4697fea8715 100644 --- a/python/test/Ice/operations/Test.ice +++ b/python/test/Ice/operations/Test.ice @@ -19,21 +19,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -63,7 +63,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -258,28 +258,28 @@ interface MyClass ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -349,7 +349,7 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} module Test2 { @@ -362,6 +362,6 @@ module Test2 **/ interface MyDerivedClass extends Test::MyClass { -}; +} -}; +} diff --git a/python/test/Ice/optional/ClientPrivate.ice b/python/test/Ice/optional/ClientPrivate.ice index ddb03cd4aa5..e35c0d87ef8 100644 --- a/python/test/Ice/optional/ClientPrivate.ice +++ b/python/test/Ice/optional/ClientPrivate.ice @@ -22,7 +22,7 @@ class D extends B string ds; optional(990) StringSeq seq; optional(1000) A ao; -}; +} // // This class is a hack that allows us to invoke the opClassAndUnknownOptional operation @@ -34,6 +34,6 @@ interface Initial2 void opClassAndUnknownOptional(A p, optional(1) Object o); void opVoid(optional(1) int a, optional(2) string v); -}; +} -}; +} diff --git a/python/test/Ice/optional/Test.ice b/python/test/Ice/optional/Test.ice index b95de842d06..9e230aa3b16 100644 --- a/python/test/Ice/optional/Test.ice +++ b/python/test/Ice/optional/Test.ice @@ -15,32 +15,32 @@ module Test class OneOptional { optional(1) int a; -}; +} enum MyEnum { MyEnumMember -}; +} struct SmallStruct { byte m; -}; +} struct FixedStruct { int m; -}; +} struct VarStruct { string m; -}; +} struct ClassVarStruct { int a; -}; +} sequence<byte> ByteSeq; sequence<bool> BoolSeq; @@ -105,7 +105,7 @@ class MultiOptional optional(29) BoolSeq bos; optional(30) Serializable ser; -}; +} class A { @@ -113,26 +113,26 @@ class A optional(1) int ma; optional(50) int mb; optional(500) int mc; -}; +} ["preserve-slice"] class B extends A { int requiredB; optional(10) int md; -}; +} class C extends B { string ss; optional(890) string ms; -}; +} class WD { optional(1) int a = 5; optional(2) string s = "test"; -}; +} exception OptionalException { @@ -140,46 +140,46 @@ exception OptionalException optional(1) int a = 5; optional(2) string b; optional(50) OneOptional o; -}; +} exception DerivedException extends OptionalException { optional(600) string ss = "test"; optional(601) OneOptional o2; -}; +} exception RequiredException extends OptionalException { string ss = "test"; OneOptional o2; -}; +} class OptionalWithCustom { optional(1) SmallStructList l; ["protected"] optional(2) SmallStructList lp; optional(3) ClassVarStruct s; -}; +} class E { A ae; -}; +} class F extends E { optional(1) A af; -}; +} class G1 { string a; -}; +} class G2 { long a; -}; +} class G { @@ -187,14 +187,14 @@ class G G2 gg2; optional(0) G2 gg2Opt; G1 gg1; -}; +} class Recursive; sequence<Recursive> RecursiveSeq; class Recursive { optional(0) RecursiveSeq value; -}; +} interface Initial { @@ -308,6 +308,6 @@ interface Initial bool supportsCppStringView(); bool supportsNullOptional(); -}; +} -}; +} diff --git a/python/test/Ice/proxy/Test.ice b/python/test/Ice/proxy/Test.ice index f98d7dbcb3d..711ed0289f1 100644 --- a/python/test/Ice/proxy/Test.ice +++ b/python/test/Ice/proxy/Test.ice @@ -19,11 +19,11 @@ interface MyClass void shutdown(); Ice::Context getContext(); -}; +} interface MyDerivedClass extends MyClass { Object* echo(Object* obj); -}; +} -}; +} diff --git a/python/test/Ice/servantLocator/Test.ice b/python/test/Ice/servantLocator/Test.ice index 1f2b4dc86aa..1ca00d9713b 100644 --- a/python/test/Ice/servantLocator/Test.ice +++ b/python/test/Ice/servantLocator/Test.ice @@ -14,11 +14,11 @@ module Test exception TestIntfUserException { -}; +} exception TestImpossibleException { -}; +} interface TestIntf { @@ -39,16 +39,16 @@ interface TestIntf void asyncException() throws TestIntfUserException, TestImpossibleException; void shutdown(); -}; +} interface TestActivation { void activateServantLocator(bool activate); -}; +} local class Cookie { ["cpp:const"] string message(); -}; +} -}; +} diff --git a/python/test/Ice/slicing/exceptions/ClientPrivate.ice b/python/test/Ice/slicing/exceptions/ClientPrivate.ice index 47f9db97d22..eee256e04cd 100644 --- a/python/test/Ice/slicing/exceptions/ClientPrivate.ice +++ b/python/test/Ice/slicing/exceptions/ClientPrivate.ice @@ -17,16 +17,16 @@ module Test class PreservedClass extends BaseClass { string pc; -}; +} exception Preserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception Preserved2 extends Preserved1 { BaseClass p2; -}; +} -}; +} diff --git a/python/test/Ice/slicing/exceptions/ServerPrivate.ice b/python/test/Ice/slicing/exceptions/ServerPrivate.ice index 9c7d56ca391..d290938c3a2 100644 --- a/python/test/Ice/slicing/exceptions/ServerPrivate.ice +++ b/python/test/Ice/slicing/exceptions/ServerPrivate.ice @@ -17,36 +17,36 @@ module Test exception UnknownDerived extends Base { string ud; -}; +} exception UnknownIntermediate extends Base { string ui; -}; +} exception UnknownMostDerived1 extends KnownIntermediate { string umd1; -}; +} exception UnknownMostDerived2 extends UnknownIntermediate { string umd2; -}; +} class SPreservedClass extends BaseClass { string spc; -}; +} exception SPreserved1 extends KnownPreservedDerived { BaseClass p1; -}; +} exception SPreserved2 extends SPreserved1 { BaseClass p2; -}; +} -}; +} diff --git a/python/test/Ice/slicing/exceptions/Test.ice b/python/test/Ice/slicing/exceptions/Test.ice index 3ce6959161d..c6931b59a43 100644 --- a/python/test/Ice/slicing/exceptions/Test.ice +++ b/python/test/Ice/slicing/exceptions/Test.ice @@ -15,39 +15,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -57,7 +57,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["format:sliced"] interface TestIntf @@ -93,6 +93,6 @@ interface TestIntf void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} -}; +} diff --git a/python/test/Ice/slicing/objects/ClientPrivate.ice b/python/test/Ice/slicing/objects/ClientPrivate.ice index d8445516d19..e5be8a809aa 100644 --- a/python/test/Ice/slicing/objects/ClientPrivate.ice +++ b/python/test/Ice/slicing/objects/ClientPrivate.ice @@ -18,32 +18,32 @@ class D3 extends B { string sd3; B pd3; -}; +} ["preserve-slice"] class PCUnknown extends PBase { string pu; -}; +} class PCDerived extends PDerived { PBaseSeq pbs; -}; +} class PCDerived2 extends PCDerived { int pcd2; -}; +} class PCDerived3 extends PCDerived2 { Object pcd3; -}; +} class CompactPCDerived(57) extends CompactPDerived { PBaseSeq pbs; -}; +} -}; +} diff --git a/python/test/Ice/slicing/objects/ServerPrivate.ice b/python/test/Ice/slicing/objects/ServerPrivate.ice index 010e74801d8..be4a3b3f131 100644 --- a/python/test/Ice/slicing/objects/ServerPrivate.ice +++ b/python/test/Ice/slicing/objects/ServerPrivate.ice @@ -17,51 +17,51 @@ module Test class SBSUnknownDerived extends SBase { string sbsud; -}; +} class SUnknown { string su; -}; +} class D2 extends B { string sd2; B pd2; -}; +} class D4 extends B { B p1; B p2; -}; +} exception UnknownDerivedException extends BaseException { string sude; D2 pd2; -}; +} class MyClass { int i; -}; +} class PSUnknown extends Preserved { string psu; PNode graph; MyClass cl; -}; +} class PSUnknown2 extends Preserved { PBase pb; -}; +} exception PSUnknownException extends PreservedException { PSUnknown2 p; -}; +} -}; +} diff --git a/python/test/Ice/slicing/objects/Test.ice b/python/test/Ice/slicing/objects/Test.ice index 89f2780c352..6c25277a348 100644 --- a/python/test/Ice/slicing/objects/Test.ice +++ b/python/test/Ice/slicing/objects/Test.ice @@ -15,42 +15,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS3 { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -58,20 +58,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -79,28 +79,28 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} class CompactPDerived(56) extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["format:sliced"] interface TestIntf @@ -158,17 +158,17 @@ interface TestIntf void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */ void shutdown(); -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} -}; +} diff --git a/python/test/Ice/thread/Test.ice b/python/test/Ice/thread/Test.ice index 8e1bb3fda39..d1e71c4c9f8 100644 --- a/python/test/Ice/thread/Test.ice +++ b/python/test/Ice/thread/Test.ice @@ -18,7 +18,7 @@ module Test interface TestIntf { void sleep(int ms); -}; +} interface RemoteCommunicator { @@ -31,15 +31,15 @@ interface RemoteCommunicator int getThreadStopCount(); void destroy(); -}; +} interface RemoteCommunicatorFactory { RemoteCommunicator* createCommunicator(Ice::PropertyDict props); void shutdown(); -}; +} -}; +} #endif diff --git a/python/test/Ice/timeout/Test.ice b/python/test/Ice/timeout/Test.ice index d34168a950a..aad831a9993 100644 --- a/python/test/Ice/timeout/Test.ice +++ b/python/test/Ice/timeout/Test.ice @@ -23,6 +23,6 @@ interface Timeout void holdAdapter(int to); void shutdown(); -}; +} -}; +} diff --git a/python/test/Slice/escape/Clash.ice b/python/test/Slice/escape/Clash.ice index 2fa00947309..3839df1875c 100644 --- a/python/test/Slice/escape/Clash.ice +++ b/python/test/Slice/escape/Clash.ice @@ -30,7 +30,7 @@ interface Intf void opOut(out string context, out string current, out string response, out string ex, out string sent, out string cookie, out string sync, out string result, out string istr, out string ostr, out optional(1) string proxy); -}; +} class Cls { @@ -49,7 +49,7 @@ class Cls string inS; string in; string proxy; -}; +} struct St { @@ -58,12 +58,12 @@ struct St int ostr; int rhs; string other; -}; +} exception Ex { short istr; int ostr; -}; +} -}; +} diff --git a/python/test/Slice/escape/Key.ice b/python/test/Slice/escape/Key.ice index 9457a782d97..3b5f2a6d4f6 100644 --- a/python/test/Slice/escape/Key.ice +++ b/python/test/Slice/escape/Key.ice @@ -12,33 +12,33 @@ module and enum assert { break - }; + } struct continue { int def; - }; + } interface del { ["amd"] void elif(int else, out int except); - }; + } interface exec { void finally(); - }; + } class for { int lambda; exec* from; int global; - }; + } interface if extends exec, del { - }; + } sequence<assert> import; dictionary<string,assert> in; @@ -46,25 +46,25 @@ module and exception is { int lambda; - }; + } exception not extends is { int or; int pass; - }; + } local interface print { assert raise(continue else, for return, if try, del* while, exec* yield, for* lambda, if* or, int global) throws is; - }; + } const int lambda = 0; enum EnumNone { None - }; -}; + } +} diff --git a/python/test/Slice/import/Test1.ice b/python/test/Slice/import/Test1.ice index a7fa58e5879..b366160b3b1 100644 --- a/python/test/Slice/import/Test1.ice +++ b/python/test/Slice/import/Test1.ice @@ -14,14 +14,14 @@ module Test module SubSubA1 { const int Value1 = 10; - }; - }; + } + } module SubB { module SubSubB1 { const int Value1 = 20; - }; - }; -}; + } + } +} diff --git a/python/test/Slice/import/Test2.ice b/python/test/Slice/import/Test2.ice index bd8cf120390..8e2e99494d7 100644 --- a/python/test/Slice/import/Test2.ice +++ b/python/test/Slice/import/Test2.ice @@ -14,18 +14,18 @@ module Test module SubSubA1 { const int Value2 = 11; - }; + } module SubSubA2 { const int Value1 = 30; - }; - }; + } + } module SubB { module SubSubB1 { const int Value2 = 21; - }; - }; -}; + } + } +} diff --git a/python/test/Slice/macros/Test.ice b/python/test/Slice/macros/Test.ice index 138519f2385..7bf6cd8be05 100644 --- a/python/test/Slice/macros/Test.ice +++ b/python/test/Slice/macros/Test.ice @@ -32,13 +32,13 @@ class Default { int x DEFAULT(10); int y DEFAULT(10); -}; +} class NoDefault { int x NODEFAULT(10); int y NODEFAULT(10); -}; +} // // This class is only defined when compiling with slice2py. @@ -48,7 +48,7 @@ class PythonOnly { string lang DEFAULT("python"); int version DEFAULT(ICE_VERSION); -}; +} #endif -}; +} diff --git a/python/test/Slice/structure/Test.ice b/python/test/Slice/structure/Test.ice index 6499411aa74..0728f397bb0 100644 --- a/python/test/Slice/structure/Test.ice +++ b/python/test/Slice/structure/Test.ice @@ -18,7 +18,7 @@ dictionary<string, string> StringDict; struct S1 { string name; -}; +} struct S2 { @@ -30,18 +30,18 @@ struct S2 string str; IntSeq seq; S1 s; -}; +} class C { string name; -}; +} struct S3 { C obj; StringDict sd; Object* prx; -}; +} -}; +} diff --git a/ruby/test/Ice/acm/Test.ice b/ruby/test/Ice/acm/Test.ice index 7018c9df821..520c551ce34 100644 --- a/ruby/test/Ice/acm/Test.ice +++ b/ruby/test/Ice/acm/Test.ice @@ -19,7 +19,7 @@ interface TestIntf void interruptSleep(); void startHeartbeatCount(); void waitForHeartbeatCount(int count); -}; +} interface RemoteObjectAdapter { @@ -27,13 +27,13 @@ interface RemoteObjectAdapter void activate(); void hold(); void deactivate(); -}; +} interface RemoteCommunicator { RemoteObjectAdapter* createObjectAdapter(int acmTimeout, int close, int heartbeat); void shutdown(); -}; +} -}; +} diff --git a/ruby/test/Ice/binding/Test.ice b/ruby/test/Ice/binding/Test.ice index f23f3433258..de2937a32ce 100644 --- a/ruby/test/Ice/binding/Test.ice +++ b/ruby/test/Ice/binding/Test.ice @@ -15,14 +15,14 @@ module Test interface TestIntf { string getAdapterName(); -}; +} interface RemoteObjectAdapter { TestIntf* getTestIntf(); void deactivate(); -}; +} interface RemoteCommunicator { @@ -31,6 +31,6 @@ interface RemoteCommunicator void deactivateObjectAdapter(RemoteObjectAdapter* adapter); void shutdown(); -}; +} -}; +} diff --git a/ruby/test/Ice/checksum/CTypes.ice b/ruby/test/Ice/checksum/CTypes.ice index c15d5c94633..1ed68f50407 100644 --- a/ruby/test/Ice/checksum/CTypes.ice +++ b/ruby/test/Ice/checksum/CTypes.ice @@ -30,42 +30,42 @@ const int IntConst3 = 100; // // TEST: Same // -enum Enum1 { Enum11, Enum12, Enum13 }; +enum Enum1 { Enum11, Enum12, Enum13 } // // TEST: Add enumerator // -enum Enum2 { Enum21, Enum22, Enum23 }; +enum Enum2 { Enum21, Enum22, Enum23 } // // TEST: Remove enumerator // -enum Enum3 { Enum31, Enum32, Enum33 }; +enum Enum3 { Enum31, Enum32, Enum33 } // // TEST: Change to a different type // -enum Enum4 { Enum41, Enum42, Enum43 }; +enum Enum4 { Enum41, Enum42, Enum43 } // // TEST: Enum with explicit values. // -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 }; +enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } // // TEST: Enum with same explicit values, different order. // -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 }; +enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } // // TEST: Enum with different explicit values. // -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3}; +enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} // // TEST: Enum with explicit values, removed enumerator. // -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3}; +enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} // // TEST: Same @@ -109,7 +109,7 @@ struct Struct1 { string str; bool b; -}; +} // // TEST: Add member @@ -118,7 +118,7 @@ struct Struct2 { string str; bool b; -}; +} // // TEST: Change member type @@ -127,7 +127,7 @@ struct Struct3 { string str; bool b; -}; +} // // TEST: Remove member @@ -136,7 +136,7 @@ struct Struct4 { string str; bool b; -}; +} // // TEST: Change to a different type @@ -145,70 +145,70 @@ struct Struct5 { string str; bool b; -}; +} // // TEST: Same // interface Interface1 { -}; +} // // TEST: Change interface to class // interface Interface2 { -}; +} // // TEST: Add base interface // interface Interface3 { -}; +} // // TEST: Add operation // interface Interface4 { -}; +} // // TEST: Same // class EmptyClass1 { -}; +} // // TEST: Add data member // class EmptyClass2 { -}; +} // // TEST: Add operation // class EmptyClass3 { -}; +} // // TEST: Add base class // class EmptyClass4 { -}; +} // // TEST: Add interface // class EmptyClass5 { -}; +} // // TEST: Same @@ -217,7 +217,7 @@ class SimpleClass1 { string str; float f; -}; +} // // TEST: Add operation @@ -226,7 +226,7 @@ class SimpleClass2 { string str; float f; -}; +} // // TEST: Rename member @@ -235,7 +235,7 @@ class SimpleClass3 { string str; float f; -}; +} // // TEST: Add member @@ -244,7 +244,7 @@ class SimpleClass4 { string str; float f; -}; +} // // TEST: Remove member @@ -253,7 +253,7 @@ class SimpleClass5 { string str; float f; -}; +} // // TEST: Reorder members @@ -262,7 +262,7 @@ class SimpleClass6 { string str; float f; -}; +} // // TEST: Change member type @@ -271,7 +271,7 @@ class SimpleClass7 { string str; float f; -}; +} // // TEST: Same @@ -280,7 +280,7 @@ exception Exception1 { string str; bool b; -}; +} // // TEST: Add member @@ -289,7 +289,7 @@ exception Exception2 { string str; bool b; -}; +} // // TEST: Change member type @@ -298,7 +298,7 @@ exception Exception3 { string str; bool b; -}; +} // // TEST: Remove member @@ -307,14 +307,14 @@ exception Exception4 { string str; bool b; -}; +} // // TEST: Add base exception // exception Exception5 { -}; +} // // TEST: Change to a different type @@ -323,7 +323,7 @@ exception Exception6 { string str; bool b; -}; +} // // TEST: Exception with optional members. @@ -333,7 +333,7 @@ exception OptionalEx0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members, different order, same tags. @@ -343,7 +343,7 @@ exception OptionalEx1 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -353,7 +353,7 @@ exception OptionalEx2 string firstName; string secondName; optional(1) string emailAddress; -}; +} // // TEST: Exception with different optional members. @@ -363,7 +363,7 @@ exception OptionalEx3 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Exception with optional members using different tags. @@ -373,7 +373,7 @@ exception OptionalEx4 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Same @@ -382,7 +382,7 @@ interface BaseInterface1 { void baseOp1(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change return type @@ -391,7 +391,7 @@ interface BaseInterface2 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add parameter @@ -400,7 +400,7 @@ interface BaseInterface3 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add exception @@ -409,7 +409,7 @@ interface BaseInterface4 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Change out parameter to in parameter @@ -418,7 +418,7 @@ interface BaseInterface5 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove parameter @@ -427,7 +427,7 @@ interface BaseInterface6 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove exception @@ -436,7 +436,7 @@ interface BaseInterface7 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Remove operation @@ -445,7 +445,7 @@ interface BaseInterface8 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Add base interface @@ -454,7 +454,7 @@ interface BaseInterface9 { void baseOp(); void baseOp2(int i, out string s) throws Exception1; -}; +} // // TEST: Class with compact id @@ -462,14 +462,14 @@ interface BaseInterface9 class Compact1(1) { int id; -}; +} // // TEST: Derived from class with compact id // class Derived1 extends Compact1 { -}; +} // // TEST: Same class names but different compact id @@ -477,7 +477,7 @@ class Derived1 extends Compact1 class Compact2(2) { int id; -}; +} // // TEST: Class with optional members. @@ -487,7 +487,7 @@ class Optional0 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members, different order, same tags. @@ -497,7 +497,7 @@ class Optional1 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -507,7 +507,7 @@ class Optional2 string firstName; string secondName; optional(1) string emailAddress; -}; +} // // TEST: Class with different optional members. @@ -517,7 +517,7 @@ class Optional3 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Class with optional members using different tags. @@ -527,7 +527,7 @@ class Optional4 string firstName; optional(1) string secondName; optional(2) string emailAddress; -}; +} // // TEST: Interface with optional parameters. @@ -536,7 +536,7 @@ interface OptionalParameters0 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different order. @@ -545,7 +545,7 @@ interface OptionalParameters1 { void op1(string firstName, optional(1) string secondName, optional(2) string emailAddress); -}; +} // // TEST: Interface with optional parameters, different tags. @@ -554,7 +554,7 @@ interface OptionalParameters2 { void op1(string firstName, optional(1) string emailAddress, optional(2) string secondName); -}; +} // // TEST: Interface with different optional parameters. @@ -563,7 +563,7 @@ interface OptionalParameters3 { void op1(string firstName, optional(1) string emailAddress, string secondName); -}; +} // // TEST: Interface with optional return type. @@ -571,7 +571,7 @@ interface OptionalParameters3 interface OptionalReturn0 { optional(1) int op(); -}; +} // // TEST: Interface that changes optional return type. @@ -579,12 +579,12 @@ interface OptionalReturn0 interface OptionalReturn2 { optional(1) int op(); -}; +} // // TEST: Local // -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 }; +local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } // // TEST: Local @@ -602,13 +602,13 @@ local dictionary<string, string> LocalDictionary; local struct LocalStruct { string str; -}; +} // // TEST: Local // local class LocalClass { -}; +} -}; +} diff --git a/ruby/test/Ice/checksum/Test.ice b/ruby/test/Ice/checksum/Test.ice index 2fc963eb1ca..3f3a3bf32b1 100644 --- a/ruby/test/Ice/checksum/Test.ice +++ b/ruby/test/Ice/checksum/Test.ice @@ -19,6 +19,6 @@ interface Checksum idempotent Ice::SliceChecksumDict getSliceChecksums(); void shutdown(); -}; +} -}; +} diff --git a/ruby/test/Ice/defaultValue/Test.ice b/ruby/test/Ice/defaultValue/Test.ice index 7b1b717d05d..8503556b985 100644 --- a/ruby/test/Ice/defaultValue/Test.ice +++ b/ruby/test/Ice/defaultValue/Test.ice @@ -14,14 +14,14 @@ module Test { -enum Color { red, green, blue }; +enum Color { red, green, blue } module Nested { -enum Color { red, green, blue }; +enum Color { red, green, blue } -}; +} struct Struct1 { @@ -47,7 +47,7 @@ struct Struct1 float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} const bool ConstBool = true; const byte ConstByte = 254; @@ -92,7 +92,7 @@ struct Struct2 float zeroDotF = ConstZeroDotF; double zeroD = ConstZeroD; double zeroDotD = ConstZeroDotD; -}; +} class Base { @@ -112,7 +112,7 @@ class Base float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} class Derived extends Base { @@ -122,7 +122,7 @@ class Derived extends Base Nested::Color nc1 = ::Test::Nested::Color::red; Nested::Color nc2 = Nested::green; Nested::Color nc3 = blue; -}; +} exception BaseEx { @@ -142,7 +142,7 @@ exception BaseEx float zeroDotF = 0.0; double zeroD = 0; double zeroDotD = 0; -}; +} exception DerivedEx extends BaseEx { @@ -152,7 +152,7 @@ exception DerivedEx extends BaseEx Nested::Color nc1 = ConstNestedColor1; Nested::Color nc2 = ConstNestedColor2; Nested::Color nc3 = ConstNestedColor3; -}; +} sequence<byte> ByteSeq; sequence<int> IntSeq; @@ -161,7 +161,7 @@ dictionary<int, string> IntStringDict; struct InnerStruct { int a; -}; +} struct StructNoDefaults { @@ -178,32 +178,32 @@ struct StructNoDefaults IntSeq is; IntStringDict dict; InnerStruct st; -}; +} exception ExceptionNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} exception ExceptionNoDefaults extends ExceptionNoDefaultsBase { InnerStruct st; IntStringDict dict; -}; +} class ClassNoDefaultsBase { string str; Color c1; ByteSeq bs; -}; +} class ClassNoDefaults extends ClassNoDefaultsBase { InnerStruct st; IntStringDict dict; -}; +} -}; +} diff --git a/ruby/test/Ice/enums/Test.ice b/ruby/test/Ice/enums/Test.ice index 420b8cf6623..8b50132427b 100644 --- a/ruby/test/Ice/enums/Test.ice +++ b/ruby/test/Ice/enums/Test.ice @@ -35,7 +35,7 @@ enum ByteEnum benum9 = LongConst1, benum10, benum11 = ByteConst2 -}; +} enum ShortEnum { @@ -50,7 +50,7 @@ enum ShortEnum senum9 = LongConst1, senum10, senum11 = ShortConst2 -}; +} enum IntEnum { @@ -66,14 +66,14 @@ enum IntEnum ienum10, ienum11 = IntConst2, ienum12 = LongConst2 -}; +} enum SimpleEnum { red, green, blue -}; +} interface TestIntf { @@ -83,6 +83,6 @@ interface TestIntf SimpleEnum opSimple(SimpleEnum s1, out SimpleEnum s2); void shutdown(); -}; +} -}; +} diff --git a/ruby/test/Ice/exceptions/Test.ice b/ruby/test/Ice/exceptions/Test.ice index 9b375877054..c229d303893 100644 --- a/ruby/test/Ice/exceptions/Test.ice +++ b/ruby/test/Ice/exceptions/Test.ice @@ -16,37 +16,37 @@ module Test interface Empty { -}; +} interface Thrower; exception A { int aMem; -}; +} exception B extends A { int bMem; -}; +} exception C extends B { int cMem; -}; +} exception D { int dMem; -}; +} module Mod { exception A extends ::Test::A { int a2Mem; - }; -}; + } +} interface Thrower @@ -74,11 +74,11 @@ interface Thrower Ice::ByteSeq throwMemoryLimitException(Ice::ByteSeq seq); idempotent void throwLocalExceptionIdempotent(); -}; +} interface WrongOperation { void noSuchOperation(); -}; +} -}; +} diff --git a/ruby/test/Ice/facets/Test.ice b/ruby/test/Ice/facets/Test.ice index 195bbe5e1a0..8a55ad38274 100644 --- a/ruby/test/Ice/facets/Test.ice +++ b/ruby/test/Ice/facets/Test.ice @@ -14,47 +14,47 @@ module Test interface Empty { -}; +} interface A { string callA(); -}; +} interface B extends A { string callB(); -}; +} interface C extends A { string callC(); -}; +} interface D extends B, C { string callD(); -}; +} interface E { string callE(); -}; +} interface F extends E { string callF(); -}; +} interface G { void shutdown(); string callG(); -}; +} interface H extends G { string callH(); -}; +} -}; +} diff --git a/ruby/test/Ice/info/Test.ice b/ruby/test/Ice/info/Test.ice index c518d54b867..6741d5348d4 100644 --- a/ruby/test/Ice/info/Test.ice +++ b/ruby/test/Ice/info/Test.ice @@ -21,6 +21,6 @@ interface TestIntf Ice::Context getEndpointInfoAsContext(); Ice::Context getConnectionInfoAsContext(); -}; +} -}; +} diff --git a/ruby/test/Ice/inheritance/Test.ice b/ruby/test/Ice/inheritance/Test.ice index 372dbcc414a..1bbd2255d80 100644 --- a/ruby/test/Ice/inheritance/Test.ice +++ b/ruby/test/Ice/inheritance/Test.ice @@ -20,14 +20,14 @@ module MA interface IA { IA* iaop(IA* p); -}; +} class CA { CA* caop(CA* p); -}; +} -}; +} module MB { @@ -35,19 +35,19 @@ module MB interface IB1 extends MA::IA { IB1* ib1op(IB1* p); -}; +} interface IB2 extends MA::IA { IB2* ib2op(IB2* p); -}; +} class CB extends MA::CA { CB* cbop(CB* p); -}; +} -}; +} module MA { @@ -55,19 +55,19 @@ module MA interface IC extends MB::IB1, MB::IB2 { IC* icop(IC* p); -}; +} class CC extends MB::CB { CC* ccop(CC* p); -}; +} class CD extends CC implements MB::IB1, MB::IB2 { CD* cdop(CD* p); -}; +} -}; +} interface Initial { @@ -80,6 +80,6 @@ interface Initial MB::IB1* ib1op(); MB::IB2* ib2op(); MA::IC* icop(); -}; +} -}; +} diff --git a/ruby/test/Ice/location/Test.ice b/ruby/test/Ice/location/Test.ice index 5d99b53ad5b..66fd65203af 100644 --- a/ruby/test/Ice/location/Test.ice +++ b/ruby/test/Ice/location/Test.ice @@ -20,18 +20,18 @@ interface TestLocatorRegistry extends ::Ice::LocatorRegistry // Allow remote addition of objects to the locator registry. // void addObject(Object* obj); -}; +} interface ServerManager { void startServer(); void shutdown(); -}; +} interface Hello { void sayHello(); -}; +} interface TestIntf { @@ -40,6 +40,6 @@ interface TestIntf Hello* getHello(); void migrateHello(); -}; +} -}; +} diff --git a/ruby/test/Ice/objects/ClientPrivate.ice b/ruby/test/Ice/objects/ClientPrivate.ice index 719b6a4d8a2..8e989ba2923 100644 --- a/ruby/test/Ice/objects/ClientPrivate.ice +++ b/ruby/test/Ice/objects/ClientPrivate.ice @@ -14,16 +14,16 @@ module Test class Empty { -}; +} class AlsoEmpty { -}; +} interface UnexpectedObjectExceptionTest { Empty op(); -}; +} // // Remaining definitions are here to ensure that the generated code compiles. @@ -32,37 +32,37 @@ interface UnexpectedObjectExceptionTest class COneMember { Empty e; -}; +} class CTwoMembers { Empty e1; Empty e2; -}; +} exception EOneMember { Empty e; -}; +} exception ETwoMembers { Empty e1; Empty e2; -}; +} struct SOneMember { Empty e; -}; +} struct STwoMembers { Empty e1; Empty e2; -}; +} dictionary<int, COneMember> DOneMember; dictionary<int, CTwoMembers> DTwoMembers; -}; +} diff --git a/ruby/test/Ice/objects/Test.ice b/ruby/test/Ice/objects/Test.ice index 571b20b2db4..4e989b3a2cb 100644 --- a/ruby/test/Ice/objects/Test.ice +++ b/ruby/test/Ice/objects/Test.ice @@ -17,18 +17,18 @@ module Test struct S { string str; -}; +} class Base { S theS; string str; -}; +} class AbstractBase extends Base { void op(); -}; +} class B; class C; @@ -40,12 +40,12 @@ class A bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class B extends A { A theA; -}; +} class C { @@ -53,7 +53,7 @@ class C bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} class D { @@ -63,31 +63,31 @@ class D bool preMarshalInvoked; bool postUnmarshalInvoked; -}; +} ["protected"] class E { int i; string s; -}; +} class F { ["protected"] E e1; E e2; -}; +} interface I { -}; +} interface J extends I { -}; +} class H implements I { -}; +} sequence<Base> BaseSeq; @@ -95,47 +95,47 @@ class CompactExt; class Compact(1) { -}; +} const int CompactExtId = 789; class CompactExt(CompactExtId) extends Compact { -}; +} class A1 { string name; -}; +} class B1 { A1 a1; A1 a2; -}; +} class D1 extends B1 { A1 a3; A1 a4; -}; +} exception EBase { A1 a1; A1 a2; -}; +} exception EDerived extends EBase { A1 a3; A1 a4; -}; +} class Recursive { Recursive v; -}; +} class Initial { @@ -167,6 +167,6 @@ class Initial BaseSeq opBaseSeq(BaseSeq inSeq, out BaseSeq outSeq); Compact getCompact(); -}; +} -}; +} diff --git a/ruby/test/Ice/operations/Test.ice b/ruby/test/Ice/operations/Test.ice index 0f78f32d80a..15e894176b3 100644 --- a/ruby/test/Ice/operations/Test.ice +++ b/ruby/test/Ice/operations/Test.ice @@ -19,21 +19,21 @@ enum MyEnum enum1, enum2, enum3 -}; +} interface MyClass; struct AnotherStruct { string s; -}; +} struct Structure { MyClass* p; MyEnum e; AnotherStruct s; -}; +} sequence<byte> ByteS; sequence<bool> BoolS; @@ -63,7 +63,7 @@ struct MyStruct { int i; int j; -}; +} dictionary<byte, bool> ByteBoolD; dictionary<short, int> ShortIntD; @@ -256,28 +256,28 @@ interface MyClass ["marshaled-result"] StringStringD opMDict1(); ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2); -}; +} struct MyStruct1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct -}; +} class MyClass1 { string tesT; // Same name as the enclosing module MyClass myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class -}; +} interface MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); -}; +} // // String literals @@ -347,7 +347,7 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃"; const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343"; -}; +} module Test2 { @@ -360,6 +360,6 @@ module Test2 **/ interface MyDerivedClass extends Test::MyClass { -}; +} -}; +} diff --git a/ruby/test/Ice/optional/ClientPrivate.ice b/ruby/test/Ice/optional/ClientPrivate.ice index ddb03cd4aa5..e35c0d87ef8 100644 --- a/ruby/test/Ice/optional/ClientPrivate.ice +++ b/ruby/test/Ice/optional/ClientPrivate.ice @@ -22,7 +22,7 @@ class D extends B string ds; optional(990) StringSeq seq; optional(1000) A ao; -}; +} // // This class is a hack that allows us to invoke the opClassAndUnknownOptional operation @@ -34,6 +34,6 @@ interface Initial2 void opClassAndUnknownOptional(A p, optional(1) Object o); void opVoid(optional(1) int a, optional(2) string v); -}; +} -}; +} diff --git a/ruby/test/Ice/optional/Test.ice b/ruby/test/Ice/optional/Test.ice index 3e4e993d001..0bc0290fbb4 100644 --- a/ruby/test/Ice/optional/Test.ice +++ b/ruby/test/Ice/optional/Test.ice @@ -15,32 +15,32 @@ module Test class OneOptional { optional(1) int a; -}; +} enum MyEnum { MyEnumMember -}; +} struct SmallStruct { byte m; -}; +} struct FixedStruct { int m; -}; +} struct VarStruct { string m; -}; +} struct ClassVarStruct { int a; -}; +} sequence<byte> ByteSeq; sequence<bool> BoolSeq; @@ -105,7 +105,7 @@ class MultiOptional optional(29) BoolSeq bos; optional(30) Serializable ser; -}; +} class A { @@ -113,26 +113,26 @@ class A optional(1) int ma; optional(50) int mb; optional(500) int mc; -}; +} ["preserve-slice"] class B extends A { int requiredB; optional(10) int md; -}; +} class C extends B { string ss; optional(890) string ms; -}; +} class WD { optional(1) int a = 5; optional(2) string s = "test"; -}; +} exception OptionalException { @@ -140,46 +140,46 @@ exception OptionalException optional(1) int a = 5; optional(2) string b; optional(50) OneOptional o; -}; +} exception DerivedException extends OptionalException { optional(600) string ss = "test"; optional(601) OneOptional o2; -}; +} exception RequiredException extends OptionalException { string ss = "test"; OneOptional o2; -}; +} class OptionalWithCustom { optional(1) SmallStructList l; ["protected"] optional(2) SmallStructList lp; optional(3) ClassVarStruct s; -}; +} class E { A ae; -}; +} class F extends E { optional(1) A af; -}; +} class G1 { string a; -}; +} class G2 { long a; -}; +} class G { @@ -187,7 +187,7 @@ class G G2 gg2; optional(0) G2 gg2Opt; G1 gg1; -}; +} class Recursive; sequence<Recursive> RecursiveSeq; @@ -195,7 +195,7 @@ sequence<Recursive> RecursiveSeq; class Recursive { optional(0) RecursiveSeq value; -}; +} interface Initial { @@ -309,6 +309,6 @@ interface Initial bool supportsCppStringView(); bool supportsNullOptional(); -}; +} -}; +} diff --git a/ruby/test/Ice/proxy/Test.ice b/ruby/test/Ice/proxy/Test.ice index f98d7dbcb3d..711ed0289f1 100644 --- a/ruby/test/Ice/proxy/Test.ice +++ b/ruby/test/Ice/proxy/Test.ice @@ -19,11 +19,11 @@ interface MyClass void shutdown(); Ice::Context getContext(); -}; +} interface MyDerivedClass extends MyClass { Object* echo(Object* obj); -}; +} -}; +} diff --git a/ruby/test/Ice/slicing/exceptions/Test.ice b/ruby/test/Ice/slicing/exceptions/Test.ice index 3ce6959161d..c6931b59a43 100644 --- a/ruby/test/Ice/slicing/exceptions/Test.ice +++ b/ruby/test/Ice/slicing/exceptions/Test.ice @@ -15,39 +15,39 @@ module Test exception Base { string b; -}; +} exception KnownDerived extends Base { string kd; -}; +} exception KnownIntermediate extends Base { string ki; -}; +} exception KnownMostDerived extends KnownIntermediate { string kmd; -}; +} ["preserve-slice"] exception KnownPreserved extends Base { string kp; -}; +} exception KnownPreservedDerived extends KnownPreserved { string kpd; -}; +} ["preserve-slice"] class BaseClass { string bc; -}; +} ["format:sliced"] interface Relay @@ -57,7 +57,7 @@ interface Relay void unknownPreservedAsBase() throws Base; void unknownPreservedAsKnownPreserved() throws KnownPreserved; -}; +} ["format:sliced"] interface TestIntf @@ -93,6 +93,6 @@ interface TestIntf void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved; void shutdown(); -}; +} -}; +} diff --git a/ruby/test/Ice/slicing/objects/ClientPrivate.ice b/ruby/test/Ice/slicing/objects/ClientPrivate.ice index d8445516d19..e5be8a809aa 100644 --- a/ruby/test/Ice/slicing/objects/ClientPrivate.ice +++ b/ruby/test/Ice/slicing/objects/ClientPrivate.ice @@ -18,32 +18,32 @@ class D3 extends B { string sd3; B pd3; -}; +} ["preserve-slice"] class PCUnknown extends PBase { string pu; -}; +} class PCDerived extends PDerived { PBaseSeq pbs; -}; +} class PCDerived2 extends PCDerived { int pcd2; -}; +} class PCDerived3 extends PCDerived2 { Object pcd3; -}; +} class CompactPCDerived(57) extends CompactPDerived { PBaseSeq pbs; -}; +} -}; +} diff --git a/ruby/test/Ice/slicing/objects/Test.ice b/ruby/test/Ice/slicing/objects/Test.ice index 89f2780c352..6c25277a348 100644 --- a/ruby/test/Ice/slicing/objects/Test.ice +++ b/ruby/test/Ice/slicing/objects/Test.ice @@ -15,42 +15,42 @@ module Test class SBase { string sb; -}; +} class SBSKnownDerived extends SBase { string sbskd; -}; +} class B { string sb; B pb; -}; +} class D1 extends B { string sd1; B pd1; -}; +} sequence<B> BSeq; class SS1 { BSeq s; -}; +} class SS2 { BSeq s; -}; +} struct SS3 { SS1 c1; SS2 c2; -}; +} dictionary<int, B> BDict; @@ -58,20 +58,20 @@ exception BaseException { string sbe; B pb; -}; +} exception DerivedException extends BaseException { string sde; D1 pd1; -}; +} class Forward; class PBase { int pi; -}; +} sequence<PBase> PBaseSeq; @@ -79,28 +79,28 @@ sequence<PBase> PBaseSeq; class Preserved extends PBase { string ps; -}; +} class PDerived extends Preserved { PBase pb; -}; +} class CompactPDerived(56) extends Preserved { PBase pb; -}; +} ["preserve-slice"] class PNode { PNode next; -}; +} ["preserve-slice"] exception PreservedException { -}; +} ["format:sliced"] interface TestIntf @@ -158,17 +158,17 @@ interface TestIntf void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */ void shutdown(); -}; +} class Hidden { Forward f; -}; +} class Forward { Hidden h; -}; +} -}; +} diff --git a/ruby/test/Ice/timeout/Test.ice b/ruby/test/Ice/timeout/Test.ice index d34168a950a..aad831a9993 100644 --- a/ruby/test/Ice/timeout/Test.ice +++ b/ruby/test/Ice/timeout/Test.ice @@ -23,6 +23,6 @@ interface Timeout void holdAdapter(int to); void shutdown(); -}; +} -}; +} diff --git a/ruby/test/Slice/escape/Clash.ice b/ruby/test/Slice/escape/Clash.ice index 2fa00947309..3839df1875c 100644 --- a/ruby/test/Slice/escape/Clash.ice +++ b/ruby/test/Slice/escape/Clash.ice @@ -30,7 +30,7 @@ interface Intf void opOut(out string context, out string current, out string response, out string ex, out string sent, out string cookie, out string sync, out string result, out string istr, out string ostr, out optional(1) string proxy); -}; +} class Cls { @@ -49,7 +49,7 @@ class Cls string inS; string in; string proxy; -}; +} struct St { @@ -58,12 +58,12 @@ struct St int ostr; int rhs; string other; -}; +} exception Ex { short istr; int ostr; -}; +} -}; +} diff --git a/ruby/test/Slice/escape/Key.ice b/ruby/test/Slice/escape/Key.ice index a64366d48b5..2b9effe3101 100644 --- a/ruby/test/Slice/escape/Key.ice +++ b/ruby/test/Slice/escape/Key.ice @@ -14,12 +14,12 @@ module BEGIN enum END { alias - }; + } struct and { int begin; - }; + } interface break { @@ -27,7 +27,7 @@ module BEGIN void to_a(); void instance_variable_set(); void instance_variables(); - }; + } class display { @@ -35,11 +35,11 @@ module BEGIN int do; break* dup; int else; - }; + } interface elsif extends break { - }; + } sequence<END> rescue; dictionary<string, END> ensure; @@ -47,19 +47,19 @@ module BEGIN exception next { int new; - }; + } exception nil extends next { int not; int or; - }; + } local interface extend { END for(display freeze, elsif hash, break* if, display inspect, elsif method, int methods) throws nil; - }; + } const int redo = 1; -}; +} diff --git a/ruby/test/Slice/macros/Test.ice b/ruby/test/Slice/macros/Test.ice index 6a9800c5245..3cc21543525 100644 --- a/ruby/test/Slice/macros/Test.ice +++ b/ruby/test/Slice/macros/Test.ice @@ -32,13 +32,13 @@ class Default { int x DEFAULT(10); int y DEFAULT(10); -}; +} class NoDefault { int x NODEFAULT(10); int y NODEFAULT(10); -}; +} // // This class is only defined when compiling with slice2rb. @@ -48,7 +48,7 @@ class RubyOnly { string lang DEFAULT("ruby"); int version DEFAULT(ICE_VERSION); -}; +} #endif -}; +} diff --git a/ruby/test/Slice/structure/Test.ice b/ruby/test/Slice/structure/Test.ice index 79940e1c2d8..4790ff8eba3 100644 --- a/ruby/test/Slice/structure/Test.ice +++ b/ruby/test/Slice/structure/Test.ice @@ -18,12 +18,12 @@ dictionary<string, string> StringDict; class C { int i; -}; +} struct S1 { string name; -}; +} struct S2 { @@ -40,6 +40,6 @@ struct S2 S1 s; C cls; Object* prx; -}; +} -}; +} diff --git a/scripts/Controller.ice b/scripts/Controller.ice index 9ad2c018939..9c3d3d303d4 100644 --- a/scripts/Controller.ice +++ b/scripts/Controller.ice @@ -25,7 +25,7 @@ class Config optional(5) bool ipv6; optional(6) StringSeq cprops; optional(7) StringSeq sprops; -}; +} class OptionOverrides { @@ -34,17 +34,17 @@ class OptionOverrides optional(3) BoolSeq serialize; optional(4) BoolSeq compress; optional(5) BoolSeq ipv6; -}; +} exception TestCaseNotExistException { string reason; -}; +} exception TestCaseFailedException { string output; -}; +} interface TestCase { @@ -58,7 +58,7 @@ interface TestCase throws TestCaseFailedException; void destroy(); -}; +} interface Controller { @@ -68,12 +68,12 @@ interface Controller OptionOverrides getOptionOverrides(); StringSeq getTestSuites(string mapping); -}; +} exception ProcessFailedException { string reason; -}; +} interface Process { @@ -84,7 +84,7 @@ interface Process throws ProcessFailedException; string terminate(); -}; +} interface ProcessController { @@ -92,13 +92,13 @@ interface ProcessController throws ProcessFailedException; string getHost(string protocol, bool ipv6); -}; +} interface ProcessControllerRegistry { void setProcessController(ProcessController* controller); -}; +} -}; +} -}; +} diff --git a/slice/Glacier2/Metrics.ice b/slice/Glacier2/Metrics.ice index 3cf73a3c6d9..49947dee3af 100644 --- a/slice/Glacier2/Metrics.ice +++ b/slice/Glacier2/Metrics.ice @@ -77,6 +77,6 @@ class SessionMetrics extends Metrics * **/ int overriddenServer = 0; -}; +} -}; +} diff --git a/slice/Glacier2/PermissionsVerifier.ice b/slice/Glacier2/PermissionsVerifier.ice index 0ffc81cb701..af16d0f40fa 100644 --- a/slice/Glacier2/PermissionsVerifier.ice +++ b/slice/Glacier2/PermissionsVerifier.ice @@ -37,7 +37,7 @@ exception PermissionDeniedException * **/ string reason; -}; +} /** * @@ -69,7 +69,7 @@ interface PermissionsVerifier ["nonmutating", "cpp:const", "format:sliced"] idempotent bool checkPermissions(string userId, string password, out string reason) throws PermissionDeniedException; -}; +} /** * @@ -101,6 +101,6 @@ interface SSLPermissionsVerifier ["nonmutating", "cpp:const", "format:sliced"] idempotent bool authorize(SSLInfo info, out string reason) throws PermissionDeniedException; -}; +} -}; +} diff --git a/slice/Glacier2/PermissionsVerifierF.ice b/slice/Glacier2/PermissionsVerifierF.ice index b413a274b8a..fba9eff9df4 100644 --- a/slice/Glacier2/PermissionsVerifierF.ice +++ b/slice/Glacier2/PermissionsVerifierF.ice @@ -22,4 +22,4 @@ module Glacier2 interface PermissionsVerifier; interface SSLPermissionsVerifier; -}; +} diff --git a/slice/Glacier2/Router.ice b/slice/Glacier2/Router.ice index 976d921972b..018f8247d48 100644 --- a/slice/Glacier2/Router.ice +++ b/slice/Glacier2/Router.ice @@ -42,7 +42,7 @@ module Glacier2 **/ exception SessionNotExistException { -}; +} /** * @@ -176,6 +176,6 @@ interface Router extends Ice::Router * **/ ["nonmutating", "cpp:const"] idempotent int getACMTimeout(); -}; +} -}; +} diff --git a/slice/Glacier2/RouterF.ice b/slice/Glacier2/RouterF.ice index e488d29e3ee..b39bd711611 100644 --- a/slice/Glacier2/RouterF.ice +++ b/slice/Glacier2/RouterF.ice @@ -21,4 +21,4 @@ module Glacier2 interface Router; -}; +} diff --git a/slice/Glacier2/SSLInfo.ice b/slice/Glacier2/SSLInfo.ice index 20c5a508acd..fa11a9cc9b9 100644 --- a/slice/Glacier2/SSLInfo.ice +++ b/slice/Glacier2/SSLInfo.ice @@ -49,6 +49,6 @@ struct SSLInfo /** The certificate chain. */ Ice::StringSeq certs; -}; +} -}; +} diff --git a/slice/Glacier2/Session.ice b/slice/Glacier2/Session.ice index 7d4818211a4..262bb9d8aff 100644 --- a/slice/Glacier2/Session.ice +++ b/slice/Glacier2/Session.ice @@ -38,7 +38,7 @@ exception CannotCreateSessionException * **/ string reason; -}; +} /** * @@ -56,7 +56,7 @@ interface Session * **/ void destroy(); -}; +} /** * @@ -99,7 +99,7 @@ interface StringSet * **/ idempotent Ice::StringSeq get(); -}; +} /** * @@ -141,7 +141,7 @@ interface IdentitySet * **/ idempotent Ice::IdentitySeq get(); -}; +} /** * @@ -198,7 +198,7 @@ interface SessionControl * **/ void destroy(); -}; +} /** * @@ -231,7 +231,7 @@ interface SessionManager ["format:sliced"] Session* create(string userId, SessionControl* control) throws CannotCreateSessionException; -}; +} /** * @@ -264,6 +264,6 @@ interface SSLSessionManager ["format:sliced"] Session* create(SSLInfo info, SessionControl* control) throws CannotCreateSessionException; -}; +} -}; +} diff --git a/slice/Ice/BuiltinSequences.ice b/slice/Ice/BuiltinSequences.ice index 9ff3e794b0b..a2dd12ff23c 100644 --- a/slice/Ice/BuiltinSequences.ice +++ b/slice/Ice/BuiltinSequences.ice @@ -49,4 +49,4 @@ sequence<Object> ObjectSeq; /** A sequence of object proxies. **/ sequence<Object*> ObjectProxySeq; -}; +} diff --git a/slice/Ice/Communicator.ice b/slice/Ice/Communicator.ice index 853b5f9fe1d..280458bbcd0 100644 --- a/slice/Ice/Communicator.ice +++ b/slice/Ice/Communicator.ice @@ -598,7 +598,7 @@ local interface Communicator * **/ FacetMap findAllAdminFacets(); -}; +} /** @@ -628,6 +628,6 @@ local enum ToStringMode * to generate strings compatible with Ice 3.6 and earlier. **/ Compat -}; +} -}; +} diff --git a/slice/Ice/CommunicatorF.ice b/slice/Ice/CommunicatorF.ice index 3b929bae259..697558c8d16 100644 --- a/slice/Ice/CommunicatorF.ice +++ b/slice/Ice/CommunicatorF.ice @@ -21,4 +21,4 @@ module Ice local interface Communicator; -}; +} diff --git a/slice/Ice/Connection.ice b/slice/Ice/Connection.ice index 10280acc02e..75ea49989f8 100644 --- a/slice/Ice/Connection.ice +++ b/slice/Ice/Connection.ice @@ -45,7 +45,7 @@ local enum CompressBatch * made on a compressed proxy. **/ BasedOnProxy -}; +} /** * @@ -83,7 +83,7 @@ local class ConnectionInfo * **/ string connectionId; -}; +} local interface Connection; @@ -107,7 +107,7 @@ local interface CloseCallback * @param con The connection that closed. **/ void closed(Connection con); -}; +} /** * @@ -128,7 +128,7 @@ local interface HeartbeatCallback * @param con The connection on which a heartbeat was received. **/ void heartbeat(Connection con); -}; +} local enum ACMClose { @@ -137,7 +137,7 @@ local enum ACMClose CloseOnInvocation, CloseOnInvocationAndIdle, CloseOnIdleForceful -}; +} local enum ACMHeartbeat { @@ -145,14 +145,14 @@ local enum ACMHeartbeat HeartbeatOnInvocation, HeartbeatOnIdle, HeartbeatAlways -}; +} local struct ACM { int timeout; ACMClose close; ACMHeartbeat heartbeat; -}; +} /** * Determines the behavior when manually closing a connection. @@ -174,7 +174,7 @@ local enum ConnectionClose * Wait for all pending invocations to complete before closing the connection. **/ GracefullyWithWait -}; +} /** * @@ -379,7 +379,7 @@ local interface Connection * **/ ["cpp:const"] void throwException(); -}; +} /** * @@ -400,7 +400,7 @@ local class IPConnectionInfo extends ConnectionInfo /** The remote port. */ int remotePort = -1; -}; +} /** * @@ -423,7 +423,7 @@ local class TCPConnectionInfo extends IPConnectionInfo * **/ int sndSize = 0; -}; +} /** * @@ -460,7 +460,7 @@ local class UDPConnectionInfo extends IPConnectionInfo * **/ int sndSize = 0; -}; +} dictionary<string, string> HeaderDict; @@ -474,6 +474,6 @@ local class WSConnectionInfo extends ConnectionInfo { /** The headers from the HTTP upgrade request. */ HeaderDict headers; -}; +} -}; +} diff --git a/slice/Ice/ConnectionF.ice b/slice/Ice/ConnectionF.ice index b83775d56db..d56e24618fd 100644 --- a/slice/Ice/ConnectionF.ice +++ b/slice/Ice/ConnectionF.ice @@ -23,4 +23,4 @@ local class ConnectionInfo; local class WSConnectionInfo; local interface Connection; -}; +} diff --git a/slice/Ice/Current.ice b/slice/Ice/Current.ice index b0e1599e659..219305ff1ba 100644 --- a/slice/Ice/Current.ice +++ b/slice/Ice/Current.ice @@ -83,7 +83,7 @@ enum OperationMode * recoverable error. */ \Idempotent -}; +} /** * @@ -159,6 +159,6 @@ local struct Current * **/ Ice::EncodingVersion encoding; -}; +} -}; +} diff --git a/slice/Ice/Endpoint.ice b/slice/Ice/Endpoint.ice index db2a2fbcf7f..f56703612f7 100644 --- a/slice/Ice/Endpoint.ice +++ b/slice/Ice/Endpoint.ice @@ -144,7 +144,7 @@ local class EndpointInfo * **/ ["cpp:const"] bool secure(); -}; +} /** * @@ -171,7 +171,7 @@ local interface Endpoint * **/ ["cpp:const"] EndpointInfo getInfo(); -}; +} /** * @@ -203,7 +203,7 @@ local class IPEndpointInfo extends EndpointInfo * */ string sourceAddress; -}; +} /** * @@ -215,7 +215,7 @@ local class IPEndpointInfo extends EndpointInfo ["php:internal"] local class TCPEndpointInfo extends IPEndpointInfo { -}; +} /** * @@ -240,7 +240,7 @@ local class UDPEndpointInfo extends IPEndpointInfo * **/ int mcastTtl; -}; +} /** * @@ -256,7 +256,7 @@ local class WSEndpointInfo extends EndpointInfo * **/ string resource; -}; +} /** * @@ -282,6 +282,6 @@ local class OpaqueEndpointInfo extends EndpointInfo * **/ Ice::ByteSeq rawBytes; -}; +} -}; +} diff --git a/slice/Ice/EndpointF.ice b/slice/Ice/EndpointF.ice index c3fcb07d03d..1ee2db282e8 100644 --- a/slice/Ice/EndpointF.ice +++ b/slice/Ice/EndpointF.ice @@ -33,4 +33,4 @@ local interface Endpoint; **/ local sequence<Endpoint> EndpointSeq; -}; +} diff --git a/slice/Ice/EndpointTypes.ice b/slice/Ice/EndpointTypes.ice index 9ba3db1a827..5bf6248cf39 100644 --- a/slice/Ice/EndpointTypes.ice +++ b/slice/Ice/EndpointTypes.ice @@ -36,6 +36,6 @@ local enum EndpointSelectionType * order they appeared in the proxy. */ Ordered -}; +} -}; +} diff --git a/slice/Ice/FacetMap.ice b/slice/Ice/FacetMap.ice index 6da250d2686..aa433408391 100644 --- a/slice/Ice/FacetMap.ice +++ b/slice/Ice/FacetMap.ice @@ -26,4 +26,4 @@ module Ice **/ local dictionary<string, Object> FacetMap; -}; +} diff --git a/slice/Ice/Identity.ice b/slice/Ice/Identity.ice index b230bc169ba..e0e6c6d17e1 100644 --- a/slice/Ice/Identity.ice +++ b/slice/Ice/Identity.ice @@ -44,7 +44,7 @@ struct Identity * **/ string category; -}; +} /** * @@ -65,4 +65,4 @@ local dictionary<Identity, Object> ObjectDict; **/ sequence<Identity> IdentitySeq; -}; +} diff --git a/slice/Ice/ImplicitContext.ice b/slice/Ice/ImplicitContext.ice index 5f9d521b5fb..fbbf671283d 100644 --- a/slice/Ice/ImplicitContext.ice +++ b/slice/Ice/ImplicitContext.ice @@ -108,5 +108,5 @@ local interface ImplicitContext * **/ string remove(string key); -}; -}; +} +} diff --git a/slice/Ice/ImplicitContextF.ice b/slice/Ice/ImplicitContextF.ice index b9661ad8c9b..b87fb14246f 100644 --- a/slice/Ice/ImplicitContextF.ice +++ b/slice/Ice/ImplicitContextF.ice @@ -21,4 +21,4 @@ module Ice local interface ImplicitContext; -}; +} diff --git a/slice/Ice/Instrumentation.ice b/slice/Ice/Instrumentation.ice index 23c12ce8916..ff0063a7937 100644 --- a/slice/Ice/Instrumentation.ice +++ b/slice/Ice/Instrumentation.ice @@ -65,7 +65,7 @@ local interface Observer * **/ void failed(string exceptionName); -}; +} /** * @@ -107,7 +107,7 @@ local enum ThreadState * **/ ThreadStateInUseForOther, -}; +} /** * @@ -128,7 +128,7 @@ local interface ThreadObserver extends Observer * **/ void stateChanged(ThreadState oldState, ThreadState newState); -}; +} /** * @@ -173,7 +173,7 @@ local enum ConnectionState * **/ ConnectionStateClosed -}; +} /** @@ -200,7 +200,7 @@ local interface ConnectionObserver extends Observer * **/ void receivedBytes(int num); -}; +} /** * @@ -224,7 +224,7 @@ local interface DispatchObserver extends Observer * **/ void reply(int size); -}; +} /** * @@ -242,7 +242,7 @@ local interface ChildInvocationObserver extends Observer * **/ void reply(int size); -}; +} /** @@ -253,7 +253,7 @@ local interface ChildInvocationObserver extends Observer **/ local interface RemoteObserver extends ChildInvocationObserver { -}; +} /** * @@ -263,7 +263,7 @@ local interface RemoteObserver extends ChildInvocationObserver **/ local interface CollocatedObserver extends ChildInvocationObserver { -}; +} /** * @@ -320,7 +320,7 @@ local interface InvocationObserver extends Observer * **/ CollocatedObserver getCollocatedObserver(ObjectAdapter adapter, int requestId, int size); -}; +} /** * @@ -364,7 +364,7 @@ local interface ObserverUpdater * **/ void updateThreadObservers(); -}; +} /** * @@ -497,8 +497,8 @@ local interface CommunicatorObserver * **/ void setObserverUpdater(ObserverUpdater updater); -}; +} -}; +} -}; +} diff --git a/slice/Ice/InstrumentationF.ice b/slice/Ice/InstrumentationF.ice index 713f4172b02..18ad14e1a25 100644 --- a/slice/Ice/InstrumentationF.ice +++ b/slice/Ice/InstrumentationF.ice @@ -26,6 +26,6 @@ module Instrumentation local interface Observer; local interface CommunicatorObserver; -}; +} -}; +} diff --git a/slice/Ice/LocalException.ice b/slice/Ice/LocalException.ice index 22ab50f7f47..f0b21b3324f 100644 --- a/slice/Ice/LocalException.ice +++ b/slice/Ice/LocalException.ice @@ -37,7 +37,7 @@ local exception InitializationException * **/ string reason; -}; +} /** * @@ -54,7 +54,7 @@ local exception PluginInitializationException * **/ string reason; -}; +} /** * @@ -65,7 +65,7 @@ local exception PluginInitializationException ["cpp:ice_print", "deprecate:this exception isn't used anymore by the Ice runtime"] local exception CollocationOptimizationException { -}; +} /** * @@ -96,7 +96,7 @@ local exception AlreadyRegisteredException * **/ string id; -}; +} /** * @@ -130,7 +130,7 @@ local exception NotRegisteredException * **/ string id; -}; +} /** * @@ -151,7 +151,7 @@ local exception TwowayOnlyException * **/ string operation; -}; +} /** * @@ -167,7 +167,7 @@ local exception TwowayOnlyException ["cpp:ice_print"] local exception CloneNotImplementedException { -}; +} /** * @@ -188,7 +188,7 @@ local exception UnknownException * **/ string unknown; -}; +} /** * @@ -204,7 +204,7 @@ local exception UnknownException ["cpp:ice_print"] local exception UnknownLocalException extends UnknownException { -}; +} /** * @@ -224,7 +224,7 @@ local exception UnknownLocalException extends UnknownException ["cpp:ice_print"] local exception UnknownUserException extends UnknownException { -}; +} /** * @@ -235,7 +235,7 @@ local exception UnknownUserException extends UnknownException ["cpp:ice_print"] local exception VersionMismatchException { -}; +} /** * @@ -247,7 +247,7 @@ local exception VersionMismatchException ["cpp:ice_print"] local exception CommunicatorDestroyedException { -}; +} /** * @@ -267,7 +267,7 @@ local exception ObjectAdapterDeactivatedException * **/ string name; -}; +} /** * @@ -286,7 +286,7 @@ local exception ObjectAdapterIdInUseException * **/ string id; -}; +} /** * @@ -303,7 +303,7 @@ local exception NoEndpointException * **/ string proxy; -}; +} /** * @@ -320,7 +320,7 @@ local exception EndpointParseException * **/ string str; -}; +} /** * @@ -337,7 +337,7 @@ local exception EndpointSelectionTypeParseException * **/ string str; -}; +} /** * @@ -354,7 +354,7 @@ local exception VersionParseException * **/ string str; -}; +} /** * @@ -371,7 +371,7 @@ local exception IdentityParseException * **/ string str; -}; +} /** * @@ -388,7 +388,7 @@ local exception ProxyParseException * **/ string str; -}; +} /** * @@ -404,7 +404,7 @@ local exception IllegalIdentityException * **/ Identity id; -}; +} /** * @@ -421,7 +421,7 @@ local exception IllegalServantException * **/ string reason; -}; +} /** @@ -443,7 +443,7 @@ local exception RequestFailedException /** The operation name of the request. */ string operation; -}; +} /** * @@ -454,7 +454,7 @@ local exception RequestFailedException ["cpp:ice_print"] local exception ObjectNotExistException extends RequestFailedException { -}; +} /** * @@ -465,7 +465,7 @@ local exception ObjectNotExistException extends RequestFailedException ["cpp:ice_print"] local exception FacetNotExistException extends RequestFailedException { -}; +} /** * @@ -477,7 +477,7 @@ local exception FacetNotExistException extends RequestFailedException ["cpp:ice_print"] local exception OperationNotExistException extends RequestFailedException { -}; +} /** * @@ -500,7 +500,7 @@ local exception SyscallException * **/ int error = 0; // Don't use errno, as errno is usually a macro. -}; +} /** * @@ -510,7 +510,7 @@ local exception SyscallException ["cpp:ice_print"] local exception SocketException extends SyscallException { -}; +} /** * @@ -526,7 +526,7 @@ local exception CFNetworkException extends SocketException * **/ string domain; -}; +} /** * @@ -538,7 +538,7 @@ local exception FileException extends SyscallException { /** The path of the file responsible for the error. */ string path; -}; +} /** * @@ -548,7 +548,7 @@ local exception FileException extends SyscallException ["cpp:ice_print"] local exception ConnectFailedException extends SocketException { -}; +} /** * @@ -559,7 +559,7 @@ local exception ConnectFailedException extends SocketException ["cpp:ice_print"] local exception ConnectionRefusedException extends ConnectFailedException { -}; +} /** * @@ -569,7 +569,7 @@ local exception ConnectionRefusedException extends ConnectFailedException ["cpp:ice_print"] local exception ConnectionLostException extends SocketException { -}; +} /** * @@ -596,7 +596,7 @@ local exception DNSException * **/ string host; -}; +} /** * @@ -606,7 +606,7 @@ local exception DNSException ["cpp:ice_print"] local exception OperationInterruptedException { -}; +} /** * @@ -616,7 +616,7 @@ local exception OperationInterruptedException ["cpp:ice_print"] local exception TimeoutException { -}; +} /** * @@ -626,7 +626,7 @@ local exception TimeoutException ["cpp:ice_print"] local exception ConnectTimeoutException extends TimeoutException { -}; +} /** * @@ -636,7 +636,7 @@ local exception ConnectTimeoutException extends TimeoutException ["cpp:ice_print"] local exception CloseTimeoutException extends TimeoutException { -}; +} /** * @@ -647,7 +647,7 @@ local exception CloseTimeoutException extends TimeoutException ["cpp:ice_print"] local exception ConnectionTimeoutException extends TimeoutException { -}; +} /** * @@ -658,7 +658,7 @@ local exception ConnectionTimeoutException extends TimeoutException ["cpp:ice_print"] local exception InvocationTimeoutException extends TimeoutException { -}; +} /** * @@ -670,7 +670,7 @@ local exception InvocationTimeoutException extends TimeoutException ["cpp:ice_print"] local exception InvocationCanceledException { -}; +} /** * @@ -687,7 +687,7 @@ local exception ProtocolException * **/ string reason; -}; +} /** * @@ -704,7 +704,7 @@ local exception BadMagicException extends ProtocolException * **/ ByteSeq badMagic; -}; +} /** * @@ -727,7 +727,7 @@ local exception UnsupportedProtocolException extends ProtocolException * **/ ProtocolVersion supported; -}; +} /** * @@ -750,7 +750,7 @@ local exception UnsupportedEncodingException extends ProtocolException * **/ EncodingVersion supported; -}; +} /** * @@ -760,7 +760,7 @@ local exception UnsupportedEncodingException extends ProtocolException ["cpp:ice_print"] local exception UnknownMessageException extends ProtocolException { -}; +} /** * @@ -771,7 +771,7 @@ local exception UnknownMessageException extends ProtocolException ["cpp:ice_print"] local exception ConnectionNotValidatedException extends ProtocolException { -}; +} /** * @@ -782,7 +782,7 @@ local exception ConnectionNotValidatedException extends ProtocolException ["cpp:ice_print"] local exception UnknownRequestIdException extends ProtocolException { -}; +} /** * @@ -792,7 +792,7 @@ local exception UnknownRequestIdException extends ProtocolException ["cpp:ice_print"] local exception UnknownReplyStatusException extends ProtocolException { -}; +} /** * @@ -809,7 +809,7 @@ local exception UnknownReplyStatusException extends ProtocolException ["cpp:ice_print"] local exception CloseConnectionException extends ProtocolException { -}; +} /** * @@ -824,7 +824,7 @@ local exception ConnectionManuallyClosedException { /** True if the connection was closed gracefully, false otherwise. **/ bool graceful; -}; +} /** * @@ -835,7 +835,7 @@ local exception ConnectionManuallyClosedException ["cpp:ice_print"] local exception IllegalMessageSizeException extends ProtocolException { -}; +} /** * @@ -845,7 +845,7 @@ local exception IllegalMessageSizeException extends ProtocolException ["cpp:ice_print"] local exception CompressionException extends ProtocolException { -}; +} /** * @@ -858,7 +858,7 @@ local exception CompressionException extends ProtocolException ["cpp:ice_print"] local exception DatagramLimitException extends ProtocolException { -}; +} /** * @@ -868,7 +868,7 @@ local exception DatagramLimitException extends ProtocolException ["cpp:ice_print"] local exception MarshalException extends ProtocolException { -}; +} /** * @@ -878,7 +878,7 @@ local exception MarshalException extends ProtocolException ["cpp:ice_print"] local exception ProxyUnmarshalException extends MarshalException { -}; +} /** * @@ -888,7 +888,7 @@ local exception ProxyUnmarshalException extends MarshalException ["cpp:ice_print"] local exception UnmarshalOutOfBoundsException extends MarshalException { -}; +} /** * @@ -911,7 +911,7 @@ local exception NoValueFactoryException extends MarshalException * **/ string type; -}; +} /** * @@ -940,7 +940,7 @@ local exception UnexpectedObjectException extends MarshalException * **/ string expectedType; -}; +} /** * @@ -952,7 +952,7 @@ local exception UnexpectedObjectException extends MarshalException ["cpp:ice_print"] local exception MemoryLimitException extends MarshalException { -}; +} /** * @@ -963,7 +963,7 @@ local exception MemoryLimitException extends MarshalException ["cpp:ice_print"] local exception StringConversionException extends MarshalException { -}; +} /** @@ -974,7 +974,7 @@ local exception StringConversionException extends MarshalException ["cpp:ice_print"] local exception EncapsulationException extends MarshalException { -}; +} /** * @@ -992,7 +992,7 @@ local exception FeatureNotSupportedException * **/ string unsupportedFeature; -}; +} /** @@ -1010,7 +1010,7 @@ local exception SecurityException * **/ string reason; -}; +} /** * @@ -1021,7 +1021,7 @@ local exception SecurityException ["cpp:ice_print"] local exception FixedProxyException { -}; +} /** * @@ -1032,6 +1032,6 @@ local exception FixedProxyException ["cpp:ice_print"] local exception ResponseSentException { -}; +} -}; +} diff --git a/slice/Ice/Locator.ice b/slice/Ice/Locator.ice index 9e260485120..441ac5ab397 100644 --- a/slice/Ice/Locator.ice +++ b/slice/Ice/Locator.ice @@ -29,7 +29,7 @@ module Ice **/ exception AdapterNotFoundException { -}; +} /** * @@ -39,7 +39,7 @@ exception AdapterNotFoundException **/ exception InvalidReplicaGroupIdException { -}; +} /** * @@ -49,7 +49,7 @@ exception InvalidReplicaGroupIdException **/ exception AdapterAlreadyActiveException { -}; +} /** * @@ -58,7 +58,7 @@ exception AdapterAlreadyActiveException **/ exception ObjectNotFoundException { -}; +} /** * @@ -67,7 +67,7 @@ exception ObjectNotFoundException **/ exception ServerNotFoundException { -}; +} interface LocatorRegistry; @@ -126,7 +126,7 @@ interface Locator * **/ ["nonmutating", "cpp:const"] idempotent LocatorRegistry* getRegistry(); -}; +} /** * @@ -205,7 +205,7 @@ interface LocatorRegistry **/ ["amd"] idempotent void setServerProcessProxy(string id, Process* proxy) throws ServerNotFoundException; -}; +} /** * @@ -227,6 +227,6 @@ interface LocatorFinder * **/ Locator* getLocator(); -}; +} -}; +} diff --git a/slice/Ice/LocatorF.ice b/slice/Ice/LocatorF.ice index af90af94c63..8d028c5a67d 100644 --- a/slice/Ice/LocatorF.ice +++ b/slice/Ice/LocatorF.ice @@ -22,4 +22,4 @@ module Ice interface Locator; interface LocatorRegistry; -}; +} diff --git a/slice/Ice/Logger.ice b/slice/Ice/Logger.ice index 005781307a3..376e99984b1 100644 --- a/slice/Ice/Logger.ice +++ b/slice/Ice/Logger.ice @@ -87,6 +87,6 @@ local interface Logger * */ Logger cloneWithPrefix(string prefix); -}; +} -}; +} diff --git a/slice/Ice/LoggerF.ice b/slice/Ice/LoggerF.ice index e4692e7254e..c1b41f84ab4 100644 --- a/slice/Ice/LoggerF.ice +++ b/slice/Ice/LoggerF.ice @@ -21,4 +21,4 @@ module Ice local interface Logger; -}; +} diff --git a/slice/Ice/Metrics.ice b/slice/Ice/Metrics.ice index b7147458f0c..43ea05a2cbc 100644 --- a/slice/Ice/Metrics.ice +++ b/slice/Ice/Metrics.ice @@ -78,7 +78,7 @@ class Metrics * **/ int failures = 0; -}; +} /** * @@ -102,7 +102,7 @@ struct MetricsFailures * **/ StringIntDict failures; -}; +} /** * @@ -136,7 +136,7 @@ dictionary<string, MetricsMap> MetricsView; **/ exception UnknownMetricsView { -}; +} /** * @@ -243,7 +243,7 @@ interface MetricsAdmin **/ MetricsFailures getMetricsFailures(string view, string map, string id) throws UnknownMetricsView; -}; +} /** * @@ -278,7 +278,7 @@ class ThreadMetrics extends Metrics * **/ int inUseForOther = 0; -}; +} /** * @@ -309,7 +309,7 @@ class DispatchMetrics extends Metrics * **/ long replySize = 0; -}; +} /** * @@ -337,7 +337,7 @@ class ChildInvocationMetrics extends Metrics * **/ long replySize = 0; -}; +} /** * @@ -347,7 +347,7 @@ class ChildInvocationMetrics extends Metrics **/ class CollocatedMetrics extends ChildInvocationMetrics { -}; +} /** * @@ -358,7 +358,7 @@ class CollocatedMetrics extends ChildInvocationMetrics **/ class RemoteMetrics extends ChildInvocationMetrics { -}; +} /** * @@ -399,7 +399,7 @@ class InvocationMetrics extends Metrics * **/ MetricsMap collocated; -}; +} /** * @@ -422,6 +422,6 @@ class ConnectionMetrics extends Metrics * **/ long sentBytes = 0; -}; +} -}; +} diff --git a/slice/Ice/ObjectAdapter.ice b/slice/Ice/ObjectAdapter.ice index 2088891782b..4ee3956fd02 100644 --- a/slice/Ice/ObjectAdapter.ice +++ b/slice/Ice/ObjectAdapter.ice @@ -110,7 +110,7 @@ local interface ObjectAdapter * requests through its endpoints. Object adapters that have been * deactivated must not be reactivated again, and cannot be used * otherwise. Attempts to use a deactivated object adapter raise - * {@link ObjectAdapterDeactivatedException}; however, attempts to + * {@link ObjectAdapterDeactivatedException} however, attempts to * {@link #deactivate} an already deactivated object adapter are * ignored and do nothing. Once deactivated, it is possible to * destroy the adapter to clean up resources and then create and @@ -684,6 +684,6 @@ local interface ObjectAdapter * **/ void setPublishedEndpoints(EndpointSeq newEndpoints); -}; +} -}; +} diff --git a/slice/Ice/ObjectAdapterF.ice b/slice/Ice/ObjectAdapterF.ice index bfcce78eb37..097544e7bab 100644 --- a/slice/Ice/ObjectAdapterF.ice +++ b/slice/Ice/ObjectAdapterF.ice @@ -21,4 +21,4 @@ module Ice local interface ObjectAdapter; -}; +} diff --git a/slice/Ice/ObjectFactory.ice b/slice/Ice/ObjectFactory.ice index 07bb5110b59..291dc3a2914 100644 --- a/slice/Ice/ObjectFactory.ice +++ b/slice/Ice/ObjectFactory.ice @@ -57,6 +57,6 @@ local interface ObjectFactory * **/ void destroy(); -}; +} -}; +} diff --git a/slice/Ice/Plugin.ice b/slice/Ice/Plugin.ice index f08219cfeb3..63f5969a803 100644 --- a/slice/Ice/Plugin.ice +++ b/slice/Ice/Plugin.ice @@ -48,7 +48,7 @@ local interface Plugin * **/ void destroy(); -}; +} /** * @@ -116,6 +116,6 @@ local interface PluginManager * **/ void destroy(); -}; +} -}; +} diff --git a/slice/Ice/PluginF.ice b/slice/Ice/PluginF.ice index c8e9696ff54..e3023a56d7f 100644 --- a/slice/Ice/PluginF.ice +++ b/slice/Ice/PluginF.ice @@ -22,4 +22,4 @@ module Ice local interface Plugin; local interface PluginManager; -}; +} diff --git a/slice/Ice/Process.ice b/slice/Ice/Process.ice index c36e8b526b1..b07f4c858da 100644 --- a/slice/Ice/Process.ice +++ b/slice/Ice/Process.ice @@ -53,6 +53,6 @@ interface Process * **/ void writeMessage(string message, int fd); -}; +} -}; +} diff --git a/slice/Ice/ProcessF.ice b/slice/Ice/ProcessF.ice index 9836602f130..c74ba6d2754 100644 --- a/slice/Ice/ProcessF.ice +++ b/slice/Ice/ProcessF.ice @@ -21,4 +21,4 @@ module Ice interface Process; -}; +} diff --git a/slice/Ice/Properties.ice b/slice/Ice/Properties.ice index cfeadd602c8..66aa611d3b5 100644 --- a/slice/Ice/Properties.ice +++ b/slice/Ice/Properties.ice @@ -228,6 +228,6 @@ local interface Properties * **/ Properties clone(); -}; +} -}; +} diff --git a/slice/Ice/PropertiesAdmin.ice b/slice/Ice/PropertiesAdmin.ice index 43dd725b918..350c4176105 100644 --- a/slice/Ice/PropertiesAdmin.ice +++ b/slice/Ice/PropertiesAdmin.ice @@ -75,6 +75,6 @@ interface PropertiesAdmin * **/ void setProperties(PropertyDict newProperties); -}; +} -}; +} diff --git a/slice/Ice/PropertiesF.ice b/slice/Ice/PropertiesF.ice index 3958bc0a447..9f5799191b5 100644 --- a/slice/Ice/PropertiesF.ice +++ b/slice/Ice/PropertiesF.ice @@ -22,4 +22,4 @@ module Ice local interface Properties; interface PropertiesAdmin; -}; +} diff --git a/slice/Ice/RemoteLogger.ice b/slice/Ice/RemoteLogger.ice index 9ce6fafd90c..69a41d000c3 100644 --- a/slice/Ice/RemoteLogger.ice +++ b/slice/Ice/RemoteLogger.ice @@ -56,7 +56,7 @@ enum LogMessageType * **/ ErrorMessage -}; +} /** @@ -103,7 +103,7 @@ struct LogMessage * **/ string message; -}; +} /** @@ -151,7 +151,7 @@ interface RemoteLogger * **/ void log(LogMessage message); -}; +} /** @@ -163,7 +163,7 @@ interface RemoteLogger **/ exception RemoteLoggerAlreadyAttachedException { -}; +} /** * @@ -231,6 +231,6 @@ interface LoggerAdmin * **/ LogMessageSeq getLog(LogMessageTypeSeq messageTypes, StringSeq traceCategories, int messageMax, out string prefix); -}; +} -}; +} diff --git a/slice/Ice/Router.ice b/slice/Ice/Router.ice index cbfa0865d20..a1c55e93e5b 100644 --- a/slice/Ice/Router.ice +++ b/slice/Ice/Router.ice @@ -69,7 +69,7 @@ interface Router * **/ idempotent ObjectProxySeq addProxies(ObjectProxySeq proxies); -}; +} /** * @@ -91,6 +91,6 @@ interface RouterFinder * **/ Router* getRouter(); -}; +} -}; +} diff --git a/slice/Ice/RouterF.ice b/slice/Ice/RouterF.ice index 2e9b3f7f2c1..224576b77dd 100644 --- a/slice/Ice/RouterF.ice +++ b/slice/Ice/RouterF.ice @@ -21,4 +21,4 @@ module Ice interface Router; -}; +} diff --git a/slice/Ice/ServantLocator.ice b/slice/Ice/ServantLocator.ice index a898bb75f6d..8f04f81f7a0 100644 --- a/slice/Ice/ServantLocator.ice +++ b/slice/Ice/ServantLocator.ice @@ -122,6 +122,6 @@ local interface ServantLocator * **/ void deactivate(string category); -}; +} -}; +} diff --git a/slice/Ice/ServantLocatorF.ice b/slice/Ice/ServantLocatorF.ice index 4ef81aa6c20..f6caa430554 100644 --- a/slice/Ice/ServantLocatorF.ice +++ b/slice/Ice/ServantLocatorF.ice @@ -21,4 +21,4 @@ module Ice local interface ServantLocator; -}; +} diff --git a/slice/Ice/SliceChecksumDict.ice b/slice/Ice/SliceChecksumDict.ice index 72c26b95383..1788628194b 100644 --- a/slice/Ice/SliceChecksumDict.ice +++ b/slice/Ice/SliceChecksumDict.ice @@ -26,4 +26,4 @@ module Ice **/ dictionary<string, string> SliceChecksumDict; -}; +} diff --git a/slice/Ice/ValueFactory.ice b/slice/Ice/ValueFactory.ice index da074064a8e..0c83b6da694 100644 --- a/slice/Ice/ValueFactory.ice +++ b/slice/Ice/ValueFactory.ice @@ -48,7 +48,7 @@ local interface ValueFactory * **/ Value create(string type); -}; +} /** * @@ -122,6 +122,6 @@ local interface ValueFactoryManager * **/ ["cpp:const"] ValueFactory find(string id); -}; +} -}; +} diff --git a/slice/Ice/Version.ice b/slice/Ice/Version.ice index 73155518896..9458b6e6376 100644 --- a/slice/Ice/Version.ice +++ b/slice/Ice/Version.ice @@ -28,7 +28,7 @@ struct ProtocolVersion { byte major; byte minor; -}; +} /** * @@ -39,6 +39,6 @@ struct EncodingVersion { byte major; byte minor; -}; +} -}; +} diff --git a/slice/IceBT/ConnectionInfo.ice b/slice/IceBT/ConnectionInfo.ice index e74ac4f5eda..773b69200e8 100644 --- a/slice/IceBT/ConnectionInfo.ice +++ b/slice/IceBT/ConnectionInfo.ice @@ -48,6 +48,6 @@ local class ConnectionInfo extends Ice::ConnectionInfo /** The connection buffer send size. **/ int sndSize = 0; -}; +} -}; +} diff --git a/slice/IceBT/EndpointInfo.ice b/slice/IceBT/EndpointInfo.ice index 256c809157b..0791b55a81b 100644 --- a/slice/IceBT/EndpointInfo.ice +++ b/slice/IceBT/EndpointInfo.ice @@ -46,6 +46,6 @@ local class EndpointInfo extends Ice::EndpointInfo * **/ string uuid; -}; +} -}; +} diff --git a/slice/IceBT/Types.ice b/slice/IceBT/Types.ice index 4f90dbda24b..71f467e38b8 100644 --- a/slice/IceBT/Types.ice +++ b/slice/IceBT/Types.ice @@ -34,6 +34,6 @@ local exception BluetoothException { /** Provides more information about the failure. */ string reason; -}; +} -}; +} diff --git a/slice/IceBox/IceBox.ice b/slice/IceBox/IceBox.ice index a882ec3d461..22b85651a4f 100644 --- a/slice/IceBox/IceBox.ice +++ b/slice/IceBox/IceBox.ice @@ -49,7 +49,7 @@ local exception FailureException * **/ string reason; -}; +} /** @@ -60,7 +60,7 @@ local exception FailureException **/ exception AlreadyStartedException { -}; +} /** * @@ -70,7 +70,7 @@ exception AlreadyStartedException **/ exception AlreadyStoppedException { -}; +} /** * @@ -80,7 +80,7 @@ exception AlreadyStoppedException **/ exception NoSuchServiceException { -}; +} /** * @@ -118,7 +118,7 @@ local interface Service * **/ void stop(); -}; +} /** @@ -133,7 +133,7 @@ interface ServiceObserver { void servicesStarted(Ice::StringSeq services); void servicesStopped(Ice::StringSeq services); -}; +} /** @@ -195,6 +195,6 @@ interface ServiceManager * **/ void shutdown(); -}; +} -}; +} diff --git a/slice/IceDiscovery/IceDiscovery.ice b/slice/IceDiscovery/IceDiscovery.ice index c8ba27735fd..451e6a421a8 100644 --- a/slice/IceDiscovery/IceDiscovery.ice +++ b/slice/IceDiscovery/IceDiscovery.ice @@ -24,13 +24,13 @@ interface LookupReply void foundObjectById(Ice::Identity id, Object* prx); void foundAdapterById(string id, Object* prx, bool isReplicaGroup); -}; +} interface Lookup { idempotent void findObjectById(string domainId, Ice::Identity id, LookupReply* reply); idempotent void findAdapterById(string domainId, string id, LookupReply* reply); -}; +} -}; +} diff --git a/slice/IceGrid/Admin.ice b/slice/IceGrid/Admin.ice index 32fe78288ef..ef1ccf7ad7a 100644 --- a/slice/IceGrid/Admin.ice +++ b/slice/IceGrid/Admin.ice @@ -87,7 +87,7 @@ enum ServerState * **/ Destroyed -}; +} /** * @@ -117,7 +117,7 @@ struct ObjectInfo * **/ string type; -}; +} /** * @@ -155,7 +155,7 @@ struct AdapterInfo * **/ string replicaGroupId; -}; +} /** * @@ -212,7 +212,7 @@ struct ServerInfo * **/ string sessionId; -}; +} /** * @@ -279,7 +279,7 @@ struct NodeInfo * **/ string dataDir; -}; +} /** * @@ -302,7 +302,7 @@ struct RegistryInfo * **/ string hostname; -}; +} /** * @@ -326,7 +326,7 @@ struct LoadInfo /** The load average over the past 15 minutes. */ float avg15; -}; +} /** * @@ -355,7 +355,7 @@ struct ApplicationInfo /** The application descriptor */ ApplicationDescriptor descriptor; -}; +} /** * @@ -382,7 +382,7 @@ struct ApplicationUpdateInfo /** The update descriptor. */ ApplicationUpdateDescriptor descriptor; -}; +} /** * @@ -1215,7 +1215,7 @@ interface Admin * **/ ["nonmutating", "cpp:const"] idempotent Ice::SliceChecksumDict getSliceChecksums(); -}; +} /** * @@ -1253,7 +1253,7 @@ interface FileIterator * **/ void destroy(); -}; +} /** * @@ -1289,7 +1289,7 @@ struct ServerDynamicInfo * **/ bool enabled; -}; +} /** * @@ -1318,7 +1318,7 @@ struct AdapterDynamicInfo * **/ Object* proxy; -}; +} /** * @@ -1354,7 +1354,7 @@ struct NodeDynamicInfo * **/ AdapterDynamicInfoSeq adapters; -}; +} /** * @@ -1393,7 +1393,7 @@ interface RegistryObserver * **/ void registryDown(string name); -}; +} /** * @@ -1464,7 +1464,7 @@ interface NodeObserver * **/ void updateAdapter(string node, AdapterDynamicInfo updatedInfo); -}; +} /** * @@ -1525,7 +1525,7 @@ interface ApplicationObserver * **/ void applicationUpdated(int serial, ApplicationUpdateInfo desc); -}; +} /** * @@ -1574,7 +1574,7 @@ interface AdapterObserver * **/ void adapterRemoved(string id); -}; +} /** * @@ -1623,7 +1623,7 @@ interface ObjectObserver * **/ void objectRemoved(Ice::Identity id); -}; +} /** * @@ -1949,6 +1949,6 @@ interface AdminSession extends Glacier2::Session FileIterator * openRegistryStdOut(string name, int count) throws FileNotAvailableException, RegistryNotExistException, RegistryUnreachableException; -}; +} -}; +} diff --git a/slice/IceGrid/Descriptor.ice b/slice/IceGrid/Descriptor.ice index 2a64b792326..e40ecb4e261 100644 --- a/slice/IceGrid/Descriptor.ice +++ b/slice/IceGrid/Descriptor.ice @@ -55,7 +55,7 @@ struct PropertyDescriptor * **/ string value; -}; +} /** * @@ -85,7 +85,7 @@ struct PropertySetDescriptor * **/ PropertyDescriptorSeq properties; -}; +} /** * @@ -123,7 +123,7 @@ struct ObjectDescriptor * **/ string proxyOptions; -}; +} /** * @@ -207,7 +207,7 @@ struct AdapterDescriptor * **/ ObjectDescriptorSeq allocatables; -}; +} /** * @@ -254,7 +254,7 @@ struct DbEnvDescriptor * **/ PropertyDescriptorSeq properties; -}; +} /** * @@ -304,7 +304,7 @@ class CommunicatorDescriptor * **/ string description; -}; +} /** * @@ -320,7 +320,7 @@ struct DistributionDescriptor /** The source directories. */ ["java:type:java.util.LinkedList<String>"] Ice::StringSeq directories; -}; +} /** * @@ -427,7 +427,7 @@ class ServerDescriptor extends CommunicatorDescriptor * **/ string user; -}; +} /** * @@ -456,7 +456,7 @@ class ServiceDescriptor extends CommunicatorDescriptor * **/ string entry; -}; +} /** * @@ -501,7 +501,7 @@ struct ServerInstanceDescriptor * **/ PropertySetDescriptorDict servicePropertySets; -}; +} /** * @@ -538,7 +538,7 @@ struct TemplateDescriptor * **/ StringStringDict parameterDefaults; -}; +} /** * @@ -582,7 +582,7 @@ struct ServiceInstanceDescriptor * **/ PropertySetDescriptor propertySet; -}; +} /** * @@ -605,7 +605,7 @@ class IceBoxDescriptor extends ServerDescriptor * **/ ServiceInstanceDescriptorSeq services; -}; +} /** * @@ -655,7 +655,7 @@ struct NodeDescriptor * **/ PropertySetDescriptorDict propertySets; -}; +} /** * @@ -678,7 +678,7 @@ class LoadBalancingPolicy * **/ string nReplicas; -}; +} /** * @@ -687,7 +687,7 @@ class LoadBalancingPolicy **/ class RandomLoadBalancingPolicy extends LoadBalancingPolicy { -}; +} /** * @@ -696,7 +696,7 @@ class RandomLoadBalancingPolicy extends LoadBalancingPolicy **/ class OrderedLoadBalancingPolicy extends LoadBalancingPolicy { -}; +} /** * @@ -705,7 +705,7 @@ class OrderedLoadBalancingPolicy extends LoadBalancingPolicy **/ class RoundRobinLoadBalancingPolicy extends LoadBalancingPolicy { -}; +} /** * @@ -723,7 +723,7 @@ class AdaptiveLoadBalancingPolicy extends LoadBalancingPolicy * **/ string loadSample; -}; +} /** * @@ -773,7 +773,7 @@ struct ReplicaGroupDescriptor * **/ string filter; -}; +} /** * @@ -851,7 +851,7 @@ struct ApplicationDescriptor * **/ PropertySetDescriptorDict propertySets; -}; +} /** * @@ -869,7 +869,7 @@ class BoxedString { /** The value of the boxed string. */ string value; -}; +} /** * @@ -950,7 +950,7 @@ struct NodeUpdateDescriptor * **/ BoxedString loadFactor; -}; +} /** * @@ -968,7 +968,7 @@ class BoxedDistributionDescriptor { /** The value of the boxed distribution descriptor. */ DistributionDescriptor value; -}; +} /** * @@ -1083,6 +1083,6 @@ struct ApplicationUpdateDescriptor * **/ Ice::StringSeq removeNodes; -}; +} -}; +} diff --git a/slice/IceGrid/Exception.ice b/slice/IceGrid/Exception.ice index 27323317b9a..5cb78c4f169 100644 --- a/slice/IceGrid/Exception.ice +++ b/slice/IceGrid/Exception.ice @@ -41,7 +41,7 @@ exception ApplicationNotExistException * **/ string name; -}; +} /** * @@ -56,7 +56,7 @@ exception ServerNotExistException * */ string id; -}; +} /** * @@ -78,7 +78,7 @@ exception ServerStartException * **/ string reason; -}; +} /** * @@ -100,7 +100,7 @@ exception ServerStopException * **/ string reason; -}; +} /** * @@ -115,7 +115,7 @@ exception AdapterNotExistException * **/ string id; -}; +} /** * @@ -130,7 +130,7 @@ exception ObjectExistsException * **/ Ice::Identity id; -}; +} /** * @@ -145,7 +145,7 @@ exception ObjectNotRegisteredException * **/ Ice::Identity id; -}; +} /** * @@ -160,7 +160,7 @@ exception NodeNotExistException * **/ string name; -}; +} /** * @@ -175,7 +175,7 @@ exception RegistryNotExistException * **/ string name; -}; +} /** * @@ -190,7 +190,7 @@ exception DeploymentException * **/ string reason; -}; +} /** * @@ -212,7 +212,7 @@ exception NodeUnreachableException * **/ string reason; -}; +} /** * @@ -234,7 +234,7 @@ exception ServerUnreachableException * **/ string reason; -}; +} /** @@ -257,7 +257,7 @@ exception RegistryUnreachableException * **/ string reason; -}; +} /** * @@ -273,7 +273,7 @@ exception BadSignalException * **/ string reason; -}; +} /** * @@ -288,7 +288,7 @@ exception PatchException * **/ Ice::StringSeq reasons; -}; +} /** * @@ -304,7 +304,7 @@ exception AccessDeniedException * **/ string lockUserId; -}; +} /** * @@ -319,7 +319,7 @@ exception AllocationException * **/ string reason; -}; +} /** * @@ -329,7 +329,7 @@ exception AllocationException **/ exception AllocationTimeoutException extends AllocationException { -}; +} /** * @@ -345,7 +345,7 @@ exception PermissionDeniedException * **/ string reason; -}; +} /** * @@ -364,7 +364,7 @@ exception ObserverAlreadyRegisteredException * **/ Ice::Identity id; -}; +} /** * @@ -386,7 +386,7 @@ exception FileNotAvailableException * **/ string reason; -}; +} -}; +} diff --git a/slice/IceGrid/FileParser.ice b/slice/IceGrid/FileParser.ice index fd16d83a9af..335379b8f50 100644 --- a/slice/IceGrid/FileParser.ice +++ b/slice/IceGrid/FileParser.ice @@ -31,7 +31,7 @@ exception ParseException { /** The reason for the failure. */ string reason; -}; +} /** * @@ -60,6 +60,6 @@ interface FileParser idempotent ApplicationDescriptor parse(string xmlFile, Admin* adminProxy) throws ParseException; -}; +} -}; +} diff --git a/slice/IceGrid/PluginFacade.ice b/slice/IceGrid/PluginFacade.ice index 35235bbbec2..c80e7b6f40c 100644 --- a/slice/IceGrid/PluginFacade.ice +++ b/slice/IceGrid/PluginFacade.ice @@ -55,7 +55,7 @@ local interface ReplicaGroupFilter * **/ Ice::StringSeq filter(string replicaGroupId, Ice::StringSeq adapterIds, Ice::Connection con, Ice::Context ctx); -}; +} /** * @@ -88,7 +88,7 @@ local interface TypeFilter * **/ Ice::ObjectProxySeq filter(string type, Ice::ObjectProxySeq proxies, Ice::Connection con, Ice::Context ctx); -}; +} /** @@ -318,6 +318,6 @@ local interface RegistryPluginFacade * **/ bool removeTypeFilter(string type, TypeFilter filter); -}; +} -}; +} diff --git a/slice/IceGrid/Registry.ice b/slice/IceGrid/Registry.ice index ff14faf17fb..144af2d2d52 100644 --- a/slice/IceGrid/Registry.ice +++ b/slice/IceGrid/Registry.ice @@ -46,7 +46,7 @@ enum LoadSample * Sample every fifteen minutes. **/ LoadSample15 -}; +} /** * @@ -122,7 +122,7 @@ interface Query * **/ ["cpp:const"] idempotent Ice::ObjectProxySeq findAllReplicas(Object* proxy); -}; +} /** * @@ -225,7 +225,7 @@ interface Registry * **/ ["nonmutating", "cpp:const"] idempotent int getACMTimeout(); -}; +} /** * @@ -257,6 +257,6 @@ interface Locator extends Ice::Locator * **/ ["cpp:const"] idempotent Query* getLocalQuery(); -}; +} -}; +} diff --git a/slice/IceGrid/Session.ice b/slice/IceGrid/Session.ice index 741955ebe5f..e88c496997f 100644 --- a/slice/IceGrid/Session.ice +++ b/slice/IceGrid/Session.ice @@ -116,6 +116,6 @@ interface Session extends Glacier2::Session * **/ idempotent void setAllocationTimeout(int timeout); -}; +} -}; +} diff --git a/slice/IceGrid/UserAccountMapper.ice b/slice/IceGrid/UserAccountMapper.ice index d02255d195a..051ec120116 100644 --- a/slice/IceGrid/UserAccountMapper.ice +++ b/slice/IceGrid/UserAccountMapper.ice @@ -28,7 +28,7 @@ module IceGrid **/ exception UserAccountNotFoundException { -}; +} /** * @@ -57,6 +57,6 @@ interface UserAccountMapper **/ string getUserAccount(string user) throws UserAccountNotFoundException; -}; +} -}; +} diff --git a/slice/IceIAP/ConnectionInfo.ice b/slice/IceIAP/ConnectionInfo.ice index 4e081587e3f..80dd01a860e 100644 --- a/slice/IceIAP/ConnectionInfo.ice +++ b/slice/IceIAP/ConnectionInfo.ice @@ -65,7 +65,7 @@ local class ConnectionInfo extends Ice::ConnectionInfo * **/ string protocol; -}; +} -}; +} diff --git a/slice/IceIAP/EndpointInfo.ice b/slice/IceIAP/EndpointInfo.ice index 153f18b99de..71621c62c7a 100644 --- a/slice/IceIAP/EndpointInfo.ice +++ b/slice/IceIAP/EndpointInfo.ice @@ -59,7 +59,7 @@ local class EndpointInfo extends Ice::EndpointInfo * **/ string protocol; -}; +} -}; +} diff --git a/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice b/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice index b0c0db983e7..4c29617b1c4 100644 --- a/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +++ b/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice @@ -44,7 +44,7 @@ interface LookupReply * **/ void foundLocator(Ice::Locator* prx); -}; +} /** * @@ -74,6 +74,6 @@ interface Lookup * **/ idempotent void findLocator(string instanceName, LookupReply* reply); -}; +} -}; +} diff --git a/slice/IcePatch2/FileInfo.ice b/slice/IcePatch2/FileInfo.ice index 20c3a98ad54..2eb9e6bb7ef 100644 --- a/slice/IcePatch2/FileInfo.ice +++ b/slice/IcePatch2/FileInfo.ice @@ -40,7 +40,7 @@ struct FileInfo /** The executable flag. */ bool executable; -}; +} /** * @@ -68,7 +68,7 @@ struct LargeFileInfo /** The executable flag. */ bool executable; -}; +} /** * @@ -77,4 +77,4 @@ struct LargeFileInfo **/ sequence<LargeFileInfo> LargeFileInfoSeq; -}; +} diff --git a/slice/IcePatch2/FileServer.ice b/slice/IcePatch2/FileServer.ice index a718a012799..71e3a6b20ba 100644 --- a/slice/IcePatch2/FileServer.ice +++ b/slice/IcePatch2/FileServer.ice @@ -44,7 +44,7 @@ sequence<Ice::ByteSeq> ByteSeqSeq; **/ exception PartitionOutOfRangeException { -}; +} /** * @@ -59,7 +59,7 @@ exception FileAccessException * **/ string reason; -}; +} /** * @@ -69,7 +69,7 @@ exception FileAccessException **/ exception FileSizeRangeException extends FileAccessException { -}; +} /** * @@ -180,6 +180,6 @@ interface FileServer ["amd", "nonmutating", "cpp:const", "cpp:array"] idempotent Ice::ByteSeq getLargeFileCompressed(string path, long pos, int num) throws FileAccessException; -}; +} -}; +} diff --git a/slice/IceSSL/ConnectionInfo.ice b/slice/IceSSL/ConnectionInfo.ice index 829ba2ef26f..9cbce24c8b0 100644 --- a/slice/IceSSL/ConnectionInfo.ice +++ b/slice/IceSSL/ConnectionInfo.ice @@ -41,6 +41,6 @@ local class ConnectionInfo extends Ice::ConnectionInfo /** The certificate chain verification status. */ bool verified; -}; +} -}; +} diff --git a/slice/IceSSL/ConnectionInfoF.ice b/slice/IceSSL/ConnectionInfoF.ice index 5babcaa39b2..d415b7ce163 100644 --- a/slice/IceSSL/ConnectionInfoF.ice +++ b/slice/IceSSL/ConnectionInfoF.ice @@ -21,4 +21,4 @@ module IceSSL local class ConnectionInfo; -}; +} diff --git a/slice/IceSSL/EndpointInfo.ice b/slice/IceSSL/EndpointInfo.ice index 5ef41e5d31d..f1378e62498 100644 --- a/slice/IceSSL/EndpointInfo.ice +++ b/slice/IceSSL/EndpointInfo.ice @@ -33,6 +33,6 @@ module IceSSL **/ local class EndpointInfo extends Ice::EndpointInfo { -}; +} -}; +} diff --git a/slice/IceStorm/IceStorm.ice b/slice/IceStorm/IceStorm.ice index dce0f2fa28f..72994e0f404 100644 --- a/slice/IceStorm/IceStorm.ice +++ b/slice/IceStorm/IceStorm.ice @@ -62,7 +62,7 @@ struct LinkInfo * **/ int cost; -}; +} /** * @@ -94,7 +94,7 @@ exception LinkExists * */ string name; -}; +} /** * @@ -110,7 +110,7 @@ exception NoSuchLink * */ string name; -}; +} /** * @@ -120,7 +120,7 @@ exception NoSuchLink **/ exception AlreadySubscribed { -}; +} /** * @@ -136,7 +136,7 @@ exception InvalidSubscriber * **/ string reason; -}; +} /** * @@ -152,7 +152,7 @@ exception BadQoS * **/ string reason; -}; +} /** * @@ -288,7 +288,7 @@ interface Topic * **/ void destroy(); -}; +} /** * @@ -311,7 +311,7 @@ exception TopicExists * */ string name; -}; +} /** * @@ -327,7 +327,7 @@ exception NoSuchTopic * */ string name; -}; +} /** * @@ -383,7 +383,7 @@ interface TopicManager * **/ ["nonmutating", "cpp:const"] idempotent Ice::SliceChecksumDict getSliceChecksums(); -}; +} /** * @@ -404,6 +404,6 @@ interface Finder * **/ TopicManager* getTopicManager(); -}; +} -}; +} diff --git a/slice/IceStorm/Metrics.ice b/slice/IceStorm/Metrics.ice index 8ab82b11df6..dae0f6d98d6 100644 --- a/slice/IceStorm/Metrics.ice +++ b/slice/IceStorm/Metrics.ice @@ -42,7 +42,7 @@ class TopicMetrics extends Metrics * **/ long forwarded = 0; -}; +} /** * @@ -71,6 +71,6 @@ class SubscriberMetrics extends Metrics * **/ long delivered = 0; -}; +} -}; +} |