[WIP] made the pretty printer a little bit prettier #39
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added more tests for the pretty printer fixed switchcasebreak fixed closure bracketing in body and around
| @@ -422,7 +422,7 @@ public function pExpr_Closure(PHPParser_Node_Expr_Closure $node) { | |||
| return ($node->static ? 'static ' : '') | |||
| . 'function ' . ($node->byRef ? '&' : '') | |||
| . '(' . $this->pCommaSeparated($node->params) . ')' | |||
| . (!empty($node->uses) ? ' use(' . $this->pCommaSeparated($node->uses) . ')': '') | |||
| . (!empty($node->uses) ? ' use (' . $this->pCommaSeparated($node->uses) . ')': '') | |||
There was a problem hiding this comment.
i don't know if this is against Zend Coding standard
nikic
added a commit
that referenced
this pull request
Oct 31, 2012
Previously the pretty printer added unnecessary and odd-looking parentheses
when several operators with the same precedence were chained:
'a' . 'b' . 'c' . 'd' . 'e'
// was printed as
'a' . ('b' . ('c' . ('d' . 'e')))
Another issue reported as part of #39 was that assignments inside closures
were wrapped in parentheses:
function() {
$a = $b;
}
// was printed as
function() {
($a = $b);
}
This was caused by the automatic precedence handling, which just regarded
the closure as an ordinal nested expression.
With the new system the $predenceMap of PrettyPrinterAbstract contains both
precedence and associativity and there is a new method pPrec() which prints
a node taking precedence and associativity into account.
For simpler usage there are additional function pInfixOp(), pPrefixOp() and
pPostfixOp().
Prints not going through pPrec() do not have any precedence handling (fixing
the closure issue).
|
Sorry for the long response time. I fixed the closure issue as part of implementing associativity handling (which will make the printing of operator chains prettier) and also committed the switch formatting changes you did. I didn't do much testing of the pretty printer output yet, so there are probably a few more ugly places. |
|
I would love to see something that does PSR-2 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I added a few more tests for the printer. The switch looked really strange for me.
If this breaks something with the Zend Conventions I'd like to create a new Pretty Printer which is more closely to PSR-2 then.