Removed optional semicolons after braces

38 files changed, 332 insertions, 332 deletions

diff --git a/objective-c/test/Ice/acm/ACMTest.ice b/objective-c/test/Ice/acm/ACMTest.ice
index 3af340f03fa..ffddab8a53b 100644
--- a/objective-c/test/Ice/acm/ACMTest.ice
+++ b/objective-c/test/Ice/acm/ACMTest.ice
@@ -20,7 +20,7 @@ interface TestIntf
     void interruptSleep();
     void startHeartbeatCount();
     void waitForHeartbeatCount(int count);
-};
+}
 
 interface RemoteObjectAdapter
 {
@@ -28,12 +28,12 @@ interface RemoteObjectAdapter
     void activate();
     void hold();
     void deactivate();
-};
+}
 
 interface RemoteCommunicator
 {
     RemoteObjectAdapter* createObjectAdapter(int acmTimeout, int close, int heartbeat);
     void shutdown();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice b/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice
index 320af282283..2d764b7419c 100644
--- a/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice
+++ b/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice
@@ -18,6 +18,6 @@ interface TestIntf
     void transient();
 
     void deactivate();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/admin/AdminTest.ice b/objective-c/test/Ice/admin/AdminTest.ice
index f6d7317b290..71d0d94e5c0 100644
--- a/objective-c/test/Ice/admin/AdminTest.ice
+++ b/objective-c/test/Ice/admin/AdminTest.ice
@@ -34,18 +34,18 @@ interface RemoteCommunicator
     void waitForShutdown();
 
     void destroy();
-};
+}
 
 interface RemoteCommunicatorFactory
 {
     RemoteCommunicator* createCommunicator(Ice::PropertyDict props);
 
     void shutdown();
-};
+}
 
 interface TestFacet
 {
     void op();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/ami/AMITest.ice b/objective-c/test/Ice/ami/AMITest.ice
index ccad46cfd8a..2c47356f107 100644
--- a/objective-c/test/Ice/ami/AMITest.ice
+++ b/objective-c/test/Ice/ami/AMITest.ice
@@ -18,7 +18,7 @@ module Test
 
 exception TestIntfException
 {
-};
+}
 
 ["objc:scoped"]
 enum CloseMode
@@ -26,12 +26,12 @@ enum CloseMode
     Forcefully,
     Gracefully,
     GracefullyWithWait
-};
+}
 
 interface PingReply
 {
     void reply();
-};
+}
 
 interface TestIntf
 {
@@ -53,12 +53,12 @@ interface TestIntf
     bool supportsFunctionalTests();
 
     void pingBiDir(Ice::Identity id);
-};
+}
 
 interface TestIntfController
 {
     void holdAdapter();
     void resumeAdapter();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/binding/BindingTest.ice b/objective-c/test/Ice/binding/BindingTest.ice
index 8b73fd44db1..8ab3b9ed78a 100644
--- a/objective-c/test/Ice/binding/BindingTest.ice
+++ b/objective-c/test/Ice/binding/BindingTest.ice
@@ -16,14 +16,14 @@ module Test
 interface TestIntf
 {
     string getAdapterName();
-};
+}
 
 interface RemoteObjectAdapter
 {
     TestIntf* getTestIntf();
 
     void deactivate();
-};
+}
 
 interface RemoteCommunicator
 {
@@ -32,6 +32,6 @@ interface RemoteCommunicator
     void deactivateObjectAdapter(RemoteObjectAdapter* adapter);
 
     void shutdown();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/defaultServant/DefaultServantTest.ice b/objective-c/test/Ice/defaultServant/DefaultServantTest.ice
index 789accb8f18..af2b64c4345 100644
--- a/objective-c/test/Ice/defaultServant/DefaultServantTest.ice
+++ b/objective-c/test/Ice/defaultServant/DefaultServantTest.ice
@@ -16,6 +16,6 @@ module Test
 interface MyObject
 {
     string getName();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/defaultValue/DefaultValueTest.ice b/objective-c/test/Ice/defaultValue/DefaultValueTest.ice
index eea2b0d2090..6d90eeb36e0 100644
--- a/objective-c/test/Ice/defaultValue/DefaultValueTest.ice
+++ b/objective-c/test/Ice/defaultValue/DefaultValueTest.ice
@@ -13,7 +13,7 @@
 module Test
 {
 
-enum Color { red, green, blue };
+enum Color { red, green, blue }
 
 struct Struct1
 {
@@ -28,7 +28,7 @@ struct Struct1
     string str = "foo bar";
     Color c = red;
     string noDefault;
-};
+}
 
 ["cpp:class"]
 struct Struct2
@@ -44,7 +44,7 @@ struct Struct2
     string str = "foo bar";
     Color c = blue;
     string noDefault;
-};
+}
 
 class Base
 {
@@ -58,12 +58,12 @@ class Base
     double d = 6.0;
     string str = "foo bar";
     string noDefault;
-};
+}
 
 class Derived extends Base
 {
     Color c = green;
-};
+}
 
 exception BaseEx
 {
@@ -77,12 +77,12 @@ exception BaseEx
     double d = 6.0;
     string str = "foo bar";
     string noDefault;
-};
+}
 
 exception DerivedEx extends BaseEx
 {
     Color c = green;
-};
+}
 
 sequence<byte> ByteSeq;
 sequence<int> IntSeq;
