Pass FileToRead to ReadFileAndStoreInContext explicitly

Previously, this filename was set by GCCPreprocRunner into the context,
because the full filename was not known until then. Since the previous
commit, this filename is known by the ContainerAddPrototypes, which can
just pass it to ReadFileAndStoreInContext explicitly. This allows
Context::FileToRead to be removed.

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

Author: matthijskooijman

container_add_prototypes.go

@@ -56,7 +56,7 @@ func (s *ContainerAddPrototypes) Run(ctx *types.Context) error {
 		return i18n.WrapError(err)
 	}
 	commands := []types.Command{
-		&ReadFileAndStoreInContext{Target: &ctx.SourceGccMinusE},
+		&ReadFileAndStoreInContext{FileToRead: targetFilePath, Target: &ctx.SourceGccMinusE},
 		&FilterSketchSource{Source: &ctx.SourceGccMinusE},
 		&CTagsTargetFileSaver{Source: &ctx.SourceGccMinusE, TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},
 		&CTagsRunner{},

gcc_preproc_runner.go

@@ -58,8 +58,6 @@ func GCCPreprocRunner(ctx *types.Context, sourceFilePath string, targetFilePath
 		return i18n.WrapError(err)
 	}
 
-	ctx.FileToRead = targetFilePath
-
 	return nil
 }
 

read_file_and_store_in_context.go

@@ -36,11 +36,12 @@ import (
 )
 
 type ReadFileAndStoreInContext struct {
+	FileToRead string
 	Target *string
 }
 
 func (s *ReadFileAndStoreInContext) Run(ctx *types.Context) error {
-	bytes, err := ioutil.ReadFile(ctx.FileToRead)
+	bytes, err := ioutil.ReadFile(s.FileToRead)
 	if err != nil {
 		return i18n.WrapError(err)
 	}

test/read_file_and_store_in_context_test.go

@@ -47,9 +47,8 @@ func TestReadFileAndStoreInContext(t *testing.T) {
 	utils.WriteFile(file.Name(), "test test\nciao")
 
 	ctx := &types.Context{}
-	ctx.FileToRead = file.Name()
 
-	command := &builder.ReadFileAndStoreInContext{Target: &ctx.SourceGccMinusE}
+	command := &builder.ReadFileAndStoreInContext{FileToRead: file.Name(), Target: &ctx.SourceGccMinusE}
 	err = command.Run(ctx)
 	NoError(t, err)
 

types/context.go

@@ -84,9 +84,6 @@ type Context struct {
 	// Logging
 	logger     i18n.Logger
 	DebugLevel int
-
-	// ReadFileAndStoreInContext command
-	FileToRead string
 }
 
 func (ctx *Context) ExtractBuildOptions() properties.Map {