Preserving 'static' keyword when generating function prototypes. Fixes #47

Signed-off-by: Federico Fissore <[email protected]>

Author: Federico Fissore

Diff for: src/arduino.cc/builder/ctags_parser.go

@@ -51,6 +51,7 @@ const FIELD_SKIP = "skipMe"
 const KIND_PROTOTYPE = "prototype"
 
 const TEMPLATE = "template"
+const STATIC = "static"
 
 var FIELDS = map[string]bool{"kind": true, "line": true, "typeref": true, "signature": true, "returntype": true, "class": true, "struct": true, "namespace": true}
 var KNOWN_TAG_KINDS = map[string]bool{"prototype": true, "function": true}
@@ -120,8 +121,13 @@ func addPrototype(tag map[string]string) {
 			code = code[:strings.LastIndex(code, ")")+1]
 		}
 		tag[KIND_PROTOTYPE] = code + ";"
-	} else {
-		tag[KIND_PROTOTYPE] = tag[FIELD_RETURNTYPE] + " " + tag[FIELD_FUNCTION_NAME] + tag[FIELD_SIGNATURE] + ";"
+		return
+	}
+
+	tag[KIND_PROTOTYPE] = tag[FIELD_RETURNTYPE] + " " + tag[FIELD_FUNCTION_NAME] + tag[FIELD_SIGNATURE] + ";"
+
+	if strings.Index(tag[FIELD_CODE], STATIC+" ") != -1 {
+		tag[KIND_PROTOTYPE] = STATIC + " " + tag[KIND_PROTOTYPE]
 	}
 }
 

Diff for: src/arduino.cc/builder/test/ctags_output/TestCTagsParserStatic.txt

@@ -0,0 +1,3 @@
+setup	/tmp/test542833488/preproc/ctags_target.cpp	/^void setup(){}$/;"	kind:function	line:2	signature:()	returntype:void
+loop	/tmp/test542833488/preproc/ctags_target.cpp	/^void loop(){}$/;"	kind:function	line:3	signature:()	returntype:void
+doStuff	/tmp/test542833488/preproc/ctags_target.cpp	/^static void doStuff() {}$/;"	kind:function	line:4	signature:()	returntype:void

Diff for: src/arduino.cc/builder/test/ctags_parser_test.go

@@ -243,3 +243,22 @@ func TestCTagsParserNamespace(t *testing.T) {
 	require.Equal(t, "void setup();", prototypes[0].Prototype)
 	require.Equal(t, "void loop();", prototypes[1].Prototype)
 }
+
+func TestCTagsParserStatic(t *testing.T) {
+	context := make(map[string]interface{})
+
+	bytes, err := ioutil.ReadFile(filepath.Join("ctags_output", "TestCTagsParserStatic.txt"))
+	NoError(t, err)
+
+	context[constants.CTX_CTAGS_OUTPUT] = string(bytes)
+
+	ctagsParser := builder.CTagsParser{PrototypesField: constants.CTX_PROTOTYPES}
+	ctagsParser.Run(context)
+
+	prototypes := context[constants.CTX_PROTOTYPES].([]*types.Prototype)
+
+	require.Equal(t, 3, len(prototypes))
+	require.Equal(t, "void setup();", prototypes[0].Prototype)
+	require.Equal(t, "void loop();", prototypes[1].Prototype)
+	require.Equal(t, "static void doStuff();", prototypes[2].Prototype)
+}

Diff for: src/arduino.cc/builder/test/prototypes_adder_test.go

@@ -574,7 +574,7 @@ func TestPrototypesAdderSketchWithInlineFunction(t *testing.T) {
 	}
 
 	require.Equal(t, "#include <Arduino.h>\n#line 1\n", context[constants.CTX_INCLUDE_SECTION].(string))
-	require.Equal(t, "void setup();\nvoid loop();\nshort unsigned int testInt();\nint8_t testInline();\nuint8_t testAttribute();\n#line 1\n", context[constants.CTX_PROTOTYPE_SECTION].(string))
+	require.Equal(t, "void setup();\nvoid loop();\nshort unsigned int testInt();\nstatic int8_t testInline();\nuint8_t testAttribute();\n#line 1\n", context[constants.CTX_PROTOTYPE_SECTION].(string))
 }
 
 func TestPrototypesAdderSketchWithFunctionSignatureInsideIFDEF(t *testing.T) {