phabel/php-parser
1
0
Fork 0
mirror of https://github.com/phabelio/PHP-Parser.git synced 2024-11-30 04:29:15 +01:00
Code Issues Projects Releases Wiki Activity

Next try to fix HHVM build

Browse Source
This commit is contained in:
Nikita Popov 2016-09-30 20:57:21 +02:00
parent 2e5ae28c39
commit 648a246be0
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/PhpParser/Lexer.php
View File

@ -159,9 +159,24 @@ class Lexer
$line += substr_count($tokenValue, "\n");
}
// Invalid characters at the end of the input
if ($filePos !== \strlen($this->code)) {
$this->handleInvalidCharacterRange($filePos, \strlen($this->code), $line);
if (substr($this->code, $filePos, 2) === '/*') {
// Unlike PHP, HHVM will drop unterminated comments entirely
$comment = substr($this->code, $filePos);
$this->errors[] = new Error('Unterminated comment', [
'startLine' => $line,
'endLine' => $line + substr_count($comment, "\n"),
'startFilePos' => $filePos,
'endFilePos' => $filePos + \strlen($comment),
]);
// Emulate the PHP behavior
$isDocComment = isset($comment[3]) && $comment[3] === '*';
$this->tokens[] = [$isDocComment ? T_DOC_COMMENT : T_COMMENT, $comment, $line];
} else {
// Invalid characters at the end of the input
$this->handleInvalidCharacterRange($filePos, \strlen($this->code), $line);
}
}
// Check for unterminated comment