Micro-optimizations

src/Lexer/Lexer.php

@@ -151,8 +151,8 @@ private function generateRegexp(): string
 
 			self::TOKEN_FLOAT => '(?:-?[0-9]++\\.[0-9]*+(?:e-?[0-9]++)?)|(?:-?[0-9]*+\\.[0-9]++(?:e-?[0-9]++)?)|(?:-?[0-9]++e-?[0-9]++)',
 			self::TOKEN_INTEGER => '-?(?:(?:0b[0-1]++)|(?:0o[0-7]++)|(?:0x[0-9a-f]++)|(?:[0-9]++))',
-			self::TOKEN_SINGLE_QUOTED_STRING => '\'(?:\\\\[^\\r\\n]|[^\'\\r\\n\\\\])*+\'',
-			self::TOKEN_DOUBLE_QUOTED_STRING => '"(?:\\\\[^\\r\\n]|[^"\\r\\n\\\\])*+"',
+			self::TOKEN_SINGLE_QUOTED_STRING => '\'(?:\\\\[^\\r\\n]|[^\'\\r\\n\\\\]++)*+\'',
+			self::TOKEN_DOUBLE_QUOTED_STRING => '"(?:\\\\[^\\r\\n]|[^"\\r\\n\\\\]++)*+"',
 
 			self::TOKEN_WILDCARD => '\\*',
 

src/Parser/TokenIterator.php

@@ -3,6 +3,7 @@
 namespace PHPStan\PhpDocParser\Parser;
 
 use PHPStan\PhpDocParser\Lexer\Lexer;
+use function array_flip;
 use function array_pop;
 use function assert;
 use function count;
@@ -160,8 +161,10 @@ public function getSkippedHorizontalWhiteSpaceIfAny(): string
 	/** @phpstan-impure */
 	public function joinUntil(int ...$tokenType): string
 	{
+		$tokenTypeMap = array_flip($tokenType);
+
 		$s = '';
-		while (!in_array($this->tokens[$this->index][Lexer::TYPE_OFFSET], $tokenType, true)) {
+		while (!isset($tokenTypeMap[$this->tokens[$this->index][Lexer::TYPE_OFFSET]])) {
 			$s .= $this->tokens[$this->index++][Lexer::VALUE_OFFSET];
 		}
 		return $s;
@@ -207,6 +210,15 @@ public function rollback(): void
 	}
 
 
+	/** @internal */
+	public function copy(): self
+	{
+		$copy = new self($this->tokens, $this->index);
+		$copy->savePoints = $this->savePoints;
+		return $copy;
+	}
+
+
 	/**
 	 * @throws ParserException
 	 */

src/Parser/TypeParser.php

@@ -139,26 +139,29 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode
 			$tokens->dropSavePoint(); // because of ConstFetchNode
 		}
 
-		$exception = new ParserException(
-			$tokens->currentTokenValue(),
-			$tokens->currentTokenType(),
-			$tokens->currentTokenOffset(),
-			Lexer::TOKEN_IDENTIFIER
-		);
+		$tokensCopy = $tokens->copy();
+		$exception = static function () use ($tokensCopy): ParserException {
+			return new ParserException(
+				$tokensCopy->currentTokenValue(),
+				$tokensCopy->currentTokenType(),
+				$tokensCopy->currentTokenOffset(),
+				Lexer::TOKEN_IDENTIFIER
+			);
+		};
 
 		if ($this->constExprParser === null) {
-			throw $exception;
+			throw $exception();
 		}
 
 		try {
 			$constExpr = $this->constExprParser->parse($tokens, true);
 			if ($constExpr instanceof Ast\ConstExpr\ConstExprArrayNode) {
-				throw $exception;
+				throw $exception();
 			}
 
 			return new Ast\Type\ConstTypeNode($constExpr);
 		} catch (LogicException $e) {
-			throw $exception;
+			throw $exception();
 		}
 	}