fix #4, ml string containing '0'

Author: laktak

src/HJSON/HJSONParser.php

@@ -25,20 +25,12 @@ function __construct() {
 
     public function parse($source, $options=[])
     {
-        $result;
-
         $this->keepWsc = $options && $options['keepWsc'];
         $this->text = $source;
-        $this->resetAt();
-        $result = $this->rootValue();
-        $this->white();
-
-        if ($this->ch) throw new HJSONException("Syntax error, found trailing characters");
-
-        return $result;
+        return $this->rootValue();
     }
 
-    function resetAt()
+    private function resetAt()
     {
         $this->at = 0;
         $this->ch = ' ';
@@ -49,23 +41,32 @@ public function parseWsc($source, $options=[])
         return $this->parse($source, array_merge($options, ['keepWsc' => true]));
     }
 
+    private function checkExit($result)
+    {
+        $this->white();
+        if ($this->ch !== null) $this->error("Syntax error, found trailing characters!");
+        return $result;
+    }
+
     private function rootValue()
     {
         // Braces for the root object are optional
+
+        $this->resetAt();
         $this->white();
         switch ($this->ch) {
-            case '{': return $this->object();
-            case '[': return $this->_array();
+            case '{': return $this->checkExit($this->object());
+            case '[': return $this->checkExit($this->_array());
         }
 
         try {
           // assume we have a root object without braces
-          return $this->object(true);
+          return $this->checkExit($this->object(true));
         }
         catch (HJSONException $e) {
             // test if we are dealing with a single JSON value instead (true/false/null/num/"")
             $this->resetAt();
-            try { return $this->value(); }
+            try { return $this->checkExit($this->value()); }
             catch (HJSONException $e2) { throw $e; } // throw original error
         }
     }
@@ -272,7 +273,7 @@ private function mlString()
         $indent = 0;
         while (true) {
             $c = $this->peek(-$indent-5);
-            if (!$c || $c === "\n") break;
+            if ($c === null || $c === "\n") break;
             $indent++;
         }
 
@@ -282,7 +283,7 @@ private function mlString()
 
         // When parsing multiline string values, we must look for ' characters.
         while (true) {
-            if (!$this->ch) $this->error("Bad multiline string");
+            if ($this->ch === null) $this->error("Bad multiline string");
             else if ($this->ch === '\'') {
                 $triple++;
                 $this->next();

tests/assets/charset_result.hjson

@@ -0,0 +1,5 @@
+{
+  ql-ascii: ! "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
+  js-ascii: ! "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
+  ml-ascii: ! "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
+}

tests/assets/charset_result.json

@@ -0,0 +1,5 @@
+{
+  "ql-ascii": "! \"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",
+  "js-ascii": "! \"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",
+  "ml-ascii": "! \"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+}

tests/assets/charset_test.hjson

@@ -0,0 +1,6 @@
+ql-ascii: ! "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
+js-ascii: "! \"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+ml-ascii:
+  '''
+  ! "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
+  '''