summaryrefslogtreecommitdiff
path: root/cpp/test/Slice/errorDetection
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/Slice/errorDetection')
-rw-r--r--cpp/test/Slice/errorDetection/CaseInsensitive.ice4
-rw-r--r--cpp/test/Slice/errorDetection/ChangedMeaning.ice56
-rw-r--r--cpp/test/Slice/errorDetection/ConstDef.ice60
-rw-r--r--cpp/test/Slice/errorDetection/DerivedRedefinition.ice16
-rw-r--r--cpp/test/Slice/errorDetection/IdentAsKeyword.ice14
-rw-r--r--cpp/test/Slice/errorDetection/IllegalDictionary.ice40
-rw-r--r--cpp/test/Slice/errorDetection/IllegalLocal.ice38
-rw-r--r--cpp/test/Slice/errorDetection/IllegalMI.ice44
-rw-r--r--cpp/test/Slice/errorDetection/Reserved.ice2
-rw-r--r--cpp/test/Slice/errorDetection/SelfContainment.ice4
-rw-r--r--cpp/test/Slice/errorDetection/StructMembers.ice26
-rwxr-xr-xcpp/test/Slice/errorDetection/run.py4
12 files changed, 154 insertions, 154 deletions
diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.ice b/cpp/test/Slice/errorDetection/CaseInsensitive.ice
index 74f30d56e36..0760387509f 100644
--- a/cpp/test/Slice/errorDetection/CaseInsensitive.ice
+++ b/cpp/test/Slice/errorDetection/CaseInsensitive.ice
@@ -263,12 +263,12 @@ module CI
{
interface base1
{
- void op();
+ void op();
};
interface base2
{
- void OP();
+ void OP();
};
interface derived extends base1, base2
diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.ice b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
index e853190070e..0286ec8e3f4 100644
--- a/cpp/test/Slice/errorDetection/ChangedMeaning.ice
+++ b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
@@ -16,24 +16,24 @@ sequence<long> ls;
struct s00
{
- ls ls; // Changed meaning
+ ls ls; // Changed meaning
};
struct s0
{
- Test::ls ls; // OK
+ Test::ls ls; // OK
};
struct s1
{
ls mem;
- long ls; // Changed meaning
+ long ls; // Changed meaning
};
struct s2
{
Test::ls mem;
- long ls; // OK
+ long ls; // OK
};
module M
@@ -46,21 +46,21 @@ sequence<long> ls;
interface i1
{
M::ls op();
- void M(); // Changed meaning
+ void M(); // Changed meaning
};
interface i2
{
M::ls op();
- long M(); // Changed meaning
+ long M(); // Changed meaning
};
module N
{
interface n1 extends i1 {};
- interface i1 {}; // Changed meaning
- interface i2 extends i2 {}; // Changed meaning
+ interface i1 {}; // Changed meaning
+ interface i2 extends i2 {}; // Changed meaning
};
@@ -68,8 +68,8 @@ module O
{
interface n1 extends ::Test::i1 {};
- interface i1 {}; // OK
- interface i2 extends ::Test::i2 {}; // OK
+ interface i1 {}; // OK
+ interface i2 extends ::Test::i2 {}; // OK
};
@@ -81,8 +81,8 @@ module E
{
exception ee1 extends e1 {};
- exception e1 {}; // Changed meaning
- exception e2 extends e2 {}; // Changed meaning
+ exception e1 {}; // Changed meaning
+ exception e2 extends e2 {}; // Changed meaning
};
@@ -94,8 +94,8 @@ module C
{
class cc1 implements c1 {};
- class c1 {}; // Changed meaning
- class c2 extends c2 {}; // Changed meaning
+ class c1 {}; // Changed meaning
+ class c2 extends c2 {}; // Changed meaning
};
@@ -106,7 +106,7 @@ module B
const color fc = blue;
- interface blue {}; // Changed meaning
+ interface blue {}; // Changed meaning
};
@@ -123,40 +123,40 @@ interface ParamTest
{
void op(long param);
void op2(counter param);
- void param(counter counter); // Changed meaning
- void op3(long counter, counter x); // Second "counter" is not a type
+ void param(counter counter); // Changed meaning
+ void op3(long counter, counter x); // Second "counter" is not a type
void op4(long param, long param);
};
sequence<int> IS;
struct x
{
- IS is; // Changed meaning (case-insensitive)
+ IS is; // Changed meaning (case-insensitive)
};
struct y
{
- ::Test::IS is; // OK, nothing introduced
+ ::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
+ 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
+ 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
+ void op5() throws E::ee1; // Introduces E
+ void E(); // Changed meaning
};
module M1
@@ -165,7 +165,7 @@ module M1
struct smnpStruct
{
- smnpEnum e;
+ smnpEnum e;
};
exception smnpException
diff --git a/cpp/test/Slice/errorDetection/ConstDef.ice b/cpp/test/Slice/errorDetection/ConstDef.ice
index 1f92f5a92d1..0af93184258 100644
--- a/cpp/test/Slice/errorDetection/ConstDef.ice
+++ b/cpp/test/Slice/errorDetection/ConstDef.ice
@@ -72,57 +72,57 @@ const float nf9 = -1E+1;
const float nf10 = -1E+1f;
const float nf11 = -1E1F;
-const XXX ic1 = 1; // no such type
-const long f11 = 1; // redefinition
-const long F10 = 1; // case-insensitive redefinition
+const XXX ic1 = 1; // no such type
+const long f11 = 1; // redefinition
+const long F10 = 1; // case-insensitive redefinition
sequence<long> LS;
-const LS ic2 = 1; // illegal constant type
-const Object ic3 = 0; // illegal constant type
+const LS ic2 = 1; // illegal constant type
+const Object ic3 = 0; // illegal constant type
-const bool ic4 = 0; // type mismatch
-const byte ic5 = "hello"; // type mismatch
-const short ic6 = 1.1; // type mismatch
-const int ic7 = blue; // type mismatch
-const long ic8 = false; // type mismatch
+const bool ic4 = 0; // type mismatch
+const byte ic5 = "hello"; // type mismatch
+const short ic6 = 1.1; // type mismatch
+const int ic7 = blue; // type mismatch
+const long ic8 = false; // type mismatch
-const long = 0; // missing identifier
+const long = 0; // missing identifier
enum digit { one, two };
-const color ic9 = two; // wrong enumerator type
-const color ic10 = 0; // wrong initializer type
+const color ic9 = two; // wrong enumerator type
+const color ic10 = 0; // wrong initializer type
//
// Range checks
//
-const long r1 = 9223372036854775807; // LLONG_MAX, OK
-const long r2 = -9223372036854775807; // -LLONG_MAX, OK
+const long r1 = 9223372036854775807; // LLONG_MAX, OK
+const long r2 = -9223372036854775807; // -LLONG_MAX, OK
//
// TODO: This should work, but doesn't. STLport can't handle inserting
// LLONG_MIN onto a stream and inserts garbage. We can periodically try
// this again as new versions of STLport come out...
//
-// const long r3 = -9223372036854775808; // LLONG_MIN, OK
+// const long r3 = -9223372036854775808; // LLONG_MIN, OK
//
-const long r4 = -9223372036854775809; // underflow
-const long r5 = +9223372036854775808; // overflow
+const long r4 = -9223372036854775809; // underflow
+const long r5 = +9223372036854775808; // overflow
-const int i1 = -2147483648; // INT_MIN, OK
-const int i2 = +2147483647; // INT_MAX, OK
-const int i3 = -2147483649; // underflow
-const int i4 = +2147483648; // overflow
+const int i1 = -2147483648; // INT_MIN, OK
+const int i2 = +2147483647; // INT_MAX, OK
+const int i3 = -2147483649; // underflow
+const int i4 = +2147483648; // overflow
-const short s1 = -32768; // SHORT_MIN, OK
-const short s2 = +32767; // SHORT_MAX, OK
-const short s3 = -32769; // underflow
-const short s4 = +32768; // overflow
+const short s1 = -32768; // SHORT_MIN, OK
+const short s2 = +32767; // SHORT_MAX, OK
+const short s3 = -32769; // underflow
+const short s4 = +32768; // overflow
-const byte b1 = 0; // OK
-const byte b2 = 255; // OK
-const byte b3 = -1; // underflow
-const byte b4 = 256; // overflow
+const byte b1 = 0; // OK
+const byte b2 = 255; // OK
+const byte b3 = -1; // underflow
+const byte b4 = 256; // overflow
const string nullstring1 = "a\000";
const string nullstring2 = "a\x000";
diff --git a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
index 483d8483fb8..dc99aca5084 100644
--- a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
@@ -20,8 +20,8 @@ interface Base1
interface Derived1 extends Base1
{
- void op(); // error
- long op(); // error
+ void op(); // error
+ long op(); // error
void foo();
};
@@ -32,22 +32,22 @@ interface Base2
interface D1 extends Base1
{
- void foo(); // OK
+ void foo(); // OK
};
interface D2 extends D1
{
- void op(); // error, op() in Base1
+ void op(); // error, op() in Base1
};
interface D3 extends D1, Base2
{
- void bar(); // error, op() in Base1 and 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 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/IdentAsKeyword.ice b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
index 44a5e50e424..6e940706bb4 100644
--- a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
+++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
@@ -83,14 +83,14 @@ interface i8 { void op(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
-interface \_true; // Illegal leading underscore
+interface _a; // Illegal leading underscore
+interface _true; // Illegal leading underscore
+interface \_true; // Illegal leading underscore
-interface b_; // Illegal underscore
-interface tr_ue; // Illegal underscore
-interface \tr_ue; // Illegal underscore
+interface b_; // Illegal underscore
+interface tr_ue; // Illegal underscore
+interface \tr_ue; // Illegal underscore
};
diff --git a/cpp/test/Slice/errorDetection/IllegalDictionary.ice b/cpp/test/Slice/errorDetection/IllegalDictionary.ice
index e7863ef7b62..18b59a7a812 100644
--- a/cpp/test/Slice/errorDetection/IllegalDictionary.ice
+++ b/cpp/test/Slice/errorDetection/IllegalDictionary.ice
@@ -12,48 +12,48 @@
module Test
{
-dictionary<bool, long> d1; // OK
-dictionary<byte, long> d2; // OK
-dictionary<short, long> d3; // OK
-dictionary<int, long> d4; // OK
-dictionary<long, long> d5; // OK
-dictionary<string, long> d6; // OK
-
-dictionary<float, long> b1; // Bad
-dictionary<double, long> b2; // Bad
-dictionary<Object, long> b3; // Bad
-dictionary<Object*, long> b4; // Bad
-dictionary<LocalObject, long> b5; // Bad
+dictionary<bool, long> d1; // OK
+dictionary<byte, long> d2; // OK
+dictionary<short, long> d3; // OK
+dictionary<int, long> d4; // OK
+dictionary<long, long> d5; // OK
+dictionary<string, long> d6; // OK
+
+dictionary<float, long> b1; // Bad
+dictionary<double, long> b2; // Bad
+dictionary<Object, long> b3; // Bad
+dictionary<Object*, long> b4; // Bad
+dictionary<LocalObject, long> b5; // Bad
sequence<byte> s1;
-dictionary<s1, long> d7; // OK
+dictionary<s1, long> d7; // OK
sequence<float> s2;
-dictionary<s2, long> b6; // Bad
+dictionary<s2, long> b6; // Bad
sequence<s1> s3;
-dictionary<s3, long> b7; // OK
+dictionary<s3, long> b7; // OK
struct st1
{
long x;
long y;
};
-dictionary<st1, long> d8; // OK
+dictionary<st1, long> d8; // OK
struct st2
{
long x;
float y;
};
-dictionary<st2, long> b8; // Bad
+dictionary<st2, long> b8; // Bad
enum e { e1, e2 };
-dictionary<e, long> d9; // OK
+dictionary<e, long> d9; // OK
sequence<e> s4;
-dictionary<s4, long> d10; // OK
+dictionary<s4, long> d10; // OK
-dictionary<d9, long> b9; // Bad
+dictionary<d9, long> b9; // Bad
};
diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.ice b/cpp/test/Slice/errorDetection/IllegalLocal.ice
index 44fad05de27..8ab2d9b63a8 100644
--- a/cpp/test/Slice/errorDetection/IllegalLocal.ice
+++ b/cpp/test/Slice/errorDetection/IllegalLocal.ice
@@ -14,51 +14,51 @@ module Test
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 {}; // OK
+class c1 implements i1 {}; // OK
-class c2 implements i2 {}; // error
+class c2 implements i2 {}; // error
local exception le {};
interface i
{
- void op() throws le; // error
+ void op() throws le; // error
};
-exception le2 extends le {}; // error
+exception le2 extends le {}; // error
local sequence<long> lls;
class c3
{
- LocalObject lo1; // error
- i2* lo2; // error
- i2 lo3; // error
- lls ls; // error
+ LocalObject lo1; // error
+ i2* lo2; // error
+ i2 lo3; // error
+ lls ls; // error
};
struct s1
{
- lls ls; // error
+ lls ls; // error
};
exception e3
{
- lls ls; // error
+ lls ls; // error
};
-sequence<LocalObject> los; // error
+sequence<LocalObject> los; // error
local sequence<byte> bs;
-dictionary<bs, long> d1; // error
-dictionary<long, bs> d2; // error
-dictionary<bs, bs> d3; // error
+dictionary<bs, long> d1; // error
+dictionary<long, bs> d2; // error
+dictionary<bs, bs> d3; // error
local interface i4;
struct s2
@@ -84,12 +84,12 @@ exception E
local interface i6
{
- void op() throws E; // error
+ void op() throws E; // error
};
local class c7
{
- void op() throws E; // error
+ void op() throws E; // error
};
};
diff --git a/cpp/test/Slice/errorDetection/IllegalMI.ice b/cpp/test/Slice/errorDetection/IllegalMI.ice
index 4dc2d4bd731..395a4b0b7c5 100644
--- a/cpp/test/Slice/errorDetection/IllegalMI.ice
+++ b/cpp/test/Slice/errorDetection/IllegalMI.ice
@@ -59,7 +59,7 @@ module M2
void op();
};
- interface A3 extends A2, B2 // Error
+ interface A3 extends A2, B2 // Error
{
void ia3();
};
@@ -200,7 +200,7 @@ module M7
void ic1();
};
- interface A2 extends A1, B1, C1 // Error
+ interface A2 extends A1, B1, C1 // Error
{
void ia2();
};
@@ -228,7 +228,7 @@ module M8
void op();
};
- interface A2 extends A1, B1, C1 // Error
+ interface A2 extends A1, B1, C1 // Error
{
void ia2();
};
@@ -256,7 +256,7 @@ module M9
void op();
};
- interface A2 extends A1, B1, C1 // Error
+ interface A2 extends A1, B1, C1 // Error
{
void ia2();
};
@@ -286,7 +286,7 @@ module M10
void op();
};
- interface A2 extends A1, B1, C1 // Error
+ interface A2 extends A1, B1, C1 // Error
{
void ia2();
};
@@ -350,7 +350,7 @@ module M12
void id1();
};
- interface A2 extends A1, B1, C1, D1 // Error
+ interface A2 extends A1, B1, C1, D1 // Error
{
void ia2();
};
@@ -384,7 +384,7 @@ module M13
void id1();
};
- interface A2 extends A1, B1, C1, D1 // Error
+ interface A2 extends A1, B1, C1, D1 // Error
{
void ia2();
};
@@ -417,7 +417,7 @@ module M14
void op();
};
- interface A2 extends A1, B1, C1, D1 // Error
+ interface A2 extends A1, B1, C1, D1 // Error
{
void ia2();
};
@@ -451,7 +451,7 @@ module M15
void id1();
};
- interface A2 extends A1, B1, C1, D1 // Error
+ interface A2 extends A1, B1, C1, D1 // Error
{
void ia2();
};
@@ -485,7 +485,7 @@ module M16
void op();
};
- interface A2 extends A1, B1, C1, D1 // Error
+ interface A2 extends A1, B1, C1, D1 // Error
{
void ia2();
};
@@ -519,7 +519,7 @@ module M17
void op();
};
- interface A2 extends A1, B1, C1, D1 // Error
+ interface A2 extends A1, B1, C1, D1 // Error
{
void ia2();
};
@@ -554,7 +554,7 @@ module M18
void id1();
};
- interface A2 extends A1, B1, C1, D1 // Error
+ interface A2 extends A1, B1, C1, D1 // Error
{
void ia2();
};
@@ -624,7 +624,7 @@ module M20
void op();
};
- interface A2 extends A1, B1, C1, D1 // Error
+ interface A2 extends A1, B1, C1, D1 // Error
{
void ia2();
};
@@ -659,7 +659,7 @@ module M21
void op();
};
- interface A2 extends A1, B1, C1, D1 // Error
+ interface A2 extends A1, B1, C1, D1 // Error
{
void ia2();
};
@@ -695,7 +695,7 @@ module M22
void op();
};
- interface A2 extends A1, B1, C1, D1 // Error
+ interface A2 extends A1, B1, C1, D1 // Error
{
void ia2();
};
@@ -737,7 +737,7 @@ module M23
void id1();
};
- interface A2 extends A1, B1, C1, D1 // OK
+ interface A2 extends A1, B1, C1, D1 // OK
{
void ia2();
};
@@ -899,7 +899,7 @@ module M26
void ib3();
};
- interface A4 extends A3, B3 // OK
+ interface A4 extends A3, B3 // OK
{
void ia4();
};
@@ -973,7 +973,7 @@ module M27
void ib3();
};
- interface A4 extends A3, B3 // Error
+ interface A4 extends A3, B3 // Error
{
void ia4();
};
@@ -1047,7 +1047,7 @@ module M28
void ib3();
};
- interface A4 extends A3, B3 // Error
+ interface A4 extends A3, B3 // Error
{
void ia4();
};
@@ -1121,7 +1121,7 @@ module M29
void ib3();
};
- interface A4 extends A3, B3 // Error
+ interface A4 extends A3, B3 // Error
{
void ia4();
};
@@ -1193,7 +1193,7 @@ module M30
void ib3();
};
- interface A4 extends A3, B3 // Error
+ interface A4 extends A3, B3 // Error
{
void ia4();
};
@@ -1265,7 +1265,7 @@ module M31
void ib3();
};
- interface A4 extends A3, B3 // Error
+ interface A4 extends A3, B3 // Error
{
void ia4();
};
diff --git a/cpp/test/Slice/errorDetection/Reserved.ice b/cpp/test/Slice/errorDetection/Reserved.ice
index c14a5a449a7..b1519bbcbe8 100644
--- a/cpp/test/Slice/errorDetection/Reserved.ice
+++ b/cpp/test/Slice/errorDetection/Reserved.ice
@@ -12,7 +12,7 @@
-#include <include/IcePrefix.ice> // No error should be caused by this file
+#include <include/IcePrefix.ice> // No error should be caused by this file
module OK
{
diff --git a/cpp/test/Slice/errorDetection/SelfContainment.ice b/cpp/test/Slice/errorDetection/SelfContainment.ice
index 9e7ddde676d..0b256b7fce0 100644
--- a/cpp/test/Slice/errorDetection/SelfContainment.ice
+++ b/cpp/test/Slice/errorDetection/SelfContainment.ice
@@ -15,13 +15,13 @@ module Test
struct x
{
int i;
- x j; // Error
+ x j; // Error
};
class y
{
int i;
- y j; // OK
+ y j; // OK
};
};
diff --git a/cpp/test/Slice/errorDetection/StructMembers.ice b/cpp/test/Slice/errorDetection/StructMembers.ice
index 86429390781..89c5a2799ca 100644
--- a/cpp/test/Slice/errorDetection/StructMembers.ice
+++ b/cpp/test/Slice/errorDetection/StructMembers.ice
@@ -12,41 +12,41 @@
module Test
{
-struct s1 // Illegal empty struct
+struct s1 // Illegal empty struct
{
};
struct s2
{
- long l; // One member, OK
+ long l; // One member, OK
};
struct s4
{
- [ "Hi" ] long l; // One member with metadata, OK
+ [ "Hi" ] long l; // One member with metadata, OK
};
-struct s5 // Two members, OK
+struct s5 // Two members, OK
{
long l;
byte b;
};
struct s6
-{ // Two members with metadata, OK
- [ "Hi" ] long l;
- byte b;
+{ // Two members with metadata, OK
+ [ "Hi" ] long l;
+ byte b;
};
-struct s7 // Two members with metadata, OK
+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
@@ -56,12 +56,12 @@ struct s9
struct s10
{
- long ; // Missing data member name
+ long ; // Missing data member name
};
struct s11
{
- long // Missing data member name
+ long // Missing data member name
};
};
diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py
index 70e7550f1d6..52b20f94051 100755
--- a/cpp/test/Slice/errorDetection/run.py
+++ b/cpp/test/Slice/errorDetection/run.py
@@ -39,9 +39,9 @@ for file in files:
print file + "...",
if file == "CaseSensitive.ice":
- command = slice2cpp + " --case-sensitive -I. " + os.path.join(directory, file);
+ command = slice2cpp + " --case-sensitive -I. " + os.path.join(directory, file);
else:
- command = slice2cpp + " -I. " + os.path.join(directory, file);
+ command = slice2cpp + " -I. " + os.path.join(directory, file);
stdin, stdout, stderr = os.popen3(command)
lines1 = stdout.readlines()
lines2 = open(os.path.join(directory, regex1.sub(".err", file)), "r").readlines()
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 16:53:21 +0000