Merge commit '95c0de64ae17c01d71956d26ae295540e8d3c359' of https://github.com/genintho/php-parser into cs-parser-intersect

Author: cseufert

src/ast.js

@@ -522,6 +522,7 @@ AST.prototype.checkNodes = function () {
  require("./ast/include"),
  require("./ast/inline"),
  require("./ast/interface"),
+ require("./ast/intersectiontype"),
  require("./ast/isset"),
  require("./ast/label"),
  require("./ast/list"),

src/ast/intersectiontype.js

@@ -0,0 +1,23 @@
+/**
+ * Copyright (C) 2018 Glayzzle (BSD3 License)
+ * @authors https://github.com/glayzzle/php-parser/graphs/contributors
+ * @url http://glayzzle.com
+ */
+"use strict";
+
+const Declaration = require("./declaration");
+const KIND = "intersectiontype";
+
+/**
+ * A union of types
+ * @constructor IntersectionType
+ * @extends {Declaration}
+ * @property {TypeReference[]} types
+ */
+module.exports = Declaration.extends(
+ KIND,
+ function IntersectionType(types, docs, location) {
+ Declaration.apply(this, [KIND, null, docs, location]);
+ this.types = types;
+ }
+);

src/parser.js

@@ -35,6 +35,7 @@ const Parser = function (lexer, ast) {
  this.EOF = lexer.EOF;
  this.token = null;
  this.prev = null;
+ this.previous_token = null;
  this.debug = false;
  this.version = 801;
  this.extractDoc = false;
@@ -589,6 +590,8 @@ Parser.prototype.text = function () {
  * @memberOf module:php-parser
  */
 Parser.prototype.next = function () {
+ this.previous_token = this.token;
+
  // prepare the back command
  if (this.token !== ";" || this.lexer.yytext === ";") {
  // ignore '?>' from automated resolution

src/parser/function.js

@@ -10,7 +10,10 @@ module.exports = {
  * checks if current token is a reference keyword
  */
  is_reference: function () {
- if (this.token == "&") {
+ if (this.previous_token === "&") {
+ return true;
+ }
+ if (this.token === "&") {
  this.next();
  return true;
  }
@@ -288,19 +291,24 @@ module.exports = {
  },
  read_types() {
  const types = [];
- const unionType = this.node("uniontype");
+ let isIntersection = false;
  let type = this.read_type();
  if (!type) return null;
  types.push(type);
- while (this.token === "|") {
+ while (this.token === "|" || (this.version >= 801 && this.token === "&")) {
+ isIntersection = this.token === "&";
  this.next();
  type = this.read_type();
- types.push(type);
+ if (type) {
+ types.push(type);
+ }
  }
  if (types.length === 1) {
  return types[0];
  } else {
- return unionType(types);
+ return isIntersection
+ ? this.node("intersectiontype")(types)
+ : this.node("uniontype")(types);
  }
  },
  read_promoted() {