@@ -91,7 +91,7 @@ dictionary<int, string> IntStringDict;
 struct InnerStruct
 {
     int a;
-};
+}
 
 struct StructNoDefaults
 {
@@ -108,32 +108,32 @@ struct StructNoDefaults
     IntSeq is;
     InnerStruct st;
     IntStringDict dict;
-};
+}
 
 exception ExceptionNoDefaultsBase
 {
     string str;
     Color c1;
     ByteSeq bs;
-};
+}
 
 exception ExceptionNoDefaults extends ExceptionNoDefaultsBase
 {
     InnerStruct st;
     IntStringDict dict;
-};
+}
 
 class ClassNoDefaultsBase
 {
     string str;
     Color c1;
     ByteSeq bs;
-};
+}
 
 class ClassNoDefaults extends ClassNoDefaultsBase
 {
     InnerStruct st;
     IntStringDict dict;
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/dispatcher/DispatcherTest.ice b/objective-c/test/Ice/dispatcher/DispatcherTest.ice
index 411db56418e..716cb70b861 100644
--- a/objective-c/test/Ice/dispatcher/DispatcherTest.ice
+++ b/objective-c/test/Ice/dispatcher/DispatcherTest.ice
@@ -21,12 +21,12 @@ interface TestIntf
     void sleep(int to);
     void opWithPayload(Ice::ByteSeq seq);
     void shutdown();
-};
+}
 
 interface TestIntfController
 {
     void holdAdapter();
     void resumeAdapter();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/enums/EnumTest.ice b/objective-c/test/Ice/enums/EnumTest.ice
index a25c25cc249..c11e4b00af2 100644
--- a/objective-c/test/Ice/enums/EnumTest.ice
+++ b/objective-c/test/Ice/enums/EnumTest.ice
@@ -36,7 +36,7 @@ enum ByteEnum
     benum9 = LongConst1,
     benum10,
     benum11 = ByteConst2
-};
+}
 sequence<ByteEnum> ByteEnumSeq;
 
 enum ShortEnum
@@ -52,7 +52,7 @@ enum ShortEnum
     senum9 = LongConst1,
     senum10,
     senum11 = ShortConst2
-};
+}
 sequence<ShortEnum> ShortEnumSeq;
 
 enum IntEnum
@@ -69,7 +69,7 @@ enum IntEnum
     ienum10,
     ienum11 = IntConst2,
     ienum12 = LongConst2
-};
+}
 sequence<IntEnum> IntEnumSeq;
 
 enum SimpleEnum
@@ -77,7 +77,7 @@ enum SimpleEnum
     red,
     green,
     blue
-};
+}
 sequence<SimpleEnum> SimpleEnumSeq;
 
 interface TestIntf
@@ -93,6 +93,6 @@ interface TestIntf
     SimpleEnumSeq opSimpleSeq(SimpleEnumSeq s1, out SimpleEnumSeq s2);
 
     void shutdown();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/exceptions/ExceptionsTest.ice b/objective-c/test/Ice/exceptions/ExceptionsTest.ice
index 307ed42cdf7..2379abe52a3 100644
--- a/objective-c/test/Ice/exceptions/ExceptionsTest.ice
+++ b/objective-c/test/Ice/exceptions/ExceptionsTest.ice
@@ -17,29 +17,29 @@ module Test
 
 interface Empty
 {
-};
+}
 
 interface Thrower;
 
 exception A
 {
     int aMem;
-};
+}
 
 exception B extends A
 {
     int bMem;
-};
+}
 
 exception C extends B
 {
     int cMem;
-};
+}
 
 exception D
 {
     int dMem;
-};
+}
 
 ["objc:prefix:TestExceptionsMod"]
 module Mod
@@ -47,8 +47,8 @@ module Mod
     exception A extends ::Test::A
     {
         int a2Mem;
-    };
-};
+    }
+}
 
 
 interface Thrower
@@ -78,11 +78,11 @@ interface Thrower
 
     void throwAfterResponse();
     void throwAfterException() throws A;
-};
+}
 
 interface WrongOperation
 {
     void noSuchOperation();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/facets/FacetsTest.ice b/objective-c/test/Ice/facets/FacetsTest.ice
index 1fa33db50a1..780e7cd9889 100644
--- a/objective-c/test/Ice/facets/FacetsTest.ice
+++ b/objective-c/test/Ice/facets/FacetsTest.ice
@@ -15,47 +15,47 @@ module Test
 
 interface Empty
 {
-};
+}
 
 interface A
 {
     string callA();
-};
+}
 
 interface B extends A
 {
     string callB();
-};
+}
 
 interface C extends A
 {
     string callC();
-};
+}
 
 interface D extends B, C
 {
     string callD();
-};
+}
 
 interface E
 {
     string callE();
-};
+}
 
 interface F extends E
 {
     string callF();
-};
+}
 
 interface G
 {
     void shutdown();
     string callG();
-};
+}
 
 interface H extends G
 {
     string callH();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice b/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice
index 2eb092e5203..a9e41465f35 100644
--- a/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice
+++ b/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice
@@ -18,6 +18,6 @@ interface TestIntf
     void abort();
     idempotent void idempotentAbort();
     idempotent int pid();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/hash/HashTest.ice b/objective-c/test/Ice/hash/HashTest.ice
index b51afb8c183..9b666914c28 100644
--- a/objective-c/test/Ice/hash/HashTest.ice
+++ b/objective-c/test/Ice/hash/HashTest.ice
@@ -16,17 +16,17 @@ module Test
 
 exception BaseException
 {
-};
+}
 
 exception InvalidPointException extends BaseException
 {
     int index;
-};
+}
 
 exception InvalidLengthException extends BaseException
 {
     int length;
-};
+}
 
 exception OtherException
 {
@@ -34,7 +34,7 @@ exception OtherException
     int y;
     int z;
     bool b;
-};
+}
 
 
 struct PointF
@@ -42,26 +42,26 @@ struct PointF
     float x;
     float y;
     float z;
