Fix unicode escapes (#46)

Author: trobro

src/HJSON/HJSONStringifier.php

@@ -101,8 +101,6 @@ private function isWhite($c)
 
     private function quoteReplace($string)
     {
-        mb_ereg_search_init($string, $this->needsEscape);
-        $r = mb_ereg_search();
         $chars = mb_str_split($string);
         $chars = array_map(function ($char) {
             if (preg_match($this->needsEscape, $char)) {
@@ -111,7 +109,7 @@ private function quoteReplace($string)
                 if (gettype($c) === 'string') {
                     return $c;
                 } else {
-                    return $char;
+                    return substr(json_encode($char), 1, -1);
                 }
             } else {
                 return $char;

tests/HJSONParserTest.php

@@ -79,6 +79,7 @@ private function runEach($name, $file, $isJson, $inputCr, $outputCr)
         echo "Running test for $name, $file, ".(+$isJson).', '.(+$inputCr).', '.(+$outputCr)."\n";
         $text = $this->load($file, $inputCr);
         $shouldFail = substr($name, 0, 4) === "fail";
+        $unexpectedPass = false;
 
         try {
             $parser = new HJSONParser();
@@ -108,14 +109,19 @@ private function runEach($name, $file, $isJson, $inputCr, $outputCr)
                 $hjson2 = $this->load("{$name}_result.hjson", $outputCr);
                 $this->assertEquals($hjson1, $hjson2);
             } else {
-                $this->markTestIncomplete('This test succeeded on data that should fail.');
+                $unexpectedPass = true;
             }
         } catch (HJSONException $e) {
             if (!$shouldFail) {
                 echo "\n$e\n";
                 throw $e;
             }
         }
+
+        if ($unexpectedPass) {
+            echo "This test succeeded on data that should fail.\n";
+            throw new HJSONException();
+        }
     }
 
     public function testAll()

tests/assets/charset2_result.hjson

@@ -0,0 +1,5 @@
+{
+  uescape: "\u0000,\u0001,\uffff"
+  "um\u000blaut": äöüßÄÖÜ
+  hex: ģ䕧覫췯ꯍ
+}

tests/assets/charset2_result.json

@@ -0,0 +1,5 @@
+{
+  "uescape": "\u0000,\u0001,\uffff",
+  "um\u000blaut": "äöüßÄÖÜ",
+  "hex": "ģ䕧覫췯ꯍ"
+}

tests/assets/charset2_test.hjson

@@ -0,0 +1,5 @@
+{
+  uescape: "\u0000,\u0001,\uffff"
+  "um\u000blaut": äöüßÄÖÜ
+  hex: "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A"
+}

tests/assets/failObj4_test.hjson

@@ -0,0 +1,4 @@
+a: 1
+b: 2
+# trailing bracket in bracketless root
+}

tests/assets/strings3_result.hjson

@@ -1 +1,4 @@
-""
+{
+  a: ""
+  b: "\u00ad\u0600\u0604\u070f\u17b4\u17b5\u200c\u200f\u2028\u202f\u2060\u206f\ufeff\ufff0\uffff"
+}

tests/assets/strings3_result.json

@@ -1 +1,4 @@
-""
+{
+  "a": "",
+  "b": "\u00ad\u0600\u0604\u070f\u17b4\u17b5\u200c\u200f\u2028\u202f\u2060\u206f\ufeff\ufff0\uffff"
+}

tests/assets/strings3_test.hjson

@@ -1 +1,6 @@
-''''''
+{
+  // Empty string
+  a: ""
+  // Unicode code points that require escape inside quotes.
+  b: "\u00ad\u0600\u0604\u070f\u17b4\u17b5\u200c\u200f\u2028\u202f\u2060\u206f\ufeff\ufff0\uffff"
+}

tests/assets/strings4_result.hjson

@@ -0,0 +1 @@
+""