Merge pull request #894 from Bertk/MS-exception-throw

support Visual C++ throw(...)
SonarOpenCommunity · Jun 24, 2016 · b36b6b6 · b36b6b6
2 parents b3ffea5 + 80fa402
commit b36b6b6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
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
@@ -1751,7 +1751,12 @@ private static void exceptionHandling(LexerfulGrammarBuilder b) {
 
     b.rule(dynamicExceptionSpecification).is(CxxKeyword.THROW, "(", b.optional(typeIdList), ")"); // C++
 
-    b.rule(typeIdList).is(typeId, b.optional("..."), b.zeroOrMore(",", typeId, b.optional("..."))); // C++
+    b.rule(typeIdList).is(
+        b.firstOf(
+          b.sequence(typeId, b.optional("..."), b.zeroOrMore(",", typeId, b.optional("..."))), // C++ 
+          "..."// Microsoft extension
+        )
+      ); 
 
     b.rule(noexceptSpecification).is(
       b.firstOf(

diff --git a/cxx-squid/src/test/java/org/sonar/cxx/parser/ExceptionHandlingTest.java b/cxx-squid/src/test/java/org/sonar/cxx/parser/ExceptionHandlingTest.java
@@ -48,6 +48,7 @@ public void exceptionSpecification_reallife() {
     p.setRootRule(g.rule(CxxGrammarImpl.exceptionSpecification));
 
     assertThat(p).matches("throw()");
+    assertThat(p).matches("throw(...)");
   }
 
   @Test
@@ -60,6 +61,7 @@ public void typeIdList() {
     assertThat(p).matches("typeId ...");
     assertThat(p).matches("typeId , typeId");
     assertThat(p).matches("typeId , typeId ...");
+    assertThat(p).matches("...");
   }
 
   @Test

diff --git a/cxx-squid/src/test/resources/parser/own/VC/exception-specification.cc b/cxx-squid/src/test/resources/parser/own/VC/exception-specification.cc
@@ -0,0 +1,18 @@
+int myfunc1() throw(){
+}
+
+int myfunc2() throw(int){
+}
+
+int myfunc3() throw(int, int){
+}
+
+int myfunc4() throw(int ...){
+}
+
+int myfunc5() throw(int ..., int ...){
+}
+
+int myfunc() throw(...){
+}
+