-};
+}
 
 struct PointD
 {
     double x;
     double y;
     double z;
-};
+}
 
 struct Point
 {
     int x;
     int y;
-};
+}
 sequence<Point> Points;
 
 struct Polyline
 {
     Points vertices;
-};
+}
 
 struct Color
 {
@@ -69,25 +69,25 @@ struct Color
     int g;
     int b;
     int a;
-};
+}
 dictionary<int, Color> StringColorMap;
 
 struct ColorPalette
 {
     StringColorMap colors;
-};
+}
 
 class Pen
 {
     int thickness;
     Test::Color color;
-};
+}
 
 struct Draw
 {
     Test::Color backgroundColor;
     Test::Pen pen;
     bool shared;
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/hold/HoldTest.ice b/objective-c/test/Ice/hold/HoldTest.ice
index 1aed0fcc640..b4103332195 100644
--- a/objective-c/test/Ice/hold/HoldTest.ice
+++ b/objective-c/test/Ice/hold/HoldTest.ice
@@ -20,6 +20,6 @@ interface Hold
     int set(int value, int delay);
     void setOneway(int value, int expected);
     void shutdown();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/info/InfoTest.ice b/objective-c/test/Ice/info/InfoTest.ice
index 297a327d6dc..ba9980f182f 100644
--- a/objective-c/test/Ice/info/InfoTest.ice
+++ b/objective-c/test/Ice/info/InfoTest.ice
@@ -22,6 +22,6 @@ interface TestIntf
     Ice::Context getEndpointInfoAsContext();
 
     Ice::Context getConnectionInfoAsContext();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/inheritance/InheritanceTest.ice b/objective-c/test/Ice/inheritance/InheritanceTest.ice
index 9d0b5aa2743..abfedba3734 100644
--- a/objective-c/test/Ice/inheritance/InheritanceTest.ice
+++ b/objective-c/test/Ice/inheritance/InheritanceTest.ice
@@ -22,14 +22,14 @@ module MA
 interface IA
 {
     IA* iaop(IA* p);
-};
+}
 
 class CA
 {
     CA* caop(CA* p);
-};
+}
 
-};
+}
 
 ["objc:prefix:TestInheritanceMB"]
 module MB
@@ -38,19 +38,19 @@ module MB
 interface IB1 extends MA::IA
 {
     IB1* ib1op(IB1* p);
-};
+}
 
 interface IB2 extends MA::IA
 {
     IB2* ib2op(IB2* p);
-};
+}
 
 class CB extends MA::CA
 {
     CB* cbop(CB* p);
-};
+}
 
-};
+}
 
 ["objc:prefix:TestInheritanceMA"]
 module MA
@@ -59,19 +59,19 @@ module MA
 interface IC extends MB::IB1, MB::IB2
 {
     IC* icop(IC* p);
-};
+}
 
 class CC extends MB::CB
 {
     CC* ccop(CC* p);
-};
+}
 
 class CD extends CC implements MB::IB1, MB::IB2
 {
     CD* cdop(CD* p);
-};
+}
 
-};
+}
 
 interface Initial
 {
@@ -84,6 +84,6 @@ interface Initial
     MB::IB1* ib1op();
     MB::IB2* ib2op();
     MA::IC* icop();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/interceptor/InterceptorTest.ice b/objective-c/test/Ice/interceptor/InterceptorTest.ice
index 9dbe6b92e7c..90cc95e94d1 100644
--- a/objective-c/test/Ice/interceptor/InterceptorTest.ice
+++ b/objective-c/test/Ice/interceptor/InterceptorTest.ice
@@ -16,11 +16,11 @@ module Test
 exception InvalidInputException
 {
     string reason;
-};
+}
 
 local exception RetryException
 {
-};
+}
 
 interface MyObject
 {
@@ -48,6 +48,6 @@ interface MyObject
     // Raise system exception
     //
     int badSystemAdd(int x, int y);
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/invoke/InvokeTest.ice b/objective-c/test/Ice/invoke/InvokeTest.ice
index 30f8216ef06..187be5132ba 100644
--- a/objective-c/test/Ice/invoke/InvokeTest.ice
+++ b/objective-c/test/Ice/invoke/InvokeTest.ice
@@ -15,7 +15,7 @@ module Test
 
 exception MyException
 {
-};
+}
 
 interface MyClass
 {
@@ -26,6 +26,6 @@ interface MyClass
     void opException() throws MyException;
 
     void shutdown();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/location/LocationTest.ice b/objective-c/test/Ice/location/LocationTest.ice
index d22e4082a4f..88b2656f164 100644
--- a/objective-c/test/Ice/location/LocationTest.ice
+++ b/objective-c/test/Ice/location/LocationTest.ice
@@ -21,7 +21,7 @@ interface TestLocatorRegistry extends ::Ice::LocatorRegistry
     // Allow remote addition of objects to the locator registry.
     //
     void addObject(Object* obj);
-};
+}
 
 interface TestLocator extends ::Ice::Locator
 {
@@ -29,18 +29,18 @@ interface TestLocator extends ::Ice::Locator
     // Returns the number of request on the locator interface.
     //
     ["cpp:const"] idempotent int getRequestCount();
-};
+}
 
 interface ServerManager
 {
     void startServer();
     void shutdown();
-};
+}
 
 interface Hello
 {
     void sayHello();
-};
+}
 
 interface TestIntf
 {
@@ -51,6 +51,6 @@ interface TestIntf
     Hello* getReplicatedHello();
 
     void migrateHello();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/metrics/MetricsTest.ice b/objective-c/test/Ice/metrics/MetricsTest.ice
index c8f8e02eed3..6fb9b6e570e 100644
--- a/objective-c/test/Ice/metrics/MetricsTest.ice
+++ b/objective-c/test/Ice/metrics/MetricsTest.ice
@@ -15,7 +15,7 @@ module Test
 
 exception UserEx
 {
-};
+}
 
 sequence<byte> ByteSeq;
 
