FileToRead field moved in Context

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

Author: cmaglie

Diff for: src/arduino.cc/builder/constants/constants.go

@@ -73,7 +73,6 @@ const BUILD_PROPERTIES_SOURCE_PATH = "build.source.path"
 const BUILD_PROPERTIES_TOOLS_KEY = "tools"
 const BUILD_PROPERTIES_VID = "vid"
 const CTAGS = "ctags"
-const CTX_FILE_PATH_TO_READ = "filePathToRead"
 const CTX_INCLUDE_SECTION = "includeSection"
 const CTX_INCLUDES_JUST_FOUND = "includesJustFound"
 const CTX_LINE_OFFSET = "lineOffset"

Diff for: src/arduino.cc/builder/gcc_preproc_runner.go

@@ -64,7 +64,7 @@ func (s *GCCPreprocRunner) Run(context map[string]interface{}, ctx *types.Contex
 		return i18n.WrapError(err)
 	}
 
-	context[constants.CTX_FILE_PATH_TO_READ] = targetFilePath
+	ctx.FileToRead = targetFilePath
 
 	return nil
 }

Diff for: src/arduino.cc/builder/read_file_and_store_in_context.go

@@ -30,7 +30,6 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/types"
 	"io/ioutil"
@@ -41,7 +40,7 @@ type ReadFileAndStoreInContext struct {
 }
 
 func (s *ReadFileAndStoreInContext) Run(context map[string]interface{}, ctx *types.Context) error {
-	bytes, err := ioutil.ReadFile(context[constants.CTX_FILE_PATH_TO_READ].(string))
+	bytes, err := ioutil.ReadFile(ctx.FileToRead)
 	if err != nil {
 		return i18n.WrapError(err)
 	}

Diff for: src/arduino.cc/builder/test/read_file_and_store_in_context_test.go

@@ -31,7 +31,6 @@ package test
 
 import (
 	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
 	"github.com/stretchr/testify/require"
@@ -49,7 +48,7 @@ func TestReadFileAndStoreInContext(t *testing.T) {
 
 	context := make(map[string]interface{})
 	ctx := &types.Context{}
-	context[constants.CTX_FILE_PATH_TO_READ] = file.Name()
+	ctx.FileToRead = file.Name()
 
 	command := &builder.ReadFileAndStoreInContext{Target: &ctx.SourceGccMinusE}
 	err = command.Run(context, ctx)

Diff for: src/arduino.cc/builder/types/context.go

@@ -82,6 +82,9 @@ type Context struct {
 	logger     i18n.Logger
 	DebugLevel int
 
+	// ReadFileAndStoreInContext command
+	FileToRead string
+
 	// For now it is used in conjunction with the old map[string]string, but
 	// it will be slowly populated with all the fields currently used in the
 	// map in the next commits.