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

Support file offsets in emulative lexer as well

Browse Source 
Also run normal lexer tests against emulative lexer and fix a bug
in __halt_compiler() handling found as a result.
This commit is contained in:
nikic 2014-11-27 20:57:38 +01:00
parent d774dbc1b7
commit 7c98ad6f9b
3 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/PhpParser/Lexer/Emulative.php
View File

@ -20,8 +20,8 @@ class Emulative extends \PhpParser\Lexer
const PHP_5_5 = '5.5.0beta1';
const PHP_5_4 = '5.4.0beta1';
public function __construct() {
parent::__construct();
public function __construct(array $options = array()) {
parent::__construct($options);
$newKeywordsPerVersion = array(
self::PHP_5_5 => array(
@ -60,6 +60,10 @@ class Emulative extends \PhpParser\Lexer
if ($preprocessedCode !== $code) {
$this->postprocessTokens();
}
// Set code property back to the original code, so __halt_compiler()
// handling and (start|end)FilePos attributes use the correct offsets
$this->code = $code;
}
/*
@ -179,4 +183,4 @@ class Emulative extends \PhpParser\Lexer
return $token;
}
}
}

43
test/PhpParser/Lexer/EmulativeTest.php
View File

@ -2,36 +2,36 @@
namespace PhpParser\Lexer;
use PhpParser\LexerTest;
use PhpParser\Parser;
class EmulativeTest extends \PHPUnit_Framework_TestCase
class EmulativeTest extends LexerTest
{
/** @var Emulative */
protected $lexer;
protected function setUp() {
$this->lexer = new Emulative;
protected function getLexer(array $options = array()) {
return new Emulative($options);
}
/**
* @dataProvider provideTestReplaceKeywords
*/
public function testReplaceKeywords($keyword, $expectedToken) {
$this->lexer->startLexing('<?php ' . $keyword);
$lexer = $this->getLexer();
$lexer->startLexing('<?php ' . $keyword);
$this->assertSame($expectedToken, $this->lexer->getNextToken());
$this->assertSame(0, $this->lexer->getNextToken());
$this->assertSame($expectedToken, $lexer->getNextToken());
$this->assertSame(0, $lexer->getNextToken());
}
/**
* @dataProvider provideTestReplaceKeywords
*/
public function testNoReplaceKeywordsAfterObjectOperator($keyword) {
$this->lexer->startLexing('<?php ->' . $keyword);
$lexer = $this->getLexer();
$lexer->startLexing('<?php ->' . $keyword);
$this->assertSame(Parser::T_OBJECT_OPERATOR, $this->lexer->getNextToken());
$this->assertSame(Parser::T_STRING, $this->lexer->getNextToken());
$this->assertSame(0, $this->lexer->getNextToken());
$this->assertSame(Parser::T_OBJECT_OPERATOR, $lexer->getNextToken());
$this->assertSame(Parser::T_STRING, $lexer->getNextToken());
$this->assertSame(0, $lexer->getNextToken());
}
public function provideTestReplaceKeywords() {
@ -58,14 +58,15 @@ class EmulativeTest extends \PHPUnit_Framework_TestCase
* @dataProvider provideTestLexNewFeatures
*/
public function testLexNewFeatures($code, array $expectedTokens) {
$this->lexer->startLexing('<?php ' . $code);
$lexer = $this->getLexer();
$lexer->startLexing('<?php ' . $code);
foreach ($expectedTokens as $expectedToken) {
list($expectedTokenType, $expectedTokenText) = $expectedToken;
$this->assertSame($expectedTokenType, $this->lexer->getNextToken($text));
$this->assertSame($expectedTokenType, $lexer->getNextToken($text));
$this->assertSame($expectedTokenText, $text);
}
$this->assertSame(0, $this->lexer->getNextToken());
$this->assertSame(0, $lexer->getNextToken());
}
/**
@ -73,11 +74,13 @@ class EmulativeTest extends \PHPUnit_Framework_TestCase
*/
public function testLeaveStuffAloneInStrings($code) {
$stringifiedToken = '"' . addcslashes($code, '"\\') . '"';
$this->lexer->startLexing('<?php ' . $stringifiedToken);
$this->assertSame(Parser::T_CONSTANT_ENCAPSED_STRING, $this->lexer->getNextToken($text));
$lexer = $this->getLexer();
$lexer->startLexing('<?php ' . $stringifiedToken);
$this->assertSame(Parser::T_CONSTANT_ENCAPSED_STRING, $lexer->getNextToken($text));
$this->assertSame($stringifiedToken, $text);
$this->assertSame(0, $this->lexer->getNextToken());
$this->assertSame(0, $lexer->getNextToken());
}
public function provideTestLexNewFeatures() {
@ -113,4 +116,4 @@ class EmulativeTest extends \PHPUnit_Framework_TestCase
)),
);
}
}
}

12
test/PhpParser/LexerTest.php
View File

@ -4,12 +4,16 @@ namespace PhpParser;
class LexerTest extends \PHPUnit_Framework_TestCase
{
/* To allow overwriting in parent class */
protected function getLexer(array $options = array()) {
return new Lexer($options);
}
/**
* @dataProvider provideTestError
*/
public function testError($code, $message) {
$lexer = new Lexer;
$lexer = $this->getLexer();
try {
$lexer->startLexing($code);
} catch (Error $e) {
@ -33,7 +37,7 @@ class LexerTest extends \PHPUnit_Framework_TestCase
* @dataProvider provideTestLex
*/
public function testLex($code, $options, $tokens) {
$lexer = new Lexer($options);
$lexer = $this->getLexer($options);
$lexer->startLexing($code);
while ($id = $lexer->getNextToken($value, $startAttributes, $endAttributes)) {
$token = array_shift($tokens);
@ -165,12 +169,12 @@ class LexerTest extends \PHPUnit_Framework_TestCase
* @dataProvider provideTestHaltCompiler
*/
public function testHandleHaltCompiler($code, $remaining) {
$lexer = new Lexer;
$lexer = $this->getLexer();
$lexer->startLexing($code);
while (Parser::T_HALT_COMPILER !== $lexer->getNextToken());
$this->assertSame($lexer->handleHaltCompiler(), $remaining);
$this->assertSame($remaining, $lexer->handleHaltCompiler());
$this->assertSame(0, $lexer->getNextToken());
}