Merge pull request #3 from colinodell/code-coverage

Code coverage

Author: colinodell

.travis.yml

@@ -27,8 +27,5 @@ script:
   - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
 after_script:
-  - |
-    if [[ "$TRAVIS_PHP_VERSION" != '7.0' ]]; then
-      wget https://scrutinizer-ci.com/ocular.phar
-      php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-    fi
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover

src/Json5Decoder.php

@@ -245,20 +245,14 @@ private function number()
 
         // support for Infinity
         if ($this->ch === 'I') {
-            $number = $this->word();
-            if ($number === null) {
-                $this->throwSyntaxError('Unexpected word for number');
-            }
+            $this->word();
 
             return ($sign === '-') ? -INF : INF;
         }
 
         // support for NaN
         if ($this->ch === 'N') {
             $number = $this->word();
-            if ($number !== NAN) {
-                $this->throwSyntaxError('expected word to be NaN');
-            }
 
             // ignore sign as -NaN also is NaN
             return $number;
@@ -483,41 +477,37 @@ private function arr()
     {
         $arr = [];
 
-        if ($this->ch === '[') {
-            if (++$this->depth > $this->maxDepth) {
-                $this->throwSyntaxError('Maximum stack depth exceeded');
-            }
+        if (++$this->depth > $this->maxDepth) {
+            $this->throwSyntaxError('Maximum stack depth exceeded');
+        }
 
-            $this->nextOrFail('[');
-            $this->white();
-            while ($this->ch !== null) {
-                if ($this->ch === ']') {
-                    $this->nextOrFail(']');
-                    $this->depth--;
-                    return $arr; // Potentially empty array
-                }
-                // ES5 allows omitting elements in arrays, e.g. [,] and
-                // [,null]. We don't allow this in JSON5.
-                if ($this->ch === ',') {
-                    $this->throwSyntaxError('Missing array element');
-                }
+        $this->nextOrFail('[');
+        $this->white();
+        while ($this->ch !== null) {
+            if ($this->ch === ']') {
+                $this->nextOrFail(']');
+                $this->depth--;
+                return $arr; // Potentially empty array
+            }
+            // ES5 allows omitting elements in arrays, e.g. [,] and
+            // [,null]. We don't allow this in JSON5.
+            if ($this->ch === ',') {
+                $this->throwSyntaxError('Missing array element');
+            }
 
-                $arr[] = $this->value();
+            $arr[] = $this->value();
 
-                $this->white();
-                // If there's no comma after this value, this needs to
-                // be the end of the array.
-                if ($this->ch !== ',') {
-                    $this->nextOrFail(']');
-                    $this->depth--;
-                    return $arr;
-                }
-                $this->nextOrFail(',');
-                $this->white();
+            $this->white();
+            // If there's no comma after this value, this needs to
+            // be the end of the array.
+            if ($this->ch !== ',') {
+                $this->nextOrFail(']');
+                $this->depth--;
+                return $arr;
             }
+            $this->nextOrFail(',');
+            $this->white();
         }
-
-        $this->throwSyntaxError('Bad array');
     }
 
     /**
@@ -527,49 +517,45 @@ private function obj()
     {
         $object = $this->associative ? [] : new \stdClass;
 
-        if ($this->ch === '{') {
-            if (++$this->depth > $this->maxDepth) {
-                $this->throwSyntaxError('Maximum stack depth exceeded');
-            }
+        if (++$this->depth > $this->maxDepth) {
+            $this->throwSyntaxError('Maximum stack depth exceeded');
+        }
 
-            $this->nextOrFail('{');
-            $this->white();
-            while ($this->ch) {
-                if ($this->ch === '}') {
-                    $this->nextOrFail('}');
-                    $this->depth--;
-                    return $object; // Potentially empty object
-                }
+        $this->nextOrFail('{');
+        $this->white();
+        while ($this->ch !== null) {
+            if ($this->ch === '}') {
+                $this->nextOrFail('}');
+                $this->depth--;
+                return $object; // Potentially empty object
+            }
 
-                // Keys can be unquoted. If they are, they need to be
-                // valid JS identifiers.
-                if ($this->ch === '"' || $this->ch === "'") {
-                    $key = $this->string();
-                } else {
-                    $key = $this->identifier();
-                }
+            // Keys can be unquoted. If they are, they need to be
+            // valid JS identifiers.
+            if ($this->ch === '"' || $this->ch === "'") {
+                $key = $this->string();
+            } else {
+                $key = $this->identifier();
+            }
 
-                $this->white();
-                $this->nextOrFail(':');
-                if ($this->associative) {
-                    $object[$key] = $this->value();
-                } else {
-                    $object->{$key} = $this->value();
-                }
-                $this->white();
-                // If there's no comma after this pair, this needs to be
-                // the end of the object.
-                if ($this->ch !== ',') {
-                    $this->nextOrFail('}');
-                    $this->depth--;
-                    return $object;
-                }
-                $this->nextOrFail(',');
-                $this->white();
+            $this->white();
+            $this->nextOrFail(':');
+            if ($this->associative) {
+                $object[$key] = $this->value();
+            } else {
+                $object->{$key} = $this->value();
             }
+            $this->white();
+            // If there's no comma after this pair, this needs to be
+            // the end of the object.
+            if ($this->ch !== ',') {
+                $this->nextOrFail('}');
+                $this->depth--;
+                return $object;
+            }
+            $this->nextOrFail(',');
+            $this->white();
         }
-
-        $this->throwSyntaxError('Bad object');
     }
 
     /**

test/Functional/ParseTest.php

@@ -155,6 +155,23 @@ public function dataForTestInvalidES5WhichIsAlsoInvalidJson5()
         return $tests;
     }
 
+    public function testNaNWithSign()
+    {
+        $this->assertTrue(is_nan(Json5Decoder::decode('+NaN')));
+    }
+
+    public function testBadNumberStartingWithN()
+    {
+        $this->setExpectedException('ColinODell\\Json5\\SyntaxError');
+        Json5Decoder::decode('NotANumber');
+    }
+
+    public function testBadNumberStartingWithI()
+    {
+        $this->setExpectedException('ColinODell\\Json5\\SyntaxError');
+        Json5Decoder::decode('+Indigo');
+    }
+
     private function getErrorSpec($file)
     {
         $errorSpec = str_replace('.txt', '.errorSpec', $file);