fix glayzzle#144 - add missing first char

Author: ichiriac

dist/php-parser.js

@@ -1,4 +1,4 @@
-/*! php-parser - BSD3 License - 2018-03-27 */
+/*! php-parser - BSD3 License - 2018-04-02 */
 
 require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 /*!
@@ -6942,7 +6942,7 @@ module.exports = {
           this.expect("]") && this.next();
           name = node(name, offset);
         } else {
-          name = varName;
+          name = this.node("constref")(varName);
         }
       } else {
         name = this.read_expr();
@@ -6953,6 +6953,9 @@ module.exports = {
       // expression
       // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L1246
       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
@@ -7011,7 +7014,7 @@ module.exports = {
     }
 
     this.expect(expect) && this.next();
-    node = node(value, this.lexer._input.substring(start, this.lexer.yylloc.first_offset), type);
+    node = node(value, this.lexer._input.substring(start - 1, this.lexer.yylloc.first_offset), type);
 
     if (expect === this.tok.T_END_HEREDOC) {
       node.label = this.lexer.heredoc_label;

dist/php-parser.min.js

@@ -273,7 +273,7 @@ module.exports = {
     this.expect(expect) && this.next();
     node = node(
       value,
-      this.lexer._input.substring(start, this.lexer.yylloc.first_offset),
+      this.lexer._input.substring(start - 1, this.lexer.yylloc.first_offset),
       type
     );
 

dist/php-parser.min.js.map

@@ -1,6 +1,11 @@
 var parser = require("../src/index");
 
 describe("Test strings", function() {
+  it("fix #144", function() {
+    let ast = parser.parseEval('"encapsed \\\" {$var}";');
+    ast.children[0].kind.should.be.exactly("encapsed");
+    ast.children[0].raw.should.be.exactly("\"encapsed \\\" {$var}\"");
+  });
   it("fix #101", function() {
     let ast = parser.parseEval('"encapsed {$var}";');
     ast.children[0].value[1].kind.should.be.exactly("variable");