diff options
Diffstat (limited to 'cpp')
109 files changed, 627 insertions, 884 deletions
diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.err b/cpp/test/Slice/errorDetection/CaseInsensitive.err index 3c14e641bfc..2d36eb57bf5 100644 --- a/cpp/test/Slice/errorDetection/CaseInsensitive.err +++ b/cpp/test/Slice/errorDetection/CaseInsensitive.err @@ -1,65 +1,65 @@ -CaseInsensitive.ice:18: redefinition of operation `op' as operation `op' -CaseInsensitive.ice:24: operation `oP' differs only in capitalization from operation `op' -CaseInsensitive.ice:24: redefinition of operation `op' as operation `oP' -CaseInsensitive.ice:30: redefinition of data member `l' as operation `l' -CaseInsensitive.ice:36: operation `L' differs only in capitalization from data member `l' -CaseInsensitive.ice:36: redefinition of data member `l' as operation `L' -CaseInsensitive.ice:43: module `M1' is capitalized inconsistently with its previous name: `m1' -CaseInsensitive.ice:45: redefinition of class `c1' as module -CaseInsensitive.ice:47: module `C1' differs only in capitalization from class name `c1' -CaseInsensitive.ice:52: redefinition of parameter `aa' -CaseInsensitive.ice:53: parameter `BB' differs only in capitalization from parameter `bb' -CaseInsensitive.ice:53: `BB' has changed meaning -CaseInsensitive.ice:58: operation `I4' differs only in capitalization from enclosing interface name `i4' -CaseInsensitive.ice:63: interface name `i5' cannot be used as operation name -CaseInsensitive.ice:73: operation `op' is already defined as an operation in a base interface or class -CaseInsensitive.ice:78: operation `OP' differs only in capitalization from operation `op', which is defined in a base interface or class -CaseInsensitive.ice:88: operation `l' is already defined as a data member in a base interface or class -CaseInsensitive.ice:93: operation `L' differs only in capitalization from data member `l', which is defined in a base interface or class -CaseInsensitive.ice:93: warning: classes with operations are deprecated -CaseInsensitive.ice:99: operation `L' differs only in capitalization from data member `l' -CaseInsensitive.ice:99: redefinition of data member `l' as operation `L' -CaseInsensitive.ice:104: data member `l' is already defined as a data member in a base interface or class -CaseInsensitive.ice:109: data member `L' differs only in capitalization from data member `l', which is defined in a base interface or class -CaseInsensitive.ice:114: warning: classes with operations are deprecated -CaseInsensitive.ice:115: data member `l' differs only in capitalization from operation `L' -CaseInsensitive.ice:121: redefinition of exception member `l' -CaseInsensitive.ice:127: exception member `L' differs only in capitalization from exception member `l' -CaseInsensitive.ice:127: `L' has changed meaning -CaseInsensitive.ice:147: exception member `l' is already defined in a base exception -CaseInsensitive.ice:152: exception member `L' differs only in capitalization from exception member `l', which is defined in a base exception -CaseInsensitive.ice:158: redefinition of struct member `l' -CaseInsensitive.ice:164: member `L' differs only in capitalization from member `l' -CaseInsensitive.ice:164: `L' has changed meaning -CaseInsensitive.ice:180: sequence `LS' differs only in capitalization from sequence `ls' -CaseInsensitive.ice:181: redefinition of module `m1' as sequence -CaseInsensitive.ice:182: sequence `M1' differs only in capitalization from module `m1' -CaseInsensitive.ice:185: dictionary `D' differs only in capitalization from dictionary `d' -CaseInsensitive.ice:186: redefinition of module `m1' as dictionary -CaseInsensitive.ice:187: dictionary `M1' differs only in capitalization from module `m1' -CaseInsensitive.ice:190: enumeration `eN1' differs only in capitalization from enumeration `en1' -CaseInsensitive.ice:191: redefinition of module `m1' as enumeration -CaseInsensitive.ice:192: enumeration `M1' differs only in capitalization from module `m1' -CaseInsensitive.ice:193: enumerator `EN1' differs only in capitalization from `en1' -CaseInsensitive.ice:211: interface name `base' is capitalized inconsistently with its previous name: `::Test::xxx::xx::Base' -CaseInsensitive.ice:211: redefinition of interface `Derived' -CaseInsensitive.ice:218: exception name `E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' -CaseInsensitive.ice:225: sequence name `S1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1' -CaseInsensitive.ice:226: sequence name `xxx::xx::S1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1' -CaseInsensitive.ice:227: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1' -CaseInsensitive.ice:228: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1' -CaseInsensitive.ice:234: interface name `derived' is capitalized inconsistently with its previous name: `::Test::xxx::xx::Derived' -CaseInsensitive.ice:243: parameter `Param' differs only in capitalization from parameter `param' -CaseInsensitive.ice:243: `Param' has changed meaning -CaseInsensitive.ice:245: exception name `E1' is capitalized inconsistently with its previous name: `::Test::e1' -CaseInsensitive.ice:247: exception name `Test::xxx::xx::E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' -CaseInsensitive.ice:248: exception name `Test::xxx::XX::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' -CaseInsensitive.ice:249: exception name `Test::XXX::xx::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' -CaseInsensitive.ice:251: exception name `Test::xxx::xx::E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' -CaseInsensitive.ice:252: exception name `Test::xxx::XX::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' -CaseInsensitive.ice:253: exception name `Test::XXX::xx::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' -CaseInsensitive.ice:271: ambiguous multiple inheritance: `derived' inherits operations `op' and `OP', which differ only in capitalization, from unrelated base interfaces -CaseInsensitive.ice:286: warning: classes with operations are deprecated -CaseInsensitive.ice:288: parameter `BASE1' differs only in capitalization from parameter `base1' -CaseInsensitive.ice:288: `BASE1' has changed meaning -CaseInsensitive.ice:318: data member `x' differs only in capitalization from data member `X', which is defined in a base interface or class +CaseInsensitive.ice:13: redefinition of operation `op' as operation `op' +CaseInsensitive.ice:19: operation `oP' differs only in capitalization from operation `op' +CaseInsensitive.ice:19: redefinition of operation `op' as operation `oP' +CaseInsensitive.ice:25: redefinition of data member `l' as operation `l' +CaseInsensitive.ice:31: operation `L' differs only in capitalization from data member `l' +CaseInsensitive.ice:31: redefinition of data member `l' as operation `L' +CaseInsensitive.ice:38: module `M1' is capitalized inconsistently with its previous name: `m1' +CaseInsensitive.ice:40: redefinition of class `c1' as module +CaseInsensitive.ice:42: module `C1' differs only in capitalization from class name `c1' +CaseInsensitive.ice:47: redefinition of parameter `aa' +CaseInsensitive.ice:48: parameter `BB' differs only in capitalization from parameter `bb' +CaseInsensitive.ice:48: `BB' has changed meaning +CaseInsensitive.ice:53: operation `I4' differs only in capitalization from enclosing interface name `i4' +CaseInsensitive.ice:58: interface name `i5' cannot be used as operation name +CaseInsensitive.ice:68: operation `op' is already defined as an operation in a base interface or class +CaseInsensitive.ice:73: operation `OP' differs only in capitalization from operation `op', which is defined in a base interface or class +CaseInsensitive.ice:83: operation `l' is already defined as a data member in a base interface or class +CaseInsensitive.ice:88: operation `L' differs only in capitalization from data member `l', which is defined in a base interface or class +CaseInsensitive.ice:88: warning: classes with operations are deprecated +CaseInsensitive.ice:94: operation `L' differs only in capitalization from data member `l' +CaseInsensitive.ice:94: redefinition of data member `l' as operation `L' +CaseInsensitive.ice:99: data member `l' is already defined as a data member in a base interface or class +CaseInsensitive.ice:104: data member `L' differs only in capitalization from data member `l', which is defined in a base interface or class +CaseInsensitive.ice:109: warning: classes with operations are deprecated +CaseInsensitive.ice:110: data member `l' differs only in capitalization from operation `L' +CaseInsensitive.ice:116: redefinition of exception member `l' +CaseInsensitive.ice:122: exception member `L' differs only in capitalization from exception member `l' +CaseInsensitive.ice:122: `L' has changed meaning +CaseInsensitive.ice:142: exception member `l' is already defined in a base exception +CaseInsensitive.ice:147: exception member `L' differs only in capitalization from exception member `l', which is defined in a base exception +CaseInsensitive.ice:153: redefinition of struct member `l' +CaseInsensitive.ice:159: member `L' differs only in capitalization from member `l' +CaseInsensitive.ice:159: `L' has changed meaning +CaseInsensitive.ice:175: sequence `LS' differs only in capitalization from sequence `ls' +CaseInsensitive.ice:176: redefinition of module `m1' as sequence +CaseInsensitive.ice:177: sequence `M1' differs only in capitalization from module `m1' +CaseInsensitive.ice:180: dictionary `D' differs only in capitalization from dictionary `d' +CaseInsensitive.ice:181: redefinition of module `m1' as dictionary +CaseInsensitive.ice:182: dictionary `M1' differs only in capitalization from module `m1' +CaseInsensitive.ice:185: enumeration `eN1' differs only in capitalization from enumeration `en1' +CaseInsensitive.ice:186: redefinition of module `m1' as enumeration +CaseInsensitive.ice:187: enumeration `M1' differs only in capitalization from module `m1' +CaseInsensitive.ice:188: enumerator `EN1' differs only in capitalization from `en1' +CaseInsensitive.ice:206: interface name `base' is capitalized inconsistently with its previous name: `::Test::xxx::xx::Base' +CaseInsensitive.ice:206: redefinition of interface `Derived' +CaseInsensitive.ice:213: exception name `E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' +CaseInsensitive.ice:220: sequence name `S1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1' +CaseInsensitive.ice:221: sequence name `xxx::xx::S1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1' +CaseInsensitive.ice:222: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1' +CaseInsensitive.ice:223: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1' +CaseInsensitive.ice:229: interface name `derived' is capitalized inconsistently with its previous name: `::Test::xxx::xx::Derived' +CaseInsensitive.ice:238: parameter `Param' differs only in capitalization from parameter `param' +CaseInsensitive.ice:238: `Param' has changed meaning +CaseInsensitive.ice:240: exception name `E1' is capitalized inconsistently with its previous name: `::Test::e1' +CaseInsensitive.ice:242: exception name `Test::xxx::xx::E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' +CaseInsensitive.ice:243: exception name `Test::xxx::XX::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' +CaseInsensitive.ice:244: exception name `Test::XXX::xx::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' +CaseInsensitive.ice:246: exception name `Test::xxx::xx::E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' +CaseInsensitive.ice:247: exception name `Test::xxx::XX::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' +CaseInsensitive.ice:248: exception name `Test::XXX::xx::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' +CaseInsensitive.ice:266: ambiguous multiple inheritance: `derived' inherits operations `op' and `OP', which differ only in capitalization, from unrelated base interfaces +CaseInsensitive.ice:281: warning: classes with operations are deprecated +CaseInsensitive.ice:283: parameter `BASE1' differs only in capitalization from parameter `base1' +CaseInsensitive.ice:283: `BASE1' has changed meaning +CaseInsensitive.ice:313: data member `x' differs only in capitalization from data member `X', which is defined in a base interface or class diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.ice b/cpp/test/Slice/errorDetection/CaseInsensitive.ice index 94714fb8917..0cb832cefed 100644 --- a/cpp/test/Slice/errorDetection/CaseInsensitive.ice +++ b/cpp/test/Slice/errorDetection/CaseInsensitive.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.err b/cpp/test/Slice/errorDetection/ChangedMeaning.err index 5dc3b6e6d7d..955514c7362 100644 --- a/cpp/test/Slice/errorDetection/ChangedMeaning.err +++ b/cpp/test/Slice/errorDetection/ChangedMeaning.err @@ -1,23 +1,23 @@ -ChangedMeaning.ice:50: `M' has changed meaning -ChangedMeaning.ice:56: `M' has changed meaning -ChangedMeaning.ice:63: `i1' has changed meaning -ChangedMeaning.ice:64: `i2' has changed meaning -ChangedMeaning.ice:85: `e1' has changed meaning -ChangedMeaning.ice:86: `e2' has changed meaning -ChangedMeaning.ice:98: `c1' has changed meaning -ChangedMeaning.ice:99: `c2' has changed meaning -ChangedMeaning.ice:120: `CounterSeq' has changed meaning -ChangedMeaning.ice:129: redefinition of parameter `param' -ChangedMeaning.ice:147: `E' is not an exception -ChangedMeaning.ice:147: `E' has changed meaning -ChangedMeaning.ice:154: `E' has changed meaning -ChangedMeaning.ice:160: `E' has changed meaning -ChangedMeaning.ice:195: data member `X' differs only in capitalization from data member `x' -ChangedMeaning.ice:195: `X' has changed meaning -ChangedMeaning.ice:201: member `X' differs only in capitalization from member `x' -ChangedMeaning.ice:201: `X' has changed meaning -ChangedMeaning.ice:206: parameter `A' differs only in capitalization from parameter `a' -ChangedMeaning.ice:206: `A' has changed meaning -ChangedMeaning.ice:214: redefinition of operation `x' as data member `x' -ChangedMeaning.ice:226: exception member `X' differs only in capitalization from exception member `x' -ChangedMeaning.ice:226: `X' has changed meaning +ChangedMeaning.ice:47: `M' has changed meaning +ChangedMeaning.ice:53: `M' has changed meaning +ChangedMeaning.ice:60: `i1' has changed meaning +ChangedMeaning.ice:61: `i2' has changed meaning +ChangedMeaning.ice:81: `e1' has changed meaning +ChangedMeaning.ice:82: `e2' has changed meaning +ChangedMeaning.ice:92: `c1' has changed meaning +ChangedMeaning.ice:93: `c2' has changed meaning +ChangedMeaning.ice:110: `CounterSeq' has changed meaning +ChangedMeaning.ice:119: redefinition of parameter `param' +ChangedMeaning.ice:137: `E' is not an exception +ChangedMeaning.ice:137: `E' has changed meaning +ChangedMeaning.ice:144: `E' has changed meaning +ChangedMeaning.ice:150: `E' has changed meaning +ChangedMeaning.ice:185: data member `X' differs only in capitalization from data member `x' +ChangedMeaning.ice:185: `X' has changed meaning +ChangedMeaning.ice:191: member `X' differs only in capitalization from member `x' +ChangedMeaning.ice:191: `X' has changed meaning +ChangedMeaning.ice:196: parameter `A' differs only in capitalization from parameter `a' +ChangedMeaning.ice:196: `A' has changed meaning +ChangedMeaning.ice:204: redefinition of operation `x' as data member `x' +ChangedMeaning.ice:216: exception member `X' differs only in capitalization from exception member `x' +ChangedMeaning.ice:216: `X' has changed meaning diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.ice b/cpp/test/Slice/errorDetection/ChangedMeaning.ice index 526a96f6432..f2419a3671a 100644 --- a/cpp/test/Slice/errorDetection/ChangedMeaning.ice +++ b/cpp/test/Slice/errorDetection/ChangedMeaning.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - [["suppress-warning:deprecated"]] // for classes with operations module Test @@ -80,11 +77,9 @@ exception e2 {} module E { - exception ee1 extends e1 {} exception e1 {} // Changed meaning exception e2 extends e2 {} // Changed meaning - } interface c1 {} @@ -93,22 +88,17 @@ class c2 {} module C { - class cc1 implements c1 {} class c1 {} // Changed meaning class c2 extends c2 {} // Changed meaning - } enum color { blue } module B { - const color fc = blue; - interface blue {} // OK as of Ice 3.7 (enumerators are in their enum's namespace) - } enum counter { one, two } diff --git a/cpp/test/Slice/errorDetection/ClassRedefinition.err b/cpp/test/Slice/errorDetection/ClassRedefinition.err index d50418a4237..f59d9e7a53b 100644 --- a/cpp/test/Slice/errorDetection/ClassRedefinition.err +++ b/cpp/test/Slice/errorDetection/ClassRedefinition.err @@ -1,2 +1,2 @@ -ClassRedefinition.ice:17: redefinition of class `Class1' -ClassRedefinition.ice:21: redefinition of class `Class2' +ClassRedefinition.ice:12: redefinition of class `Class1' +ClassRedefinition.ice:16: redefinition of class `Class2' diff --git a/cpp/test/Slice/errorDetection/ClassRedefinition.ice b/cpp/test/Slice/errorDetection/ClassRedefinition.ice index 31f6a308c49..8207ac66784 100644 --- a/cpp/test/Slice/errorDetection/ClassRedefinition.ice +++ b/cpp/test/Slice/errorDetection/ClassRedefinition.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/ConstDef.err b/cpp/test/Slice/errorDetection/ConstDef.err index 5183f111763..983fc886dd2 100644 --- a/cpp/test/Slice/errorDetection/ConstDef.err +++ b/cpp/test/Slice/errorDetection/ConstDef.err @@ -1,31 +1,31 @@ -ConstDef.ice:75: `XXX' is not defined -ConstDef.ice:76: redefinition of constant `f11' as constant -ConstDef.ice:77: constant `F10' differs only in capitalization from constant `f10' -ConstDef.ice:80: constant `ic2' has illegal type -ConstDef.ice:81: constant `ic3' has illegal type: `Object' -ConstDef.ice:83: initializer of type `long' is incompatible with the type `bool' of constant `ic4' -ConstDef.ice:84: initializer of type `string' is incompatible with the type `byte' of constant `ic5' -ConstDef.ice:85: initializer of type `double' is incompatible with the type `short' of constant `ic6' -ConstDef.ice:86: type of initializer is incompatible with the type `int' of constant `ic7' -ConstDef.ice:87: initializer of type `bool' is incompatible with the type `long' of constant `ic8' -ConstDef.ice:89: missing constant name -ConstDef.ice:92: `two' does not designate an enumerator of `::Test::color' -ConstDef.ice:93: type of initializer is incompatible with the type of constant `ic10' -ConstDef.ice:109: integer constant `-9223372036854775809' out of range -ConstDef.ice:110: integer constant `+9223372036854775808' out of range -ConstDef.ice:114: initializer `-2147483649' for constant `i3' out of range for type int -ConstDef.ice:115: initializer `2147483648' for constant `i4' out of range for type int -ConstDef.ice:119: initializer `-32769' for constant `s3' out of range for type short -ConstDef.ice:120: initializer `32768' for constant `s4' out of range for type short -ConstDef.ice:124: initializer `-1' for constant `b3' out of range for type byte -ConstDef.ice:125: initializer `256' for constant `b4' out of range for type byte -ConstDef.ice:137: initializer `32767' for constant `c5' out of range for type byte -ConstDef.ice:138: initializer `2147483647' for constant `c6' out of range for type short -ConstDef.ice:139: initializer `9223372036854775807' for constant `c7' out of range for type int -ConstDef.ice:150: warning: unknown escape sequence `\g' -ConstDef.ice:151: unknown escape sequence in string literal: `\u000N' -ConstDef.ice:152: unknown escape sequence in string literal: `\U0000000K' -ConstDef.ice:153: octal escape sequence out of range: `\455' -ConstDef.ice:154: no hex digit in hex escape sequence -ConstDef.ice:155: a universal character name cannot designate a surrogate: `\uD83C' -ConstDef.ice:155: a universal character name cannot designate a surrogate: `\uDF4C' +ConstDef.ice:70: `XXX' is not defined +ConstDef.ice:71: redefinition of constant `f11' as constant +ConstDef.ice:72: constant `F10' differs only in capitalization from constant `f10' +ConstDef.ice:75: constant `ic2' has illegal type +ConstDef.ice:76: constant `ic3' has illegal type: `Object' +ConstDef.ice:78: initializer of type `long' is incompatible with the type `bool' of constant `ic4' +ConstDef.ice:79: initializer of type `string' is incompatible with the type `byte' of constant `ic5' +ConstDef.ice:80: initializer of type `double' is incompatible with the type `short' of constant `ic6' +ConstDef.ice:81: type of initializer is incompatible with the type `int' of constant `ic7' +ConstDef.ice:82: initializer of type `bool' is incompatible with the type `long' of constant `ic8' +ConstDef.ice:84: missing constant name +ConstDef.ice:87: `two' does not designate an enumerator of `::Test::color' +ConstDef.ice:88: type of initializer is incompatible with the type of constant `ic10' +ConstDef.ice:104: integer constant `-9223372036854775809' out of range +ConstDef.ice:105: integer constant `+9223372036854775808' out of range +ConstDef.ice:109: initializer `-2147483649' for constant `i3' out of range for type int +ConstDef.ice:110: initializer `2147483648' for constant `i4' out of range for type int +ConstDef.ice:114: initializer `-32769' for constant `s3' out of range for type short +ConstDef.ice:115: initializer `32768' for constant `s4' out of range for type short +ConstDef.ice:119: initializer `-1' for constant `b3' out of range for type byte +ConstDef.ice:120: initializer `256' for constant `b4' out of range for type byte +ConstDef.ice:132: initializer `32767' for constant `c5' out of range for type byte +ConstDef.ice:133: initializer `2147483647' for constant `c6' out of range for type short +ConstDef.ice:134: initializer `9223372036854775807' for constant `c7' out of range for type int +ConstDef.ice:145: warning: unknown escape sequence `\g' +ConstDef.ice:146: unknown escape sequence in string literal: `\u000N' +ConstDef.ice:147: unknown escape sequence in string literal: `\U0000000K' +ConstDef.ice:148: octal escape sequence out of range: `\455' +ConstDef.ice:149: no hex digit in hex escape sequence +ConstDef.ice:150: a universal character name cannot designate a surrogate: `\uD83C' +ConstDef.ice:150: a universal character name cannot designate a surrogate: `\uDF4C' diff --git a/cpp/test/Slice/errorDetection/ConstDef.ice b/cpp/test/Slice/errorDetection/ConstDef.ice index a4de9ed9794..f5c18fd6255 100644 --- a/cpp/test/Slice/errorDetection/ConstDef.ice +++ b/cpp/test/Slice/errorDetection/ConstDef.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/DataMemberRedefinition.err b/cpp/test/Slice/errorDetection/DataMemberRedefinition.err index f423e83227b..49a1d289190 100644 --- a/cpp/test/Slice/errorDetection/DataMemberRedefinition.err +++ b/cpp/test/Slice/errorDetection/DataMemberRedefinition.err @@ -1,5 +1,5 @@ -DataMemberRedefinition.ice:18: redefinition of data member `member' as data member `member' -DataMemberRedefinition.ice:28: data member `x' is already defined as an operation in a base interface or class -DataMemberRedefinition.ice:38: operation `x' is already defined as a data member in a base interface or class -DataMemberRedefinition.ice:48: data member `x' is already defined as a data member in a base interface or class -DataMemberRedefinition.ice:54: redefinition of struct member `member' +DataMemberRedefinition.ice:15: redefinition of data member `member' as data member `member' +DataMemberRedefinition.ice:25: data member `x' is already defined as an operation in a base interface or class +DataMemberRedefinition.ice:35: operation `x' is already defined as a data member in a base interface or class +DataMemberRedefinition.ice:45: data member `x' is already defined as a data member in a base interface or class +DataMemberRedefinition.ice:51: redefinition of struct member `member' diff --git a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice index c47b550dfde..c959e11913e 100644 --- a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - [["suppress-warning:deprecated"]] // for classes with operations module Test @@ -54,5 +51,4 @@ struct S int member; } - } diff --git a/cpp/test/Slice/errorDetection/DeclaratorMissing.err b/cpp/test/Slice/errorDetection/DeclaratorMissing.err index 070ea115152..efeda527258 100644 --- a/cpp/test/Slice/errorDetection/DeclaratorMissing.err +++ b/cpp/test/Slice/errorDetection/DeclaratorMissing.err @@ -1,4 +1,4 @@ -DeclaratorMissing.ice:17: missing parameter name -DeclaratorMissing.ice:17: missing parameter name -DeclaratorMissing.ice:18: missing parameter name -DeclaratorMissing.ice:18: missing parameter name +DeclaratorMissing.ice:12: missing parameter name +DeclaratorMissing.ice:12: missing parameter name +DeclaratorMissing.ice:13: missing parameter name +DeclaratorMissing.ice:13: missing parameter name diff --git a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice index 0bd2899a906..1bfc07fd997 100644 --- a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice +++ b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/DerivedRedefinition.err b/cpp/test/Slice/errorDetection/DerivedRedefinition.err index 730249d15f4..9f2d9e45af5 100644 --- a/cpp/test/Slice/errorDetection/DerivedRedefinition.err +++ b/cpp/test/Slice/errorDetection/DerivedRedefinition.err @@ -1,6 +1,6 @@ -DerivedRedefinition.ice:23: operation `op' is already defined as an operation in a base interface or class -DerivedRedefinition.ice:24: operation `op' is already defined as an operation in a base interface or class -DerivedRedefinition.ice:40: operation `op' is already defined as an operation in a base interface or class -DerivedRedefinition.ice:44: ambiguous multiple inheritance: `D3' inherits operation `op' from two or more unrelated base interfaces -DerivedRedefinition.ice:49: data member `l' is already defined as a data member in a base interface or class -DerivedRedefinition.ice:51: data member `l' is already defined as a data member in a base interface or class +DerivedRedefinition.ice:18: operation `op' is already defined as an operation in a base interface or class +DerivedRedefinition.ice:19: operation `op' is already defined as an operation in a base interface or class +DerivedRedefinition.ice:35: operation `op' is already defined as an operation in a base interface or class +DerivedRedefinition.ice:39: ambiguous multiple inheritance: `D3' inherits operation `op' from two or more unrelated base interfaces +DerivedRedefinition.ice:44: data member `l' is already defined as a data member in a base interface or class +DerivedRedefinition.ice:46: data member `l' is already defined as a data member in a base interface or class diff --git a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice index 1da41145181..e80e7e8b02e 100644 --- a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.err b/cpp/test/Slice/errorDetection/DictionaryRedefinition.err index a09dbc4846b..306d78820d0 100644 --- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.err +++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.err @@ -1 +1 @@ -DictionaryRedefinition.ice:18: redefinition of dictionary `foo' as dictionary +DictionaryRedefinition.ice:13: redefinition of dictionary `foo' as dictionary diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice index 664ec932a11..2c060578e5f 100644 --- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.err b/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.err index 69bec07fa6c..9d67e0d6239 100644 --- a/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.err +++ b/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.err @@ -1,8 +1,8 @@ -DummyAtGlobalLevel.ice:11: `Foo': an interface can be defined only at module scope -DummyAtGlobalLevel.ice:12: `UndefinedException' is not defined -DummyAtGlobalLevel.ice:13: keyword `class' cannot be used as exception name -DummyAtGlobalLevel.ice:16: `IntSeq': a sequence can be defined only at module scope -DummyAtGlobalLevel.ice:19: `S': a structure can be defined only at module scope -DummyAtGlobalLevel.ice:23: `StringDict': a dictionary can be defined only at module scope -DummyAtGlobalLevel.ice:25: `E': an enumeration can be defined only at module scope -DummyAtGlobalLevel.ice:27: `x': a constant can be defined only at module scope +DummyAtGlobalLevel.ice:8: `Foo': an interface can be defined only at module scope +DummyAtGlobalLevel.ice:9: `UndefinedException' is not defined +DummyAtGlobalLevel.ice:10: keyword `class' cannot be used as exception name +DummyAtGlobalLevel.ice:13: `IntSeq': a sequence can be defined only at module scope +DummyAtGlobalLevel.ice:16: `S': a structure can be defined only at module scope +DummyAtGlobalLevel.ice:20: `StringDict': a dictionary can be defined only at module scope +DummyAtGlobalLevel.ice:22: `E': an enumeration can be defined only at module scope +DummyAtGlobalLevel.ice:24: `x': a constant can be defined only at module scope diff --git a/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice b/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice index ab021316f3f..899bfbc46c7 100644 --- a/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice +++ b/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - interface Foo { void op() throws UndefinedException; diff --git a/cpp/test/Slice/errorDetection/DuplicateParameter.err b/cpp/test/Slice/errorDetection/DuplicateParameter.err index 2266a397688..337dd88f218 100644 --- a/cpp/test/Slice/errorDetection/DuplicateParameter.err +++ b/cpp/test/Slice/errorDetection/DuplicateParameter.err @@ -1,8 +1,8 @@ -DuplicateParameter.ice:18: redefinition of parameter `s' -DuplicateParameter.ice:19: redefinition of parameter `s' -DuplicateParameter.ice:20: redefinition of parameter `s' -DuplicateParameter.ice:21: redefinition of parameter `i' -DuplicateParameter.ice:27: redefinition of parameter `s' -DuplicateParameter.ice:28: redefinition of parameter `s' -DuplicateParameter.ice:29: redefinition of parameter `s' -DuplicateParameter.ice:30: redefinition of parameter `i' +DuplicateParameter.ice:15: redefinition of parameter `s' +DuplicateParameter.ice:16: redefinition of parameter `s' +DuplicateParameter.ice:17: redefinition of parameter `s' +DuplicateParameter.ice:18: redefinition of parameter `i' +DuplicateParameter.ice:24: redefinition of parameter `s' +DuplicateParameter.ice:25: redefinition of parameter `s' +DuplicateParameter.ice:26: redefinition of parameter `s' +DuplicateParameter.ice:27: redefinition of parameter `i' diff --git a/cpp/test/Slice/errorDetection/DuplicateParameter.ice b/cpp/test/Slice/errorDetection/DuplicateParameter.ice index 4c2000d0a66..a227d2389e7 100644 --- a/cpp/test/Slice/errorDetection/DuplicateParameter.ice +++ b/cpp/test/Slice/errorDetection/DuplicateParameter.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - [["suppress-warning:deprecated"]] // for classes with operations module Test diff --git a/cpp/test/Slice/errorDetection/DuplicateThrows.err b/cpp/test/Slice/errorDetection/DuplicateThrows.err index 4fd4aac496d..f899f1caca6 100644 --- a/cpp/test/Slice/errorDetection/DuplicateThrows.err +++ b/cpp/test/Slice/errorDetection/DuplicateThrows.err @@ -1,4 +1,4 @@ -DuplicateThrows.ice:17: operation `op' has a throws clause with a duplicate exception: `e' -DuplicateThrows.ice:18: operation `op' has a throws clause with a duplicate exception: `e' -DuplicateThrows.ice:19: operation `op' has a throws clause with a duplicate exception: `e2' -DuplicateThrows.ice:20: operation `op' has a throws clause with duplicate exceptions: `e', `e2' +DuplicateThrows.ice:12: operation `op' has a throws clause with a duplicate exception: `e' +DuplicateThrows.ice:13: operation `op' has a throws clause with a duplicate exception: `e' +DuplicateThrows.ice:14: operation `op' has a throws clause with a duplicate exception: `e2' +DuplicateThrows.ice:15: operation `op' has a throws clause with duplicate exceptions: `e', `e2' diff --git a/cpp/test/Slice/errorDetection/DuplicateThrows.ice b/cpp/test/Slice/errorDetection/DuplicateThrows.ice index da64648533d..27099deb977 100644 --- a/cpp/test/Slice/errorDetection/DuplicateThrows.ice +++ b/cpp/test/Slice/errorDetection/DuplicateThrows.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/EnumEmpty.err b/cpp/test/Slice/errorDetection/EnumEmpty.err index 47010df6239..67d86d160d8 100644 --- a/cpp/test/Slice/errorDetection/EnumEmpty.err +++ b/cpp/test/Slice/errorDetection/EnumEmpty.err @@ -1 +1 @@ -EnumEmpty.ice:15: enum `foo' must have at least one enumerator +EnumEmpty.ice:10: enum `foo' must have at least one enumerator diff --git a/cpp/test/Slice/errorDetection/EnumEmpty.ice b/cpp/test/Slice/errorDetection/EnumEmpty.ice index def5b88089f..ce7a101234b 100644 --- a/cpp/test/Slice/errorDetection/EnumEmpty.ice +++ b/cpp/test/Slice/errorDetection/EnumEmpty.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/EnumRedefinition.err b/cpp/test/Slice/errorDetection/EnumRedefinition.err index fac12aa205c..9bf0fd0f10c 100644 --- a/cpp/test/Slice/errorDetection/EnumRedefinition.err +++ b/cpp/test/Slice/errorDetection/EnumRedefinition.err @@ -1 +1 @@ -EnumRedefinition.ice:16: redefinition of enumeration `E1' as enumeration +EnumRedefinition.ice:11: redefinition of enumeration `E1' as enumeration diff --git a/cpp/test/Slice/errorDetection/EnumRedefinition.ice b/cpp/test/Slice/errorDetection/EnumRedefinition.ice index 9241c48691d..90a60ab0e1e 100644 --- a/cpp/test/Slice/errorDetection/EnumRedefinition.ice +++ b/cpp/test/Slice/errorDetection/EnumRedefinition.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/EnumeratorDuplication.err b/cpp/test/Slice/errorDetection/EnumeratorDuplication.err index 58132400946..0f8d870d0bc 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorDuplication.err +++ b/cpp/test/Slice/errorDetection/EnumeratorDuplication.err @@ -1,2 +1,2 @@ -EnumeratorDuplication.ice:16: enumerator `B' has the same value as enumerator `A' -EnumeratorDuplication.ice:18: enumerator `D' has the same value as enumerator `C' +EnumeratorDuplication.ice:13: enumerator `B' has the same value as enumerator `A' +EnumeratorDuplication.ice:15: enumerator `D' has the same value as enumerator `C' diff --git a/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice b/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice index 84bb55d9e62..2d9254ca7f6 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice +++ b/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - module Test { diff --git a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err index ed5674cb9c4..f0365798301 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err +++ b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err @@ -1 +1 @@ -EnumeratorRedefinition.ice:17: redefinition of enumerator `A' +EnumeratorRedefinition.ice:12: redefinition of enumerator `A' diff --git a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice index cddf28c8643..d1f025b3e3d 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice +++ b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/EnumeratorValues.err b/cpp/test/Slice/errorDetection/EnumeratorValues.err index b8db9454436..2725c7b103d 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorValues.err +++ b/cpp/test/Slice/errorDetection/EnumeratorValues.err @@ -1,5 +1,5 @@ -EnumeratorValues.ice:17: value for enumerator `C' is out of range -EnumeratorValues.ice:17: enumerator `C' has the same value as enumerator `B' -EnumeratorValues.ice:18: value for enumerator `D' is out of range -EnumeratorValues.ice:19: value for enumerator `E' is out of range -EnumeratorValues.ice:20: value for enumerator `F' is out of range +EnumeratorValues.ice:14: value for enumerator `C' is out of range +EnumeratorValues.ice:14: enumerator `C' has the same value as enumerator `B' +EnumeratorValues.ice:15: value for enumerator `D' is out of range +EnumeratorValues.ice:16: value for enumerator `E' is out of range +EnumeratorValues.ice:17: value for enumerator `F' is out of range diff --git a/cpp/test/Slice/errorDetection/EnumeratorValues.ice b/cpp/test/Slice/errorDetection/EnumeratorValues.ice index de8201fb0d2..7e5e91abe98 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorValues.ice +++ b/cpp/test/Slice/errorDetection/EnumeratorValues.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - module Test { diff --git a/cpp/test/Slice/errorDetection/ExceptionRedefinition.err b/cpp/test/Slice/errorDetection/ExceptionRedefinition.err index e2ffcf497c5..1538e99f47e 100644 --- a/cpp/test/Slice/errorDetection/ExceptionRedefinition.err +++ b/cpp/test/Slice/errorDetection/ExceptionRedefinition.err @@ -1,2 +1,2 @@ -ExceptionRedefinition.ice:14: redefinition of exception `Base' as exception -ExceptionRedefinition.ice:16: redefinition of exception `Derived' as exception +ExceptionRedefinition.ice:11: redefinition of exception `Base' as exception +ExceptionRedefinition.ice:13: redefinition of exception `Derived' as exception diff --git a/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice b/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice index a21929a269b..c4a5ca1c8eb 100644 --- a/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice +++ b/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - module Test { diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.err b/cpp/test/Slice/errorDetection/IdentAsKeyword.err index d3bbb497a7b..4a674ab159c 100644 --- a/cpp/test/Slice/errorDetection/IdentAsKeyword.err +++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.err @@ -1,85 +1,85 @@ -IdentAsKeyword.ice:15: syntax error -IdentAsKeyword.ice:17: `Void': an exception can be defined only at module scope -IdentAsKeyword.ice:18: keyword `int' cannot be used as exception name -IdentAsKeyword.ice:18: `int': an exception can be defined only at module scope -IdentAsKeyword.ice:20: `OUT': a structure can be defined only at module scope -IdentAsKeyword.ice:21: keyword `double' cannot be used as struct name -IdentAsKeyword.ice:21: `double': a structure can be defined only at module scope -IdentAsKeyword.ice:23: `s1': a structure can be defined only at module scope -IdentAsKeyword.ice:24: `s2': a structure can be defined only at module scope -IdentAsKeyword.ice:24: keyword `byte' cannot be used as data member name -IdentAsKeyword.ice:25: `s3': a structure can be defined only at module scope -IdentAsKeyword.ice:26: `s4': a structure can be defined only at module scope -IdentAsKeyword.ice:26: keyword `byte' cannot be used as data member name -IdentAsKeyword.ice:28: `inTERface': a class can be defined only at module scope -IdentAsKeyword.ice:29: keyword `interface' cannot be used as class name -IdentAsKeyword.ice:29: `interface': a class can be defined only at module scope -IdentAsKeyword.ice:31: `MOdule': a class can be defined only at module scope -IdentAsKeyword.ice:32: keyword `module' cannot be used as class name -IdentAsKeyword.ice:32: `module': a class can be defined only at module scope -IdentAsKeyword.ice:34: `C': a class can be defined only at module scope -IdentAsKeyword.ice:35: `C': a class can be defined only at module scope -IdentAsKeyword.ice:35: keyword `extends' cannot be used as data member name -IdentAsKeyword.ice:36: `D': a class can be defined only at module scope -IdentAsKeyword.ice:36: keyword `extends' cannot be used as data member name -IdentAsKeyword.ice:38: keyword `local' cannot be used as interface name -IdentAsKeyword.ice:38: `local': an interface can be defined only at module scope -IdentAsKeyword.ice:39: `Local': an interface can be defined only at module scope -IdentAsKeyword.ice:41: keyword `Object' cannot be used as interface name -IdentAsKeyword.ice:41: `Object': an interface can be defined only at module scope -IdentAsKeyword.ice:42: `object': an interface can be defined only at module scope -IdentAsKeyword.ice:43: keyword `long' cannot be used as interface name -IdentAsKeyword.ice:43: `long': an interface can be defined only at module scope -IdentAsKeyword.ice:45: `impLEments': a sequence can be defined only at module scope -IdentAsKeyword.ice:46: sequence `implements' differs only in capitalization from sequence `impLEments' -IdentAsKeyword.ice:46: keyword `implements' cannot be used as sequence name -IdentAsKeyword.ice:47: `short': a sequence can be defined only at module scope -IdentAsKeyword.ice:47: keyword `short' cannot be used as sequence name -IdentAsKeyword.ice:49: syntax error -IdentAsKeyword.ice:50: `moDule' is not defined -IdentAsKeyword.ice:52: `throws': a dictionary can be defined only at module scope -IdentAsKeyword.ice:52: keyword `throws' cannot be used as dictionary name -IdentAsKeyword.ice:53: dictionary `thRows' differs only in capitalization from dictionary `throws' -IdentAsKeyword.ice:54: `LOCALobject': a dictionary can be defined only at module scope -IdentAsKeyword.ice:56: syntax error -IdentAsKeyword.ice:57: `MODULE' is not defined -IdentAsKeyword.ice:59: syntax error -IdentAsKeyword.ice:60: `d4': a dictionary can be defined only at module scope -IdentAsKeyword.ice:62: syntax error -IdentAsKeyword.ice:63: `VOID' is an exception, which cannot be used as a type -IdentAsKeyword.ice:65: keyword `local' cannot be used as enumeration name -IdentAsKeyword.ice:65: `local': an enumeration can be defined only at module scope -IdentAsKeyword.ice:66: enumeration `LOCAL' differs only in capitalization from enumeration `local' -IdentAsKeyword.ice:68: `e1': an enumeration can be defined only at module scope -IdentAsKeyword.ice:68: keyword `long' cannot be used as enumerator -IdentAsKeyword.ice:68: keyword `byte' cannot be used as enumerator -IdentAsKeyword.ice:69: `e2': an enumeration can be defined only at module scope -IdentAsKeyword.ice:71: `i1': an interface can be defined only at module scope -IdentAsKeyword.ice:72: `i2': an interface can be defined only at module scope -IdentAsKeyword.ice:74: `i3': an interface can be defined only at module scope -IdentAsKeyword.ice:75: `i4': an interface can be defined only at module scope -IdentAsKeyword.ice:77: `i5': an interface can be defined only at module scope -IdentAsKeyword.ice:77: syntax error -IdentAsKeyword.ice:78: `i6': an interface can be defined only at module scope -IdentAsKeyword.ice:80: `i7': an interface can be defined only at module scope -IdentAsKeyword.ice:81: `i8': an interface can be defined only at module scope -IdentAsKeyword.ice:83: `i9': an interface can be defined only at module scope -IdentAsKeyword.ice:84: `i10': an interface can be defined only at module scope -IdentAsKeyword.ice:86: `true': an interface can be defined only at module scope -IdentAsKeyword.ice:88: illegal leading underscore in identifier `_a' -IdentAsKeyword.ice:88: `_a': an interface can be defined only at module scope -IdentAsKeyword.ice:89: illegal leading underscore in identifier `_true' -IdentAsKeyword.ice:89: `_true': an interface can be defined only at module scope -IdentAsKeyword.ice:90: illegal leading underscore in identifier `_true' -IdentAsKeyword.ice:90: `_true': an interface can be defined only at module scope -IdentAsKeyword.ice:92: illegal trailing underscore in identifier `b_' -IdentAsKeyword.ice:92: `b_': an interface can be defined only at module scope -IdentAsKeyword.ice:94: illegal double underscore in identifier `b__c' -IdentAsKeyword.ice:94: `b__c': an interface can be defined only at module scope -IdentAsKeyword.ice:95: illegal double underscore in identifier `b___c' -IdentAsKeyword.ice:95: `b___c': an interface can be defined only at module scope -IdentAsKeyword.ice:97: illegal underscore in identifier `a_b' -IdentAsKeyword.ice:97: `a_b': an interface can be defined only at module scope -IdentAsKeyword.ice:98: illegal underscore in identifier `a_b_c' -IdentAsKeyword.ice:98: `a_b_c': an interface can be defined only at module scope -IdentAsKeyword.ice:100: syntax error +IdentAsKeyword.ice:10: syntax error +IdentAsKeyword.ice:12: `Void': an exception can be defined only at module scope +IdentAsKeyword.ice:13: keyword `int' cannot be used as exception name +IdentAsKeyword.ice:13: `int': an exception can be defined only at module scope +IdentAsKeyword.ice:15: `OUT': a structure can be defined only at module scope +IdentAsKeyword.ice:16: keyword `double' cannot be used as struct name +IdentAsKeyword.ice:16: `double': a structure can be defined only at module scope +IdentAsKeyword.ice:18: `s1': a structure can be defined only at module scope +IdentAsKeyword.ice:19: `s2': a structure can be defined only at module scope +IdentAsKeyword.ice:19: keyword `byte' cannot be used as data member name +IdentAsKeyword.ice:20: `s3': a structure can be defined only at module scope +IdentAsKeyword.ice:21: `s4': a structure can be defined only at module scope +IdentAsKeyword.ice:21: keyword `byte' cannot be used as data member name +IdentAsKeyword.ice:23: `inTERface': a class can be defined only at module scope +IdentAsKeyword.ice:24: keyword `interface' cannot be used as class name +IdentAsKeyword.ice:24: `interface': a class can be defined only at module scope +IdentAsKeyword.ice:26: `MOdule': a class can be defined only at module scope +IdentAsKeyword.ice:27: keyword `module' cannot be used as class name +IdentAsKeyword.ice:27: `module': a class can be defined only at module scope +IdentAsKeyword.ice:29: `C': a class can be defined only at module scope +IdentAsKeyword.ice:30: `C': a class can be defined only at module scope +IdentAsKeyword.ice:30: keyword `extends' cannot be used as data member name +IdentAsKeyword.ice:31: `D': a class can be defined only at module scope +IdentAsKeyword.ice:31: keyword `extends' cannot be used as data member name +IdentAsKeyword.ice:33: keyword `local' cannot be used as interface name +IdentAsKeyword.ice:33: `local': an interface can be defined only at module scope +IdentAsKeyword.ice:34: `Local': an interface can be defined only at module scope +IdentAsKeyword.ice:36: keyword `Object' cannot be used as interface name +IdentAsKeyword.ice:36: `Object': an interface can be defined only at module scope +IdentAsKeyword.ice:37: `object': an interface can be defined only at module scope +IdentAsKeyword.ice:38: keyword `long' cannot be used as interface name +IdentAsKeyword.ice:38: `long': an interface can be defined only at module scope +IdentAsKeyword.ice:40: `impLEments': a sequence can be defined only at module scope +IdentAsKeyword.ice:41: sequence `implements' differs only in capitalization from sequence `impLEments' +IdentAsKeyword.ice:41: keyword `implements' cannot be used as sequence name +IdentAsKeyword.ice:42: `short': a sequence can be defined only at module scope +IdentAsKeyword.ice:42: keyword `short' cannot be used as sequence name +IdentAsKeyword.ice:44: syntax error +IdentAsKeyword.ice:45: `moDule' is not defined +IdentAsKeyword.ice:47: `throws': a dictionary can be defined only at module scope +IdentAsKeyword.ice:47: keyword `throws' cannot be used as dictionary name +IdentAsKeyword.ice:48: dictionary `thRows' differs only in capitalization from dictionary `throws' +IdentAsKeyword.ice:49: `LOCALobject': a dictionary can be defined only at module scope +IdentAsKeyword.ice:51: syntax error +IdentAsKeyword.ice:52: `MODULE' is not defined +IdentAsKeyword.ice:54: syntax error +IdentAsKeyword.ice:55: `d4': a dictionary can be defined only at module scope +IdentAsKeyword.ice:57: syntax error +IdentAsKeyword.ice:58: `VOID' is an exception, which cannot be used as a type +IdentAsKeyword.ice:60: keyword `local' cannot be used as enumeration name +IdentAsKeyword.ice:60: `local': an enumeration can be defined only at module scope +IdentAsKeyword.ice:61: enumeration `LOCAL' differs only in capitalization from enumeration `local' +IdentAsKeyword.ice:63: `e1': an enumeration can be defined only at module scope +IdentAsKeyword.ice:63: keyword `long' cannot be used as enumerator +IdentAsKeyword.ice:63: keyword `byte' cannot be used as enumerator +IdentAsKeyword.ice:64: `e2': an enumeration can be defined only at module scope +IdentAsKeyword.ice:66: `i1': an interface can be defined only at module scope +IdentAsKeyword.ice:67: `i2': an interface can be defined only at module scope +IdentAsKeyword.ice:69: `i3': an interface can be defined only at module scope +IdentAsKeyword.ice:70: `i4': an interface can be defined only at module scope +IdentAsKeyword.ice:72: `i5': an interface can be defined only at module scope +IdentAsKeyword.ice:72: syntax error +IdentAsKeyword.ice:73: `i6': an interface can be defined only at module scope +IdentAsKeyword.ice:75: `i7': an interface can be defined only at module scope +IdentAsKeyword.ice:76: `i8': an interface can be defined only at module scope +IdentAsKeyword.ice:78: `i9': an interface can be defined only at module scope +IdentAsKeyword.ice:79: `i10': an interface can be defined only at module scope +IdentAsKeyword.ice:81: `true': an interface can be defined only at module scope +IdentAsKeyword.ice:83: illegal leading underscore in identifier `_a' +IdentAsKeyword.ice:83: `_a': an interface can be defined only at module scope +IdentAsKeyword.ice:84: illegal leading underscore in identifier `_true' +IdentAsKeyword.ice:84: `_true': an interface can be defined only at module scope +IdentAsKeyword.ice:85: illegal leading underscore in identifier `_true' +IdentAsKeyword.ice:85: `_true': an interface can be defined only at module scope +IdentAsKeyword.ice:87: illegal trailing underscore in identifier `b_' +IdentAsKeyword.ice:87: `b_': an interface can be defined only at module scope +IdentAsKeyword.ice:89: illegal double underscore in identifier `b__c' +IdentAsKeyword.ice:89: `b__c': an interface can be defined only at module scope +IdentAsKeyword.ice:90: illegal double underscore in identifier `b___c' +IdentAsKeyword.ice:90: `b___c': an interface can be defined only at module scope +IdentAsKeyword.ice:92: illegal underscore in identifier `a_b' +IdentAsKeyword.ice:92: `a_b': an interface can be defined only at module scope +IdentAsKeyword.ice:93: illegal underscore in identifier `a_b_c' +IdentAsKeyword.ice:93: `a_b_c': an interface can be defined only at module scope +IdentAsKeyword.ice:95: syntax error diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice index 6af17b64e77..740add511ff 100644 --- a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice +++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err b/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err index 8d9dc11b53d..551a7e5b97e 100644 --- a/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err +++ b/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err @@ -1,83 +1,83 @@ -IdentAsKeywordUnderscore.ice:15: syntax error -IdentAsKeywordUnderscore.ice:17: `Void': an exception can be defined only at module scope -IdentAsKeywordUnderscore.ice:18: keyword `int' cannot be used as exception name -IdentAsKeywordUnderscore.ice:18: `int': an exception can be defined only at module scope -IdentAsKeywordUnderscore.ice:20: `OUT': a structure can be defined only at module scope -IdentAsKeywordUnderscore.ice:21: keyword `double' cannot be used as struct name -IdentAsKeywordUnderscore.ice:21: `double': a structure can be defined only at module scope -IdentAsKeywordUnderscore.ice:23: `s1': a structure can be defined only at module scope -IdentAsKeywordUnderscore.ice:24: `s2': a structure can be defined only at module scope -IdentAsKeywordUnderscore.ice:24: keyword `byte' cannot be used as data member name -IdentAsKeywordUnderscore.ice:25: `s3': a structure can be defined only at module scope -IdentAsKeywordUnderscore.ice:26: `s4': a structure can be defined only at module scope -IdentAsKeywordUnderscore.ice:26: keyword `byte' cannot be used as data member name -IdentAsKeywordUnderscore.ice:28: `inTERface': a class can be defined only at module scope -IdentAsKeywordUnderscore.ice:29: keyword `interface' cannot be used as class name -IdentAsKeywordUnderscore.ice:29: `interface': a class can be defined only at module scope -IdentAsKeywordUnderscore.ice:31: `MOdule': a class can be defined only at module scope -IdentAsKeywordUnderscore.ice:32: keyword `module' cannot be used as class name -IdentAsKeywordUnderscore.ice:32: `module': a class can be defined only at module scope -IdentAsKeywordUnderscore.ice:34: `C': a class can be defined only at module scope -IdentAsKeywordUnderscore.ice:35: `C': a class can be defined only at module scope -IdentAsKeywordUnderscore.ice:35: keyword `extends' cannot be used as data member name -IdentAsKeywordUnderscore.ice:36: `D': a class can be defined only at module scope -IdentAsKeywordUnderscore.ice:36: keyword `extends' cannot be used as data member name -IdentAsKeywordUnderscore.ice:38: keyword `local' cannot be used as interface name -IdentAsKeywordUnderscore.ice:38: `local': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:39: `Local': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:41: keyword `Object' cannot be used as interface name -IdentAsKeywordUnderscore.ice:41: `Object': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:42: `object': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:43: keyword `long' cannot be used as interface name -IdentAsKeywordUnderscore.ice:43: `long': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:45: `impLEments': a sequence can be defined only at module scope -IdentAsKeywordUnderscore.ice:46: sequence `implements' differs only in capitalization from sequence `impLEments' -IdentAsKeywordUnderscore.ice:46: keyword `implements' cannot be used as sequence name -IdentAsKeywordUnderscore.ice:47: `short': a sequence can be defined only at module scope -IdentAsKeywordUnderscore.ice:47: keyword `short' cannot be used as sequence name -IdentAsKeywordUnderscore.ice:49: syntax error -IdentAsKeywordUnderscore.ice:50: `moDule' is not defined -IdentAsKeywordUnderscore.ice:52: `throws': a dictionary can be defined only at module scope -IdentAsKeywordUnderscore.ice:52: keyword `throws' cannot be used as dictionary name -IdentAsKeywordUnderscore.ice:53: dictionary `thRows' differs only in capitalization from dictionary `throws' -IdentAsKeywordUnderscore.ice:54: `LOCALobject': a dictionary can be defined only at module scope +IdentAsKeywordUnderscore.ice:12: syntax error +IdentAsKeywordUnderscore.ice:14: `Void': an exception can be defined only at module scope +IdentAsKeywordUnderscore.ice:15: keyword `int' cannot be used as exception name +IdentAsKeywordUnderscore.ice:15: `int': an exception can be defined only at module scope +IdentAsKeywordUnderscore.ice:17: `OUT': a structure can be defined only at module scope +IdentAsKeywordUnderscore.ice:18: keyword `double' cannot be used as struct name +IdentAsKeywordUnderscore.ice:18: `double': a structure can be defined only at module scope +IdentAsKeywordUnderscore.ice:20: `s1': a structure can be defined only at module scope +IdentAsKeywordUnderscore.ice:21: `s2': a structure can be defined only at module scope +IdentAsKeywordUnderscore.ice:21: keyword `byte' cannot be used as data member name +IdentAsKeywordUnderscore.ice:22: `s3': a structure can be defined only at module scope +IdentAsKeywordUnderscore.ice:23: `s4': a structure can be defined only at module scope +IdentAsKeywordUnderscore.ice:23: keyword `byte' cannot be used as data member name +IdentAsKeywordUnderscore.ice:25: `inTERface': a class can be defined only at module scope +IdentAsKeywordUnderscore.ice:26: keyword `interface' cannot be used as class name +IdentAsKeywordUnderscore.ice:26: `interface': a class can be defined only at module scope +IdentAsKeywordUnderscore.ice:28: `MOdule': a class can be defined only at module scope +IdentAsKeywordUnderscore.ice:29: keyword `module' cannot be used as class name +IdentAsKeywordUnderscore.ice:29: `module': a class can be defined only at module scope +IdentAsKeywordUnderscore.ice:31: `C': a class can be defined only at module scope +IdentAsKeywordUnderscore.ice:32: `C': a class can be defined only at module scope +IdentAsKeywordUnderscore.ice:32: keyword `extends' cannot be used as data member name +IdentAsKeywordUnderscore.ice:33: `D': a class can be defined only at module scope +IdentAsKeywordUnderscore.ice:33: keyword `extends' cannot be used as data member name +IdentAsKeywordUnderscore.ice:35: keyword `local' cannot be used as interface name +IdentAsKeywordUnderscore.ice:35: `local': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:36: `Local': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:38: keyword `Object' cannot be used as interface name +IdentAsKeywordUnderscore.ice:38: `Object': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:39: `object': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:40: keyword `long' cannot be used as interface name +IdentAsKeywordUnderscore.ice:40: `long': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:42: `impLEments': a sequence can be defined only at module scope +IdentAsKeywordUnderscore.ice:43: sequence `implements' differs only in capitalization from sequence `impLEments' +IdentAsKeywordUnderscore.ice:43: keyword `implements' cannot be used as sequence name +IdentAsKeywordUnderscore.ice:44: `short': a sequence can be defined only at module scope +IdentAsKeywordUnderscore.ice:44: keyword `short' cannot be used as sequence name +IdentAsKeywordUnderscore.ice:46: syntax error +IdentAsKeywordUnderscore.ice:47: `moDule' is not defined +IdentAsKeywordUnderscore.ice:49: `throws': a dictionary can be defined only at module scope +IdentAsKeywordUnderscore.ice:49: keyword `throws' cannot be used as dictionary name +IdentAsKeywordUnderscore.ice:50: dictionary `thRows' differs only in capitalization from dictionary `throws' +IdentAsKeywordUnderscore.ice:51: `LOCALobject': a dictionary can be defined only at module scope +IdentAsKeywordUnderscore.ice:53: syntax error +IdentAsKeywordUnderscore.ice:54: `MODULE' is not defined IdentAsKeywordUnderscore.ice:56: syntax error -IdentAsKeywordUnderscore.ice:57: `MODULE' is not defined +IdentAsKeywordUnderscore.ice:57: `d4': a dictionary can be defined only at module scope IdentAsKeywordUnderscore.ice:59: syntax error -IdentAsKeywordUnderscore.ice:60: `d4': a dictionary can be defined only at module scope -IdentAsKeywordUnderscore.ice:62: syntax error -IdentAsKeywordUnderscore.ice:63: `VOID' is an exception, which cannot be used as a type -IdentAsKeywordUnderscore.ice:65: keyword `local' cannot be used as enumeration name -IdentAsKeywordUnderscore.ice:65: `local': an enumeration can be defined only at module scope -IdentAsKeywordUnderscore.ice:66: enumeration `LOCAL' differs only in capitalization from enumeration `local' -IdentAsKeywordUnderscore.ice:68: `e1': an enumeration can be defined only at module scope -IdentAsKeywordUnderscore.ice:68: keyword `long' cannot be used as enumerator -IdentAsKeywordUnderscore.ice:68: keyword `byte' cannot be used as enumerator -IdentAsKeywordUnderscore.ice:69: `e2': an enumeration can be defined only at module scope -IdentAsKeywordUnderscore.ice:71: `i1': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:72: `i2': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:74: `i3': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:75: `i4': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:77: `i5': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:77: syntax error -IdentAsKeywordUnderscore.ice:78: `i6': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:80: `i7': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:81: `i8': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:83: `i9': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:84: `i10': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:86: `true': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:88: illegal leading underscore in identifier `_a' -IdentAsKeywordUnderscore.ice:88: `_a': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:89: illegal leading underscore in identifier `_true' -IdentAsKeywordUnderscore.ice:89: `_true': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:90: illegal leading underscore in identifier `_true' -IdentAsKeywordUnderscore.ice:90: `_true': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:92: illegal trailing underscore in identifier `b_' -IdentAsKeywordUnderscore.ice:92: `b_': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:94: illegal double underscore in identifier `b__c' -IdentAsKeywordUnderscore.ice:94: `b__c': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:95: illegal double underscore in identifier `b___c' -IdentAsKeywordUnderscore.ice:95: `b___c': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:97: `a_b': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:98: `a_b_c': an interface can be defined only at module scope -IdentAsKeywordUnderscore.ice:100: syntax error +IdentAsKeywordUnderscore.ice:60: `VOID' is an exception, which cannot be used as a type +IdentAsKeywordUnderscore.ice:62: keyword `local' cannot be used as enumeration name +IdentAsKeywordUnderscore.ice:62: `local': an enumeration can be defined only at module scope +IdentAsKeywordUnderscore.ice:63: enumeration `LOCAL' differs only in capitalization from enumeration `local' +IdentAsKeywordUnderscore.ice:65: `e1': an enumeration can be defined only at module scope +IdentAsKeywordUnderscore.ice:65: keyword `long' cannot be used as enumerator +IdentAsKeywordUnderscore.ice:65: keyword `byte' cannot be used as enumerator +IdentAsKeywordUnderscore.ice:66: `e2': an enumeration can be defined only at module scope +IdentAsKeywordUnderscore.ice:68: `i1': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:69: `i2': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:71: `i3': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:72: `i4': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:74: `i5': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:74: syntax error +IdentAsKeywordUnderscore.ice:75: `i6': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:77: `i7': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:78: `i8': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:80: `i9': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:81: `i10': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:83: `true': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:85: illegal leading underscore in identifier `_a' +IdentAsKeywordUnderscore.ice:85: `_a': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:86: illegal leading underscore in identifier `_true' +IdentAsKeywordUnderscore.ice:86: `_true': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:87: illegal leading underscore in identifier `_true' +IdentAsKeywordUnderscore.ice:87: `_true': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:89: illegal trailing underscore in identifier `b_' +IdentAsKeywordUnderscore.ice:89: `b_': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:91: illegal double underscore in identifier `b__c' +IdentAsKeywordUnderscore.ice:91: `b__c': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:92: illegal double underscore in identifier `b___c' +IdentAsKeywordUnderscore.ice:92: `b___c': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:94: `a_b': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:95: `a_b_c': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:97: syntax error diff --git a/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice b/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice index 3f75b47e324..78dc47c5ac8 100644 --- a/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice +++ b/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice @@ -4,10 +4,7 @@ // // ********************************************************************** - - - - +[["underscore"]] module Test { diff --git a/cpp/test/Slice/errorDetection/IllegalDeclaration.err b/cpp/test/Slice/errorDetection/IllegalDeclaration.err index ef7539242c7..ed6f9691c04 100644 --- a/cpp/test/Slice/errorDetection/IllegalDeclaration.err +++ b/cpp/test/Slice/errorDetection/IllegalDeclaration.err @@ -1,2 +1,2 @@ -IllegalDeclaration.ice:15: exceptions cannot be forward declared -IllegalDeclaration.ice:16: structs cannot be forward declared +IllegalDeclaration.ice:7: exceptions cannot be forward declared +IllegalDeclaration.ice:8: structs cannot be forward declared diff --git a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice index ef23e99be11..cf60072b4ba 100644 --- a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice +++ b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice @@ -4,13 +4,5 @@ // // ********************************************************************** - - - - - - - - exception E; struct S; diff --git a/cpp/test/Slice/errorDetection/IllegalDictionary.err b/cpp/test/Slice/errorDetection/IllegalDictionary.err index 3ab576761e6..e6d84453ffa 100644 --- a/cpp/test/Slice/errorDetection/IllegalDictionary.err +++ b/cpp/test/Slice/errorDetection/IllegalDictionary.err @@ -1,11 +1,11 @@ -IllegalDictionary.ice:22: dictionary `b1' uses an illegal key type -IllegalDictionary.ice:23: dictionary `b2' uses an illegal key type -IllegalDictionary.ice:24: dictionary `b3' uses an illegal key type -IllegalDictionary.ice:25: dictionary `b4' uses an illegal key type -IllegalDictionary.ice:26: dictionary `b5' uses an illegal key type -IllegalDictionary.ice:29: warning: use of sequences in dictionary keys has been deprecated -IllegalDictionary.ice:32: dictionary `b6' uses an illegal key type -IllegalDictionary.ice:35: warning: use of sequences in dictionary keys has been deprecated -IllegalDictionary.ice:49: dictionary `b8' uses an illegal key type -IllegalDictionary.ice:55: warning: use of sequences in dictionary keys has been deprecated -IllegalDictionary.ice:57: dictionary `b9' uses an illegal key type +IllegalDictionary.ice:17: dictionary `b1' uses an illegal key type +IllegalDictionary.ice:18: dictionary `b2' uses an illegal key type +IllegalDictionary.ice:19: dictionary `b3' uses an illegal key type +IllegalDictionary.ice:20: dictionary `b4' uses an illegal key type +IllegalDictionary.ice:21: dictionary `b5' uses an illegal key type +IllegalDictionary.ice:24: warning: use of sequences in dictionary keys has been deprecated +IllegalDictionary.ice:27: dictionary `b6' uses an illegal key type +IllegalDictionary.ice:30: warning: use of sequences in dictionary keys has been deprecated +IllegalDictionary.ice:44: dictionary `b8' uses an illegal key type +IllegalDictionary.ice:50: warning: use of sequences in dictionary keys has been deprecated +IllegalDictionary.ice:52: dictionary `b9' uses an illegal key type diff --git a/cpp/test/Slice/errorDetection/IllegalDictionary.ice b/cpp/test/Slice/errorDetection/IllegalDictionary.ice index 2b02ce3d1c4..f0e240d2fa6 100644 --- a/cpp/test/Slice/errorDetection/IllegalDictionary.ice +++ b/cpp/test/Slice/errorDetection/IllegalDictionary.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/IllegalIdentifier.err b/cpp/test/Slice/errorDetection/IllegalIdentifier.err index c51890842c0..d80b068b522 100644 --- a/cpp/test/Slice/errorDetection/IllegalIdentifier.err +++ b/cpp/test/Slice/errorDetection/IllegalIdentifier.err @@ -1,9 +1,9 @@ -IllegalIdentifier.ice:18: illegal input character: '\357' -IllegalIdentifier.ice:18: syntax error -IllegalIdentifier.ice:18: illegal input character: '\273' -IllegalIdentifier.ice:18: illegal input character: '\277' -IllegalIdentifier.ice:26: illegal input character: '\305' -IllegalIdentifier.ice:26: illegal input character: '\222' -IllegalIdentifier.ice:28: illegal input character: '\305' -IllegalIdentifier.ice:28: illegal input character: '\223' -IllegalIdentifier.ice:29: syntax error +IllegalIdentifier.ice:14: illegal input character: '\357' +IllegalIdentifier.ice:14: syntax error +IllegalIdentifier.ice:14: illegal input character: '\273' +IllegalIdentifier.ice:14: illegal input character: '\277' +IllegalIdentifier.ice:22: illegal input character: '\305' +IllegalIdentifier.ice:22: illegal input character: '\222' +IllegalIdentifier.ice:24: illegal input character: '\305' +IllegalIdentifier.ice:24: illegal input character: '\223' +IllegalIdentifier.ice:25: syntax error diff --git a/cpp/test/Slice/errorDetection/IllegalIdentifier.ice b/cpp/test/Slice/errorDetection/IllegalIdentifier.ice index 33d413c4ae2..a40bfe3ec58 100644 --- a/cpp/test/Slice/errorDetection/IllegalIdentifier.ice +++ b/cpp/test/Slice/errorDetection/IllegalIdentifier.ice @@ -8,10 +8,6 @@ // // ********************************************************************** - - - - // // Check that UTF-8 BOM is rejected when not at start of file // diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.err b/cpp/test/Slice/errorDetection/IllegalLocal.err index 939af203014..d8d5a767640 100644 --- a/cpp/test/Slice/errorDetection/IllegalLocal.err +++ b/cpp/test/Slice/errorDetection/IllegalLocal.err @@ -1,25 +1,25 @@ -IllegalLocal.ice:17: local interface `i2' cannot have non-local base interface `i1' -IllegalLocal.ice:19: non-local interface `i3' cannot have local base interface `i2' -IllegalLocal.ice:23: warning: classes implementing interfaces are deprecated -IllegalLocal.ice:25: non-local class `c2' cannot have local base interface `i2' -IllegalLocal.ice:25: warning: classes implementing interfaces are deprecated -IllegalLocal.ice:31: non-local interface `i' cannot have operation `op' throwing local exception `le' -IllegalLocal.ice:34: non-local exception `le2' cannot have local base exception `le' -IllegalLocal.ice:40: non-local class`c3' cannot contain local member `lo1' -IllegalLocal.ice:41: cannot create proxy for local interface `i2' -IllegalLocal.ice:41: non-local class`c3' cannot contain local member `lo2' -IllegalLocal.ice:42: non-local class`c3' cannot contain local member `lo3' -IllegalLocal.ice:43: non-local class`c3' cannot contain local member `ls' -IllegalLocal.ice:48: non-local struct`s1' cannot contain local member `ls' -IllegalLocal.ice:53: non-local exception`e3' cannot contain local member `ls' -IllegalLocal.ice:56: non-local sequence `los' cannot have local element type -IllegalLocal.ice:59: warning: use of sequences in dictionary keys has been deprecated -IllegalLocal.ice:59: non-local dictionary `d1' cannot have local key type -IllegalLocal.ice:60: non-local dictionary `d2' cannot have local value type -IllegalLocal.ice:61: warning: use of sequences in dictionary keys has been deprecated -IllegalLocal.ice:61: non-local dictionary `d3' cannot have local key type -IllegalLocal.ice:61: non-local dictionary `d3' cannot have local value type -IllegalLocal.ice:66: non-local struct`s2' cannot contain local member `m' -IllegalLocal.ice:72: non-local struct`s3' cannot contain local member `e' -IllegalLocal.ice:77: non-local interface `i5' cannot have local parameter `p' in operation `op' -IllegalLocal.ice:78: non-local interface `i5' cannot have operation `op2' with local return type +IllegalLocal.ice:12: local interface `i2' cannot have non-local base interface `i1' +IllegalLocal.ice:14: non-local interface `i3' cannot have local base interface `i2' +IllegalLocal.ice:18: warning: classes implementing interfaces are deprecated +IllegalLocal.ice:20: non-local class `c2' cannot have local base interface `i2' +IllegalLocal.ice:20: warning: classes implementing interfaces are deprecated +IllegalLocal.ice:26: non-local interface `i' cannot have operation `op' throwing local exception `le' +IllegalLocal.ice:29: non-local exception `le2' cannot have local base exception `le' +IllegalLocal.ice:35: non-local class`c3' cannot contain local member `lo1' +IllegalLocal.ice:36: cannot create proxy for local interface `i2' +IllegalLocal.ice:36: non-local class`c3' cannot contain local member `lo2' +IllegalLocal.ice:37: non-local class`c3' cannot contain local member `lo3' +IllegalLocal.ice:38: non-local class`c3' cannot contain local member `ls' +IllegalLocal.ice:43: non-local struct`s1' cannot contain local member `ls' +IllegalLocal.ice:48: non-local exception`e3' cannot contain local member `ls' +IllegalLocal.ice:51: non-local sequence `los' cannot have local element type +IllegalLocal.ice:54: warning: use of sequences in dictionary keys has been deprecated +IllegalLocal.ice:54: non-local dictionary `d1' cannot have local key type +IllegalLocal.ice:55: non-local dictionary `d2' cannot have local value type +IllegalLocal.ice:56: warning: use of sequences in dictionary keys has been deprecated +IllegalLocal.ice:56: non-local dictionary `d3' cannot have local key type +IllegalLocal.ice:56: non-local dictionary `d3' cannot have local value type +IllegalLocal.ice:61: non-local struct`s2' cannot contain local member `m' +IllegalLocal.ice:67: non-local struct`s3' cannot contain local member `e' +IllegalLocal.ice:72: non-local interface `i5' cannot have local parameter `p' in operation `op' +IllegalLocal.ice:73: non-local interface `i5' cannot have operation `op2' with local return type diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.ice b/cpp/test/Slice/errorDetection/IllegalLocal.ice index 1bc68b89b3d..308bf703d76 100644 --- a/cpp/test/Slice/errorDetection/IllegalLocal.ice +++ b/cpp/test/Slice/errorDetection/IllegalLocal.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/IllegalMI.err b/cpp/test/Slice/errorDetection/IllegalMI.err index 54746c07864..2d0f1d49838 100644 --- a/cpp/test/Slice/errorDetection/IllegalMI.err +++ b/cpp/test/Slice/errorDetection/IllegalMI.err @@ -1,26 +1,26 @@ -IllegalMI.ice:63: ambiguous multiple inheritance: `A3' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:93: operation `op' is already defined as an operation in a base interface or class -IllegalMI.ice:122: operation `op' is already defined as an operation in a base interface or class -IllegalMI.ice:151: operation `op' is already defined as an operation in a base interface or class -IllegalMI.ice:204: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:232: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:260: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:290: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:354: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:388: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:421: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:455: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:489: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:523: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:558: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:593: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:628: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:663: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:699: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:786: operation `op' is already defined as an operation in a base interface or class -IllegalMI.ice:830: operation `op' is already defined as an operation in a base interface or class -IllegalMI.ice:977: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:1051: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:1125: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:1197: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:1269: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:55: ambiguous multiple inheritance: `A3' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:85: operation `op' is already defined as an operation in a base interface or class +IllegalMI.ice:114: operation `op' is already defined as an operation in a base interface or class +IllegalMI.ice:143: operation `op' is already defined as an operation in a base interface or class +IllegalMI.ice:196: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:224: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:252: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:282: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:346: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:380: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:413: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:447: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:481: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:515: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:550: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:585: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:620: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:655: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:691: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:778: operation `op' is already defined as an operation in a base interface or class +IllegalMI.ice:822: operation `op' is already defined as an operation in a base interface or class +IllegalMI.ice:969: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:1043: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:1117: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:1189: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:1261: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces diff --git a/cpp/test/Slice/errorDetection/IllegalMI.ice b/cpp/test/Slice/errorDetection/IllegalMI.ice index 0d635153712..ab40eba2c1a 100644 --- a/cpp/test/Slice/errorDetection/IllegalMI.ice +++ b/cpp/test/Slice/errorDetection/IllegalMI.ice @@ -4,14 +4,6 @@ // // ********************************************************************** - - - - - - - - module M1 { diff --git a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err index a7dfbac0f16..a33289eb682 100644 --- a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err +++ b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err @@ -1,26 +1,26 @@ -IllegalUseOfKeyword.ice:15: keyword `module' cannot be used as exception name -IllegalUseOfKeyword.ice:15: exceptions cannot be forward declared -IllegalUseOfKeyword.ice:16: keyword `void' cannot be used as exception name -IllegalUseOfKeyword.ice:21: keyword `exception' cannot be used as struct name -IllegalUseOfKeyword.ice:21: structs cannot be forward declared -IllegalUseOfKeyword.ice:22: keyword `class' cannot be used as struct name -IllegalUseOfKeyword.ice:27: keyword `interface' cannot be used as class name -IllegalUseOfKeyword.ice:28: keyword `struct' cannot be used as class name -IllegalUseOfKeyword.ice:34: keyword `local' cannot be used as interface name -IllegalUseOfKeyword.ice:35: keyword `extends' cannot be used as interface name -IllegalUseOfKeyword.ice:42: keyword `implements' cannot be used as operation name -IllegalUseOfKeyword.ice:44: keyword `throws' cannot be used as parameter name -IllegalUseOfKeyword.ice:44: keyword `void' cannot be used as parameter name -IllegalUseOfKeyword.ice:46: keyword `byte' cannot be used as parameter name -IllegalUseOfKeyword.ice:46: keyword `short' cannot be used as parameter name -IllegalUseOfKeyword.ice:51: keyword `int' cannot be used as data member name -IllegalUseOfKeyword.ice:52: keyword `long' cannot be used as data member name -IllegalUseOfKeyword.ice:53: keyword `float' cannot be used as data member name -IllegalUseOfKeyword.ice:54: keyword `double' cannot be used as data member name -IllegalUseOfKeyword.ice:57: keyword `Object' cannot be used as sequence name -IllegalUseOfKeyword.ice:59: keyword `LocalObject' cannot be used as dictionary name -IllegalUseOfKeyword.ice:61: keyword `string' cannot be used as enumeration name -IllegalUseOfKeyword.ice:68: keyword `sequence' cannot be used as enumerator -IllegalUseOfKeyword.ice:69: keyword `dictionary' cannot be used as enumerator -IllegalUseOfKeyword.ice:70: keyword `enum' cannot be used as enumerator -IllegalUseOfKeyword.ice:74: illegal inheritance from type Object +IllegalUseOfKeyword.ice:12: keyword `module' cannot be used as exception name +IllegalUseOfKeyword.ice:12: exceptions cannot be forward declared +IllegalUseOfKeyword.ice:13: keyword `void' cannot be used as exception name +IllegalUseOfKeyword.ice:18: keyword `exception' cannot be used as struct name +IllegalUseOfKeyword.ice:18: structs cannot be forward declared +IllegalUseOfKeyword.ice:19: keyword `class' cannot be used as struct name +IllegalUseOfKeyword.ice:24: keyword `interface' cannot be used as class name +IllegalUseOfKeyword.ice:25: keyword `struct' cannot be used as class name +IllegalUseOfKeyword.ice:31: keyword `local' cannot be used as interface name +IllegalUseOfKeyword.ice:32: keyword `extends' cannot be used as interface name +IllegalUseOfKeyword.ice:39: keyword `implements' cannot be used as operation name +IllegalUseOfKeyword.ice:41: keyword `throws' cannot be used as parameter name +IllegalUseOfKeyword.ice:41: keyword `void' cannot be used as parameter name +IllegalUseOfKeyword.ice:43: keyword `byte' cannot be used as parameter name +IllegalUseOfKeyword.ice:43: keyword `short' cannot be used as parameter name +IllegalUseOfKeyword.ice:48: keyword `int' cannot be used as data member name +IllegalUseOfKeyword.ice:49: keyword `long' cannot be used as data member name +IllegalUseOfKeyword.ice:50: keyword `float' cannot be used as data member name +IllegalUseOfKeyword.ice:51: keyword `double' cannot be used as data member name +IllegalUseOfKeyword.ice:54: keyword `Object' cannot be used as sequence name +IllegalUseOfKeyword.ice:56: keyword `LocalObject' cannot be used as dictionary name +IllegalUseOfKeyword.ice:58: keyword `string' cannot be used as enumeration name +IllegalUseOfKeyword.ice:65: keyword `sequence' cannot be used as enumerator +IllegalUseOfKeyword.ice:66: keyword `dictionary' cannot be used as enumerator +IllegalUseOfKeyword.ice:67: keyword `enum' cannot be used as enumerator +IllegalUseOfKeyword.ice:71: illegal inheritance from type Object diff --git a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice index 77ce9ed2a79..f9562bbcbce 100644 --- a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice +++ b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - [["suppress-warning:deprecated"]] // for classes with operations module Test diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.err b/cpp/test/Slice/errorDetection/InterfaceMismatch.err index 0d97ece8a62..99621ae6636 100644 --- a/cpp/test/Slice/errorDetection/InterfaceMismatch.err +++ b/cpp/test/Slice/errorDetection/InterfaceMismatch.err @@ -1,6 +1,6 @@ -InterfaceMismatch.ice:16: class `Foo1' was declared as interface -InterfaceMismatch.ice:17: class `Foo1' was declared as interface -InterfaceMismatch.ice:20: class `Foo2' was defined as interface -InterfaceMismatch.ice:23: interface `Foo3' was declared as class -InterfaceMismatch.ice:24: interface `Foo3' was declared as class -InterfaceMismatch.ice:27: interface `Foo4' was defined as class +InterfaceMismatch.ice:11: class `Foo1' was declared as interface +InterfaceMismatch.ice:12: class `Foo1' was declared as interface +InterfaceMismatch.ice:15: class `Foo2' was defined as interface +InterfaceMismatch.ice:18: interface `Foo3' was declared as class +InterfaceMismatch.ice:19: interface `Foo3' was declared as class +InterfaceMismatch.ice:22: interface `Foo4' was defined as class diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice index cf0a2c17e5b..6e91cf55597 100644 --- a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice +++ b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/InterfaceRedefinition.err b/cpp/test/Slice/errorDetection/InterfaceRedefinition.err index 6137478016e..7049176e760 100644 --- a/cpp/test/Slice/errorDetection/InterfaceRedefinition.err +++ b/cpp/test/Slice/errorDetection/InterfaceRedefinition.err @@ -1,2 +1,2 @@ -InterfaceRedefinition.ice:16: redefinition of interface `Intf1' -InterfaceRedefinition.ice:20: redefinition of interface `Intf2' +InterfaceRedefinition.ice:11: redefinition of interface `Intf1' +InterfaceRedefinition.ice:15: redefinition of interface `Intf2' diff --git a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice index 2f8a91b6afd..f4177e6c711 100644 --- a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice +++ b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/LocalMismatch.err b/cpp/test/Slice/errorDetection/LocalMismatch.err index 9ea56523855..9337b2b4194 100644 --- a/cpp/test/Slice/errorDetection/LocalMismatch.err +++ b/cpp/test/Slice/errorDetection/LocalMismatch.err @@ -1,12 +1,12 @@ -LocalMismatch.ice:16: local `Intf1' was declared non-local -LocalMismatch.ice:17: local `Intf1' was declared non-local -LocalMismatch.ice:20: local `Intf2' was defined non-local -LocalMismatch.ice:23: non-local `Intf3' was declared local -LocalMismatch.ice:24: non-local `Intf3' was declared local -LocalMismatch.ice:27: non-local `Intf4' was defined local -LocalMismatch.ice:30: local `Class1' was declared non-local -LocalMismatch.ice:31: local `Class1' was declared non-local -LocalMismatch.ice:34: local `Class2' was defined non-local -LocalMismatch.ice:37: non-local `Class3' was declared local -LocalMismatch.ice:38: non-local `Class3' was declared local -LocalMismatch.ice:41: non-local `Class4' was defined local +LocalMismatch.ice:11: local `Intf1' was declared non-local +LocalMismatch.ice:12: local `Intf1' was declared non-local +LocalMismatch.ice:15: local `Intf2' was defined non-local +LocalMismatch.ice:18: non-local `Intf3' was declared local +LocalMismatch.ice:19: non-local `Intf3' was declared local +LocalMismatch.ice:22: non-local `Intf4' was defined local +LocalMismatch.ice:25: local `Class1' was declared non-local +LocalMismatch.ice:26: local `Class1' was declared non-local +LocalMismatch.ice:29: local `Class2' was defined non-local +LocalMismatch.ice:32: non-local `Class3' was declared local +LocalMismatch.ice:33: non-local `Class3' was declared local +LocalMismatch.ice:36: non-local `Class4' was defined local diff --git a/cpp/test/Slice/errorDetection/LocalMismatch.ice b/cpp/test/Slice/errorDetection/LocalMismatch.ice index debaa006452..4706483181e 100644 --- a/cpp/test/Slice/errorDetection/LocalMismatch.ice +++ b/cpp/test/Slice/errorDetection/LocalMismatch.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err index 22e3bcacc44..88a3390494a 100644 --- a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err +++ b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err @@ -1,2 +1,2 @@ -NameCanNotBeUsed.ice:17: class name `Foo' cannot be used as operation name -NameCanNotBeUsed.ice:23: interface name `IFoo' cannot be used as operation name +NameCanNotBeUsed.ice:12: class name `Foo' cannot be used as operation name +NameCanNotBeUsed.ice:18: interface name `IFoo' cannot be used as operation name diff --git a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice index 7d9dd9e0182..e8daf72c83a 100644 --- a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice +++ b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/NotClassOrInterface.err b/cpp/test/Slice/errorDetection/NotClassOrInterface.err index d9df5d08fa3..bfd9e2125b4 100644 --- a/cpp/test/Slice/errorDetection/NotClassOrInterface.err +++ b/cpp/test/Slice/errorDetection/NotClassOrInterface.err @@ -1,9 +1,9 @@ -NotClassOrInterface.ice:19: `Seq' is not an interface -NotClassOrInterface.ice:20: `Seq' is not a class -NotClassOrInterface.ice:21: `Sequence3' is not an interface -NotClassOrInterface.ice:21: `Sequence2' is not an interface -NotClassOrInterface.ice:21: `Sequence1' is not an interface -NotClassOrInterface.ice:22: `Seq' is not a class -NotClassOrInterface.ice:22: `Sequence3' is not an interface -NotClassOrInterface.ice:22: `Sequence2' is not an interface -NotClassOrInterface.ice:22: `Sequence1' is not an interface +NotClassOrInterface.ice:14: `Seq' is not an interface +NotClassOrInterface.ice:15: `Seq' is not a class +NotClassOrInterface.ice:16: `Sequence3' is not an interface +NotClassOrInterface.ice:16: `Sequence2' is not an interface +NotClassOrInterface.ice:16: `Sequence1' is not an interface +NotClassOrInterface.ice:17: `Seq' is not a class +NotClassOrInterface.ice:17: `Sequence3' is not an interface +NotClassOrInterface.ice:17: `Sequence2' is not an interface +NotClassOrInterface.ice:17: `Sequence1' is not an interface diff --git a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice index 0033bc8a017..2e03532c2d4 100644 --- a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice +++ b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/NotException.err b/cpp/test/Slice/errorDetection/NotException.err index 6375c8e83b2..efddd7deb23 100644 --- a/cpp/test/Slice/errorDetection/NotException.err +++ b/cpp/test/Slice/errorDetection/NotException.err @@ -1,4 +1,4 @@ -NotException.ice:24: `C' is not an exception -NotException.ice:25: `S' is not an exception -NotException.ice:26: `D' is not an exception -NotException.ice:27: keyword `int' cannot be used as exception name +NotException.ice:16: `C' is not an exception +NotException.ice:17: `S' is not an exception +NotException.ice:18: `D' is not an exception +NotException.ice:19: keyword `int' cannot be used as exception name diff --git a/cpp/test/Slice/errorDetection/NotException.ice b/cpp/test/Slice/errorDetection/NotException.ice index 0bd7d1984a8..befae0d9215 100644 --- a/cpp/test/Slice/errorDetection/NotException.ice +++ b/cpp/test/Slice/errorDetection/NotException.ice @@ -4,14 +4,6 @@ // // ********************************************************************** - - - - - - - - module M { diff --git a/cpp/test/Slice/errorDetection/NotType.err b/cpp/test/Slice/errorDetection/NotType.err index b28ddbc7502..934e93ba49d 100644 --- a/cpp/test/Slice/errorDetection/NotType.err +++ b/cpp/test/Slice/errorDetection/NotType.err @@ -1,15 +1,15 @@ +NotType.ice:16: `Mod' is not a type +NotType.ice:17: `Mod' is not a type +NotType.ice:18: `Mod' is not a type +NotType.ice:19: `Mod' is not a type +NotType.ice:20: `Module3' is not a type +NotType.ice:20: `Module2' is not a type +NotType.ice:20: `Module1' is not a type NotType.ice:21: `Mod' is not a type -NotType.ice:22: `Mod' is not a type -NotType.ice:23: `Mod' is not a type -NotType.ice:24: `Mod' is not a type -NotType.ice:25: `Module3' is not a type -NotType.ice:25: `Module2' is not a type -NotType.ice:25: `Module1' is not a type -NotType.ice:26: `Mod' is not a type -NotType.ice:26: `Module3' is not a type -NotType.ice:26: `Module2' is not a type -NotType.ice:26: `Module1' is not a type +NotType.ice:21: `Module3' is not a type +NotType.ice:21: `Module2' is not a type +NotType.ice:21: `Module1' is not a type +NotType.ice:29: `E' is an exception, which cannot be used as a type +NotType.ice:30: struct `S' must have at least one member +NotType.ice:34: `E' is an exception, which cannot be used as a type NotType.ice:34: `E' is an exception, which cannot be used as a type -NotType.ice:35: struct `S' must have at least one member -NotType.ice:39: `E' is an exception, which cannot be used as a type -NotType.ice:39: `E' is an exception, which cannot be used as a type diff --git a/cpp/test/Slice/errorDetection/NotType.ice b/cpp/test/Slice/errorDetection/NotType.ice index a844bc15f71..8f2bf0d6f8b 100644 --- a/cpp/test/Slice/errorDetection/NotType.ice +++ b/cpp/test/Slice/errorDetection/NotType.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/OperationRedefinition.err b/cpp/test/Slice/errorDetection/OperationRedefinition.err index befa3ed4cdf..002c4630dc0 100644 --- a/cpp/test/Slice/errorDetection/OperationRedefinition.err +++ b/cpp/test/Slice/errorDetection/OperationRedefinition.err @@ -1 +1 @@ -OperationRedefinition.ice:18: redefinition of operation `operation' as operation `operation' +OperationRedefinition.ice:15: redefinition of operation `operation' as operation `operation' diff --git a/cpp/test/Slice/errorDetection/OperationRedefinition.ice b/cpp/test/Slice/errorDetection/OperationRedefinition.ice index 7dbd1022883..ebc88ac7124 100644 --- a/cpp/test/Slice/errorDetection/OperationRedefinition.ice +++ b/cpp/test/Slice/errorDetection/OperationRedefinition.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - [["suppress-warning:deprecated"]] // for classes with operations module Test diff --git a/cpp/test/Slice/errorDetection/OptionalMembers.err b/cpp/test/Slice/errorDetection/OptionalMembers.err index 8b9fbf5d41c..bedb8c49006 100644 --- a/cpp/test/Slice/errorDetection/OptionalMembers.err +++ b/cpp/test/Slice/errorDetection/OptionalMembers.err @@ -1,33 +1,33 @@ -OptionalMembers.ice:26: missing tag for optional -OptionalMembers.ice:27: missing tag for optional -OptionalMembers.ice:28: `abc' is not defined -OptionalMembers.ice:29: tag for optional is out of range -OptionalMembers.ice:30: tag for optional is out of range +OptionalMembers.ice:23: missing tag for optional +OptionalMembers.ice:24: missing tag for optional +OptionalMembers.ice:25: `abc' is not defined +OptionalMembers.ice:26: tag for optional is out of range +OptionalMembers.ice:27: tag for optional is out of range +OptionalMembers.ice:28: tag for optional is out of range +OptionalMembers.ice:30: tag for optional data member `m8' is already in use OptionalMembers.ice:31: tag for optional is out of range -OptionalMembers.ice:33: tag for optional data member `m8' is already in use -OptionalMembers.ice:34: tag for optional is out of range -OptionalMembers.ice:34: invalid tag `C3' for optional -OptionalMembers.ice:35: tag for optional is out of range -OptionalMembers.ice:35: invalid tag `C4' for optional -OptionalMembers.ice:36: invalid tag `C5' for optional -OptionalMembers.ice:38: tag for optional data member `m13' is already in use -OptionalMembers.ice:39: enumerator `e2' could designate `::Test::E::e2' or `::Test::Ebis::e2' or `::Test::Eter::e2' -OptionalMembers.ice:40: warning: referencing enumerator `::Test::E::e3' without its enumeration's scope is deprecated -OptionalMembers.ice:41: tag for optional data member `m16' is already in use -OptionalMembers.ice:56: missing tag for optional -OptionalMembers.ice:57: missing tag for optional -OptionalMembers.ice:58: `abc' is not defined -OptionalMembers.ice:59: tag for optional is out of range -OptionalMembers.ice:60: tag for optional is out of range +OptionalMembers.ice:31: invalid tag `C3' for optional +OptionalMembers.ice:32: tag for optional is out of range +OptionalMembers.ice:32: invalid tag `C4' for optional +OptionalMembers.ice:33: invalid tag `C5' for optional +OptionalMembers.ice:35: tag for optional data member `m13' is already in use +OptionalMembers.ice:36: enumerator `e2' could designate `::Test::E::e2' or `::Test::Ebis::e2' or `::Test::Eter::e2' +OptionalMembers.ice:37: warning: referencing enumerator `::Test::E::e3' without its enumeration's scope is deprecated +OptionalMembers.ice:38: tag for optional data member `m16' is already in use +OptionalMembers.ice:53: missing tag for optional +OptionalMembers.ice:54: missing tag for optional +OptionalMembers.ice:55: `abc' is not defined +OptionalMembers.ice:56: tag for optional is out of range +OptionalMembers.ice:57: tag for optional is out of range +OptionalMembers.ice:58: tag for optional is out of range +OptionalMembers.ice:60: tag for optional data member `m8' is already in use OptionalMembers.ice:61: tag for optional is out of range -OptionalMembers.ice:63: tag for optional data member `m8' is already in use -OptionalMembers.ice:64: tag for optional is out of range -OptionalMembers.ice:64: invalid tag `C3' for optional -OptionalMembers.ice:65: tag for optional is out of range -OptionalMembers.ice:65: invalid tag `C4' for optional -OptionalMembers.ice:66: invalid tag `C5' for optional -OptionalMembers.ice:68: tag for optional data member `m13' is already in use -OptionalMembers.ice:70: warning: referencing enumerator `::Test::E::e3' without its enumeration's scope is deprecated -OptionalMembers.ice:71: tag for optional data member `m16' is already in use -OptionalMembers.ice:86: optional data members not supported in struct -OptionalMembers.ice:87: optional data members not supported in struct +OptionalMembers.ice:61: invalid tag `C3' for optional +OptionalMembers.ice:62: tag for optional is out of range +OptionalMembers.ice:62: invalid tag `C4' for optional +OptionalMembers.ice:63: invalid tag `C5' for optional +OptionalMembers.ice:65: tag for optional data member `m13' is already in use +OptionalMembers.ice:67: warning: referencing enumerator `::Test::E::e3' without its enumeration's scope is deprecated +OptionalMembers.ice:68: tag for optional data member `m16' is already in use +OptionalMembers.ice:83: optional data members not supported in struct +OptionalMembers.ice:84: optional data members not supported in struct diff --git a/cpp/test/Slice/errorDetection/OptionalMembers.ice b/cpp/test/Slice/errorDetection/OptionalMembers.ice index 74b4a09c2af..e0f9e2fbd9f 100644 --- a/cpp/test/Slice/errorDetection/OptionalMembers.ice +++ b/cpp/test/Slice/errorDetection/OptionalMembers.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - module Test { diff --git a/cpp/test/Slice/errorDetection/OptionalParams.err b/cpp/test/Slice/errorDetection/OptionalParams.err index 53f53aacd96..e62ed2ad186 100644 --- a/cpp/test/Slice/errorDetection/OptionalParams.err +++ b/cpp/test/Slice/errorDetection/OptionalParams.err @@ -1,40 +1,40 @@ -OptionalParams.ice:25: missing tag for optional -OptionalParams.ice:26: missing tag for optional -OptionalParams.ice:27: `abc' is not defined -OptionalParams.ice:28: tag for optional is out of range +OptionalParams.ice:22: missing tag for optional +OptionalParams.ice:23: missing tag for optional +OptionalParams.ice:24: `abc' is not defined +OptionalParams.ice:25: tag for optional is out of range +OptionalParams.ice:26: tag for optional is out of range +OptionalParams.ice:27: tag for optional is out of range OptionalParams.ice:29: tag for optional is out of range +OptionalParams.ice:29: invalid tag `C3' for optional OptionalParams.ice:30: tag for optional is out of range -OptionalParams.ice:32: tag for optional is out of range -OptionalParams.ice:32: invalid tag `C3' for optional -OptionalParams.ice:33: tag for optional is out of range -OptionalParams.ice:33: invalid tag `C4' for optional -OptionalParams.ice:34: invalid tag `C5' for optional -OptionalParams.ice:37: syntax error -OptionalParams.ice:39: missing tag for optional -OptionalParams.ice:40: missing tag for optional -OptionalParams.ice:41: `abc' is not defined -OptionalParams.ice:42: tag for optional is out of range +OptionalParams.ice:30: invalid tag `C4' for optional +OptionalParams.ice:31: invalid tag `C5' for optional +OptionalParams.ice:34: syntax error +OptionalParams.ice:36: missing tag for optional +OptionalParams.ice:37: missing tag for optional +OptionalParams.ice:38: `abc' is not defined +OptionalParams.ice:39: tag for optional is out of range +OptionalParams.ice:40: tag for optional is out of range +OptionalParams.ice:41: tag for optional is out of range OptionalParams.ice:43: tag for optional is out of range +OptionalParams.ice:43: invalid tag `C3' for optional OptionalParams.ice:44: tag for optional is out of range -OptionalParams.ice:46: tag for optional is out of range -OptionalParams.ice:46: invalid tag `C3' for optional -OptionalParams.ice:47: tag for optional is out of range -OptionalParams.ice:47: invalid tag `C4' for optional -OptionalParams.ice:48: invalid tag `C5' for optional -OptionalParams.ice:50: warning: referencing enumerator `::Test::E::e2' without its enumeration's scope is deprecated -OptionalParams.ice:52: missing tag for optional -OptionalParams.ice:53: missing tag for optional -OptionalParams.ice:54: `abc' is not defined -OptionalParams.ice:55: tag for optional is out of range +OptionalParams.ice:44: invalid tag `C4' for optional +OptionalParams.ice:45: invalid tag `C5' for optional +OptionalParams.ice:47: warning: referencing enumerator `::Test::E::e2' without its enumeration's scope is deprecated +OptionalParams.ice:49: missing tag for optional +OptionalParams.ice:50: missing tag for optional +OptionalParams.ice:51: `abc' is not defined +OptionalParams.ice:52: tag for optional is out of range +OptionalParams.ice:53: tag for optional is out of range +OptionalParams.ice:54: tag for optional is out of range OptionalParams.ice:56: tag for optional is out of range +OptionalParams.ice:56: invalid tag `C3' for optional OptionalParams.ice:57: tag for optional is out of range -OptionalParams.ice:59: tag for optional is out of range -OptionalParams.ice:59: invalid tag `C3' for optional -OptionalParams.ice:60: tag for optional is out of range -OptionalParams.ice:60: invalid tag `C4' for optional -OptionalParams.ice:61: invalid tag `C5' for optional -OptionalParams.ice:63: enumerator `e1' could designate `::Test::E::e1' or `::Test::Ebis::e1' +OptionalParams.ice:57: invalid tag `C4' for optional +OptionalParams.ice:58: invalid tag `C5' for optional +OptionalParams.ice:60: enumerator `e1' could designate `::Test::E::e1' or `::Test::Ebis::e1' +OptionalParams.ice:64: tag for optional parameter `o' is already in use +OptionalParams.ice:65: tag for optional parameter `o' is already in use +OptionalParams.ice:66: tag for optional parameter `o' is already in use OptionalParams.ice:67: tag for optional parameter `o' is already in use -OptionalParams.ice:68: tag for optional parameter `o' is already in use -OptionalParams.ice:69: tag for optional parameter `o' is already in use -OptionalParams.ice:70: tag for optional parameter `o' is already in use diff --git a/cpp/test/Slice/errorDetection/OptionalParams.ice b/cpp/test/Slice/errorDetection/OptionalParams.ice index a50f59b487f..73d167930ac 100644 --- a/cpp/test/Slice/errorDetection/OptionalParams.ice +++ b/cpp/test/Slice/errorDetection/OptionalParams.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - module Test { diff --git a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err index 0eede01a786..61f3662175a 100644 --- a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err +++ b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err @@ -1,2 +1,2 @@ -ParamsOutOfOrder.ice:17: `l3': in parameters cannot follow out parameters -ParamsOutOfOrder.ice:18: `l3': in parameters cannot follow out parameters +ParamsOutOfOrder.ice:12: `l3': in parameters cannot follow out parameters +ParamsOutOfOrder.ice:13: `l3': in parameters cannot follow out parameters diff --git a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice index 4a9642d90e6..abd06967df5 100644 --- a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice +++ b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsClass.err b/cpp/test/Slice/errorDetection/RedefinitionAsClass.err index 8cfe1c1173a..f6dab350443 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsClass.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsClass.err @@ -1,2 +1,2 @@ -RedefinitionAsClass.ice:16: declaration of already defined `Sequence1' as class -RedefinitionAsClass.ice:19: redefinition of sequence `Sequence2' as class +RedefinitionAsClass.ice:11: declaration of already defined `Sequence1' as class +RedefinitionAsClass.ice:14: redefinition of sequence `Sequence2' as class diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice index e7419c87283..9088b5e1caa 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err index dbbf3f68d98..da031f11be6 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err @@ -1 +1 @@ -RedefinitionAsDataMember.ice:18: redefinition of operation `operation' as data member `operation' +RedefinitionAsDataMember.ice:15: redefinition of operation `operation' as data member `operation' diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice index 22580cf995c..5aa00011df1 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - [["suppress-warning:deprecated"]] // for classes with operations module Test diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err index 8a6858f8b90..2b9f923a458 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err @@ -1 +1 @@ -RedefinitionAsDictionary.ice:16: redefinition of class `C' as dictionary +RedefinitionAsDictionary.ice:11: redefinition of class `C' as dictionary diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice index ff8546d07d1..c2b56f35f83 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err index a764d0eb540..c463ee79b4d 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err @@ -1 +1 @@ -RedefinitionAsEnum.ice:16: redefinition of class `C' as enumeration +RedefinitionAsEnum.ice:11: redefinition of class `C' as enumeration diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice index 849508f4834..86ffd1623fd 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err index 2a5d92b882c..3c4161330f5 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err @@ -1,2 +1,2 @@ -RedefinitionAsInterface.ice:16: declaration of already defined `Sequence1' as interface -RedefinitionAsInterface.ice:19: redefinition of sequence `Sequence2' as interface +RedefinitionAsInterface.ice:11: declaration of already defined `Sequence1' as interface +RedefinitionAsInterface.ice:14: redefinition of sequence `Sequence2' as interface diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice index 680deb60ec2..dcbb1e9e8d9 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsModule.err b/cpp/test/Slice/errorDetection/RedefinitionAsModule.err index 680ec8ab739..b92533c3230 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsModule.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsModule.err @@ -1 +1 @@ -RedefinitionAsModule.ice:16: redefinition of sequence `Seq' as module +RedefinitionAsModule.ice:11: redefinition of sequence `Seq' as module diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice index 7cdbc7c78f5..0c0349b1059 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err index 361a03d9192..cbc7cfba7a0 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err @@ -1 +1 @@ -RedefinitionAsOperation.ice:18: redefinition of data member `member' as operation `member' +RedefinitionAsOperation.ice:13: redefinition of data member `member' as operation `member' diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice index 005be67330e..042aa35fad9 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err index 706eb02db02..aaf072a48b7 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err @@ -1 +1 @@ -RedefinitionAsSequence.ice:16: redefinition of class `C' as sequence +RedefinitionAsSequence.ice:11: redefinition of class `C' as sequence diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice index e98b68c9e32..e77f55d9fff 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/Reserved.err b/cpp/test/Slice/errorDetection/Reserved.err index 25fbf9e061c..d4fc4d98658 100644 --- a/cpp/test/Slice/errorDetection/Reserved.err +++ b/cpp/test/Slice/errorDetection/Reserved.err @@ -1,19 +1,19 @@ -Reserved.ice:32: illegal identifier `Prx': `Prx' suffix is reserved -Reserved.ice:33: illegal identifier `abcPrx': `Prx' suffix is reserved -Reserved.ice:34: illegal identifier `Ptr': `Ptr' suffix is reserved -Reserved.ice:35: illegal identifier `abcPtr': `Ptr' suffix is reserved -Reserved.ice:36: illegal identifier `Helper': `Helper' suffix is reserved -Reserved.ice:37: illegal identifier `abcHelper': `Helper' suffix is reserved -Reserved.ice:38: illegal identifier `Holder': `Holder' suffix is reserved -Reserved.ice:39: illegal identifier `abcHolder': `Holder' suffix is reserved -Reserved.ice:40: illegal identifier `Ice': `Ice' prefix is reserved -Reserved.ice:41: illegal identifier `ice': `ice' prefix is reserved -Reserved.ice:41: constant `ice' differs only in capitalization from constant `Ice' -Reserved.ice:42: illegal identifier `icea': `ice' prefix is reserved -Reserved.ice:43: illegal identifier `Iceblah': `Ice' prefix is reserved -Reserved.ice:44: illegal identifier `IceFoo': `Ice' prefix is reserved -Reserved.ice:45: illegal identifier `icecream': `ice' prefix is reserved -Reserved.ice:46: illegal identifier `ICEpick': `ICE' prefix is reserved -Reserved.ice:47: illegal identifier `iCEaxe': `iCE' prefix is reserved -Reserved.ice:50: illegal identifier `Ice': `Ice' prefix is reserved -Reserved.ice:51: illegal identifier `IceFoo': `Ice' prefix is reserved +Reserved.ice:24: illegal identifier `Prx': `Prx' suffix is reserved +Reserved.ice:25: illegal identifier `abcPrx': `Prx' suffix is reserved +Reserved.ice:26: illegal identifier `Ptr': `Ptr' suffix is reserved +Reserved.ice:27: illegal identifier `abcPtr': `Ptr' suffix is reserved +Reserved.ice:28: illegal identifier `Helper': `Helper' suffix is reserved +Reserved.ice:29: illegal identifier `abcHelper': `Helper' suffix is reserved +Reserved.ice:30: illegal identifier `Holder': `Holder' suffix is reserved +Reserved.ice:31: illegal identifier `abcHolder': `Holder' suffix is reserved +Reserved.ice:32: illegal identifier `Ice': `Ice' prefix is reserved +Reserved.ice:33: illegal identifier `ice': `ice' prefix is reserved +Reserved.ice:33: constant `ice' differs only in capitalization from constant `Ice' +Reserved.ice:34: illegal identifier `icea': `ice' prefix is reserved +Reserved.ice:35: illegal identifier `Iceblah': `Ice' prefix is reserved +Reserved.ice:36: illegal identifier `IceFoo': `Ice' prefix is reserved +Reserved.ice:37: illegal identifier `icecream': `ice' prefix is reserved +Reserved.ice:38: illegal identifier `ICEpick': `ICE' prefix is reserved +Reserved.ice:39: illegal identifier `iCEaxe': `iCE' prefix is reserved +Reserved.ice:42: illegal identifier `Ice': `Ice' prefix is reserved +Reserved.ice:43: illegal identifier `IceFoo': `Ice' prefix is reserved diff --git a/cpp/test/Slice/errorDetection/Reserved.ice b/cpp/test/Slice/errorDetection/Reserved.ice index c95bdbfb1d9..a6ef16f1d0e 100644 --- a/cpp/test/Slice/errorDetection/Reserved.ice +++ b/cpp/test/Slice/errorDetection/Reserved.ice @@ -4,14 +4,6 @@ // // ********************************************************************** - - - - - - - - #include <include/IcePrefix.ice> // No error should be caused by this file module OK diff --git a/cpp/test/Slice/errorDetection/SelfContainment.err b/cpp/test/Slice/errorDetection/SelfContainment.err index 4af59683fbb..da20a80ca8d 100644 --- a/cpp/test/Slice/errorDetection/SelfContainment.err +++ b/cpp/test/Slice/errorDetection/SelfContainment.err @@ -1 +1 @@ -SelfContainment.ice:18: struct `x' cannot contain itself +SelfContainment.ice:13: struct `x' cannot contain itself diff --git a/cpp/test/Slice/errorDetection/SelfContainment.ice b/cpp/test/Slice/errorDetection/SelfContainment.ice index 36c4b344351..66ef44a9b0a 100644 --- a/cpp/test/Slice/errorDetection/SelfContainment.ice +++ b/cpp/test/Slice/errorDetection/SelfContainment.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/SequenceRedefinition.err b/cpp/test/Slice/errorDetection/SequenceRedefinition.err index 98e9430ad5b..ab4cdd3eef7 100644 --- a/cpp/test/Slice/errorDetection/SequenceRedefinition.err +++ b/cpp/test/Slice/errorDetection/SequenceRedefinition.err @@ -1 +1 @@ -SequenceRedefinition.ice:16: redefinition of sequence `Seq' as sequence +SequenceRedefinition.ice:11: redefinition of sequence `Seq' as sequence diff --git a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice index 884f3125199..a421705b825 100644 --- a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice +++ b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/StructMembers.err b/cpp/test/Slice/errorDetection/StructMembers.err index a92a2f1eb92..7494d4a37d9 100644 --- a/cpp/test/Slice/errorDetection/StructMembers.err +++ b/cpp/test/Slice/errorDetection/StructMembers.err @@ -1,7 +1,7 @@ -StructMembers.ice:17: struct `s1' must have at least one member -StructMembers.ice:49: missing data member name -StructMembers.ice:55: missing data member name -StructMembers.ice:55: `;' missing after definition -StructMembers.ice:59: missing data member name -StructMembers.ice:65: missing data member name -StructMembers.ice:65: `;' missing after definition +StructMembers.ice:12: struct `s1' must have at least one member +StructMembers.ice:44: missing data member name +StructMembers.ice:50: missing data member name +StructMembers.ice:50: `;' missing after definition +StructMembers.ice:54: missing data member name +StructMembers.ice:60: missing data member name +StructMembers.ice:60: `;' missing after definition diff --git a/cpp/test/Slice/errorDetection/StructMembers.ice b/cpp/test/Slice/errorDetection/StructMembers.ice index 00774adc5c4..9d8893d38b8 100644 --- a/cpp/test/Slice/errorDetection/StructMembers.ice +++ b/cpp/test/Slice/errorDetection/StructMembers.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/StructRedefinition.err b/cpp/test/Slice/errorDetection/StructRedefinition.err index af009af440f..e77b8fde4a7 100644 --- a/cpp/test/Slice/errorDetection/StructRedefinition.err +++ b/cpp/test/Slice/errorDetection/StructRedefinition.err @@ -1 +1 @@ -StructRedefinition.ice:14: redefinition of struct `Struct1' as struct +StructRedefinition.ice:11: redefinition of struct `Struct1' as struct diff --git a/cpp/test/Slice/errorDetection/StructRedefinition.ice b/cpp/test/Slice/errorDetection/StructRedefinition.ice index aac9a48b37f..df546245f97 100644 --- a/cpp/test/Slice/errorDetection/StructRedefinition.ice +++ b/cpp/test/Slice/errorDetection/StructRedefinition.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - module Test { diff --git a/cpp/test/Slice/errorDetection/Undefined.err b/cpp/test/Slice/errorDetection/Undefined.err index e069c49a3eb..a1ee7cbad5b 100644 --- a/cpp/test/Slice/errorDetection/Undefined.err +++ b/cpp/test/Slice/errorDetection/Undefined.err @@ -1,11 +1,11 @@ +Undefined.ice:10: `Foo' is not defined +Undefined.ice:11: `Foo' is not defined +Undefined.ice:12: `Foo' is not defined +Undefined.ice:13: `Foo' is not defined +Undefined.ice:14: `Foo3' is not defined +Undefined.ice:14: `Foo2' is not defined +Undefined.ice:14: `Foo1' is not defined Undefined.ice:15: `Foo' is not defined -Undefined.ice:16: `Foo' is not defined -Undefined.ice:17: `Foo' is not defined -Undefined.ice:18: `Foo' is not defined -Undefined.ice:19: `Foo3' is not defined -Undefined.ice:19: `Foo2' is not defined -Undefined.ice:19: `Foo1' is not defined -Undefined.ice:20: `Foo' is not defined -Undefined.ice:20: `Foo3' is not defined -Undefined.ice:20: `Foo2' is not defined -Undefined.ice:20: `Foo1' is not defined +Undefined.ice:15: `Foo3' is not defined +Undefined.ice:15: `Foo2' is not defined +Undefined.ice:15: `Foo1' is not defined diff --git a/cpp/test/Slice/errorDetection/Undefined.ice b/cpp/test/Slice/errorDetection/Undefined.ice index 29f23ac8e97..dc82bdfece0 100644 --- a/cpp/test/Slice/errorDetection/Undefined.ice +++ b/cpp/test/Slice/errorDetection/Undefined.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/WarningClassProxy.err b/cpp/test/Slice/errorDetection/WarningClassProxy.err index 773dbde311e..4faf2679684 100644 --- a/cpp/test/Slice/errorDetection/WarningClassProxy.err +++ b/cpp/test/Slice/errorDetection/WarningClassProxy.err @@ -1,6 +1,6 @@ -WarningClassProxy.ice:14: warning: proxy for a class is deprecated -WarningClassProxy.ice:18: warning: proxy for a class is deprecated -WarningClassProxy.ice:23: warning: proxy for a class is deprecated +WarningClassProxy.ice:11: warning: proxy for a class is deprecated +WarningClassProxy.ice:15: warning: proxy for a class is deprecated +WarningClassProxy.ice:20: warning: proxy for a class is deprecated +WarningClassProxy.ice:25: warning: proxy for a class is deprecated WarningClassProxy.ice:28: warning: proxy for a class is deprecated -WarningClassProxy.ice:31: warning: proxy for a class is deprecated -WarningClassProxy.ice:32: warning: proxy for a class is deprecated +WarningClassProxy.ice:29: warning: proxy for a class is deprecated diff --git a/cpp/test/Slice/errorDetection/WarningClassProxy.ice b/cpp/test/Slice/errorDetection/WarningClassProxy.ice index cbb057edb2c..027f465ed78 100644 --- a/cpp/test/Slice/errorDetection/WarningClassProxy.ice +++ b/cpp/test/Slice/errorDetection/WarningClassProxy.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - module Test { diff --git a/cpp/test/Slice/errorDetection/WarningInterfaceByValue.err b/cpp/test/Slice/errorDetection/WarningInterfaceByValue.err index cf8130acb7d..6d24772071c 100644 --- a/cpp/test/Slice/errorDetection/WarningInterfaceByValue.err +++ b/cpp/test/Slice/errorDetection/WarningInterfaceByValue.err @@ -1,7 +1,7 @@ -WarningInterfaceByValue.ice:14: warning: interface by value is deprecated -WarningInterfaceByValue.ice:18: warning: interface by value is deprecated -WarningInterfaceByValue.ice:23: warning: interface by value is deprecated -WarningInterfaceByValue.ice:28: warning: interface by value is deprecated +WarningInterfaceByValue.ice:11: warning: interface by value is deprecated +WarningInterfaceByValue.ice:15: warning: interface by value is deprecated +WarningInterfaceByValue.ice:20: warning: interface by value is deprecated +WarningInterfaceByValue.ice:25: warning: interface by value is deprecated +WarningInterfaceByValue.ice:32: warning: interface by value is deprecated WarningInterfaceByValue.ice:35: warning: interface by value is deprecated -WarningInterfaceByValue.ice:38: warning: interface by value is deprecated -WarningInterfaceByValue.ice:39: warning: interface by value is deprecated +WarningInterfaceByValue.ice:36: warning: interface by value is deprecated diff --git a/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice b/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice index 339af33d877..14ccc27444c 100644 --- a/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice +++ b/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - module Test { diff --git a/cpp/test/Slice/errorDetection/WarningInvalidMetaData.err b/cpp/test/Slice/errorDetection/WarningInvalidMetaData.err index 11146a61c8b..82bf7e1fb3d 100644 --- a/cpp/test/Slice/errorDetection/WarningInvalidMetaData.err +++ b/cpp/test/Slice/errorDetection/WarningInvalidMetaData.err @@ -9,13 +9,13 @@ WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:dll-e WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:dll-export:' WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:include' WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:include:' -WarningInvalidMetaData.ice:37: warning: ignoring metadata `cpp:noexcept' for non local interface -WarningInvalidMetaData.ice:40: warning: ignoring invalid metadata `cpp:type:std::list< ::std::string>' for operation with void return type -WarningInvalidMetaData.ice:43: warning: ignoring invalid metadata `cpp:view-type:std::experimental::string_view' for operation with void return type -WarningInvalidMetaData.ice:46: warning: ignoring invalid metadata `cpp:array' for operation with void return type -WarningInvalidMetaData.ice:49: warning: ignoring invalid metadata `cpp:range' for operation with void return type -WarningInvalidMetaData.ice:54: warning: ignoring invalid metadata `cpp:class' -WarningInvalidMetaData.ice:54: warning: ignoring invalid metadata `cpp:comparable' -WarningInvalidMetaData.ice:59: warning: ignoring invalid metadata `cpp:const' -WarningInvalidMetaData.ice:59: warning: ignoring invalid metadata `cpp:ice_print' -WarningInvalidMetaData.ice:65: warning: ignoring invalid metadata `cpp:virtual' +WarningInvalidMetaData.ice:34: warning: ignoring metadata `cpp:noexcept' for non local interface +WarningInvalidMetaData.ice:37: warning: ignoring invalid metadata `cpp:type:std::list< ::std::string>' for operation with void return type +WarningInvalidMetaData.ice:40: warning: ignoring invalid metadata `cpp:view-type:std::experimental::string_view' for operation with void return type +WarningInvalidMetaData.ice:43: warning: ignoring invalid metadata `cpp:array' for operation with void return type +WarningInvalidMetaData.ice:46: warning: ignoring invalid metadata `cpp:range' for operation with void return type +WarningInvalidMetaData.ice:51: warning: ignoring invalid metadata `cpp:class' +WarningInvalidMetaData.ice:51: warning: ignoring invalid metadata `cpp:comparable' +WarningInvalidMetaData.ice:56: warning: ignoring invalid metadata `cpp:const' +WarningInvalidMetaData.ice:56: warning: ignoring invalid metadata `cpp:ice_print' +WarningInvalidMetaData.ice:62: warning: ignoring invalid metadata `cpp:virtual' diff --git a/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice b/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice index b5f9cbfdc02..1d590354750 100644 --- a/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice +++ b/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice @@ -4,9 +4,6 @@ // // ********************************************************************** - - - [["cpp:header-ext:hh"]] [["cpp:header-ext:hh"]] diff --git a/cpp/test/Slice/errorDetection/WrongProxyType.err b/cpp/test/Slice/errorDetection/WrongProxyType.err index ab7e04633ad..9c56df741e7 100644 --- a/cpp/test/Slice/errorDetection/WrongProxyType.err +++ b/cpp/test/Slice/errorDetection/WrongProxyType.err @@ -1,7 +1,7 @@ -WrongProxyType.ice:16: warning: use of sequences in dictionary keys has been deprecated -WrongProxyType.ice:20: `Seq' must be class or interface -WrongProxyType.ice:21: `Seq' must be class or interface -WrongProxyType.ice:22: `Seq' must be class or interface -WrongProxyType.ice:24: `Dict' must be class or interface -WrongProxyType.ice:25: `Dict' must be class or interface -WrongProxyType.ice:26: `Dict' must be class or interface +WrongProxyType.ice:11: warning: use of sequences in dictionary keys has been deprecated +WrongProxyType.ice:15: `Seq' must be class or interface +WrongProxyType.ice:16: `Seq' must be class or interface +WrongProxyType.ice:17: `Seq' must be class or interface +WrongProxyType.ice:19: `Dict' must be class or interface +WrongProxyType.ice:20: `Dict' must be class or interface +WrongProxyType.ice:21: `Dict' must be class or interface diff --git a/cpp/test/Slice/errorDetection/WrongProxyType.ice b/cpp/test/Slice/errorDetection/WrongProxyType.ice index 3048bc6a3ff..637e477f355 100644 --- a/cpp/test/Slice/errorDetection/WrongProxyType.ice +++ b/cpp/test/Slice/errorDetection/WrongProxyType.ice @@ -4,11 +4,6 @@ // // ********************************************************************** - - - - - module Test { diff --git a/cpp/test/Slice/errorDetection/test.py b/cpp/test/Slice/errorDetection/test.py index 40938b9d408..86f72dd6822 100644 --- a/cpp/test/Slice/errorDetection/test.py +++ b/cpp/test/Slice/errorDetection/test.py @@ -20,8 +20,6 @@ class SliceErrorDetectionTestCase(ClientTestCase): current.write(os.path.basename(file) + "... ") args = ["-I.", file, "--output-dir", "tmp"] - if file.find("Underscore") >= 0: - args.append("--underscore") # Don't print out slice2cpp output and expect failures slice2cpp.run(current, args=args, exitstatus=0 if file.find("Warning") >= 0 else 1) |