Merge pull request #1664 from guwirth/fix-1415

speed-up initialization list handling
SonarOpenCommunity · Jan 12, 2019 · b11375a · b11375a
2 parents c7fdb54 + a5ef0aa
commit b11375a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/HardcodedAccountCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/HardcodedAccountCheck.java
@@ -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;
@@ -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

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/HardcodedIpCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/HardcodedIpCheck.java
@@ -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;
@@ -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

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/StringLiteralDuplicatedCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/StringLiteralDuplicatedCheck.java
@@ -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;
@@ -57,7 +57,7 @@ public class StringLiteralDuplicatedCheck extends SquidCheck<Grammar> {
 
   @Override
   public void init() {
-    subscribeTo(CxxGrammarImpl.LITERAL);
+    subscribeTo(CxxTokenType.STRING);
   }
 
   @Override

diff --git a/cxx-squid/src/main/java/org/sonar/cxx/parser/CxxGrammarImpl.java b/cxx-squid/src/main/java/org/sonar/cxx/parser/CxxGrammarImpl.java
@@ -386,7 +386,7 @@ private static void misc(LexerfulGrammarBuilder b) {
         BOOL, // boolean-literal
         NULLPTR // pointer-literal
       )
-    );
+    ).skip();
   }
 
   private static void vcAttributedAtl(LexerfulGrammarBuilder b) {
@@ -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
@@ -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++
       )