Rewrite namespace handling code

Add a check for disallowed statements between braced namespaces
while at it.
This commit is contained in:
nikic 2014-04-21 14:49:35 +02:00
parent 6d1f77132c
commit 1f143393e5
2 changed files with 56 additions and 65 deletions

View File

@ -302,82 +302,66 @@ abstract class ParserAbstract
* Helper functions invoked by semantic actions * Helper functions invoked by semantic actions
*/ */
/**
* Moves statements of semicolon-style namespaces into $ns->stmts and checks various error conditions.
*
* @param Node[] $stmts
* @return Node[]
*/
protected function handleNamespaces(array $stmts) { protected function handleNamespaces(array $stmts) {
// null = not in namespace, false = semicolon style, true = bracket style $style = $this->getNamespacingStyle($stmts);
$bracketed = null; if (null === $style) {
// not namespaced, nothing to do
return $stmts;
} elseif ('brace' === $style) {
// For braced namespaces we only have to check that there are no invalid statements between the namespaces
$afterFirstNamespace = false;
foreach ($stmts as $stmt) {
if ($stmt instanceof Node\Stmt\Namespace_) {
$afterFirstNamespace = true;
} elseif (!$stmt instanceof Node\Stmt\HaltCompiler && $afterFirstNamespace) {
throw new Error('No code may exist outside of namespace {}', $stmt->getLine());
}
}
return $stmts;
} else {
// For semicolon namespaces we have to move the statements after a namespace declaration into ->stmts
$resultStmts = array();
$targetStmts =& $resultStmts;
foreach ($stmts as $stmt) {
if ($stmt instanceof Node\Stmt\Namespace_) {
$stmt->stmts = array();
$targetStmts =& $stmt->stmts;
$resultStmts[] = $stmt;
} elseif ($stmt instanceof Node\Stmt\HaltCompiler) {
// __halt_compiler() is not moved into the namespace
$resultStmts[] = $stmt;
} else {
$targetStmts[] = $stmt;
}
}
return $resultStmts;
}
}
// whether any statements that aren't allowed before a namespace declaration are encountered private function getNamespacingStyle(array $stmts) {
// (the only valid statement currently is a declare) $style = null;
$hasNotAllowedStmts = false; $hasNotAllowedStmts = false;
foreach ($stmts as $stmt) {
// offsets for semicolon style namespaces
// (required for transplanting the following statements into their ->stmts property)
$nsOffsets = array();
foreach ($stmts as $i => $stmt) {
if ($stmt instanceof Node\Stmt\Namespace_) { if ($stmt instanceof Node\Stmt\Namespace_) {
// ->stmts is null if semicolon style is used $currentStyle = null === $stmt->stmts ? 'semicolon' : 'brace';
$currentBracketed = null !== $stmt->stmts; if (null === $style) {
$style = $currentStyle;
// if no namespace statement has been encountered yet
if (!isset($bracketed)) {
// set the namespacing style
$bracketed = $currentBracketed;
// and ensure that it isn't preceded by a not allowed statement
if ($hasNotAllowedStmts) { if ($hasNotAllowedStmts) {
throw new Error('Namespace declaration statement has to be the very first statement in the script', $stmt->getLine()); throw new Error('Namespace declaration statement has to be the very first statement in the script', $stmt->getLine());
} }
// otherwise ensure that the style of the current namespace matches the style of } elseif ($style !== $currentStyle) {
// namespaceing used before in this document
} elseif ($bracketed !== $currentBracketed) {
throw new Error('Cannot mix bracketed namespace declarations with unbracketed namespace declarations', $stmt->getLine()); throw new Error('Cannot mix bracketed namespace declarations with unbracketed namespace declarations', $stmt->getLine());
} }
} elseif (!$stmt instanceof Node\Stmt\Declare_ && !$stmt instanceof Node\Stmt\HaltCompiler) {
// for semicolon style namespaces remember the offset
if (!$bracketed) {
$nsOffsets[] = $i;
}
// declare() and __halt_compiler() are the only valid statements outside of namespace declarations
} elseif (!$stmt instanceof Node\Stmt\Declare_
&& !$stmt instanceof Node\Stmt\HaltCompiler
) {
if (true === $bracketed) {
throw new Error('No code may exist outside of namespace {}', $stmt->getLine());
}
$hasNotAllowedStmts = true; $hasNotAllowedStmts = true;
} }
} }
return $style;
// if bracketed namespaces were used or no namespaces were used at all just return the
// original statements
if (!isset($bracketed) || true === $bracketed) {
return $stmts;
// for semicolon style transplant statements
} else {
// take all statements preceding the first namespace
$newStmts = array_slice($stmts, 0, $nsOffsets[0]);
// iterate over all following namespaces
for ($i = 0, $c = count($nsOffsets); $i < $c; ++$i) {
$newStmts[] = $nsStmt = $stmts[$nsOffsets[$i]];
// the last namespace takes all statements after it
if ($c === $i + 1) {
$nsStmt->stmts = array_slice($stmts, $nsOffsets[$i] + 1);
// if the last statement is __halt_compiler() put it outside the namespace
if (end($nsStmt->stmts) instanceof Node\Stmt\HaltCompiler) {
$newStmts[] = array_pop($nsStmt->stmts);
}
// and all the others take all statements between the current and the following one
} else {
$nsStmt->stmts = array_slice($stmts, $nsOffsets[$i] + 1, $nsOffsets[$i + 1] - $nsOffsets[$i] - 1);
}
}
return $newStmts;
}
} }
} }

View File

@ -11,3 +11,10 @@ namespace A {}
echo 1; echo 1;
----- -----
No code may exist outside of namespace {} on line 3 No code may exist outside of namespace {} on line 3
-----
<?php
namespace A {}
declare(ticks=1);
namespace B {}
-----
No code may exist outside of namespace {} on line 3