Few microoptimizations

Author: halaxa

src/FileChunks.php

@@ -19,7 +19,7 @@ class FileChunks implements \IteratorAggregate
      * @param string $fileName
      * @param int    $chunkSize
      */
-    public function __construct($fileName, $chunkSize = 1024 * 8)
+    public function __construct($fileName, $chunkSize = 1024 * 16)
     {
         $this->fileName = $fileName;
         $this->chunkSize = $chunkSize;

src/Tokens.php

@@ -37,13 +37,7 @@ public function getIterator()
 
     private function createGenerator(): Generator
     {
-        $regex = '/
-            [{}\[\],:]
-            #| true|false|null
-            #| [\deE.+-]+
-            #| (t|tr|tru|f|fa|fal|fals|n|nu|nul)$
-            | [^\xEF\xBB\xBF\s{}\[\],:]+    # todo make matching logic positive as in comments above and solve 2 failing tests
-        /x';
+        $regex = '/ [{}\[\],:] | [^\xEF\xBB\xBF\s{}\[\],:]+ /x';
 
         $inString = 0;
         $carry = '';
@@ -58,13 +52,15 @@ private function createGenerator(): Generator
                     if ($this->stringIsEscaping($chunkItems[$i])) {
                         $carry .= $chunkItems[$i].'"';
                     } else {
-                        yield '"'.$carry.$chunkItems[$i].'"';
+                        yield "\"$carry$chunkItems[$i]\"";
                         $carry = '';
                         $inString = 0;
                     }
                 } else {
                     preg_match_all($regex, $chunkItems[$i], $matches);
-                    yield from $matches[0];
+                    foreach ($matches[0] as $match) {
+                        yield $match;
+                    }
                     $inString = 1;
                 }
             }
@@ -74,7 +70,9 @@ private function createGenerator(): Generator
             } else {
                 preg_match_all($regex, $chunkItems[$i], $matches);
                 $carry = array_pop($matches[0]);
-                yield from $matches[0];
+                foreach ($matches[0] as $match) {
+                    yield $match;
+                }
             }
         }
 

test/JsonMachineTest/TokensTest.php

@@ -19,7 +19,7 @@ class TokensTest extends \PHPUnit_Framework_TestCase
     public function bothDebugModes()
     {
         return [
-//            'debug enabled' => [TokensWithDebugging::class],
+            'debug enabled' => [TokensWithDebugging::class],
             'debug disabled' => [Tokens::class],
         ];
     }

test/performance/testPerformance.php

@@ -75,7 +75,7 @@ function createBigJsonFile()
     $separator = '';
     fputs($f, '[');
 //    for ($i = 0; $i < 1; ++$i) {
-    for ($i = 0; $i < 6000; ++$i) {
+    for ($i = 0; $i < 3000; ++$i) {
         fputs($f, $separator);
         fputs($f, file_get_contents(__DIR__.'/twitter_example_'.($i % 2).'.json'));
         $separator = ",\n\n";