@@ -39,13 +39,13 @@ interface Metrics
     Object* getAdmin();
 
     void shutdown();
-};
+}
 
 interface Controller
 {
     void hold();
 
     void resume();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/objects/ObjectsDerived.ice b/objective-c/test/Ice/objects/ObjectsDerived.ice
index 9b2ac8704a2..ccaa818f674 100644
--- a/objective-c/test/Ice/objects/ObjectsDerived.ice
+++ b/objective-c/test/Ice/objects/ObjectsDerived.ice
@@ -18,6 +18,6 @@ module Test
 class Derived extends Base
 {
     string b;
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/objects/ObjectsDerivedEx.ice b/objective-c/test/Ice/objects/ObjectsDerivedEx.ice
index 8db5fc0681f..8b514060c26 100644
--- a/objective-c/test/Ice/objects/ObjectsDerivedEx.ice
+++ b/objective-c/test/Ice/objects/ObjectsDerivedEx.ice
@@ -17,6 +17,6 @@ module Test
 
 exception DerivedEx extends BaseEx
 {
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/objects/ObjectsTest.ice b/objective-c/test/Ice/objects/ObjectsTest.ice
index 4feb80d45e4..06ebcd245bc 100644
--- a/objective-c/test/Ice/objects/ObjectsTest.ice
+++ b/objective-c/test/Ice/objects/ObjectsTest.ice
@@ -19,23 +19,23 @@ module Test
 struct S
 {
     string str;
-};
+}
 
 class Base
 {
     S theS;
     string str;
-};
+}
 
 exception BaseEx
 {
     string reason;
-};
+}
 
 class AbstractBase extends Base
 {
     void op();
-};
+}
 
 
 class B;
@@ -48,12 +48,12 @@ class A
 
     bool preMarshalInvoked;
     bool postUnmarshalInvoked;
-};
+}
 
 class B extends A
 {
     A theA;
-};
+}
 
 class C
 {
@@ -61,7 +61,7 @@ class C
 
     bool preMarshalInvoked;
     bool postUnmarshalInvoked;
-};
+}
 
 class D
 {
@@ -71,43 +71,43 @@ class D
 
     bool preMarshalInvoked;
     bool postUnmarshalInvoked;
-};
+}
 
 ["protected"] class E
 {
     int i;
     string s;
-};
+}
 
 class F
 {
     ["protected"] E e1;
     E e2;
-};
+}
 
 interface I
 {
-};
+}
 
 interface J extends I
 {
-};
+}
 
 class H implements I
 {
-};
+}
 
 class CompactExt;
 
 class Compact(1)
 {
-};
+}
 
 const int CompactExtId = 789;
 
 class CompactExt(CompactExtId) extends Compact
 {
-};
+}
 
 module Inner
 {
@@ -115,12 +115,12 @@ module Inner
 class A
 {
     ::Test::A theA;
-};
+}
 
 exception Ex
 {
     string reason;
-};
+}
 
 module Sub
 {
@@ -128,45 +128,45 @@ module Sub
 class A
 {
     ::Test::Inner::A theA;
-};
+}
 
 exception Ex
 {
     string reason;
-};
+}
 
-};
+}
 
-};
+}
 
 class A1
 {
     string name;
-};
+}
 
 class B1
 {
     A1 a1;
     A1 a2;
-};
+}
 
 class D1 extends B1
 {
     A1 a3;
     A1 a4;
-};
+}
 
 exception EBase
 {
     A1 a1;
     A1 a2;
-};
+}
 
 exception EDerived extends EBase
 {
     A1 a3;
     A1 a4;
-};
+}
 
 sequence<Object> ObjectSeq;         // For Objective-C only
 sequence<Object*> ObjectPrxSeq;     // For Objective-C only
@@ -181,7 +181,7 @@ dictionary<string, Base*> BasePrxDict;      // For Objective-C only
 class Recursive
 {
     Recursive v;
-};
+}
 
 class Initial
 {
@@ -232,26 +232,26 @@ class Initial
     ObjectPrxDict getObjectPrxDict(ObjectPrxDict d);
     BaseDict getBaseDict(BaseDict d);
     BasePrxDict getBasePrxDict(BasePrxDict d);
-};
+}
 
 interface TestIntf
 {
     Base opDerived();
     void throwDerived() throws BaseEx;
-};
+}
 
 class Empty
 {
-};
+}
 
 class AlsoEmpty
 {
-};
+}
 
 interface UnexpectedObjectExceptionTest
 {
     Empty op();
-};
+}
 
 //
 // Remaining definitions are here to ensure that the generated code compiles.
@@ -260,37 +260,37 @@ interface UnexpectedObjectExceptionTest
 class COneMember
 {
     Empty e;
-};
+}
 
 class CTwoMembers
 {
     Empty e1;
     Empty e2;
-};
+}
 
 exception EOneMember
 {
     Empty e;
-};
+}
 
 exception ETwoMembers
 {
     Empty e1;
     Empty e2;
-};
+}
 
 struct SOneMember
 {
     Empty e;
-};
+}
 
 struct STwoMembers
 {
     Empty e1;
     Empty e2;
-};
+}
 
 dictionary<int, COneMember> DOneMember;
 dictionary<int, CTwoMembers> DTwoMembers;
 
