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, 98 insertions, 0 deletions

diff --git a/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java
index 02b88e5d91a..7a9a61530b7 100644
--- a/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java
@@ -929,6 +929,48 @@ public final class AMDMyDerivedClassI extends MyDerivedClass
                 su2.value
             });
     }
+    
+    @Override
+    public void opWStringLiterals_async(AMD_MyClass_opWStringLiterals cb, Ice.Current current)
+    {
+        cb.ice_response(new String[]
+            {
+                s0.value,
+                s1.value,
+                s2.value,
+                s3.value,
+                s4.value,
+                s5.value,
+                s6.value,
+                s7.value,
+                s8.value,
+                s9.value,
+                s10.value,
+                
+                sw0.value,
+                sw1.value,
+                sw2.value,
+                sw3.value,
+                sw4.value,
+                sw5.value,
+                sw6.value,
+                sw7.value,
+                sw8.value,
+                sw9.value,
+                sw10.value,
+                
+                ss0.value,
+                ss1.value,
+                ss2.value,
+                ss3.value,
+                ss4.value,
+                ss5.value,
+                
+                su0.value,
+                su1.value,
+                su2.value
+            });
+    }
 
     private Thread _opVoidThread;
     private int _opByteSOnewayCallCount = 0;
diff --git a/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java
index 1e5ab277b56..8b78ab51efd 100644
--- a/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java
@@ -893,6 +893,48 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations
                 su2.value
             });
     }
+    
+    @Override
+    public void opWStringLiterals_async(AMD_MyClass_opWStringLiterals cb, Ice.Current current)
+    {
+        cb.ice_response(new String[]
+            {
+                s0.value,
+                s1.value,
+                s2.value,
+                s3.value,
+                s4.value,
+                s5.value,
+                s6.value,
+                s7.value,
+                s8.value,
+                s9.value,
+                s10.value,
+                
+                sw0.value,
+                sw1.value,
+                sw2.value,
+                sw3.value,
+                sw4.value,
+                sw5.value,
+                sw6.value,
+                sw7.value,
+                sw8.value,
+                sw9.value,
+                sw10.value,
+                
+                ss0.value,
+                ss1.value,
+                ss2.value,
+                ss3.value,
+                ss4.value,
+                ss5.value,
+                
+                su0.value,
+                su1.value,
+                su2.value
+            });
+    }
 
     private Thread _opVoidThread;
     private int _opByteSOnewayCallCount = 0;
diff --git a/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java
index 2e7d418a7ea..a0b09d438d3 100644
--- a/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java
@@ -875,5 +875,11 @@ public final class MyDerivedClassI extends MyDerivedClass
             };
     }
 
+    @Override
+    public String[] opWStringLiterals(Ice.Current current)
+    {
+        return opStringLiterals(current);
+    }
+
     private int _opByteSOnewayCallCount = 0;
 }
diff --git a/java/test/src/main/java/test/Ice/operations/Test.ice b/java/test/src/main/java/test/Ice/operations/Test.ice
index 069faffeb6b..4a99bcae36d 100644
--- a/java/test/src/main/java/test/Ice/operations/Test.ice
+++ b/java/test/src/main/java/test/Ice/operations/Test.ice
@@ -252,6 +252,7 @@ class MyClass
     ByteBoolD opByteBoolD2(ByteBoolD byteBoolD);
 
     StringS opStringLiterals();
+    StringS opWStringLiterals();
 };
 
 struct MyStruct1
diff --git a/java/test/src/main/java/test/Ice/operations/TestAMD.ice b/java/test/src/main/java/test/Ice/operations/TestAMD.ice
index 19b2eb839b5..3f53e4597f7 100644
--- a/java/test/src/main/java/test/Ice/operations/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/operations/TestAMD.ice
@@ -252,6 +252,7 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD;
     ByteBoolD opByteBoolD2(ByteBoolD byteBoolD);
 
     StringS opStringLiterals();
+    StringS opWStringLiterals();
 };
 
 struct MyStruct1
diff --git a/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java
index 0e4e6b89cb1..34c55945ed3 100644
--- a/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java
@@ -838,6 +838,12 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations
                 su2.value
             };
     }
+    
+    @Override
+    public String[] opWStringLiterals(Ice.Current current)
+    {
+        return opStringLiterals(current);
+    }
 
     private int _opByteSOnewayCallCount = 0;
 }