Comparing prototypes with original functions. If they don't match,

prototype is skipped

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

Author: Federico Fissore

src/arduino.cc/builder/ctags_parser.go

@@ -79,6 +79,7 @@ func (s *CTagsParser) Run(context map[string]interface{}) error {
 	tags = addPrototypes(tags)
 	tags = removeDefinedProtypes(tags)
 	tags = removeDuplicate(tags)
+	tags = skipTagsWhere(tags, prototypeAndCodeDontMatch)
 
 	if len(tags) > 0 {
 		line, err := strconv.Atoi(tags[0][FIELD_LINE])
@@ -181,6 +182,24 @@ func signatureContainsDefaultArg(tag map[string]string) bool {
 	return strings.Contains(tag[FIELD_SIGNATURE], "=")
 }
 
+func prototypeAndCodeDontMatch(tag map[string]string) bool {
+	if tag[FIELD_SKIP] == "true" {
+		return true
+	}
+
+	code := removeSpacesAndTabs(tag[FIELD_CODE])
+	prototype := removeSpacesAndTabs(tag[KIND_PROTOTYPE])
+	prototype = prototype[0 : len(prototype)-1]
+
+	return strings.Index(code, prototype) == -1
+}
+
+func removeSpacesAndTabs(s string) string {
+	s = strings.Replace(s, " ", "", -1)
+	s = strings.Replace(s, "\t", "", -1)
+	return s
+}
+
 func filterOutTagsWithField(tags []map[string]string, field string) []map[string]string {
 	var newTags []map[string]string
 	for _, tag := range tags {

src/arduino.cc/builder/test/ctags_output/TestCTagsParserFunctionPointers.txt

@@ -0,0 +1,5 @@
+setup	/tmp/test907446433/preproc/ctags_target.cpp	/^void setup(){$/;"	kind:function	line:2	signature:()	returntype:void
+loop	/tmp/test907446433/preproc/ctags_target.cpp	/^void loop(){}$/;"	kind:function	line:5	signature:()	returntype:void
+func	/tmp/test907446433/preproc/ctags_target.cpp	/^void (*func())(){$/;"	kind:function	line:7	signature:()	returntype:void
+funcArr	/tmp/test907446433/preproc/ctags_target.cpp	/^int (&funcArr())[5]{$/;"	kind:function	line:11	signature:()	returntype:int
+funcCombo	/tmp/test907446433/preproc/ctags_target.cpp	/^void (*(&funcCombo(void (*(&in)[5])(int)))[5])(int){$/;"	kind:function	line:15	signature:(void (*(&in)[5])(int))	returntype:void

src/arduino.cc/builder/test/ctags_parser_test.go

@@ -263,3 +263,21 @@ func TestCTagsParserStatic(t *testing.T) {
 	require.Equal(t, "void doStuff();", prototypes[2].Prototype)
 	require.Equal(t, "static", prototypes[2].Modifiers)
 }
+
+func TestCTagsParserFunctionPointers(t *testing.T) {
+	context := make(map[string]interface{})
+
+	bytes, err := ioutil.ReadFile(filepath.Join("ctags_output", "TestCTagsParserFunctionPointers.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, 2, len(prototypes))
+	require.Equal(t, "void setup();", prototypes[0].Prototype)
+	require.Equal(t, "void loop();", prototypes[1].Prototype)
+}