CTagsToPrototypes is now a class-method

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

src/arduino.cc/builder/container_add_prototypes.go

@@ -49,7 +49,6 @@ func (s *ContainerAddPrototypes) Run(ctx *types.Context) error {
 		&CTagsTargetFileSaver{Source: &ctx.SourceGccMinusE, TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},
 		&ctags.CTagsRunner{},
 		&ctags.CTags{},
-		&ctags.CTagsToPrototypes{},
 		&PrototypesAdder{},
 		&SketchSaver{},
 	}

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

@@ -7,5 +7,10 @@ type CTags struct{}
 func (c *CTags) Run(ctx *types.Context) error {
 	parser := &CTagsParser{}
 	ctx.CTagsOfPreprocessedSource = parser.Parse(ctx.CTagsOutput)
+	protos, line := parser.GeneratePrototypes()
+	if line != -1 {
+		ctx.PrototypesLineWhereToInsert = line
+	}
+	ctx.Prototypes = protos
 	return nil
 }

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

@@ -30,27 +30,18 @@
 package ctags
 
 import (
-	"arduino.cc/builder/types"
 	"strings"
-)
-
-type CTagsToPrototypes struct{}
-
-func (s *CTagsToPrototypes) Run(ctx *types.Context) error {
-	tags := ctx.CTagsOfPreprocessedSource
 
-	lineWhereToInsertPrototypes := findLineWhereToInsertPrototypes(tags)
-	if lineWhereToInsertPrototypes != -1 {
-		ctx.PrototypesLineWhereToInsert = lineWhereToInsertPrototypes
-	}
+	"arduino.cc/builder/types"
+)
 
-	ctx.Prototypes = toPrototypes(tags)
-	return nil
+func (p *CTagsParser) GeneratePrototypes() ([]*types.Prototype, int) {
+	return p.toPrototypes(), p.findLineWhereToInsertPrototypes()
 }
 
-func findLineWhereToInsertPrototypes(tags []*types.CTag) int {
-	firstFunctionLine := firstFunctionAtLine(tags)
-	firstFunctionPointerAsArgument := firstFunctionPointerUsedAsArgument(tags)
+func (p *CTagsParser) findLineWhereToInsertPrototypes() int {
+	firstFunctionLine := p.firstFunctionAtLine()
+	firstFunctionPointerAsArgument := p.firstFunctionPointerUsedAsArgument()
 	if firstFunctionLine != -1 && firstFunctionPointerAsArgument != -1 {
 		if firstFunctionLine < firstFunctionPointerAsArgument {
 			return firstFunctionLine
@@ -64,9 +55,9 @@ func findLineWhereToInsertPrototypes(tags []*types.CTag) int {
 	}
 }
 
-func firstFunctionPointerUsedAsArgument(tags []*types.CTag) int {
-	functionNames := collectFunctionNames(tags)
-	for _, tag := range tags {
+func (p *CTagsParser) firstFunctionPointerUsedAsArgument() int {
+	functionNames := p.collectFunctionNames()
+	for _, tag := range p.tags {
 		if functionNameUsedAsFunctionPointerIn(tag, functionNames) {
 			return tag.Line
 		}
@@ -83,28 +74,28 @@ func functionNameUsedAsFunctionPointerIn(tag *types.CTag, functionNames []string
 	return false
 }
 
-func collectFunctionNames(tags []*types.CTag) []string {
+func (p *CTagsParser) collectFunctionNames() []string {
 	names := []string{}
-	for _, tag := range tags {
+	for _, tag := range p.tags {
 		if tag.Kind == KIND_FUNCTION {
 			names = append(names, tag.FunctionName)
 		}
 	}
 	return names
 }
 
-func firstFunctionAtLine(tags []*types.CTag) int {
-	for _, tag := range tags {
+func (p *CTagsParser) firstFunctionAtLine() int {
+	for _, tag := range p.tags {
 		if !tagIsUnknown(tag) && isHandled(tag) && tag.Kind == KIND_FUNCTION {
 			return tag.Line
 		}
 	}
 	return -1
 }
 
-func toPrototypes(tags []*types.CTag) []*types.Prototype {
+func (p *CTagsParser) toPrototypes() []*types.Prototype {
 	prototypes := []*types.Prototype{}
-	for _, tag := range tags {
+	for _, tag := range p.tags {
 		if strings.TrimSpace(tag.Prototype) == "" {
 			continue
 		}