Skip to content

Commit

Permalink
Remove Useless Language-Specific Metadata (#2019)
Browse files Browse the repository at this point in the history
  • Loading branch information
@InsertCreativityHere
InsertCreativityHere authored Apr 3, 2024
1 parent 1aac6ec commit 60c41ea
Show file tree
Hide file tree
Showing 21 changed files with 77 additions and 109 deletions.
14 changes: 7 additions & 7 deletions cpp/test/Slice/errorDetection/StructMembers.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ struct s2

struct s4
{
[ "Hi" ] long l; // One member with metadata, OK
["Hi"] long l; // One member with metadata, OK
}

struct s5 // Two members, OK
Expand All @@ -27,24 +27,24 @@ struct s5 // Two members, OK

struct s6
{ // Two members with metadata, OK
[ "Hi" ] long l;
byte b;
["Hi"] long l;
byte b;
}

struct s7 // Two members with metadata, OK
{
[ "Hi" ] long l;
[ "there" ] byte b;
["Hi"] long l;
["there"] byte b;
}

struct s8
{
[ "hi" ] long ; // Missing data member name
["hi"] long ; // Missing data member name
}

struct s9
{
[ "there" ] long // Missing data member name
["there"] long // Missing data member name
}

struct s10
Expand Down
1 change: 0 additions & 1 deletion csharp/test/Glacier2/sessionHelper/Callback.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#pragma once

[["java:package:test.Glacier2.sessionHelper"]]
module Test
{

Expand Down
1 change: 0 additions & 1 deletion csharp/test/Ice/metrics/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#pragma once

[["java:package:test.Ice.metrics"]]
module Test
{

Expand Down
1 change: 0 additions & 1 deletion csharp/test/IceBox/admin/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

#include "Ice/PropertyDict.ice"

[["java:package:test.IceBox.admin"]]
module Test
{

Expand Down
1 change: 0 additions & 1 deletion csharp/test/IceDiscovery/simple/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#pragma once

[["java:package:test.IceDiscovery.simple"]]
module Test
{

Expand Down
2 changes: 1 addition & 1 deletion js/test/Ice/operations/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ sequence<long> LongS;
sequence<float> FloatS;
sequence<double> DoubleS;
sequence<string> StringS;
sequence<["cpp:type:wstring"]string> WStringS;
sequence<string> WStringS;
sequence<MyEnum> MyEnumS;
sequence<MyClass*> MyClassS;

Expand Down
1 change: 0 additions & 1 deletion js/test/Ice/servantLocator/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#pragma once

[["java:package:test.Ice.servantLocator"]]
module Test
{

Expand Down
2 changes: 1 addition & 1 deletion js/test/typescript/Ice/operations/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ sequence<long> LongS;
sequence<float> FloatS;
sequence<double> DoubleS;
sequence<string> StringS;
sequence<["cpp:type:wstring"]string> WStringS;
sequence<string> WStringS;
sequence<MyEnum> MyEnumS;
sequence<MyClass*> MyClassS;

Expand Down
1 change: 0 additions & 1 deletion matlab/test/Ice/exceptions/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ exception E
string data;
}

["cpp:ice_print"]
exception F
{
string data;
Expand Down
17 changes: 8 additions & 9 deletions matlab/test/Ice/optional/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,34 +253,33 @@ interface Initial
optional(1) SmallStructSeq opSmallStructSeq(optional(2) SmallStructSeq p1,
out optional(3) SmallStructSeq p3);

["java:optional"] optional(1) SmallStructList opSmallStructList(optional(2) SmallStructList p1,
optional(1) SmallStructList opSmallStructList(optional(2) SmallStructList p1,
out optional(3) SmallStructList p3);

["java:optional"] optional(1) FixedStructSeq opFixedStructSeq(optional(2) FixedStructSeq p1,
optional(1) FixedStructSeq opFixedStructSeq(optional(2) FixedStructSeq p1,
out optional(3) FixedStructSeq p3);

["java:optional"] optional(1) FixedStructList opFixedStructList(optional(2) FixedStructList p1,
optional(1) FixedStructList opFixedStructList(optional(2) FixedStructList p1,
out optional(3) FixedStructList p3);

["java:optional"] optional(1) VarStructSeq opVarStructSeq(optional(2) VarStructSeq p1,
optional(1) VarStructSeq opVarStructSeq(optional(2) VarStructSeq p1,
out optional(3) VarStructSeq p3);

["java:optional"] optional(1) Serializable opSerializable(optional(2) Serializable p1,
optional(1) Serializable opSerializable(optional(2) Serializable p1,
out optional(3) Serializable p3);

["java:optional"] optional(1) IntIntDict opIntIntDict(optional(2) IntIntDict p1, out optional(3) IntIntDict p3);
optional(1) IntIntDict opIntIntDict(optional(2) IntIntDict p1, out optional(3) IntIntDict p3);

["java:optional"] optional(1) StringIntDict opStringIntDict(optional(2) StringIntDict p1,
optional(1) StringIntDict opStringIntDict(optional(2) StringIntDict p1,
out optional(3) StringIntDict p3);

["java:optional"] optional(1) IntOneOptionalDict opIntOneOptionalDict(optional(2) IntOneOptionalDict p1,
optional(1) IntOneOptionalDict opIntOneOptionalDict(optional(2) IntOneOptionalDict p1,
out optional(3) IntOneOptionalDict p3);

void opClassAndUnknownOptional(A p);

void sendOptionalClass(bool req, optional(1) OneOptional o);

["java:optional"]
void returnOptionalClass(bool req, out optional(1) OneOptional o);

G opG(G g);
Expand Down
2 changes: 0 additions & 2 deletions php/test/Slice/structure/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Copyright (c) ZeroC, Inc. All rights reserved.
//

[["cpp:include:list"]]

module Test
{

Expand Down
2 changes: 1 addition & 1 deletion python/test/Ice/location/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ interface TestLocator extends ::Ice::Locator
//
// Returns the number of request on the locator interface.
//
["cpp:const"] idempotent int getRequestCount();
idempotent int getRequestCount();
}

interface ServerManager
Expand Down
2 changes: 0 additions & 2 deletions python/test/Slice/structure/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Copyright (c) ZeroC, Inc. All rights reserved.
//

[["cpp:include:list"]]

module Test
{

Expand Down
2 changes: 0 additions & 2 deletions ruby/test/Slice/structure/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Copyright (c) ZeroC, Inc. All rights reserved.
//

[["cpp:include:list"]]

module Test
{

Expand Down
1 change: 0 additions & 1 deletion swift/test/Ice/exceptions/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ exception E
string data;
}

["cpp:ice_print"]
exception F
{
string data;
Expand Down
1 change: 0 additions & 1 deletion swift/test/Ice/exceptions/TestAMD.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ exception E
string data;
}

["cpp:ice_print"]
exception F
{
string data;
Expand Down
22 changes: 11 additions & 11 deletions swift/test/Ice/inheritance/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class C extends B
int cC;
}

["cpp:virtual"] class D extends C
class D extends C
{
int dD;
}
Expand All @@ -81,22 +81,22 @@ class C extends B
module MD
{

["cpp:virtual"] class A
class A
{
int aA;
}

["cpp:virtual"] class B extends A
class B extends A
{
int bB;
}

["cpp:virtual"] class C extends B
class C extends B
{
int cC;
}

["cpp:virtual"] class D extends C
class D extends C
{
int dD;
}
Expand All @@ -116,12 +116,12 @@ class B extends A
int bB;
}

["cpp:virtual"] class C extends B
class C extends B
{
int cC;
}

["cpp:virtual"] class D extends C
class D extends C
{
int dD;
}
Expand All @@ -136,7 +136,7 @@ class A
int aA;
}

["cpp:virtual"] class B extends A
class B extends A
{
int bB;
}
Expand All @@ -146,7 +146,7 @@ class C extends B
int cC;
}

["cpp:virtual"] class D extends C
class D extends C
{
int dD;
}
Expand All @@ -161,12 +161,12 @@ class A
int aA;
}

["cpp:virtual"] class B extends A
class B extends A
{
int bB;
}

["cpp:virtual"] class C extends B
class C extends B
{
int cC;
}
Expand Down
2 changes: 1 addition & 1 deletion swift/test/Ice/location/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ interface TestLocator extends ::Ice::Locator
//
// Returns the number of request on the locator interface.
//
["cpp:const"] idempotent int getRequestCount();
idempotent int getRequestCount();
}

interface ServerManager
Expand Down
66 changes: 33 additions & 33 deletions swift/test/Ice/operations/Test.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ sequence<long> LongS;
sequence<float> FloatS;
sequence<double> DoubleS;
sequence<string> StringS;
sequence<["cpp:type:wstring"]string> WStringS;
sequence<string> WStringS;
sequence<MyEnum> MyEnumS;
sequence<MyClass*> MyClassS;

Expand Down Expand Up @@ -357,29 +357,29 @@ const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194
// Wide string literals
//

const ["cpp:type:wstring"]string ws0 = "\u005c"; // backslash
const ["cpp:type:wstring"]string ws1 = "\u0041"; // A
const ["cpp:type:wstring"]string ws2 = "\u0049\u0063\u0065"; // Ice
const ["cpp:type:wstring"]string ws3 = "\u004121"; // A21
const ["cpp:type:wstring"]string ws4 = "\\u0041 \\U00000041"; // \\u0041 \\U00000041
const ["cpp:type:wstring"]string ws5 = "\u00FF"; // ÿ
const ["cpp:type:wstring"]string ws6 = "\u03FF"; // GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL (U+03FF)
const ["cpp:type:wstring"]string ws7 = "\u05F0"; // HEBREW LIGATURE YIDDISH DOUBLE VAV (U+05F0)
const ["cpp:type:wstring"]string ws8 = "\U00010000"; // LINEAR B SYLLABLE B008 A (U+10000)
const ["cpp:type:wstring"]string ws9 = "\U0001F34C"; // BANANA (U+1F34C)
const ["cpp:type:wstring"]string ws10 = "\u0DA7"; // Sinhala Letter Alpapraana Ttayanna

const ["cpp:type:wstring"]string wsw0 = "\U0000005c"; // backslash
const ["cpp:type:wstring"]string wsw1 = "\U00000041"; // A
const ["cpp:type:wstring"]string wsw2 = "\U00000049\U00000063\U00000065"; // Ice
const ["cpp:type:wstring"]string wsw3 = "\U0000004121"; // A21
const ["cpp:type:wstring"]string wsw4 = "\\u0041 \\U00000041"; // \\u0041 \\U00000041
const ["cpp:type:wstring"]string wsw5 = "\U000000FF"; // ÿ
const ["cpp:type:wstring"]string wsw6 = "\U000003FF"; // GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL (U+03FF)
const ["cpp:type:wstring"]string wsw7 = "\U000005F0"; // HEBREW LIGATURE YIDDISH DOUBLE VAV (U+05F0)
const ["cpp:type:wstring"]string wsw8 = "\U00010000"; // LINEAR B SYLLABLE B008 A (U+10000)
const ["cpp:type:wstring"]string wsw9 = "\U0001F34C"; // BANANA (U+1F34C)
const ["cpp:type:wstring"]string wsw10 = "\U00000DA7"; // Sinhala Letter Alpapraana Ttayanna
const string ws0 = "\u005c"; // backslash
const string ws1 = "\u0041"; // A
const string ws2 = "\u0049\u0063\u0065"; // Ice
const string ws3 = "\u004121"; // A21
const string ws4 = "\\u0041 \\U00000041"; // \\u0041 \\U00000041
const string ws5 = "\u00FF"; // ÿ
const string ws6 = "\u03FF"; // GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL (U+03FF)
const string ws7 = "\u05F0"; // HEBREW LIGATURE YIDDISH DOUBLE VAV (U+05F0)
const string ws8 = "\U00010000"; // LINEAR B SYLLABLE B008 A (U+10000)
const string ws9 = "\U0001F34C"; // BANANA (U+1F34C)
const string ws10 = "\u0DA7"; // Sinhala Letter Alpapraana Ttayanna

const string wsw0 = "\U0000005c"; // backslash
const string wsw1 = "\U00000041"; // A
const string wsw2 = "\U00000049\U00000063\U00000065"; // Ice
const string wsw3 = "\U0000004121"; // A21
const string wsw4 = "\\u0041 \\U00000041"; // \\u0041 \\U00000041
const string wsw5 = "\U000000FF"; // ÿ
const string wsw6 = "\U000003FF"; // GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL (U+03FF)
const string wsw7 = "\U000005F0"; // HEBREW LIGATURE YIDDISH DOUBLE VAV (U+05F0)
const string wsw8 = "\U00010000"; // LINEAR B SYLLABLE B008 A (U+10000)
const string wsw9 = "\U0001F34C"; // BANANA (U+1F34C)
const string wsw10 = "\U00000DA7"; // Sinhala Letter Alpapraana Ttayanna

/**
\' single quote byte 0x27 in ASCII encoding
Expand All @@ -394,13 +394,13 @@ const ["cpp:type:wstring"]string wsw10 = "\U00000DA7"; // Si
\t horizontal tab byte 0x09 in ASCII encoding
\v vertical tab byte 0x0b in ASCII encoding
**/
const ["cpp:type:wstring"]string wss0 = "\'\"\?\\\a\b\f\n\r\t\v\6";
const ["cpp:type:wstring"]string wss1 = "\u0027\u0022\u003f\u005c\u0007\u0008\u000c\u000a\u000d\u0009\u000b\u0006";
const ["cpp:type:wstring"]string wss2 = "\U00000027\U00000022\U0000003f\U0000005c\U00000007\U00000008\U0000000c\U0000000a\U0000000d\U00000009\U0000000b\U00000006";
const string wss0 = "\'\"\?\\\a\b\f\n\r\t\v\6";
const string wss1 = "\u0027\u0022\u003f\u005c\u0007\u0008\u000c\u000a\u000d\u0009\u000b\u0006";
const string wss2 = "\U00000027\U00000022\U0000003f\U0000005c\U00000007\U00000008\U0000000c\U0000000a\U0000000d\U00000009\U0000000b\U00000006";

const ["cpp:type:wstring"]string wss3 = "\\\\U\\u\\"; /* \\U\u\ */
const ["cpp:type:wstring"]string wss4 = "\\\u0041\\"; /* \A\ */
const ["cpp:type:wstring"]string wss5 = "\\u0041\\"; /* \u0041\ */
const string wss3 = "\\\\U\\u\\"; /* \\U\u\ */
const string wss4 = "\\\u0041\\"; /* \A\ */
const string wss5 = "\\u0041\\"; /* \u0041\ */

//
// Ĩ - Unicode Character 'LATIN CAPITAL LETTER I WITH TILDE' (U+0128)
Expand All @@ -416,9 +416,9 @@ const ["cpp:type:wstring"]string wss5 = "\\u0041\\"; /* \u0041\ */
// 🍂 - Unicode Character 'FALLEN LEAF' (U+1F342)
// 🍃 - Unicode Character 'LEAF FLUTTERING IN WIND' (U+1F343)
//
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";
const string wsu0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃";
const string wsu1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
const string wsu2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";

}

Expand Down
2 changes: 1 addition & 1 deletion swift/test/Ice/operations/TestAMD.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ class MyClass1
string myClass1; // Same name as the enclosing class
}

["amd", "cs:tie"] interface MyDerivedClass extends MyClass
["amd"] interface MyDerivedClass extends MyClass
{
void opDerived();
MyClass1 opMyClass1(MyClass1 opMyClass1);
Expand Down
Loading

0 comments on commit 60c41ea

Please sign in to comment.