Merge pull request #5416 from ethereum/develop

Merge develop into release for 0.5.0

1 files changed, 31 insertions, 0 deletions

diff --git a/test/libsolidity/syntaxTests/unicode_escape_literals.sol b/test/libsolidity/syntaxTests/unicode_escape_literals.sol
new file mode 100644
index 00000000..a340487b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/unicode_escape_literals.sol
@@ -0,0 +1,31 @@
+contract test {
+
+    function oneByteUTF8() public pure returns (bytes32) {
+        bytes32 usdollar = "aaa\u0024aaa";
+        return usdollar;
+    }
+
+    function twoBytesUTF8() public pure returns (bytes32) {
+        bytes32 cent = "aaa\u00A2aaa";
+        return cent;
+    }
+
+    function threeBytesUTF8() public pure returns (bytes32) {
+        bytes32 eur = "aaa\u20ACaaa";
+        return  eur;
+    }
+
+    function together() public pure returns (bytes32) {
+        bytes32 res = "\u0024\u00A2\u20AC";
+        return res;
+    }
+
+    // this function returns an invalid unicode character
+    function invalidLiteral() public pure returns(bytes32) {
+        bytes32 invalid = "\u00xx";
+        return invalid;
+    }
+
+}
+// ----
+// ParserError: (678-681): Expected primary expression.