String literals fixes

- Fixed escape sequences in C++ wide strings
- Fixed objetive-c escape sequences
- Update ruby to use magic comments to set the file encoding

6 files changed, 94 insertions, 0 deletions

diff --git a/csharp/test/Ice/operations/MyDerivedClassAMDI.cs b/csharp/test/Ice/operations/MyDerivedClassAMDI.cs
index f7d9f4b267e..d25fe1a15e6 100644
--- a/csharp/test/Ice/operations/MyDerivedClassAMDI.cs
+++ b/csharp/test/Ice/operations/MyDerivedClassAMDI.cs
@@ -910,6 +910,47 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass
                 Test.su2.value
             });
     }
+    
+    public override void opWStringLiterals_async(Test.AMD_MyClass_opWStringLiterals cb, Ice.Current current)
+    {
+        cb.ice_response(new string[]
+            {
+                Test.s0.value,
+                Test.s1.value,
+                Test.s2.value,
+                Test.s3.value,
+                Test.s4.value,
+                Test.s5.value,
+                Test.s6.value,
+                Test.s7.value,
+                Test.s8.value,
+                Test.s9.value,
+                Test.s10.value,
+                
+                Test.sw0.value,
+                Test.sw1.value,
+                Test.sw2.value,
+                Test.sw3.value,
+                Test.sw4.value,
+                Test.sw5.value,
+                Test.sw6.value,
+                Test.sw7.value,
+                Test.sw8.value,
+                Test.sw9.value,
+                Test.sw10.value,
+                
+                Test.ss0.value,
+                Test.ss1.value,
+                Test.ss2.value,
+                Test.ss3.value,
+                Test.ss4.value,
+                Test.ss5.value,
+                
+                Test.su0.value,
+                Test.su1.value,
+                Test.su2.value
+            });
+    }
 
     private Thread_opVoid _opVoidThread;
     private int _opByteSOnewayCallCount = 0;
diff --git a/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs b/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs
index 984b168ba28..b1efecbbc2b 100644
--- a/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs
+++ b/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs
@@ -888,6 +888,47 @@ public sealed class MyDerivedClassTieI : Test.MyDerivedClassOperations_
                 Test.su2.value
             });
     }
+    
+    public void opWStringLiterals_async(Test.AMD_MyClass_opWStringLiterals cb, Ice.Current current)
+    {
+        cb.ice_response(new string[]
+            {
+                Test.s0.value,
+                Test.s1.value,
+                Test.s2.value,
+                Test.s3.value,
+                Test.s4.value,
+                Test.s5.value,
+                Test.s6.value,
+                Test.s7.value,
+                Test.s8.value,
+                Test.s9.value,
+                Test.s10.value,
+                
+                Test.sw0.value,
+                Test.sw1.value,
+                Test.sw2.value,
+                Test.sw3.value,
+                Test.sw4.value,
+                Test.sw5.value,
+                Test.sw6.value,
+                Test.sw7.value,
+                Test.sw8.value,
+                Test.sw9.value,
+                Test.sw10.value,
+                
+                Test.ss0.value,
+                Test.ss1.value,
+                Test.ss2.value,
+                Test.ss3.value,
+                Test.ss4.value,
+                Test.ss5.value,
+                
+                Test.su0.value,
+                Test.su1.value,
+                Test.su2.value
+            });
+    }
 
     private Thread_opVoid _opVoidThread;
     private int _opByteSOnewayCallCount = 0;
diff --git a/csharp/test/Ice/operations/MyDerivedClassI.cs b/csharp/test/Ice/operations/MyDerivedClassI.cs
index 07a182741cb..9832f3ba57e 100644
--- a/csharp/test/Ice/operations/MyDerivedClassI.cs
+++ b/csharp/test/Ice/operations/MyDerivedClassI.cs
@@ -870,6 +870,11 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass
                 Test.su2.value
             };
     }
+    
+    public override string[] opWStringLiterals(Ice.Current current)
+    {
+        return opStringLiterals(current);
+    }
 
     private int _opByteSOnewayCallCount = 0;
 }
diff --git a/csharp/test/Ice/operations/MyDerivedClassTieI.cs b/csharp/test/Ice/operations/MyDerivedClassTieI.cs
index 7d36de46c69..4ad9d672d48 100644
--- a/csharp/test/Ice/operations/MyDerivedClassTieI.cs
+++ b/csharp/test/Ice/operations/MyDerivedClassTieI.cs
@@ -846,5 +846,10 @@ public sealed class MyDerivedClassTieI : Test.MyDerivedClassOperations_
             };
     }
 
+    public string[] opWStringLiterals(Ice.Current current)
+    {
+        return opStringLiterals(current);
+    }
+
     private int _opByteSOnewayCallCount = 0;
 }
diff --git a/csharp/test/Ice/operations/Test.ice b/csharp/test/Ice/operations/Test.ice
index d085b4b2cd3..d0f62b7483b 100644
--- a/csharp/test/Ice/operations/Test.ice
+++ b/csharp/test/Ice/operations/Test.ice
@@ -253,6 +253,7 @@ class MyClass
     ByteBoolD opByteBoolD2(ByteBoolD byteBoolD);
     
     StringS opStringLiterals();
+    StringS opWStringLiterals();
 };
 
 struct MyStruct1
diff --git a/csharp/test/Ice/operations/TestAMD.ice b/csharp/test/Ice/operations/TestAMD.ice
index 179834bcd5f..60c1f9144c7 100644
--- a/csharp/test/Ice/operations/TestAMD.ice
+++ b/csharp/test/Ice/operations/TestAMD.ice
@@ -251,6 +251,7 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD;
     ByteBoolD opByteBoolD2(ByteBoolD byteBoolD);
     
     StringS opStringLiterals();
+    StringS opWStringLiterals();
 };
 
 struct MyStruct1