-};
+}
diff --git a/objective-c/test/Ice/operations/OperationsTest.ice b/objective-c/test/Ice/operations/OperationsTest.ice
index f1705ab34d5..6029218c450 100644
--- a/objective-c/test/Ice/operations/OperationsTest.ice
+++ b/objective-c/test/Ice/operations/OperationsTest.ice
@@ -20,21 +20,21 @@ enum MyEnum
     enum1,
     enum2,
     enum3
-};
+}
 
 interface MyClass;
 
 struct AnotherStruct
 {
     string s;
-};
+}
 
 struct Structure
 {
     MyClass* p;
     MyEnum e;
     AnotherStruct s;
-};
+}
 
 sequence<byte> ByteS;
 sequence<bool> BoolS;
@@ -64,7 +64,7 @@ struct MyStruct
 {
     int i;
     int j;
-};
+}
 
 dictionary<byte, bool> ByteBoolD;
 dictionary<short, int> ShortIntD;
@@ -106,12 +106,12 @@ struct Struct2 // Ensures the generated code for this struct compiles
     StructS ss;
     ByteBoolD dict;
     MyEnumSS seq;
-};
+}
 
 class A // Used Objective-C test only.
 {
     int i;
-};
+}
 
 sequence<A> AS; // Used by Objective-C test only.
 
@@ -303,28 +303,28 @@ interface MyClass
      void putNSNullStringStringDict(StringStringD d);
      void putNSNullShortIntDict(ShortIntD d);
      void putNSNullStringMyEnumDict(StringMyEnumD d);
-};
+}
 
 struct MyStruct1
 {
     string tesT; // Same name as the enclosing module
     MyClass myClass; // Same name as an already defined class
     string myStruct1; // Same name as the enclosing struct
-};
+}
 
 class MyClass1
 {
     string tesT; // Same name as the enclosing module
     MyClass myClass; // Same name as an already defined class
     string myClass1; // Same name as the enclosing class
-};
+}
 
 interface MyDerivedClass extends MyClass
 {
     void opDerived();
     MyClass1 opMyClass1(MyClass1 c);
     MyStruct1 opMyStruct1(MyStruct1 c);
-};
+}
 
 
 //
@@ -395,7 +395,7 @@ const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃";
 const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
 const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
 
-};
+}
 
 module Test2
 {
@@ -408,6 +408,6 @@ module Test2
  **/
 interface MyDerivedClass extends Test::MyClass
 {
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/optional/OptionalTest.ice b/objective-c/test/Ice/optional/OptionalTest.ice
index caa6ba56cd0..339c33d579c 100644
--- a/objective-c/test/Ice/optional/OptionalTest.ice
+++ b/objective-c/test/Ice/optional/OptionalTest.ice
@@ -18,32 +18,32 @@ module Test
 class OneOptional
 {
     optional(1) int a;
-};
+}
 
 enum MyEnum
 {
     MyEnumMember
-};
+}
 
 struct SmallStruct
 {
     byte m;
-};
+}
 
 struct FixedStruct
 {
     int m;
-};
+}
 
 struct VarStruct
 {
     string m;
-};
+}
 
 ["cpp:class"] struct ClassVarStruct
 {
     int a;
-};
+}
 
 sequence<byte> ByteSeq;
 sequence<bool> BoolSeq;
@@ -108,7 +108,7 @@ class MultiOptional
     optional(29) BoolSeq bos;
 
     optional(30) Serializable ser;
-};
+}
 
 class A
 {
@@ -116,26 +116,26 @@ class A
     optional(500) int mc;
     optional(50) int mb;
     optional(1) int ma;
-};
+}
 
 ["preserve-slice"]
 class B extends A
 {
     int requiredB = 0;
     optional(10) int md;
-};
+}
 
 class C extends B
 {
     string ss;
     optional(890) string ms;
-};
+}
 
 class WD
 {
     optional(1) int a = 5;
     optional(2) string s = "test";
-};
+}
 
 exception OptionalException
 {
@@ -143,46 +143,46 @@ exception OptionalException
     optional(1) int a = 5;
     optional(2) string b;
     optional(50) OneOptional o;
-};
+}
 
 exception DerivedException extends OptionalException
 {
     optional(600) string ss = "test";
     optional(601) OneOptional o2;
-};
+}
 
 exception RequiredException extends OptionalException
 {
     string ss = "test";
     OneOptional o2;
-};
+}
 
 class OptionalWithCustom
 {
     optional(1) SmallStructList l;
     ["protected"] optional(2) SmallStructList lp;
     optional(3) ClassVarStruct s;
-};
+}
 
 class E
 {
     A ae;
-};
+}
 
 class F extends E
 {
     optional(1) A af;
-};
+}
 
 class G1
 {
     string a;
-};
+}
 
 class G2
 {
     long a;
-};
+}
 
 class G
 {
@@ -190,7 +190,7 @@ class G
     G2 gg2;
     optional(0) G2 gg2Opt;
     G1 gg1;
-};
+}
 
 class Recursive;
 sequence<Recursive> RecursiveSeq;
