Fixing perf test and TreeCompiler

Author: mtdowling

bin/perf.php

@@ -5,23 +5,29 @@
 $dir = isset($argv[1]) ? $argv[1] : __DIR__ . '/../tests/compliance/perf';
 is_dir($dir) or die('Dir not found: ' . $dir);
 // Warm up the runner
-\JmesPath\Env::createRuntime()->search('foo', []);
-// Run the test suites.
-array_map('runSuite', glob($dir . '/*.json'));
+\JmesPath\Env::search('foo', []);
+
+$total = 0;
+foreach (glob($dir . '/*.json') as $file) {
+    $total += runSuite($file);
+}
+echo "\nTotal time: {$total}\n";
 
 function runSuite($file)
 {
     $contents = file_get_contents($file);
     $json = json_decode($contents, true);
+    $total = 0;
     foreach ($json as $suite) {
         foreach ($suite['cases'] as $case) {
-            runCase(
+            $total += runCase(
                 str_replace(getcwd(), '.', $file),
                 $suite['given'],
                 $case['expression']
             );
         }
     }
+    return $total;
 }
 
 function runCase($file, $given, $expression)
@@ -31,7 +37,7 @@ function runCase($file, $given, $expression)
 
     for ($i = 0; $i < 1000; $i++) {
         $t = microtime(true);
-        $runtime->search($expression, $given);
+        $runtime($expression, $given);
         $tryTime = (microtime(true) - $t) * 1000;
         if ($tryTime < $best) {
             $best = $tryTime;
@@ -48,4 +54,6 @@ function runCase($file, $given, $expression)
     $template = "time: %fms, %s: %s\n";
     $expression = str_replace("\n", '\n', $expression);
     printf($template, $best, basename($file), substr($expression, 0, 50));
+
+    return $best;
 }

src/TreeCompiler.php

@@ -33,8 +33,6 @@ public function visit(array $ast, $fnName, $expr)
             ->outdent()
         ->write('}');
 
-        echo $this->source;
-
         return $this->source;
     }
 

src/TreeInterpreter.php

@@ -255,7 +255,7 @@ private function dispatch(array $node, $value)
             case 'expression':
                 $apply = $node['children'][0];
                 return function ($value) use ($apply) {
-                    $this->visit($apply, $value);
+                    return $this->visit($apply, $value);
                 };
 
             default: