fix glayzzle#129 - add shortForm over <?= tags

Author: ichiriac

dist/php-parser.js

@@ -1182,10 +1182,12 @@ var KIND = "echo";
 /**
  * Defines system based call
  * @constructor Echo
+ * @property {boolean} shortForm
  * @extends {Sys}
  */
-var Echo = Sys.extends(function Echo(args, docs, location) {
+var Echo = Sys.extends(function Echo(args, shortForm, docs, location) {
   Sys.apply(this, [KIND, args, docs, location]);
+  this.shortForm = shortForm;
 });
 
 module.exports = Echo;
@@ -7242,9 +7244,11 @@ module.exports = {
       case this.tok.T_ECHO:
         {
           result = this.node("echo");
+          var text = this.text();
+          var shortForm = text === '<?=' || text === '<%=';
           var args = this.next().read_list(this.read_expr, ",");
           this.expectEndOfStatement();
-          return result(args);
+          return result(args, shortForm);
         }
 
       case this.tok.T_OPEN_TAG_WITH_ECHO:

dist/php-parser.min.js

@@ -10,10 +10,12 @@ const KIND = "echo";
 /**
  * Defines system based call
  * @constructor Echo
+ * @property {boolean} shortForm
  * @extends {Sys}
  */
-const Echo = Sys.extends(function Echo(args, docs, location) {
+const Echo = Sys.extends(function Echo(args, shortForm, docs, location) {
   Sys.apply(this, [KIND, args, docs, location]);
+  this.shortForm = shortForm;
 });
 
 module.exports = Echo;

dist/php-parser.min.js.map

@@ -268,9 +268,11 @@ module.exports = {
 
       case this.tok.T_ECHO: {
         result = this.node("echo");
+        const text = this.text();
+        const shortForm = (text === '<?=' || text === '<%=');
         const args = this.next().read_list(this.read_expr, ",");
         this.expectEndOfStatement();
-        return result(args);
+        return result(args, shortForm);
       }
 
       case this.tok.T_OPEN_TAG_WITH_ECHO: {

src/ast/echo.js

@@ -18,6 +18,7 @@ describe("Test lexer", function() {
     });
     it("parse short echo", function() {
       ast.children[1].kind.should.be.exactly("echo");
+      ast.children[1].shortForm.should.be.exactly(true);
       ast.children[1].arguments[0].kind.should.be.exactly("variable");
       ast.children[1].arguments[0].name.should.be.exactly("a");
     });