@@ -198,7 +198,7 @@ sequence<Recursive> RecursiveSeq;
 class Recursive
 {
     optional(0) RecursiveSeq value;
-};
+}
 
 interface Initial
 {
@@ -325,6 +325,6 @@ interface Initial
     bool supportsCppStringView();
 
     bool supportsNullOptional();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/proxy/ProxyTest.ice b/objective-c/test/Ice/proxy/ProxyTest.ice
index b8de17198f8..56a1634f1ff 100644
--- a/objective-c/test/Ice/proxy/ProxyTest.ice
+++ b/objective-c/test/Ice/proxy/ProxyTest.ice
@@ -20,11 +20,11 @@ interface MyClass
     void shutdown();
 
     Ice::Context getContext();
-};
+}
 
 interface MyDerivedClass extends MyClass
 {
     Object* echo(Object* obj);
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/retry/RetryTest.ice b/objective-c/test/Ice/retry/RetryTest.ice
index 49e1891dca2..608dc2380e4 100644
--- a/objective-c/test/Ice/retry/RetryTest.ice
+++ b/objective-c/test/Ice/retry/RetryTest.ice
@@ -22,6 +22,6 @@ interface Retry
     void opSystemException();
 
     idempotent void shutdown();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice b/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice
index 858280de0ae..f342c650675 100644
--- a/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice
+++ b/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice
@@ -15,11 +15,11 @@ module Test
 
 exception TestIntfUserException
 {
-};
+}
 
 exception TestImpossibleException
 {
-};
+}
 
 interface TestIntf
 {
@@ -40,16 +40,16 @@ interface TestIntf
     void asyncException() throws TestIntfUserException, TestImpossibleException;
 
     void shutdown();
-};
+}
 
 local class Cookie
 {
     ["cpp:const"] string message();
-};
+}
 
 interface TestActivation
 {
     void activateServantLocator(bool activate);
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/services/ServicesTest.ice b/objective-c/test/Ice/services/ServicesTest.ice
index 6bee318324f..9034cccb2ee 100644
--- a/objective-c/test/Ice/services/ServicesTest.ice
+++ b/objective-c/test/Ice/services/ServicesTest.ice
@@ -16,6 +16,6 @@ module Test
 interface Clock
 {
     void tick(string time);
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice
index 105fa019994..e23edd9e865 100644
--- a/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice
+++ b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice
@@ -16,54 +16,54 @@ module Test
 exception Base
 {
     string b;
-};
+}
 
 exception KnownDerived extends Base
 {
     string kd;
-};
+}
 
 exception KnownIntermediate extends Base
 {
     string ki;
-};
+}
 
 exception KnownMostDerived extends KnownIntermediate
 {
     string kmd;
-};
+}
 
 ["preserve-slice"]
 exception KnownPreserved extends Base
 {
     string kp;
-};
+}
 
 exception KnownPreservedDerived extends KnownPreserved
 {
     string kpd;
-};
+}
 
 ["preserve-slice"]
 class BaseClass
 {
     string bc;
-};
+}
 
 class PreservedClass extends BaseClass
 {
     string pc;
-};
+}
 
 exception Preserved1 extends KnownPreservedDerived
 {
     BaseClass p1;
-};
+}
 
 exception Preserved2 extends Preserved1
 {
     BaseClass p2;
-};
+}
 
 ["format:sliced"]
 interface Relay
@@ -73,7 +73,7 @@ interface Relay
 
     void unknownPreservedAsBase() throws Base;
     void unknownPreservedAsKnownPreserved() throws KnownPreserved;
-};
+}
 
 ["format:sliced"] interface TestIntf
 {
@@ -108,6 +108,6 @@ interface Relay
     void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved;
 
     void shutdown();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice
index abea9c5f14e..623f774c192 100644
--- a/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice
+++ b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice
@@ -16,39 +16,39 @@ module Test
 exception Base
 {
     string b;
-};
+}
 
 exception KnownDerived extends Base
 {
     string kd;
-};
+}
 
 exception KnownIntermediate extends Base
 {
     string ki;
-};
+}
 
 exception KnownMostDerived extends KnownIntermediate
 {
     string kmd;
-};
+}
 
 ["preserve-slice"]
 exception KnownPreserved extends Base
 {
     string kp;
-};
+}
 
 exception KnownPreservedDerived extends KnownPreserved
 {
     string kpd;
-};
+}
 
 ["preserve-slice"]
 class BaseClass
 {
     string bc;
-};
+}
 
 ["format:sliced"]
 interface Relay
@@ -58,7 +58,7 @@ interface Relay
 
     void unknownPreservedAsBase() throws Base;
     void unknownPreservedAsKnownPreserved() throws KnownPreserved;
-};
+}
 
 ["format:sliced"] interface TestIntf
 {
@@ -93,42 +93,42 @@ interface Relay
     void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved;
 
     void shutdown();
-};
+}
 
 // Stuff present in the server, not present in the client.
 exception UnknownDerived extends Base
 {
     string ud;
-};
+}
 
 exception UnknownIntermediate extends Base
 {
    string ui;
-};
+}
 
 exception UnknownMostDerived1 extends KnownIntermediate
 {
    string umd1;
-};
+}
 
 exception UnknownMostDerived2 extends UnknownIntermediate
 {
    string umd2;
-};
+}
 
 class SPreservedClass extends BaseClass
 {
     string spc;
-};
+}
 
 exception SPreserved1 extends KnownPreservedDerived
 {
     BaseClass p1;
-};
+}
 
 exception SPreserved2 extends SPreserved1
 {
     BaseClass p2;
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice
index d5f1f748757..a47bdd0e690 100644
--- a/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice
+++ b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice
@@ -16,42 +16,42 @@ module Test
 class SBase
 {
     string sb;
-};
+}
 
 class SBSKnownDerived extends SBase
 {
     string sbskd;
-};
+}
 
 class B
 {
     string sb;
     B pb;
-};
+}
 
 class D1 extends B
 {
     string sd1;
     B pd1;
-};
+}
 
 sequence<B> BSeq;
 
 class SS1
 {
     BSeq s;
-};
+}
 
 class SS2
 {
     BSeq s;
-};
+}
 
 struct SS
 {
     SS1 c1;
     SS2 c2;
-};
+}
 
 dictionary<int, B> BDict;
 
