Added extra tests for Ice-, ICE-, ice- prefix, etc.

2 files changed, 24 insertions, 15 deletions

diff --git a/cpp/test/Slice/errorDetection/Reserved.err b/cpp/test/Slice/errorDetection/Reserved.err
index a78f24e8ba8..79d7531c3d8 100644
--- a/cpp/test/Slice/errorDetection/Reserved.err
+++ b/cpp/test/Slice/errorDetection/Reserved.err
@@ -1,15 +1,21 @@
-Reserved.ice:31: illegal identifier `Prx': `Prx' suffix is reserved
-Reserved.ice:32: illegal identifier `abcPrx': `Prx' suffix is reserved
-Reserved.ice:33: illegal identifier `Ptr': `Ptr' suffix is reserved
-Reserved.ice:34: illegal identifier `abcPtr': `Ptr' suffix is reserved
-Reserved.ice:35: illegal identifier `Helper': `Helper' suffix is reserved
-Reserved.ice:36: illegal identifier `abcHelper': `Helper' suffix is reserved
-Reserved.ice:37: illegal identifier `Holder': `Holder' suffix is reserved
-Reserved.ice:38: illegal identifier `abcHolder': `Holder' suffix is reserved
-Reserved.ice:39: illegal identifier `Operations': `Operations' suffix is reserved
-Reserved.ice:40: illegal identifier `abcOperations': `Operations' suffix is reserved
-Reserved.ice:41: illegal identifier `Ice': `Ice' prefix is reserved
+Reserved.ice:29: illegal identifier `Prx': `Prx' suffix is reserved
+Reserved.ice:30: illegal identifier `abcPrx': `Prx' suffix is reserved
+Reserved.ice:31: illegal identifier `Ptr': `Ptr' suffix is reserved
+Reserved.ice:32: illegal identifier `abcPtr': `Ptr' suffix is reserved
+Reserved.ice:33: illegal identifier `Helper': `Helper' suffix is reserved
+Reserved.ice:34: illegal identifier `abcHelper': `Helper' suffix is reserved
+Reserved.ice:35: illegal identifier `Holder': `Holder' suffix is reserved
+Reserved.ice:36: illegal identifier `abcHolder': `Holder' suffix is reserved
+Reserved.ice:37: illegal identifier `Operations': `Operations' suffix is reserved
+Reserved.ice:38: illegal identifier `abcOperations': `Operations' suffix is reserved
+Reserved.ice:39: illegal identifier `Ice': `Ice' prefix is reserved
+Reserved.ice:40: illegal identifier `ice': `ice' prefix is reserved
+Reserved.ice:40: constant `ice' differs only in capitalization from constant `Ice'
+Reserved.ice:41: illegal identifier `icea': `ice' prefix is reserved
 Reserved.ice:42: illegal identifier `Iceblah': `Ice' prefix is reserved
 Reserved.ice:43: illegal identifier `IceFoo': `Ice' prefix is reserved
-Reserved.ice:46: illegal identifier `Ice': `Ice' prefix is reserved
-Reserved.ice:47: illegal identifier `IceFoo': `Ice' prefix is reserved
+Reserved.ice:44: illegal identifier `icecream': `ice' prefix is reserved
+Reserved.ice:45: illegal identifier `ICEpick': `ICE' prefix is reserved
+Reserved.ice:46: illegal identifier `iCEaxe': `iCE' prefix is reserved
+Reserved.ice:49: illegal identifier `Ice': `Ice' prefix is reserved
+Reserved.ice:50: illegal identifier `IceFoo': `Ice' prefix is reserved
diff --git a/cpp/test/Slice/errorDetection/Reserved.ice b/cpp/test/Slice/errorDetection/Reserved.ice
index 4560f79354f..15c07188019 100644
--- a/cpp/test/Slice/errorDetection/Reserved.ice
+++ b/cpp/test/Slice/errorDetection/Reserved.ice
@@ -22,8 +22,6 @@ const long HelperA = 0;
 const long HolderA = 0;
 const long OperationsA = 0;
 const long aIce = 0;
-const long ice = 0;
-const long icea = 0;
 };
 
 module errors
@@ -39,8 +37,13 @@ const long abcHolder = 0;
 const long Operations = 0;
 const long abcOperations = 0;
 const long Ice = 0;
+const long ice = 0;
+const long icea = 0;
 const long Iceblah = 0;
 const long IceFoo = 0;
+const long icecream = 0;
+const long ICEpick = 0;
+const long iCEaxe = 0;
 };
 
 module Ice {};