Skip to content
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

speed-up initialization list handling #1664

Merged
merged 2 commits into from
Jan 12, 2019
Merged

speed-up initialization list handling #1664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6e47cf
skip LITERAL from AST
guwirth Jan 11, 2019
a5ef0aa
add special case to speed-up braced initialization lists
guwirth Jan 11, 2019
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
4 changes: 2 additions & 2 deletions cxx-checks/src/main/java/org/sonar/cxx/checks/HardcodedAccountCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import org.sonar.check.Priority;
import org.sonar.check.Rule;
import org.sonar.check.RuleProperty;
import org.sonar.cxx.api.CxxTokenType;
import org.sonar.cxx.checks.utils.CheckUtils;
import org.sonar.cxx.parser.CxxGrammarImpl;
import org.sonar.cxx.tag.Tag;
import org.sonar.squidbridge.annotations.ActivatedByDefault;
import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
Expand Down Expand Up @@ -69,7 +69,7 @@ public class HardcodedAccountCheck extends SquidCheck<Grammar> {
@Override
public void init() {
pattern = CheckUtils.compileUserRegexp(regularExpression);
subscribeTo(CxxGrammarImpl.LITERAL);
subscribeTo(CxxTokenType.STRING);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions cxx-checks/src/main/java/org/sonar/cxx/checks/HardcodedIpCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import org.sonar.check.Priority;
import org.sonar.check.Rule;
import org.sonar.check.RuleProperty;
import org.sonar.cxx.api.CxxTokenType;
import org.sonar.cxx.checks.utils.CheckUtils;
import org.sonar.cxx.parser.CxxGrammarImpl;
import org.sonar.cxx.tag.Tag;
import org.sonar.squidbridge.annotations.ActivatedByDefault;
import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
Expand Down Expand Up @@ -67,7 +67,7 @@ public class HardcodedIpCheck extends SquidCheck<Grammar> {
@Override
public void init() {
pattern = CheckUtils.compileUserRegexp(regularExpression);
subscribeTo(CxxGrammarImpl.LITERAL);
subscribeTo(CxxTokenType.STRING);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions cxx-checks/src/main/java/org/sonar/cxx/checks/StringLiteralDuplicatedCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.sonar.check.Priority;
import org.sonar.check.Rule;
import org.sonar.check.RuleProperty;
import org.sonar.cxx.parser.CxxGrammarImpl;
import org.sonar.cxx.api.CxxTokenType;
import org.sonar.cxx.tag.Tag;
import org.sonar.squidbridge.annotations.ActivatedByDefault;
import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
Expand Down Expand Up @@ -57,7 +57,7 @@ public class StringLiteralDuplicatedCheck extends SquidCheck<Grammar> {

@Override
public void init() {
subscribeTo(CxxGrammarImpl.LITERAL);
subscribeTo(CxxTokenType.STRING);
}

@Override
Expand Down
7 changes: 4 additions & 3 deletions cxx-squid/src/main/java/org/sonar/cxx/parser/CxxGrammarImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ private static void misc(LexerfulGrammarBuilder b) {
BOOL, // boolean-literal
NULLPTR // pointer-literal
)
);
).skip();
}

private static void vcAttributedAtl(LexerfulGrammarBuilder b) {
Expand Down Expand Up @@ -1463,7 +1463,7 @@ private static void declarators(LexerfulGrammarBuilder b) {
b.sequence("=", initializerClause), // C++
bracedInitList // C++
)
);
).skip();

b.rule(initializerClause).is(
// C-COMPATIBILITY: C99 designated initializers
Expand All @@ -1477,14 +1477,15 @@ private static void declarators(LexerfulGrammarBuilder b) {
assignmentExpression, // C++
bracedInitList // C++
)
);
).skipIfOneChild();

b.rule(initializerList).is(
initializerClause, b.optional("..."), b.zeroOrMore(",", initializerClause, b.optional("...")) // C++
);

b.rule(bracedInitList).is(
b.firstOf(
b.sequence("{", LITERAL, b.oneOrMore(",", LITERAL), "}" ), // syntax sugar: speed-up initialisation of big arrays
b.sequence("{", initializerList, b.optional(","), "}"), // C++
b.sequence("{", "}") // C++
)
Expand Down