@@ -59,20 +59,20 @@ exception BaseException
 {
     string sbe;
     B pb;
-};
+}
 
 exception DerivedException extends BaseException
 {
     string sde;
     D1 pd1;
-};
+}
 
 class Forward;
 
 class PBase
 {
     int pi;
-};
+}
 
 sequence<PBase> PBaseSeq;
 
@@ -80,54 +80,54 @@ sequence<PBase> PBaseSeq;
 class Preserved extends PBase
 {
     string ps;
-};
+}
 
 class PDerived extends Preserved
 {
     PBase pb;
-};
+}
 
 class CompactPDerived(56) extends Preserved
 {
     PBase pb;
-};
+}
 
 ["preserve-slice"]
 class PNode
 {
     PNode next;
-};
+}
 
 ["preserve-slice"]
 exception PreservedException
 {
-};
+}
 
 ["preserve-slice"]
 class PCUnknown extends PBase
 {
     string pu;
-};
+}
 
 class PCDerived extends PDerived
 {
     PBaseSeq pbs;
-};
+}
 
 class PCDerived2 extends PCDerived
 {
     int pcd2;
-};
+}
 
 class PCDerived3 extends PCDerived2
 {
     Object pcd3;
-};
+}
 
 class CompactPCDerived(57) extends CompactPDerived
 {
     PBaseSeq pbs;
-};
+}
 
 ["format:sliced"] interface TestIntf
 {
@@ -183,17 +183,17 @@ class CompactPCDerived(57) extends CompactPDerived
     void useForward(out Forward f);     // Use of forward-declared class to verify that code is generated correctly.
 
     void shutdown();
-};
+}
 
 class Hidden
 {
     Forward f;
-};
+}
 
 class Forward
 {
     Hidden h;
-};
+}
 
 // Things private to the client.
 
@@ -201,6 +201,6 @@ class D3 extends B
 {
     string sd3;
     B pd3;
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice
index 1684651a0c7..286d46bc70f 100644
--- a/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice
+++ b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice
@@ -16,42 +16,42 @@ module Test
 class SBase
 {
     string sb;
-};
+}
 
 class SBSKnownDerived extends SBase
 {
     string sbskd;
-};
+}
 
 class B
 {
     string sb;
     B pb;
-};
+}
 
 class D1 extends B
 {
     string sd1;
     B pd1;
-};
+}
 
 sequence<B> BSeq;
 
 class SS1
 {
     BSeq s;
-};
+}
 
 class SS2
 {
     BSeq s;
-};
+}
 
 struct SS
 {
     SS1 c1;
     SS2 c2;
-};
+}
 
 dictionary<int, B> BDict;
 
@@ -59,20 +59,20 @@ exception BaseException
 {
     string sbe;
     B pb;
-};
+}
 
 exception DerivedException extends BaseException
 {
     string sde;
     D1 pd1;
-};
+}
 
 class Forward;
 
 class PBase
 {
     int pi;
-};
+}
 
 sequence<PBase> PBaseSeq;
 
@@ -80,50 +80,50 @@ sequence<PBase> PBaseSeq;
 class Preserved extends PBase
 {
     string ps;
-};
+}
 
 class PDerived extends Preserved
 {
     PBase pb;
-};
+}
 
 class CompactPDerived(56) extends Preserved
 {
     PBase pb;
-};
+}
 
 ["preserve-slice"]
 class PNode
 {
     PNode next;
-};
+}
 
 class MyClass
 {
     int i;
-};
+}
 
 class PSUnknown extends Preserved
 {
     string psu;
     PNode graph;
     MyClass cl;
-};
+}
 
 class PSUnknown2 extends Preserved
 {
     PBase pb;
-};
+}
 
 ["preserve-slice"]
 exception PreservedException
 {
-};
+}
 
 exception PSUnknownException extends PreservedException
 {
     PSUnknown2 p;
-};
+}
 
 ["format:sliced"] interface TestIntf
 {
@@ -179,46 +179,46 @@ exception PSUnknownException extends PreservedException
     void useForward(out Forward f);     // Use of forward-declared class to verify that code is generated correctly.
 
     void shutdown();
-};
+}
 
 class Hidden
 {
     Forward f;
-};
+}
 
 class Forward
 {
     Hidden h;
-};
+}
 
 // Things private to the server.
 
 class SBSUnknownDerived extends SBase
 {
     string sbsud;
-};
+}
 
 class SUnknown
 {
     string su;
-};
+}
 
 class D2 extends B
 {
     string sd2;
     B pd2;
-};
+}
 
 class D4 extends B
 {
     B p1;
     B p2;
-};
+}
 
 exception UnknownDerivedException extends BaseException
 {
     string sude;
     D2 pd2;
-};
+}
 
-};
+}
diff --git a/objective-c/test/Ice/stream/StreamTest.ice b/objective-c/test/Ice/stream/StreamTest.ice
index c717be5d79f..20b18e7af7f 100644
--- a/objective-c/test/Ice/stream/StreamTest.ice
+++ b/objective-c/test/Ice/stream/StreamTest.ice
@@ -20,7 +20,7 @@ enum MyEnum
     enum1,
     enum2,
     enum3
-};
+}
 
 class MyClass;
 
@@ -36,12 +36,12 @@ class MyClass;
     string str;
     MyEnum e;
     MyClass* p;
-};
+}
 
 ["cpp:class"] struct ClassStruct
 {
     int i;
-};
+}
 
 class OptionalClass
 {
@@ -49,7 +49,7 @@ class OptionalClass
     byte by;
     optional(1) short sh;
     optional(2) int i;
-};
+}
 
 sequence<MyEnum> MyEnumS;
 sequence<SmallStruct> SmallStructS;
