Fix prototype generation for multiline functions

Author: facchinm

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

@@ -66,9 +66,15 @@ func (s *CTagsParser) Run(ctx *types.Context) error {
 		tags = append(tags, parseTag(row))
 	}
 
+	ctx.LinesInExternCContext = make(map[string][]int)
+
+	for _, tag := range tags {
+		findLinesWithExternCScope(tag, ctx)
+	}
+
 	skipTagsWhere(tags, tagIsUnknown, ctx)
 	skipTagsWhere(tags, tagIsUnhandled, ctx)
-	addPrototypes(tags)
+	addPrototypes(tags, ctx)
 	removeDefinedProtypes(tags, ctx)
 	removeDuplicate(tags)
 	skipTagsWhere(tags, prototypeAndCodeDontMatch, ctx)
@@ -78,15 +84,58 @@ func (s *CTagsParser) Run(ctx *types.Context) error {
 	return nil
 }
 
-func addPrototypes(tags []*types.CTag) {
+func findLinesWithExternCScope(tag *types.CTag, ctx *types.Context) {
+
+	if ctx.LinesInExternCContext[tag.Filename] != nil {
+		return
+	}
+
+	file, err := os.Open(tag.Filename)
+	if err == nil {
+		defer file.Close()
+
+		ctx.LinesInExternCContext[tag.Filename] = append(ctx.LinesInExternCContext[tag.Filename], 0)
+
+		scanner := bufio.NewScanner(file)
+
+		inExternCNamespaceScope := false
+		indentLevels := 0
+		line := 0
+		for scanner.Scan() {
+			line++
+			str := scanner.Text()
+			if strings.Contains(str, EXTERN) {
+				inExternCNamespaceScope = true
+			}
+			if inExternCNamespaceScope == true {
+				ctx.LinesInExternCContext[tag.Filename] = append(ctx.LinesInExternCContext[tag.Filename], line)
+			}
+			indentLevels += strings.Count(str, "{") - strings.Count(str, "}")
+			if indentLevels == 0 {
+				inExternCNamespaceScope = false
+			}
+		}
+	}
+}
+
+func functionIsInNamespaceCnamespace(line int, index []int) bool {
+	for _, lines := range index {
+		if line == lines {
+			return true
+		}
+	}
+	return false
+}
+
+func addPrototypes(tags []*types.CTag, ctx *types.Context) {
 	for _, tag := range tags {
 		if !tag.SkipMe {
-			addPrototype(tag)
+			addPrototype(tag, ctx)
 		}
 	}
 }
 
-func addPrototype(tag *types.CTag) {
+func addPrototype(tag *types.CTag, ctx *types.Context) {
 	if strings.Index(tag.Prototype, TEMPLATE) == 0 || strings.Index(tag.Code, TEMPLATE) == 0 {
 		code := tag.Code
 		if strings.Contains(code, "{") {
@@ -102,7 +151,8 @@ func addPrototype(tag *types.CTag) {
 	if strings.Index(tag.Code, STATIC+" ") != -1 {
 		tag.PrototypeModifiers = tag.PrototypeModifiers + " " + STATIC
 	}
-	if strings.Index(tag.Code, EXTERN+" ") != -1 {
+	if strings.Index(tag.Code, EXTERN+" ") != -1 ||
+		functionIsInNamespaceCnamespace(tag.Line, ctx.LinesInExternCContext[tag.Filename]) {
 		tag.PrototypeModifiers = tag.PrototypeModifiers + " " + EXTERN
 	}
 	tag.PrototypeModifiers = strings.TrimSpace(tag.PrototypeModifiers)
@@ -190,13 +240,65 @@ func prototypeAndCodeDontMatch(tag *types.CTag) bool {
 	prototype := removeSpacesAndTabs(tag.Prototype)
 	prototype = removeTralingSemicolon(prototype)
 
-	return strings.Index(code, prototype) == -1
+	// is the code contained in the prototype?
+	ret := strings.Index(code, prototype)
+
+	if ret == -1 {
+		// what could possibly go wrong?
+		// definition is multiline
+
+		// Phase 1: add to code n non-whitespace tokens before the code line
+		code = removeEverythingAfterClosingPerentheses(code)
+
+		// is the code contained in the prototype?
+		n := strings.Index(prototype, code)
+
+		code = getFunctionPrototypWithNPreviousCharacter(tag, code, n)
+		ret = strings.Index(code, prototype)
+	}
+
+	return ret == -1
+}
+
+func getFunctionPrototypWithNPreviousCharacter(tag *types.CTag, code string, n int) string {
+
+	expectedPrototypeLen := len(code) + n
+
+	file, err := os.Open(tag.Filename)
+	if err == nil {
+		defer file.Close()
+
+		scanner := bufio.NewScanner(file)
+		line := 1
+		iteration := 1
+
+		for len(code) < expectedPrototypeLen {
+
+			// skip lines until we get to the start of this tag
+			for scanner.Scan() && line < (tag.Line-iteration) {
+				line++
+			}
+
+			code = scanner.Text() + code
+			code = removeSpacesAndTabs(code)
+			iteration++
+			// rewind the file
+			file.Seek(0, 0)
+			line = 0
+		}
+	}
+	return code
 }
 
 func removeTralingSemicolon(s string) string {
 	return s[0 : len(s)-1]
 }
 
+func removeEverythingAfterClosingPerentheses(s string) string {
+	n := strings.Index(s, ")")
+	return s[0 : n+1]
+}
+
 func removeSpacesAndTabs(s string) string {
 	s = strings.Replace(s, " ", "", -1)
 	s = strings.Replace(s, "\t", "", -1)

src/arduino.cc/builder/test/sketch_with_externC_multiline/sketch_with_externC_multiline.ino

@@ -5,9 +5,12 @@ void setup() {
 
 void loop() {
   // put your main code here, to run repeatedly:
-
+  test2();
 }
 
+void 
+test() {}
+
 extern "C" {
-	void test() {}
+	void test2() {}
 }

src/arduino.cc/builder/test/sketch_with_multiline_prototypes/sketch_with_multiline_prototypes.ino

@@ -5,5 +5,17 @@ int b,
 int c,
 int d) { }
 
-void loop() {}
+void loop() {
+	mymultilinetestfunc();
+	mymultilinetestfunc2();
+}
 
+int
+mymultilinetestfunc() {
+	
+}
+
+int		
+mymultilinetestfunc2() {
+		
+}

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

@@ -86,6 +86,9 @@ type Context struct {
 
 	// ReadFileAndStoreInContext command
 	FileToRead string
+
+	// Sketch lines with extern "C" context
+	LinesInExternCContext map[string][]int
 }
 
 func (ctx *Context) ExtractBuildOptions() properties.Map {