glayzzle#127 - fix lexer initial state on eval

Author: ichiriac

dist/php-parser.js

@@ -1,4 +1,4 @@
-/*! php-parser - BSD3 License - 2018-03-05 */
+/*! php-parser - BSD3 License - 2018-03-06 */
 
 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){
 /*!
@@ -3198,11 +3198,12 @@ lexer.prototype.setInput = function (input) {
     last_column: 0
   };
   this.tokens = [];
-  this.conditionStack = [];
   this.done = this.offset >= this.size;
   if (!this.all_tokens && this.mode_eval) {
+    this.conditionStack = ['INITIAL'];
     this.begin("ST_IN_SCRIPTING");
   } else {
+    this.conditionStack = [];
     this.begin("INITIAL");
   }
   return this;

dist/php-parser.min.js

@@ -143,11 +143,12 @@ lexer.prototype.setInput = function(input) {
     last_column: 0
   };
   this.tokens = [];
-  this.conditionStack = [];
   this.done = this.offset >= this.size;
   if (!this.all_tokens && this.mode_eval) {
+    this.conditionStack = ['INITIAL'];
     this.begin("ST_IN_SCRIPTING");
   } else {
+    this.conditionStack = [];
     this.begin("INITIAL");
   }
   return this;

dist/php-parser.min.js.map

@@ -1,6 +1,22 @@
 var parser = require("./main");
 
 describe("Test AST structure", function() {
+
+  it('fix #127 - echo statements', function() {
+    var ast = parser.parseEval('echo "hello"; ?> world');
+    ast.children.length.should.be.exactly(2);
+    ast.children[0].kind.should.be.exactly("echo");
+    ast.children[1].kind.should.be.exactly("inline");
+  });
+
+  it('fix #127 - inline', function() {
+    var ast = parser.parseEval('?>?>?>');
+    ast.children.length.should.be.exactly(1);
+    ast.children[0].kind.should.be.exactly("inline");
+    ast.children[0].value.should.be.exactly("?>?>");
+  });
+
+
   it("test program", function() {
     var ast = parser.parseEval("");
     ast.kind.should.be.exactly("program");