@@ -89,16 +89,16 @@ class MyClass
     MyEnumS seq9;
     MyClassS seq10;
     StringMyClassD d;
-};
+}
 
 interface MyInterface
 {
-};
+}
 
 exception MyException
 {
     MyClass c;
-};
+}
 
 ["objc:prefix:TestStreamSub"]
 module Sub
@@ -108,7 +108,7 @@ module Sub
         nestedEnum1,
         nestedEnum2,
         nestedEnum3
-    };
+    }
 
     ["cpp:comparable"] struct NestedStruct
     {
@@ -121,19 +121,19 @@ module Sub
         double d;
         string str;
         NestedEnum e;
-    };
+    }
 
     ["cpp:class"] struct NestedClassStruct
     {
         int i;
-    };
+    }
 
     exception NestedException
     {
         string str;
-    };
-};
-};
+    }
+}
+}
 
 ["objc:prefix:TestStream2"]
 module Test2
@@ -146,7 +146,7 @@ module Sub2
         nestedEnum4,
         nestedEnum5,
         nestedEnum6
-    };
+    }
 
     ["cpp:comparable"] struct NestedStruct2
     {
@@ -159,17 +159,17 @@ module Sub2
         double d;
         string str;
         NestedEnum2 e;
-    };
+    }
 
     ["cpp:class"] struct NestedClassStruct2
     {
         int i;
-    };
+    }
 
     exception NestedException2
     {
         string str;
-    };
-};
-};
+    }
+}
+}
 
diff --git a/objective-c/test/Ice/timeout/TimeoutTest.ice b/objective-c/test/Ice/timeout/TimeoutTest.ice
index 891a0dd8e34..93beab7d52d 100644
--- a/objective-c/test/Ice/timeout/TimeoutTest.ice
+++ b/objective-c/test/Ice/timeout/TimeoutTest.ice
@@ -24,6 +24,6 @@ interface Timeout
     void holdAdapter(int to);
 
     void shutdown();
-};
+}
 
-};
+}
diff --git a/objective-c/test/Slice/escape/Clash.ice b/objective-c/test/Slice/escape/Clash.ice
index 48bd9ee5114..a9a618382b6 100644
--- a/objective-c/test/Slice/escape/Clash.ice
+++ b/objective-c/test/Slice/escape/Clash.ice
@@ -32,7 +32,7 @@ interface Intf
     void opOut(out string context, out string current, out string response, out string ex,
                out string sent, out string cookie, out string sync, out string result, out string istr,
                out string ostr, out string target, out optional(1) string proxy, out optional(2) string ok);
-};
+}
 
 class Cls
 {
@@ -53,7 +53,7 @@ class Cls
     string proxy;
     optional(2) int stream;
     string target;
-};
+}
 
 struct St
 {
@@ -61,12 +61,12 @@ struct St
     short istr;
     int ostr;
     int rhs;
-};
+}
 
 exception Ex
 {
     short istr;
     int ostr;
-};
+}
 
-};
+}
diff --git a/objective-c/test/Slice/escape/Inherit.ice b/objective-c/test/Slice/escape/Inherit.ice
index 3d63a3c5134..e16777db905 100644
--- a/objective-c/test/Slice/escape/Inherit.ice
+++ b/objective-c/test/Slice/escape/Inherit.ice
@@ -15,7 +15,7 @@ struct Struct1
 {
     int isa;
     int retainCount;
-};
+}
 
 exception Exception1
 {
@@ -26,7 +26,7 @@ exception Exception1
     int callStackReturnAddresses;
     int userInfo;
     int reserved;
-};
+}
 
 class Class1
 {
@@ -48,7 +48,7 @@ class Class1
     int self;
     int superclass;
     int zone;
-};
+}
 
 interface Intf1
 {
@@ -69,7 +69,7 @@ interface Intf1
     void self();
     void superclass();
     void zone();
-};
+}
 
 interface Intf2
 {
@@ -90,6 +90,6 @@ interface Intf2
     void self(int a);
     void superclass(int a);
     void zone(int a);
-};
+}
 
-};
+}
diff --git a/objective-c/test/Slice/escape/Key.ice b/objective-c/test/Slice/escape/Key.ice
index a31a09a8d38..5353ee4082c 100644
--- a/objective-c/test/Slice/escape/Key.ice
+++ b/objective-c/test/Slice/escape/Key.ice
@@ -15,39 +15,39 @@ module and
 enum continue
 {
     asm
-};
+}
 
 struct auto
 {
     int default;
-};
+}
 
 ["cpp:class"] struct delete
 {
     string else;
-};
+}
 
 interface break
 {
     void case(int catch, out int try);
-};
+}
 
 interface char
 {
     void explicit();
-};
+}
 
 interface switch
 {
     void foo(char* export, out int volatile);
     void foo2(char* export, ["objc:param:y"] int YES, out ["objc:param:nil2"] int nil);
     void foo3(char* export, out int nil);
-};
+}
 
 class do implements char, break, switch
 {
     int if;
-};
+}
 
 sequence<auto> extern;
 
@@ -56,13 +56,13 @@ dictionary<string,auto> for;
 exception return
 {
     int signed;
-};
+}
 
 exception sizeof extends return
 {
     int static;
     int switch;
-};
+}
 
 local interface friend
 {
@@ -72,7 +72,7 @@ local interface friend
 
     void objc(int bycopy, int byref, int id, int IMP, int in, int inout, int nil, int NO, int oneway,
               int SEL, int super, int YES);
-};
+}
 
 const int template = 0;
 const int this = 0;
@@ -87,4 +87,4 @@ const int virtual = 0;
 const int while = 0;
 const int xor = 0;
 
-};
+}