glayzzle#133 - add a quote & raw property on nowdoc

Author: ichiriac

dist/php-parser.js

@@ -2069,11 +2069,13 @@ var KIND = "nowdoc";
  * @constructor String
  * @extends {Literal}
  * @property {String} label
-
+ * @property {String} raw
+ * @property {Boolean} quote
  */
-var Nowdoc = Literal.extends(function Nowdoc(value, raw, label, docs, location) {
+var Nowdoc = Literal.extends(function Nowdoc(value, raw, label, quote, docs, location) {
   Literal.apply(this, [KIND, value, raw, docs, location]);
   this.label = label;
+  this.quote = quote;
 });
 
 module.exports = Nowdoc;
@@ -6839,7 +6841,8 @@ module.exports = {
               value = value.substring(0, value.length - 1);
             }
             this.expect(this.tok.T_ENCAPSED_AND_WHITESPACE) && this.next();
-            node = node(value, this.lexer._input.substring(start, this.lexer.yylloc.last_offset), this.lexer.heredoc_label);
+            var raw = this.lexer._input.substring(start, this.lexer.yylloc.last_offset);
+            node = node(value, raw, this.lexer.heredoc_label, raw[3] === '"' || raw[3] === "'");
             this.expect(this.tok.T_END_HEREDOC) && this.next();
             return node;
           } else {

dist/php-parser.min.js

@@ -2,41 +2,6 @@
 
 ## AST
 
-The AST builder class
-
-**Parameters**
-
--   `withPositions`  
--   `withSource`  
-
-**Properties**
-
--   `withPositions` **[Boolean](#boolean)** Should locate any node (by default false)
--   `withSource` **[Boolean](#boolean)** Should extract the node original code (by default false)
-
-### resolvePrecedence
-
-Check and fix precence, by default using right
-
-**Parameters**
-
--   `result`  
-
-### prepare
-
-Prepares an AST node
-
-**Parameters**
-
--   `kind` **([String](#string) | null)** Defines the node type
-    (if null, the kind must be passed at the function call)
--   `parser` **Parser** The parser instance (use for extracting locations)
--   `docs`  
-
-Returns **[Function](#function)** 
-
-## AST
-
 ## Class hierarchy
 
 -   [Location](#location)
@@ -155,6 +120,41 @@ Prepares an AST node
 
 Returns **[Function](#function)** 
 
+## AST
+
+The AST builder class
+
+**Parameters**
+
+-   `withPositions`  
+-   `withSource`  
+
+**Properties**
+
+-   `withPositions` **[Boolean](#boolean)** Should locate any node (by default false)
+-   `withSource` **[Boolean](#boolean)** Should extract the node original code (by default false)
+
+### resolvePrecedence
+
+Check and fix precence, by default using right
+
+**Parameters**
+
+-   `result`  
+
+### prepare
+
+Prepares an AST node
+
+**Parameters**
+
+-   `kind` **([String](#string) | null)** Defines the node type
+    (if null, the kind must be passed at the function call)
+-   `parser` **Parser** The parser instance (use for extracting locations)
+-   `docs`  
+
+Returns **[Function](#function)** 
+
 ## Array
 
 **Extends Expression**
@@ -887,6 +887,8 @@ Defines a nowdoc string
 **Properties**
 
 -   `label` **[String](#string)** 
+-   `raw` **[String](#string)** 
+-   `quote` **[Boolean](#boolean)** 
 
 ## String
 

dist/php-parser.min.js.map

@@ -12,17 +12,20 @@ const KIND = "nowdoc";
  * @constructor String
  * @extends {Literal}
  * @property {String} label
-
+ * @property {String} raw
+ * @property {Boolean} quote
  */
 const Nowdoc = Literal.extends(function Nowdoc(
   value,
   raw,
   label,
+  quote,
   docs,
   location
 ) {
   Literal.apply(this, [KIND, value, raw, docs, location]);
   this.label = label;
+  this.quote = quote;
 });
 
 module.exports = Nowdoc;

docs/AST.md

@@ -90,10 +90,15 @@ module.exports = {
               value = value.substring(0, value.length - 1);
             }
             this.expect(this.tok.T_ENCAPSED_AND_WHITESPACE) && this.next();
+            const raw = this.lexer._input.substring(
+              start,
+              this.lexer.yylloc.last_offset
+            );
             node = node(
               value,
-              this.lexer._input.substring(start, this.lexer.yylloc.last_offset),
-              this.lexer.heredoc_label
+              raw,
+              this.lexer.heredoc_label,
+              raw[3] === '"' || raw[3] === "'"
             );
             this.expect(this.tok.T_END_HEREDOC) && this.next();
             return node;

src/ast/nowdoc.js

@@ -295,6 +295,8 @@ describe("Test strings", function() {
     expr.kind.should.be.exactly("nowdoc");
     expr.label.should.be.exactly("EOF");
     expr.value.should.be.exactly("  }");
+    expr.quote.should.be.exactly(true);
+    expr.raw.should.be.exactly("<<<'EOF'\r\n  }\r\nEOF;");
   });
   it("heredoc ...", function() {
     var ast = parser.parseEval(