phabel/php-parser
1
0
Fork 0
mirror of https://github.com/phabelio/PHP-Parser.git synced 2025-01-22 13:21:12 +01:00
Code Issues Projects Releases Wiki Activity

Ensure nodes have full complement of location info

Browse Source
This commit is contained in:
Nikita Popov 2017-11-04 18:09:20 +01:00
parent 6a2e1ae440
commit 457fe049a8
2 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/PhpParser/ParserAbstract.php
View File

@ -616,7 +616,7 @@ abstract class ParserAbstract implements Parser
}
$result = new Expr\StaticCall($staticProp->class, $prop, $args, $attributes);
$tmp->var = new Expr\Variable($staticProp->name);
$tmp->var = new Expr\Variable($staticProp->name, $staticProp->name->getAttributes());
return $result;
} else {
throw new \Exception;

54
test/PhpParser/CodeParsingTest.php
View File

@ -2,6 +2,9 @@
namespace PhpParser;
use PhpParser\Node\Expr;
use PhpParser\Node\Stmt;
require_once __DIR__ . '/CodeTestAbstract.php';
class CodeParsingTest extends CodeTestAbstract
@ -17,8 +20,8 @@ class CodeParsingTest extends CodeTestAbstract
}
list($parser5, $parser7) = $this->createParsers($modes);
$output5 = $this->getParseOutput($parser5, $code, $modes);
$output7 = $this->getParseOutput($parser7, $code, $modes);
list($stmts5, $output5) = $this->getParseOutput($parser5, $code, $modes);
list($stmts7, $output7) = $this->getParseOutput($parser7, $code, $modes);
if (isset($modes['php5'])) {
$this->assertSame($expected, $output5, $name);
@ -30,11 +33,17 @@ class CodeParsingTest extends CodeTestAbstract
$this->assertSame($expected, $output5, $name);
$this->assertSame($expected, $output7, $name);
}
$this->checkAttributes($stmts5);
$this->checkAttributes($stmts7);
}
public function createParsers(array $modes) {
$lexer = new Lexer\Emulative(['usedAttributes' => [
'startLine', 'endLine', 'startFilePos', 'endFilePos', 'comments'
'startLine', 'endLine',
'startFilePos', 'endFilePos',
'startTokenPos', 'endTokenPos',
'comments'
]]);
return [
@ -43,7 +52,7 @@ class CodeParsingTest extends CodeTestAbstract
];
}
public function getParseOutput(Parser $parser, $code, array $modes) {
private function getParseOutput(Parser $parser, $code, array $modes) {
$dumpPositions = isset($modes['positions']);
$errors = new ErrorHandler\Collecting;
@ -59,7 +68,7 @@ class CodeParsingTest extends CodeTestAbstract
$output .= $dumper->dump($stmts, $code);
}
return canonicalize($output);
return [$stmts, canonicalize($output)];
}
public function provideTestParse() {
@ -73,4 +82,39 @@ class CodeParsingTest extends CodeTestAbstract
return $e->getMessage();
}
}
private function checkAttributes($stmts) {
if ($stmts === null) {
return;
}
$traverser = new NodeTraverser();
$traverser->addVisitor(new class extends NodeVisitorAbstract {
public function enterNode(Node $node) {
$startLine = $node->getStartLine();
$endLine = $node->getEndLine();
$startFilePos = $node->getStartFilePos();
$endFilePos = $node->getEndFilePos();
$startTokenPos = $node->getStartTokenPos();
$endTokenPos = $node->getEndTokenPos();
if ($startLine < 0 || $endLine < 0 ||
$startFilePos < 0 || $endFilePos < 0 ||
$startTokenPos < 0 || $endTokenPos < 0
) {
throw new \Exception('Missing location information on ' . $node->getType());
}
if ($endLine < $startLine ||
$endFilePos < $startFilePos ||
$endTokenPos < $startTokenPos
) {
// Nops and error can have inverted order, if they are empty
if (!$node instanceof Stmt\Nop && !$node instanceof Expr\Error) {
throw new \Exception('End < start on ' . $node->getType());
}
}
}
});
$traverser->traverse($stmts);
}
}