prototypes line directives now contain original sketch file name. Useful when

sketckes are made of multiple .ino files

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

Author: Federico Fissore

src/arduino.cc/builder/compare_prototypes_from_source_and_preproc_source.go

@@ -31,7 +31,6 @@ package builder
 
 import (
 	"arduino.cc/builder/constants"
-	"arduino.cc/builder/utils"
 )
 
 type ComparePrototypesFromSourceAndPreprocSource struct{}
@@ -42,7 +41,7 @@ func (s *ComparePrototypesFromSourceAndPreprocSource) Run(context map[string]int
 
 	actualCTags := []map[string]string{}
 	for _, ctagOfPreprocSource := range ctagsOfPreprocSource {
-		if utils.SliceContainsCTag(ctagsOfSource, ctagOfPreprocSource) {
+		if sliceContainsCTag(ctagsOfSource, ctagOfPreprocSource) {
 			actualCTags = append(actualCTags, ctagOfPreprocSource)
 		}
 	}
@@ -51,3 +50,12 @@ func (s *ComparePrototypesFromSourceAndPreprocSource) Run(context map[string]int
 
 	return nil
 }
+
+func sliceContainsCTag(slice []map[string]string, target map[string]string) bool {
+	for _, value := range slice {
+		if value[FIELD_FUNCTION_NAME] == target[FIELD_FUNCTION_NAME] {
+			return true
+		}
+	}
+	return false
+}

src/arduino.cc/builder/constants/constants.go

@@ -73,7 +73,6 @@ const BUILD_PROPERTIES_TOOLS_KEY = "tools"
 const BUILD_PROPERTIES_VID = "vid"
 const COAN = "coan"
 const CTAGS = "ctags"
-const CTAGS_FIELD_FUNCTION_NAME = "functionName"
 const CTX_ACTUAL_PLATFORM = "actualPlatform"
 const CTX_ARCHIVE_FILE_PATH_CORE = "archiveFileCore"
 const CTX_BUILD_CORE = "buildCore"

src/arduino.cc/builder/ctags_parser.go

@@ -43,7 +43,9 @@ const FIELD_CODE = "code"
 const FIELD_CLASS = "class"
 const FIELD_STRUCT = "struct"
 const FIELD_NAMESPACE = "namespace"
+const FIELD_FILENAME = "filename"
 const FIELD_SKIP = "skipMe"
+const FIELD_FUNCTION_NAME = "functionName"
 
 const KIND_PROTOTYPE = "prototype"
 const KIND_FUNCTION = "function"
@@ -104,7 +106,7 @@ func addPrototype(tag map[string]string) {
 		return
 	}
 
-	tag[KIND_PROTOTYPE] = tag[FIELD_RETURNTYPE] + " " + tag[constants.CTAGS_FIELD_FUNCTION_NAME] + tag[FIELD_SIGNATURE] + ";"
+	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 {
@@ -205,8 +207,10 @@ func parseTag(row string) map[string]string {
 	tag := make(map[string]string)
 	parts := strings.Split(row, "\t")
 
-	tag[constants.CTAGS_FIELD_FUNCTION_NAME] = parts[0]
-	parts = parts[1:]
+	tag[FIELD_FUNCTION_NAME] = parts[0]
+	tag[FIELD_FILENAME] = parts[1]
+
+	parts = parts[2:]
 
 	for _, part := range parts {
 		if strings.Contains(part, ":") {

src/arduino.cc/builder/ctags_to_prototypes.go

@@ -101,7 +101,7 @@ func collectFunctionNames(tags []map[string]string) []string {
 	names := []string{}
 	for _, tag := range tags {
 		if tag[FIELD_KIND] == KIND_FUNCTION {
-			names = append(names, tag[constants.CTAGS_FIELD_FUNCTION_NAME])
+			names = append(names, tag[FIELD_FUNCTION_NAME])
 		}
 	}
 	return names
@@ -120,8 +120,8 @@ 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[constants.CTAGS_FIELD_FUNCTION_NAME], Prototype: tag[KIND_PROTOTYPE], Modifiers: tag[KIND_PROTOTYPE_MODIFIERS], Line: tag[FIELD_LINE], Fields: tag}
-			prototypes = append(prototypes, &ctag)
+			prototype := &types.Prototype{FunctionName: tag[FIELD_FUNCTION_NAME], File: tag[FIELD_FILENAME], Prototype: tag[KIND_PROTOTYPE], Modifiers: tag[KIND_PROTOTYPE_MODIFIERS], Line: tag[FIELD_LINE], Fields: tag}
+			prototypes = append(prototypes, prototype)
 		}
 	}
 	return prototypes

src/arduino.cc/builder/prototypes_adder.go

@@ -78,7 +78,7 @@ func composePrototypeSection(line int, prototypes []*types.Prototype) string {
 func joinPrototypes(prototypes []*types.Prototype) string {
 	prototypesSlice := []string{}
 	for _, proto := range prototypes {
-		prototypesSlice = append(prototypesSlice, "#line "+proto.Line)
+		prototypesSlice = append(prototypesSlice, "#line "+proto.Line+" \""+proto.File+"\"")
 		prototypeParts := []string{}
 		if proto.Modifiers != "" {
 			prototypeParts = append(prototypeParts, proto.Modifiers)