Skip to content

TooManyStatementsPerLineCheck creates false positive with type alias #659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guwirth merged 1 commit into from
Oct 21, 2015
Merged

TooManyStatementsPerLineCheck creates false positive with type alias #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions cxx-checks/src/main/java/org/sonar/cxx/checks/TooManyStatementsPerLineCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,28 +61,38 @@ public void init() {
subscribeTo(CxxGrammarImpl.statement);
}

/** Exclude subsequent generated nodes, if they are consecutive and on the same line.
/**
* Exclude subsequent generated nodes, if they are consecutive and on the same
* line.
*/
private boolean isGeneratedNodeExcluded(AstNode astNode)
{
private boolean isGeneratedNodeExcluded(AstNode astNode) {
AstNode prev = astNode.getPreviousAstNode();
return prev != null &&
prev.getTokenLine() == astNode.getTokenLine() &&
prev.getTokenLine() == astNode.getTokenLine() &&
prev.isCopyBookOrGeneratedNode();
return prev != null
&& prev.getTokenLine() == astNode.getTokenLine()
&& prev.getTokenLine() == astNode.getTokenLine()
&& prev.isCopyBookOrGeneratedNode();
}

/** Exclude 'break' statement if it is on the same line as the switch label (case: or default:).
* i.e. the break statement is on the same line as it's "switchBlockStatementGroup" ancestor.
/**
* Exclude 'break' statement if it is on the same line as the switch label
* (case: or default:). i.e. the break statement is on the same line as it's
* "switchBlockStatementGroup" ancestor.
*/
private boolean isBreakStatementExcluded(AstNode astNode)
{
if (!excludeCaseBreak || astNode.getToken().getType() != CxxKeyword.BREAK)
private boolean isBreakStatementExcluded(AstNode astNode) {
if (!excludeCaseBreak || astNode.getToken().getType() != CxxKeyword.BREAK) {
return false;
}

AstNode switchGroup = astNode.getFirstAncestor(CxxGrammarImpl.switchBlockStatementGroup);
return switchGroup != null
&& switchGroup.getTokenLine() == astNode.getTokenLine();
&& switchGroup.getTokenLine() == astNode.getTokenLine();
}

/**
* Exclude type alias definitions inside of blocks ( ... { using a = b; ... } ... )
*/
private boolean isTypeAlias(AstNode astNode) {
return astNode.getFirstDescendant(CxxGrammarImpl.aliasDeclaration) != null;
}

@Override
Expand All @@ -93,7 +103,8 @@ public boolean isExcluded(AstNode astNode) {
|| statementNode.is(CxxGrammarImpl.iterationStatement)
|| statementNode.is(CxxGrammarImpl.labeledStatement)
|| statementNode.is(CxxGrammarImpl.declaration)
|| isTypeAlias(statementNode)
|| (statementNode.isCopyBookOrGeneratedNode() && isGeneratedNodeExcluded(statementNode))
|| (statementNode.is(CxxGrammarImpl.jumpStatement) && isBreakStatementExcluded(statementNode));
}
}
}
5 changes: 4 additions & 1 deletion cxx-checks/src/test/resources/checks/TooManyStatementsPerLine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,7 @@ int main()
fpoly_only(s); // okay, enable_if allows this
}


template <typename RBM, typename Trainer>
void update_normal(RBM& rbm, Trainer& t) {
using rbm_t = RBM; // OK
}