Moving check for signatureContainsDefaultArg to prototypes_adder

ctags should list all prototypes, this commit moves the responsibility of
prototypes selection to prototypes_adder

Signed-off-by: Cristian Maglie <[email protected]>

Author: cmaglie

src/arduino.cc/builder/ctags/ctags_parser.go

@@ -67,7 +67,6 @@ func (s *CTagsParser) Run(context map[string]interface{}) error {
 
 	skipTagsWhere(tags, tagIsUnknown, context)
 	skipTagsWhere(tags, tagIsUnhandled, context)
-	skipTagsWhere(tags, signatureContainsDefaultArg, context)
 	addPrototypes(tags)
 	removeDefinedProtypes(tags, context)
 	removeDuplicate(tags)
@@ -149,10 +148,6 @@ func skipTagsWhere(tags []*types.CTag, skipFunc skipFuncType, context map[string
 	}
 }
 
-func signatureContainsDefaultArg(tag *types.CTag) bool {
-	return strings.Contains(tag.Prototype, "=")
-}
-
 func prototypeAndCodeDontMatch(tag *types.CTag) bool {
 	if tag.SkipMe {
 		return true

src/arduino.cc/builder/prototypes_adder.go

@@ -78,6 +78,9 @@ func composePrototypeSection(line int, prototypes []*types.Prototype) string {
 func joinPrototypes(prototypes []*types.Prototype) string {
 	prototypesSlice := []string{}
 	for _, proto := range prototypes {
+		if signatureContainsaDefaultArg(proto) {
+			continue
+		}
 		prototypesSlice = append(prototypesSlice, "#line "+strconv.Itoa(proto.Line)+" \""+proto.File+"\"")
 		prototypeParts := []string{}
 		if proto.Modifiers != "" {
@@ -89,6 +92,10 @@ func joinPrototypes(prototypes []*types.Prototype) string {
 	return strings.Join(prototypesSlice, "\n")
 }
 
+func signatureContainsaDefaultArg(proto *types.Prototype) bool {
+	return strings.Contains(proto.Prototype, "=")
+}
+
 func firstFunctionOutsideOfSource(firstFunctionLine int, sourceRows []string) bool {
 	return firstFunctionLine > len(sourceRows)-1
 }

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

@@ -336,10 +336,11 @@ func TestCTagsToPrototypesDefaultArguments(t *testing.T) {
 
 	prototypes := context[constants.CTX_PROTOTYPES].([]*types.Prototype)
 
-	require.Equal(t, 2, len(prototypes))
-	require.Equal(t, "void setup();", prototypes[0].Prototype)
-	require.Equal(t, "/tmp/test179252494/preproc/ctags_target.cpp", prototypes[0].File)
-	require.Equal(t, "void loop();", prototypes[1].Prototype)
+	require.Equal(t, 3, len(prototypes))
+	require.Equal(t, "void test(int x = 1);", prototypes[0].Prototype)
+	require.Equal(t, "void setup();", prototypes[1].Prototype)
+	require.Equal(t, "/tmp/test179252494/preproc/ctags_target.cpp", prototypes[1].File)
+	require.Equal(t, "void loop();", prototypes[2].Prototype)
 
 	prototypeLine := context[constants.CTX_LINE_WHERE_TO_INSERT_PROTOTYPES].(int)
 	require.Equal(t, 2, prototypeLine)