TouchInstinct
/
checkstyle
307
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iron out bugs

This commit is contained in:
Oliver Burn 2010-10-04 16:12:00 +11:00
parent 595d070db0
commit 868d96b459
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java
View File

@ -60,10 +60,10 @@ public final class OneStatementPerLineCheck extends Check
{
switch (aAst.getType()) {
case TokenTypes.EXPR:
startStatement(aAst);
visitExpr(aAst);
break;
case TokenTypes.SEMI:
startSemi(aAst);
visitSemi(aAst);
break;
case TokenTypes.FOR_INIT:
mInForHeader = true;
@ -76,8 +76,15 @@ public final class OneStatementPerLineCheck extends Check
@Override
public void leaveToken(DetailAST aAst)
{
if (TokenTypes.FOR_ITERATOR == aAst.getType()) {
switch (aAst.getType()) {
case TokenTypes.FOR_ITERATOR:
mInForHeader = false;
break;
case TokenTypes.EXPR:
mExprDepth--;
break;
default:
break;
}
}
@ -88,7 +95,7 @@ public final class OneStatementPerLineCheck extends Check
* not within a for-statement, then the rule is violated.
* @param aAst token for the {@link TokenTypes#EXPR}.
*/
private void startStatement(DetailAST aAst)
private void visitExpr(DetailAST aAst)
{
mExprDepth++;
if (mExprDepth == 1) {
@ -103,11 +110,10 @@ public final class OneStatementPerLineCheck extends Check
* line of the last statement.
* @param aAst for the {@link TokenTypes#SEMI}.
*/
private void startSemi(DetailAST aAst)
private void visitSemi(DetailAST aAst)
{
mExprDepth--;
if (mExprDepth == 0) {
mLastStatementEnd = aAst.getLineNo();
}
}
}
}