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 /cpp | |
| 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
Diffstat (limited to 'cpp')
167 files changed, 1454 insertions, 1454 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 { -}; +} |