Handle number, boolean, and constants

Author: kylekatarnls

examples/constant.js

@@ -0,0 +1,7 @@
+false;
+23;
+.34;
+-2.01;
+12e-3;
+0xf5D;
+[ null, undefined ];

examples/constant.php

@@ -0,0 +1,7 @@
+false;
+23;
+.34;
+- 2.01;
+12e-3;
+0xf5D;
+array( null, null );

src/JsPhpize/Lexer/Lexer.php

@@ -99,7 +99,7 @@ public function next()
         $patterns = array(
             '\/\/.*?\n|\/\*[\\s\\S]*?\*\/' => 'comment',
             '"(?:\\\\.|[^"\\\\])*"|\'(?:\\\\.|[^\'\\\\])*\'' => 'string',
-            '0[bB][01]+|0[oO][0-7]+|0[xX][0-9a-fA-F]|(\d+(\.\d*)?|\.\d+)([eE]-?\d+)?' => 'number',
+            '0[bB][01]+|0[oO][0-7]+|0[xX][0-9a-fA-F]+|(\d+(\.\d*)?|\.\d+)([eE]-?\d+)?' => 'number',
             '=>' => 'lambda',
             'delete|typeof|void' => 'operator',
             '>>>=|<<=|>>=|\*\*=' => 'operator',

src/JsPhpize/Lexer/Scanner.php

@@ -11,21 +11,23 @@ public function scanComment($matches)
 
     public function scanConstant($matches)
     {
-        if (substr($matches[0], 0, 5) === '__JP_') {
+        $constant = trim($matches[0]);
+        if (substr($constant, 0, 5) === '__JP_') {
             throw new Exception('Constants cannot start with __JP_, this prefix is reserved for JsPhpize' . $this->exceptionInfos(), 1);
         }
         $translate = array(
             'Infinity' => 'INF',
             'NaN' => 'NAN',
             'undefined' => 'null',
         );
-        if (isset($translate[$matches[0]])) {
-            $matches[0] = $translate[$matches[0]];
+        if (isset($translate[$constant])) {
+            $constant = $translate[$constant];
         } elseif (substr($matches[0], 0, 5) === 'Math.') {
-            $matches[0] = 'M_' . substr($matches[0], 5);
+            $constant = 'M_' . substr($constant, 5);
         }
+        $this->consume($matches[0]);
 
-        return $this->valueToken('constant', $matches);
+        return $this->token('constant', $constant);
     }
 
     public function scanFunction($matches)

src/JsPhpize/Nodes/HooksArray.php

@@ -6,7 +6,9 @@ class HooksArray extends ArrayBase
 {
     public function addItem($value)
     {
-        $this->data[] = $value;
+        if (!empty($value)) {
+            $this->data[] = $value;
+        }
     }
 
     public function __toString()

src/JsPhpize/Parser/ExpressionParser.php

@@ -72,12 +72,20 @@ protected function getHooksArray()
     {
         $array = new HooksArray();
 
+        $item = '';
         while ($token = $this->next()) {
             if ($token->type === ']') {
+                $array->addItem($item);
+
                 return $array;
             }
+            if ($token->type === ',') {
+                $array->addItem($item);
+                $item = '';
+                continue;
+            }
 
-            $array->addItem($this->expressionFromToken($token));
+            $item .= $this->expressionFromToken($token);
         }
 
         throw new Exception('Missing ] after array items list' . $this->exceptionInfos(), 6);

src/JsPhpize/Parser/Parser.php

@@ -132,10 +132,17 @@ public function parse()
                 continue;
             }
             $method = 'visit' . ucfirst($token->type);
-            if (!method_exists($this, $method)) {
-                $this->unexpected($token);
+            $token = method_exists($this, $method)
+                ? $this->$method($token)
+                : $this->visitNode($token);
+            if (!is_array($token)) {
+                $token = array($token);
             }
-            $block->addNodes((array) $this->$method($token));
+            $block->addNodes($token);
+            // if (!method_exists($this, $method)) {
+            //     $this->unexpected($token);
+            // }
+            // $block->addNodes((array) $this->$method($token));
         }
         $block->addDependencies($this->dependencies);
 

src/JsPhpize/Parser/Visitor.php

@@ -11,9 +11,11 @@ protected function visitComment($token)
         return new Comment($token);
     }
 
-    protected function visitNumber($token)
+    protected function visitNode($token)
     {
-        return $token->value;
+        $this->prepend($token);
+
+        return $this->getExpression();
     }
 
     protected function visitVariable($token)

tests/compile.php

@@ -27,8 +27,8 @@ public function testJsPhpizeGeneration($phpFile, $jsFile)
         $expected = file_get_contents($phpFile);
         $result = $jsPhpize->compile($jsFile);
 
-        $expected = trim($expected);
-        $actual = trim($result);
+        $expected = str_replace("\r", '', trim($expected));
+        $actual = str_replace("\r", '', trim($result));
 
         $this->assertSame($expected, $actual, $jsFile . ' should compile into ' . $expected);
     }

tests/render.php

@@ -27,8 +27,8 @@ public function testJsPhpizeGeneration($returnFile, $jsFile)
         $expected = file_get_contents($returnFile);
         $result = $jsPhpize->render($jsFile);
 
-        $expected = trim($expected);
-        $actual = trim($result);
+        $expected = str_replace("\r", '', trim($expected));
+        $actual = str_replace("\r", '', trim($result));
 
         $this->assertSame($expected, $actual, $jsFile . ' should render ' . $expected);
     }