Convert IncludesFinderWithRegExp to a normal function

Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl>

Author: matthijskooijman

container_find_includes.go

@@ -325,15 +325,14 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile t
 		} else {
 			commands := []types.Command{
 				&GCCPreprocRunnerForDiscoveringIncludes{SourceFilePath: sourcePath, TargetFilePath: targetFilePath, Includes: includes},
-				&IncludesFinderWithRegExp{Source: &ctx.SourceGccMinusE},
 			}
 			for _, command := range commands {
 				err := runCommand(ctx, command)
 				if err != nil {
 					return i18n.WrapError(err)
 				}
 			}
-			include = ctx.IncludeJustFound
+			include = IncludesFinderWithRegExp(ctx, ctx.SourceGccMinusE)
 		}
 
 		if include == "" {

includes_finder_with_regexp.go

@@ -37,21 +37,13 @@ import (
 
 var INCLUDE_REGEXP = regexp.MustCompile("(?ms)^\\s*#[ \t]*include\\s*[<\"](\\S+)[\">]")
 
-type IncludesFinderWithRegExp struct {
-	Source *string
-}
-
-func (s *IncludesFinderWithRegExp) Run(ctx *types.Context) error {
-	source := *s.Source
-
+func IncludesFinderWithRegExp(ctx *types.Context, source string) string {
 	match := INCLUDE_REGEXP.FindStringSubmatch(source)
 	if match != nil {
-		ctx.IncludeJustFound = strings.TrimSpace(match[1])
+		return strings.TrimSpace(match[1])
 	} else {
-		ctx.IncludeJustFound = findIncludeForOldCompilers(source)
+		return findIncludeForOldCompilers(source)
 	}
-
-	return nil
 }
 
 func findIncludeForOldCompilers(source string) string {

test/includes_finder_with_regexp_test.go

@@ -43,27 +43,17 @@ func TestIncludesFinderWithRegExp(t *testing.T) {
 		"#include <SPI.h>\n" +
 		"^\n" +
 		"compilation terminated."
-	ctx.Source = output
+	include := builder.IncludesFinderWithRegExp(ctx, output)
 
-	parser := builder.IncludesFinderWithRegExp{Source: &ctx.Source}
-	err := parser.Run(ctx)
-	NoError(t, err)
-
-	require.Equal(t, "SPI.h", ctx.IncludeJustFound)
+	require.Equal(t, "SPI.h", include)
 }
 
 func TestIncludesFinderWithRegExpEmptyOutput(t *testing.T) {
 	ctx := &types.Context{}
 
-	output := ""
-
-	ctx.Source = output
+	include := builder.IncludesFinderWithRegExp(ctx, "")
 
-	parser := builder.IncludesFinderWithRegExp{Source: &ctx.Source}
-	err := parser.Run(ctx)
-	NoError(t, err)
-
-	require.Equal(t, "", ctx.IncludeJustFound)
+	require.Equal(t, "", include)
 }
 
 func TestIncludesFinderWithRegExpPaddedIncludes(t *testing.T) {
@@ -73,13 +63,9 @@ func TestIncludesFinderWithRegExpPaddedIncludes(t *testing.T) {
 		" #               include <Wire.h>\n" +
 		"                                 ^\n" +
 		"compilation terminated.\n"
-	ctx.Source = output
-
-	parser := builder.IncludesFinderWithRegExp{Source: &ctx.Source}
-	err := parser.Run(ctx)
-	NoError(t, err)
+	include := builder.IncludesFinderWithRegExp(ctx, output)
 
-	require.Equal(t, "Wire.h", ctx.IncludeJustFound)
+	require.Equal(t, "Wire.h", include)
 }
 
 func TestIncludesFinderWithRegExpPaddedIncludes2(t *testing.T) {
@@ -89,13 +75,9 @@ func TestIncludesFinderWithRegExpPaddedIncludes2(t *testing.T) {
 		" #\t\t\tinclude <Wire.h>\n" +
 		"                                 ^\n" +
 		"compilation terminated.\n"
-	ctx.Source = output
+	include := builder.IncludesFinderWithRegExp(ctx, output)
 
-	parser := builder.IncludesFinderWithRegExp{Source: &ctx.Source}
-	err := parser.Run(ctx)
-	NoError(t, err)
-
-	require.Equal(t, "Wire.h", ctx.IncludeJustFound)
+	require.Equal(t, "Wire.h", include)
 }
 
 func TestIncludesFinderWithRegExpPaddedIncludes3(t *testing.T) {
@@ -104,13 +86,9 @@ func TestIncludesFinderWithRegExpPaddedIncludes3(t *testing.T) {
 	output := "/some/path/sketch.ino:1:33: fatal error: SPI.h: No such file or directory\n" +
 		"compilation terminated.\n"
 
-	ctx.Source = output
-
-	parser := builder.IncludesFinderWithRegExp{Source: &ctx.Source}
-	err := parser.Run(ctx)
-	NoError(t, err)
+	include := builder.IncludesFinderWithRegExp(ctx, output)
 
-	require.Equal(t, "SPI.h", ctx.IncludeJustFound)
+	require.Equal(t, "SPI.h", include)
 }
 
 func TestIncludesFinderWithRegExpPaddedIncludes4(t *testing.T) {
@@ -119,11 +97,7 @@ func TestIncludesFinderWithRegExpPaddedIncludes4(t *testing.T) {
 	output := "In file included from /tmp/arduino_modified_sketch_815412/binouts.ino:52:0:\n" +
 		"/tmp/arduino_build_static/sketch/regtable.h:31:22: fatal error: register.h: No such file or directory\n"
 
-	ctx.Source = output
-
-	parser := builder.IncludesFinderWithRegExp{Source: &ctx.Source}
-	err := parser.Run(ctx)
-	NoError(t, err)
+	include := builder.IncludesFinderWithRegExp(ctx, output)
 
-	require.Equal(t, "register.h", ctx.IncludeJustFound)
+	require.Equal(t, "register.h", include)
 }

types/context.go

@@ -64,7 +64,6 @@ type Context struct {
 	HeaderToLibraries          map[string][]*Library
 	ImportedLibraries          []*Library
 	LibrariesResolutionResults map[string]LibraryResolutionResult
-	IncludeJustFound           string
 	IncludeFolders             []string
 	OutputGccMinusM            string