add scalar tests & remove unused path

Author: ichiriac

src/parser.js

@@ -33,12 +33,19 @@ var parser = function(lexer, ast) {
   this.extractDoc = false;
   this.suppressErrors = false;
   this.entries = {
+    'VARIABLE': [
+      this.tok.T_VARIABLE,
+      '$', '&',
+      this.tok.T_NS_SEPARATOR,
+      this.tok.T_STRING,
+      this.tok.T_NAMESPACE,
+      this.tok.T_STATIC
+    ],
     'SCALAR': [
       this.tok.T_CONSTANT_ENCAPSED_STRING,
       this.tok.T_START_HEREDOC,
       this.tok.T_LNUMBER,
       this.tok.T_DNUMBER,
-      this.tok.T_STRING,
       this.tok.T_ARRAY,'[',
       this.tok.T_CLASS_C,
       this.tok.T_TRAIT_C,
@@ -48,7 +55,6 @@ var parser = function(lexer, ast) {
       this.tok.T_FILE,
       this.tok.T_DIR,
       this.tok.T_NS_C,
-      this.tok.T_NAMESPACE,
       '"',
       'b"',
       'B"',
@@ -73,13 +79,6 @@ var parser = function(lexer, ast) {
       this.tok.T_ABSTRACT,
       this.tok.T_FINAL
     ],
-    'VARIABLE': [
-      this.tok.T_VARIABLE,
-      '$', '&',
-      this.tok.T_NS_SEPARATOR,
-      this.tok.T_STRING,
-      this.tok.T_STATIC
-    ],
     'EOS': [
       ';',
       this.tok.T_CLOSE_TAG,

src/parser/scalar.js

@@ -111,28 +111,6 @@ module.exports = {
           result = result(value);
           return result;
 
-        // CONSTANTS
-        case this.tok.T_NAMESPACE:
-        case this.tok.T_NS_SEPARATOR:
-        case this.tok.T_STRING:
-          var value = this.read_namespace_name();
-          var result = ['constant', value];
-          if ( this.token == this.tok.T_DOUBLE_COLON) {
-            // class constant  MyClass::CONSTANT
-            if (this.next().expect([this.tok.T_STRING, this.tok.T_CLASS])) {
-              result[1] = [value, this.text()];
-              this.next();
-            }
-          }
-          // CONSTANT ARRAYS OFFSET : MYCONST[1][0]...
-          while(this.token === '[') {
-            var node = this.node('offsetlookup');
-            var offset = this.next().read_expr();
-            if (this.expect(']')) this.next();
-            result = node(result, offset);
-          }
-          return result;
-
         // ARRAYS
         case this.tok.T_ARRAY:  // array parser
         case '[':             // short array format
@@ -217,18 +195,18 @@ module.exports = {
     // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L1246
     else if (this.token === this.tok.T_CURLY_OPEN) {
       result = this.next().read_variable(false, false, false);
-      if (this.expect('}')) this.next();
+      this.expect('}') && this.next();
     }
 
     // plain variable
     // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L1231
     else if (this.token === this.tok.T_VARIABLE) {
-      result = this.read_variable(false, true, false);
+      result = this.read_simple_variable(false);
 
       // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L1233
       if (this.token === '[') {
         var node = this.node('offsetlookup');
-        var offset = this.next().read_expr();
+        var offset = this.next().read_encaps_var_offset();
         this.expect(']') && this.next();
         result = node(result, offset);
       }

src/parser/variable.js

@@ -33,7 +33,7 @@ module.exports = {
     // reads the entry point
     if (this.is([this.tok.T_VARIABLE, '$'])) {
       result = this.read_reference_variable(encapsed, byref);
-    } else if (this.is([this.tok.T_NS_SEPARATOR, this.tok.T_STRING])) {
+    } else if (this.is([this.tok.T_NS_SEPARATOR, this.tok.T_STRING, this.tok.T_NAMESPACE])) {
       result = this.node();
       var name = this.read_namespace_name();
       if (
@@ -235,13 +235,14 @@ module.exports = {
     while(this.token != this.EOF) {
       var node = this.node();
       if (this.token == '[') {
+        var offset = null;
         if (encapsed) {
-          result = this.next().read_encaps_var_offset();
+          offset = this.next().read_encaps_var_offset();
         } else {
-          var offset = this.next().token === ']' ? null : this.read_dim_offset();
-          result = node('offsetlookup', result, offset);
+          offset = this.next().token === ']' ? null : this.read_dim_offset();
         }
         this.expect(']') && this.next();
+        result = node('offsetlookup', result, offset);
       } else if (this.token == '{' && !encapsed) {
         var offset = this.next().read_expr();
         this.expect('}') && this.next();

test/scalarTests.js

@@ -0,0 +1,15 @@
+var should = require("should");
+var parser = require('./main');
+
+describe('Test scalar statements', function() {
+  it('constants', function() {
+    var ast = parser.parseEval([
+      '$a = foo::ref[-5];'
+    ].join('\n'), {
+      parser: {
+        debug: true
+      }
+    });
+    console.log(ast);
+  });
+});