improve grammar coverage (#47)

* fix function parameters with double colon

Author: elegoff

community-rust-frontend/src/main/java/org/sonar/rust/RustGrammar.java

@@ -641,7 +641,7 @@ private static void functionsItem(LexerlessGrammarBuilder b) {
 
 
         b.rule(FUNCTION_PARAM).is(
-                b.zeroOrMore(OUTER_ATTRIBUTE), SPC,
+                b.zeroOrMore(OUTER_ATTRIBUTE,SPC), SPC,
                 b.firstOf(FUNCTION_PARAM_PATTERN, RustPunctuator.DOTDOTDOT, TYPE));
 
         b.rule(FUNCTION_PARAM_PATTERN).is(PATTERN_NO_TOP_ALT, SPC, RustPunctuator.COLON,
@@ -1131,7 +1131,7 @@ private static void functionpointer(LexerlessGrammarBuilder b) {
         b.rule(MAYBE_NAMED_PARAM).is(
                 b.zeroOrMore(OUTER_ATTRIBUTE, SPC),
                 b.optional(b.sequence(
-                        b.firstOf(IDENTIFIER, RustPunctuator.UNDERSCORE), SPC, RustPunctuator.COLON
+                        b.firstOf(IDENTIFIER, RustPunctuator.UNDERSCORE), SPC, RustPunctuator.COLON, b.nextNot(RustPunctuator.COLON)
                 )), SPC, TYPE
         );
         b.rule(MAYBE_NAMED_FUNCTION_PARAMETERS_VARIADIC).is(
@@ -1732,7 +1732,7 @@ private static void operator(LexerlessGrammarBuilder b) {
     }
 
     private static void block(LexerlessGrammarBuilder b) {
-        b.rule(BLOCK_EXPRESSION).is("{", SPC, b.zeroOrMore(INNER_ATTRIBUTE),
+        b.rule(BLOCK_EXPRESSION).is("{", SPC, b.zeroOrMore(INNER_ATTRIBUTE,SPC),
                 SPC, b.optional(STATEMENTS), SPC, "}"
         );
 

community-rust-frontend/src/test/java/org/sonar/rust/RustLexerTest.java

@@ -68,7 +68,11 @@ public void testTokens() {
 
     @Test
     public void testParsing() {
-        String sexpr = "crate_root.call(me);";
+        String sexpr = "static INIT_ARRAY: unsafe extern \"C\" fn(c::c_int, *mut *mut u8, *mut *mut u8) = {\n" +
+                "    unsafe extern \"C\" fn function(_argc: c::c_int, _argv: *mut *mut u8, envp: *mut *mut u8) {\n" +
+                "    }\n" +
+                "    function\n" +
+                "};";
 
         //Print out Ast node content for debugging purpose
 

community-rust-frontend/src/test/java/org/sonar/rust/parser/items/FunctionTest.java

@@ -88,6 +88,8 @@ public void testFunctionParameters() {
                 .matches("x : i32")
                 .matches("x : i32, y:i64")
                 .matches("&self, n:u32")
+                .matches("*mut *mut u8, *mut *mut u8")
+                .matches("c::c_int, *mut *mut u8, *mut *mut u8")
 
         ;
 

community-rust-frontend/src/test/java/org/sonar/rust/parser/items/StaticTest.java

@@ -31,6 +31,12 @@ public void testStatic() {
         assertThat(RustGrammar.create().build().rule(RustGrammar.STATIC_ITEM))
                 .matches("static mut LEVELS: u32 = 0;")
                 .matches("static mut LEVELS: u32;")
+                .matches("static INIT_ARRAY: unsafe extern \"C\" fn(c::c_int, *mut *mut u8, *mut *mut u8) = {\n" +
+                        "    unsafe extern \"C\" fn function(_argc: c::c_int, _argv: *mut *mut u8, envp: *mut *mut u8) {\n" +
+                        "        init_from_envp(envp);\n" +
+                        "    }\n" +
+                        "    function\n" +
+                        "};")
 
 
         ;