Collecting prototype modifiers in Modifiers struct key

Signed-off-by: Federico Fissore <f.fissore@arduino.cc>

Author: Federico Fissore

src/arduino.cc/builder/ctags_parser.go

@@ -49,6 +49,7 @@ const FIELD_NAMESPACE = "namespace"
 const FIELD_SKIP = "skipMe"
 
 const KIND_PROTOTYPE = "prototype"
+const KIND_PROTOTYPE_MODIFIERS = "prototype_modifiers"
 
 const TEMPLATE = "template"
 const STATIC = "static"
@@ -98,7 +99,7 @@ func toPrototypes(tags []map[string]string) []*types.Prototype {
 	prototypes := []*types.Prototype{}
 	for _, tag := range tags {
 		if tag[FIELD_SKIP] != "true" {
-			ctag := types.Prototype{FunctionName: tag[FIELD_FUNCTION_NAME], Prototype: tag[KIND_PROTOTYPE], Fields: tag}
+			ctag := types.Prototype{FunctionName: tag[FIELD_FUNCTION_NAME], Prototype: tag[KIND_PROTOTYPE], Modifiers: tag[KIND_PROTOTYPE_MODIFIERS], Fields: tag}
 			prototypes = append(prototypes, &ctag)
 		}
 	}
@@ -126,9 +127,11 @@ func addPrototype(tag map[string]string) {
 
 	tag[KIND_PROTOTYPE] = tag[FIELD_RETURNTYPE] + " " + tag[FIELD_FUNCTION_NAME] + tag[FIELD_SIGNATURE] + ";"
 
+	tag[KIND_PROTOTYPE_MODIFIERS] = ""
 	if strings.Index(tag[FIELD_CODE], STATIC+" ") != -1 {
-		tag[KIND_PROTOTYPE] = STATIC + " " + tag[KIND_PROTOTYPE]
+		tag[KIND_PROTOTYPE_MODIFIERS] = tag[KIND_PROTOTYPE_MODIFIERS] + " " + STATIC
 	}
+	tag[KIND_PROTOTYPE_MODIFIERS] = strings.TrimSpace(tag[KIND_PROTOTYPE_MODIFIERS])
 }
 
 func removeDefinedProtypes(tags []map[string]string) []map[string]string {

src/arduino.cc/builder/prototypes_adder.go

@@ -75,19 +75,24 @@ func composePrototypeSection(line int, prototypes []*types.Prototype) string {
 	}
 
 	str := joinPrototypes(prototypes)
-	str += "#line "
+	str += "\n#line "
 	str += strconv.Itoa(line)
 	str += "\n"
 
 	return str
 }
 
 func joinPrototypes(prototypes []*types.Prototype) string {
-	join := ""
+	prototypesSlice := []string{}
 	for _, proto := range prototypes {
-		join = join + proto.Prototype + "\n"
+		prototypeParts := []string{}
+		if proto.Modifiers != "" {
+			prototypeParts = append(prototypeParts, proto.Modifiers)
+		}
+		prototypeParts = append(prototypeParts, proto.Prototype)
+		prototypesSlice = append(prototypesSlice, strings.Join(prototypeParts, " "))
 	}
-	return join
+	return strings.Join(prototypesSlice, "\n")
 }
 
 func composeIncludeArduinoSection() string {

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

@@ -260,5 +260,6 @@ func TestCTagsParserStatic(t *testing.T) {
 	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)
+	require.Equal(t, "void doStuff();", prototypes[2].Prototype)
+	require.Equal(t, "static", prototypes[2].Modifiers)
 }

src/arduino.cc/builder/types/types.go

@@ -154,6 +154,7 @@ type Command interface {
 type Prototype struct {
 	FunctionName string
 	Prototype    string
+	Modifiers    string
 	Fields       map[string]string
 }