summaryrefslogtreecommitdiff
path: root/csharp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-03-10 22:40:49 +0100
committerJose <jose@zeroc.com>2016-03-10 22:40:49 +0100
commite01092bc3d0c315e567a2f8dbd843cc1062e28ae (patch)
treeb2109b4fe190145a8a467bab24f29f3078e5d1de /csharp
parentC# doc comment fix (diff)
downloadice-e01092bc3d0c315e567a2f8dbd843cc1062e28ae.tar.bz2
ice-e01092bc3d0c315e567a2f8dbd843cc1062e28ae.tar.xz
ice-e01092bc3d0c315e567a2f8dbd843cc1062e28ae.zip
Windows wide string literal fixes
Diffstat (limited to 'csharp')
-rw-r--r--csharp/test/Ice/operations/Test.ice11
-rw-r--r--csharp/test/Ice/operations/TestAMD.ice13
2 files changed, 15 insertions, 9 deletions
diff --git a/csharp/test/Ice/operations/Test.ice b/csharp/test/Ice/operations/Test.ice
index d0f62b7483b..15867efb92f 100644
--- a/csharp/test/Ice/operations/Test.ice
+++ b/csharp/test/Ice/operations/Test.ice
@@ -251,7 +251,7 @@ class MyClass
ByteBoolD opByteBoolD1(ByteBoolD opByteBoolD1);
StringS opStringS2(StringS stringS);
ByteBoolD opByteBoolD2(ByteBoolD byteBoolD);
-
+
StringS opStringLiterals();
StringS opWStringLiterals();
};
@@ -328,6 +328,8 @@ const string ss4 = "\\\u0041\\"; /* \A\ */
const string ss5 = "\\u0041\\"; /* \u0041\ */
//
+// Ĩ - Unicode Character 'LATIN CAPITAL LETTER I WITH TILDE' (U+0128)
+// Ÿ - Unicode Character 'LATIN CAPITAL LETTER Y WITH DIAERESIS' (U+0178)
// ÿ - Unicode Character 'LATIN SMALL LETTER Y WITH DIAERESIS' (U+00FF)
// Ā - Unicode Character 'LATIN CAPITAL LETTER A WITH MACRON' (U+0100)
// ἀ - Unicode Character 'GREEK SMALL LETTER ALPHA WITH PSILI' (U+1F00)
@@ -338,8 +340,9 @@ const string ss5 = "\\u0041\\"; /* \u0041\ */
// 🍁 - Unicode Character 'MAPLE LEAF' (U+1F341)
// 🍂 - Unicode Character 'FALLEN LEAF' (U+1F342)
// 🍃 - Unicode Character 'LEAF FLUTTERING IN WIND' (U+1F343)
-const string su0 = "ÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃";
-const string su1 = "\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
-const string su2 = "\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
+//
+const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃";
+const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
+const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
};
diff --git a/csharp/test/Ice/operations/TestAMD.ice b/csharp/test/Ice/operations/TestAMD.ice
index 60c1f9144c7..ee686962e46 100644
--- a/csharp/test/Ice/operations/TestAMD.ice
+++ b/csharp/test/Ice/operations/TestAMD.ice
@@ -237,7 +237,7 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD;
idempotent void opIdempotent();
["nonmutating"] idempotent void opNonmutating();
-
+
byte opByte1(byte opByte1);
short opShort1(short opShort1);
int opInt1(int opInt1);
@@ -249,7 +249,7 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD;
ByteBoolD opByteBoolD1(ByteBoolD opByteBoolD1);
StringS opStringS2(StringS stringS);
ByteBoolD opByteBoolD2(ByteBoolD byteBoolD);
-
+
StringS opStringLiterals();
StringS opWStringLiterals();
};
@@ -331,6 +331,8 @@ const string ss4 = "\\\u0041\\"; /* \A\ */
const string ss5 = "\\u0041\\"; /* \u0041\ */
//
+// Ĩ - Unicode Character 'LATIN CAPITAL LETTER I WITH TILDE' (U+0128)
+// Ÿ - Unicode Character 'LATIN CAPITAL LETTER Y WITH DIAERESIS' (U+0178)
// ÿ - Unicode Character 'LATIN SMALL LETTER Y WITH DIAERESIS' (U+00FF)
// Ā - Unicode Character 'LATIN CAPITAL LETTER A WITH MACRON' (U+0100)
// ἀ - Unicode Character 'GREEK SMALL LETTER ALPHA WITH PSILI' (U+1F00)
@@ -341,8 +343,9 @@ const string ss5 = "\\u0041\\"; /* \u0041\ */
// 🍁 - Unicode Character 'MAPLE LEAF' (U+1F341)
// 🍂 - Unicode Character 'FALLEN LEAF' (U+1F342)
// 🍃 - Unicode Character 'LEAF FLUTTERING IN WIND' (U+1F343)
-const string su0 = "ÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃";
-const string su1 = "\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
-const string su2 = "\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
+//
+const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃";
+const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
+const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
};