glayzzle#73 define the curly property on variable node

Author: ichiriac

src/parser/function.js

@@ -115,7 +115,7 @@ module.exports = {
     this.expect(this.tok.T_VARIABLE);
     var name = this.text().substring(1);
     this.next();
-    return result(name, isRef);
+    return result(name, isRef, false);
   }
   /**
    * reads a list of parameters

src/parser/scalar.js

@@ -170,20 +170,22 @@ module.exports = {
         var varName = this.text();
         name = this.node('variable');
         this.next();
-        name = name(varName, false);
         // check if lookup an offset
         // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L1243
         if (this.token === '[') {
+          name = name(varName, false);
           var node = this.node('offsetlookup');
           var offset = this.next().read_expr();
           this.expect(']') && this.next();
           name = node(name, offset);
+        } else {
+          name = varName;
         }
       } else {
         name = this.read_expr();
       }
       this.expect('}') && this.next();
-      result = result('variable', name, false);
+      result = result('variable', name, false, true);
     }
 
     // expression

src/parser/utils.js

@@ -105,9 +105,9 @@ module.exports = {
       if (this.expect(this.tok.T_VARIABLE)) {
         var name = this.text().substring(1);
         this.next();
-        variable = variable(name, false);
+        variable = variable(name, false, false);
       } else {
-        variable = variable('#ERR', false);
+        variable = variable('#ERR', false, false);
       }
       if (this.token === '=') {
         return node(variable, this.next().read_expr());

src/parser/variable.js

@@ -140,7 +140,7 @@ module.exports = {
                 name = this.text().substring(1);
                 this.next();
                 what = this.node('encapsed')(
-                  [what, inner(name, false)],
+                  [what, inner(name, false, false)],
                   'offset'
                 );
                 if (what.loc && what.value[0].loc) {
@@ -162,7 +162,7 @@ module.exports = {
               what = this.node('variable');
               var name = this.text().substring(1);
               this.next();
-              what = what(name, false);
+              what = what(name, false, false);
               break;
             case '$':
               this.next().expect(['{', this.tok.T_VARIABLE]);
@@ -216,7 +216,7 @@ module.exports = {
     } else if (this.token === this.tok.T_VARIABLE) {
       var name = this.text().substring(1);
       this.next();
-      offset = offset('variable', name, false);
+      offset = offset('variable', name, false, false);
     } else {
       this.expect([
         this.tok.T_STRING,
@@ -273,15 +273,15 @@ module.exports = {
       // plain variable name
       var name = this.text().substring(1);
       this.next();
-      result = result(name, byref);
+      result = result(name, byref, false);
     } else {
       if (this.token === '$') this.next();
       // dynamic variable name
       switch(this.token) {
         case '{':
           var expr = this.next().read_expr();
           this.expect('}') && this.next();
-          result = result(expr, byref);
+          result = result(expr, byref, true);
           break;
         case '$': // $$$var
           result = result(this.read_simple_variable(false), byref);
@@ -290,14 +290,14 @@ module.exports = {
           var name = this.text().substring(1);
           var node = this.node('variable');
           this.next();
-          result = result(node(name, false), byref);
+          result = result(node(name, false, false), byref, false);
           break;
         default:
           this.error(['{', '$', this.tok.T_VARIABLE]);
           // graceful mode
           var name = this.text();
           this.next();
-          result = result(name, byref);
+          result = result(name, byref, false);
       }
     }
     return result;