Merge pull request #11 from pug-php/dependencies-merge

kylekatarnls · web-flow · commit 093f7ce44321 · 2016-12-29T12:42:48.000+01:00
Dependencies merge
diff --git a/src/JsPhpize/JsPhpize.php b/src/JsPhpize/JsPhpize.php
@@ -54,7 +54,7 @@ public function compile($input, $filename = null)
 
         $dependencies = $compiler->getDependencies();
         if ($this->getOption('catchDependencies')) {
-            $this->dependencies = $dependencies;
+            $this->dependencies = array_merge($this->dependencies, $dependencies);
             $dependencies = array();
         }
         $php = $compiler->compileDependencies($dependencies) . $php;
@@ -98,6 +98,18 @@ public function compileDependencies()
         return $compiler->compileDependencies($this->dependencies);
     }
 
+    /**
+     * Flush all saved dependencies.
+     *
+     * @return $this
+     */
+    public function flushDependencies()
+    {
+        $this->dependencies = array();
+
+        return $this;
+    }
+
     /**
      * Compile and return the code execution result.
      *
diff --git a/src/JsPhpize/Parser/Parser.php b/src/JsPhpize/Parser/Parser.php
@@ -93,15 +93,15 @@ protected function parseParentheses()
 
                     continue;
                 }
-                $this->unexpected($token);
+                throw $this->unexpected($token);
             }
             if ($value = $this->getValueFromToken($token)) {
                 $expectComma = true;
                 $parentheses->addNode($value);
 
                 continue;
             }
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
 
         throw new Exception('Missing ) to match ' . $exceptionInfos, 5);
@@ -122,15 +122,15 @@ protected function parseHooksArray()
 
                     continue;
                 }
-                $this->unexpected($token);
+                throw $this->unexpected($token);
             }
             if ($value = $this->getValueFromToken($token)) {
                 $expectComma = true;
                 $array->addItem($value);
 
                 continue;
             }
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
 
         throw new Exception('Missing ] to match ' . $exceptionInfos, 6);
@@ -151,7 +151,7 @@ protected function parseBracketsArray()
 
                     continue;
                 }
-                $this->unexpected($token);
+                throw $this->unexpected($token);
             }
             if ($pair = $this->getBracketsArrayItemKeyFromToken($token)) {
                 list($key, $value) = $pair;
@@ -160,7 +160,7 @@ protected function parseBracketsArray()
 
                 continue;
             }
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
 
         throw new Exception('Missing } to match ' . $exceptionInfos, 7);
@@ -237,13 +237,13 @@ protected function parseFunction($token)
             $token = $this->get(0);
         }
         if (!$token->is('(')) {
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
         $this->skip();
         $function->setValue($this->parseParentheses());
         $token = $this->get(0);
         if (!$token->is('{')) {
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
         $this->skip();
         $this->parseBlock($function);
@@ -291,7 +291,7 @@ protected function parseLet($token)
     {
         $letVariable = $this->get(0);
         if (!$letVariable->is('variable')) {
-            $this->unexpected($letVariable, $token);
+            throw $this->unexpected($letVariable, $token);
         }
 
         return $letVariable->value;
@@ -319,7 +319,7 @@ protected function parseInstructions($block)
                 $block->endInstruction();
                 continue;
             }
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
     }
 
diff --git a/src/JsPhpize/Parser/TokenCrawler.php b/src/JsPhpize/Parser/TokenCrawler.php
@@ -37,6 +37,6 @@ protected function exceptionInfos()
 
     protected function unexpected($token)
     {
-        throw new Exception('Unexpected ' . $token->type . rtrim(' ' . ($token->value ?: '')) . $this->exceptionInfos(), 8);
+        return new Exception('Unexpected ' . $token->type . rtrim(' ' . ($token->value ?: '')) . $this->exceptionInfos(), 8);
     }
 }
diff --git a/src/JsPhpize/Parser/TokenExtractor.php b/src/JsPhpize/Parser/TokenExtractor.php
@@ -31,7 +31,7 @@ protected function getBracketsArrayItemKeyFromToken($token)
                 throw new Exception('Missing value after ' . $value . $this->exceptionInfos(), 12);
             }
             if (!$token->is(':')) {
-                $this->unexpected($token);
+                throw $this->unexpected($token);
             }
             $key = new Constant($type, $value);
             $value = $this->expectValue($this->next());
@@ -50,7 +50,7 @@ protected function getVariableChildFromToken($token)
                 return new Constant('string', var_export($token->value, true));
             }
 
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
 
         if ($token->is('[')) {
@@ -68,7 +68,7 @@ protected function getVariableChildFromToken($token)
                 return $value;
             }
 
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
     }
 
@@ -145,7 +145,7 @@ protected function appendFunctionsCalls(&$value)
     {
         while ($token = $this->get(0)) {
             if ($token->is('{') || $token->expectNoLeftMember()) {
-                $this->unexpected($this->next());
+                throw $this->unexpected($this->next());
             }
             if ($token->is('?')) {
                 $this->skip();
@@ -191,13 +191,13 @@ protected function expectValue($next, $token = null)
     {
         if (!$next) {
             if ($token) {
-                $this->unexpected($token);
+                throw $this->unexpected($token);
             }
             throw new Exception('Value expected after ' . $this->exceptionInfos(), 20);
         }
         $value = $this->getValueFromToken($next);
         if (!$value) {
-            $this->unexpected($next);
+            throw $this->unexpected($next);
         }
 
         return $value;
diff --git a/tests/mainMethods.php b/tests/mainMethods.php
@@ -34,6 +34,7 @@ public function testCompileFile()
         $this->assertSame($expected, $actual);
 
         $actual = $jsPhpizeCatchDeps->compileDependencies();
+        $jsPhpizeCatchDeps->flushDependencies();
         $expected = '$GLOBALS[\'__jpv_dot\'] = ' . file_get_contents(__DIR__ . '/../src/JsPhpize/Compiler/Helpers/Dot.h') . ';';
         $expected .= '$GLOBALS[\'__jpv_plus\'] = ' . file_get_contents(__DIR__ . '/../src/JsPhpize/Compiler/Helpers/Plus.h') . ';';
 

Original file line number	Diff line number	Diff line change
`@@ -93,15 +93,15 @@ protected function parseParentheses()`
`93`	`93`
`94`	`94`	`continue;`
`95`	`95`	`}`
`96`		`- $this->unexpected($token);`
	`96`	`+ throw $this->unexpected($token);`
`97`	`97`	`}`
`98`	`98`	`if ($value = $this->getValueFromToken($token)) {`
`99`	`99`	`$expectComma = true;`
`100`	`100`	`$parentheses->addNode($value);`
`101`	`101`
`102`	`102`	`continue;`
`103`	`103`	`}`
`104`		`- $this->unexpected($token);`
	`104`	`+ throw $this->unexpected($token);`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`throw new Exception('Missing ) to match ' . $exceptionInfos, 5);`
`@@ -122,15 +122,15 @@ protected function parseHooksArray()`
`122`	`122`
`123`	`123`	`continue;`
`124`	`124`	`}`
`125`		`- $this->unexpected($token);`
	`125`	`+ throw $this->unexpected($token);`
`126`	`126`	`}`
`127`	`127`	`if ($value = $this->getValueFromToken($token)) {`
`128`	`128`	`$expectComma = true;`
`129`	`129`	`$array->addItem($value);`
`130`	`130`
`131`	`131`	`continue;`
`132`	`132`	`}`
`133`		`- $this->unexpected($token);`
	`133`	`+ throw $this->unexpected($token);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`throw new Exception('Missing ] to match ' . $exceptionInfos, 6);`
`@@ -151,7 +151,7 @@ protected function parseBracketsArray()`
`151`	`151`
`152`	`152`	`continue;`
`153`	`153`	`}`
`154`		`- $this->unexpected($token);`
	`154`	`+ throw $this->unexpected($token);`
`155`	`155`	`}`
`156`	`156`	`if ($pair = $this->getBracketsArrayItemKeyFromToken($token)) {`
`157`	`157`	`list($key, $value) = $pair;`
`@@ -160,7 +160,7 @@ protected function parseBracketsArray()`
`160`	`160`
`161`	`161`	`continue;`
`162`	`162`	`}`
`163`		`- $this->unexpected($token);`
	`163`	`+ throw $this->unexpected($token);`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`throw new Exception('Missing } to match ' . $exceptionInfos, 7);`
`@@ -237,13 +237,13 @@ protected function parseFunction($token)`
`237`	`237`	`$token = $this->get(0);`
`238`	`238`	`}`
`239`	`239`	`if (!$token->is('(')) {`
`240`		`- $this->unexpected($token);`
	`240`	`+ throw $this->unexpected($token);`
`241`	`241`	`}`
`242`	`242`	`$this->skip();`
`243`	`243`	`$function->setValue($this->parseParentheses());`
`244`	`244`	`$token = $this->get(0);`
`245`	`245`	`if (!$token->is('{')) {`
`246`		`- $this->unexpected($token);`
	`246`	`+ throw $this->unexpected($token);`
`247`	`247`	`}`
`248`	`248`	`$this->skip();`
`249`	`249`	`$this->parseBlock($function);`
`@@ -291,7 +291,7 @@ protected function parseLet($token)`
`291`	`291`	`{`
`292`	`292`	`$letVariable = $this->get(0);`
`293`	`293`	`if (!$letVariable->is('variable')) {`
`294`		`- $this->unexpected($letVariable, $token);`
	`294`	`+ throw $this->unexpected($letVariable, $token);`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`return $letVariable->value;`
`@@ -319,7 +319,7 @@ protected function parseInstructions($block)`
`319`	`319`	`$block->endInstruction();`
`320`	`320`	`continue;`
`321`	`321`	`}`
`322`		`- $this->unexpected($token);`
	`322`	`+ throw $this->unexpected($token);`
`323`	`323`	`}`
`324`	`324`	`}`
`325`	`325`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ protected function exceptionInfos()`
`37`	`37`
`38`	`38`	`protected function unexpected($token)`
`39`	`39`	`{`
`40`		`- throw new Exception('Unexpected ' . $token->type . rtrim(' ' . ($token->value ?: '')) . $this->exceptionInfos(), 8);`
	`40`	`+ return new Exception('Unexpected ' . $token->type . rtrim(' ' . ($token->value ?: '')) . $this->exceptionInfos(), 8);`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ protected function getBracketsArrayItemKeyFromToken($token)`
`31`	`31`	`throw new Exception('Missing value after ' . $value . $this->exceptionInfos(), 12);`
`32`	`32`	`}`
`33`	`33`	`if (!$token->is(':')) {`
`34`		`- $this->unexpected($token);`
	`34`	`+ throw $this->unexpected($token);`
`35`	`35`	`}`
`36`	`36`	`$key = new Constant($type, $value);`
`37`	`37`	`$value = $this->expectValue($this->next());`
`@@ -50,7 +50,7 @@ protected function getVariableChildFromToken($token)`
`50`	`50`	`return new Constant('string', var_export($token->value, true));`
`51`	`51`	`}`
`52`	`52`
`53`		`- $this->unexpected($token);`
	`53`	`+ throw $this->unexpected($token);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`if ($token->is('[')) {`
`@@ -68,7 +68,7 @@ protected function getVariableChildFromToken($token)`
`68`	`68`	`return $value;`
`69`	`69`	`}`
`70`	`70`
`71`		`- $this->unexpected($token);`
	`71`	`+ throw $this->unexpected($token);`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`@@ -145,7 +145,7 @@ protected function appendFunctionsCalls(&$value)`
`145`	`145`	`{`
`146`	`146`	`while ($token = $this->get(0)) {`
`147`	`147`	`if ($token->is('{') \|\| $token->expectNoLeftMember()) {`
`148`		`- $this->unexpected($this->next());`
	`148`	`+ throw $this->unexpected($this->next());`
`149`	`149`	`}`
`150`	`150`	`if ($token->is('?')) {`
`151`	`151`	`$this->skip();`
`@@ -191,13 +191,13 @@ protected function expectValue($next, $token = null)`
`191`	`191`	`{`
`192`	`192`	`if (!$next) {`
`193`	`193`	`if ($token) {`
`194`		`- $this->unexpected($token);`
	`194`	`+ throw $this->unexpected($token);`
`195`	`195`	`}`
`196`	`196`	`throw new Exception('Value expected after ' . $this->exceptionInfos(), 20);`
`197`	`197`	`}`
`198`	`198`	`$value = $this->getValueFromToken($next);`
`199`	`199`	`if (!$value) {`
`200`		`- $this->unexpected($next);`
	`200`	`+ throw $this->unexpected($next);`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`return $value;`