Merge pull request glayzzle#231 from glayzzle/feat-encapsed-part

feat: `EncapsedPart` node

Author: ichiriac

src/ast.js

@@ -14,6 +14,7 @@ const Position = require("./ast/position");
  * - [Location](#location)
  * - [Position](#position)
  * - [Node](#node)
+ *   - [EncapsedPart](#encapsedpart)
  *   - [Constant](#constant)
  *   - [Identifier](#identifier)
  *   - [Reference](#reference)
@@ -368,6 +369,7 @@ AST.prototype.prepare = function(kind, docs, parser) {
   require("./ast/echo"),
   require("./ast/empty"),
   require("./ast/encapsed"),
+  require("./ast/encapsedpart"),
   require("./ast/entry"),
   require("./ast/error"),
   require("./ast/eval"),

src/ast/encapsedpart.js

@@ -0,0 +1,26 @@
+/**
+ * Copyright (C) 2018 Glayzzle (BSD3 License)
+ * @authors https://github.com/glayzzle/php-parser/graphs/contributors
+ * @url http://glayzzle.com
+ */
+"use strict";
+
+const Expression = require("./expression");
+const KIND = "encapsedpart";
+
+/**
+ * Part of `Encapsed` node
+ * @constructor EncapsedPart
+ * @extends {Expression}
+ * @property {Expression} what
+ */
+module.exports = Expression.extends(KIND, function EncapsedPart(
+  expression,
+  curly,
+  docs,
+  location
+) {
+  Expression.apply(this, [KIND, docs, location]);
+  this.expression = expression;
+  this.curly = curly;
+});

src/parser/scalar.js

@@ -176,6 +176,8 @@ module.exports = {
    * @see https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L1219
    */
   read_encapsed_string_item: function(isDoubleQuote) {
+    const encapsedPart = this.node("encapsedpart");
+    let curly = false;
     let result = this.node(),
       offset,
       node,
@@ -220,11 +222,9 @@ module.exports = {
     } else if (this.token === this.tok.T_CURLY_OPEN) {
       // expression
       // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L1246
+      curly = true;
       result.destroy();
       result = this.next().read_variable(false, false, false);
-      if (result.kind === "variable") {
-        result.curly = true;
-      }
       this.expect("}") && this.next();
     } else if (this.token === this.tok.T_VARIABLE) {
       // plain variable
@@ -260,7 +260,7 @@ module.exports = {
       result = result("string", false, value, false, value);
     }
 
-    return result;
+    return encapsedPart(result, curly);
   },
   /**
    * Reads an encapsed string