Removed context map[string]interface{}

This commit concludes the refactoring.

Signed-off-by: Cristian Maglie <c.maglie@arduino.cc>

Author: cmaglie

src/arduino.cc/arduino-builder/main.go

@@ -169,7 +169,6 @@ func main() {
 		return
 	}
 
-	context := make(map[string]interface{})
 	ctx := &types.Context{}
 
 	if *buildOptionsFileFlag != "" {
@@ -305,16 +304,16 @@ func main() {
 	}
 
 	if *dumpPrefsFlag {
-		err = builder.RunParseHardwareAndDumpBuildProperties(context, ctx)
+		err = builder.RunParseHardwareAndDumpBuildProperties(ctx)
 	} else if *preprocessFlag {
-		err = builder.RunPreprocess(context, ctx)
+		err = builder.RunPreprocess(ctx)
 	} else {
 		if flag.NArg() == 0 {
 			fmt.Fprintln(os.Stderr, "Last parameter must be the sketch to compile")
 			flag.Usage()
 			os.Exit(1)
 		}
-		err = builder.RunBuilder(context, ctx)
+		err = builder.RunBuilder(ctx)
 	}
 
 	if err != nil {
@@ -330,25 +329,6 @@ func main() {
 	}
 }
 
-func setContextSliceKeyOrLoadItFromOptions(context map[string]interface{}, cliFlag []string, buildOptions map[string]string, contextKey string, paramName string, mandatory bool) (error, bool) {
-	values, err := toSliceOfUnquoted(cliFlag)
-	if err != nil {
-		return err, true
-	}
-
-	if len(values) == 0 && len(buildOptions[contextKey]) > 0 {
-		values = strings.Split(buildOptions[contextKey], ",")
-	}
-
-	if mandatory && len(values) == 0 {
-		return errors.New("Parameter '" + paramName + "' is mandatory"), false
-	}
-
-	context[contextKey] = values
-
-	return nil, false
-}
-
 func toExitCode(err error) int {
 	if exiterr, ok := err.(*exec.ExitError); ok {
 		if status, ok := exiterr.Sys().(syscall.WaitStatus); ok {

src/arduino.cc/builder/add_additional_entries_to_context.go

@@ -38,7 +38,7 @@ import (
 
 type AddAdditionalEntriesToContext struct{}
 
-func (s *AddAdditionalEntriesToContext) Run(context map[string]interface{}, ctx *types.Context) error {
+func (s *AddAdditionalEntriesToContext) Run(ctx *types.Context) error {
 	if ctx.BuildPath != "" {
 		buildPath := ctx.BuildPath
 		preprocPath, err := filepath.Abs(filepath.Join(buildPath, constants.FOLDER_PREPROC))

src/arduino.cc/builder/add_build_board_property_if_missing.go

@@ -38,7 +38,7 @@ import (
 
 type AddBuildBoardPropertyIfMissing struct{}
 
-func (s *AddBuildBoardPropertyIfMissing) Run(context map[string]interface{}, ctx *types.Context) error {
+func (s *AddBuildBoardPropertyIfMissing) Run(ctx *types.Context) error {
 	packages := ctx.Hardware
 	logger := ctx.GetLogger()
 

src/arduino.cc/builder/add_missing_build_properties_from_parent_platform_txt_files.go

@@ -35,7 +35,7 @@ import (
 
 type AddMissingBuildPropertiesFromParentPlatformTxtFiles struct{}
 
-func (s *AddMissingBuildPropertiesFromParentPlatformTxtFiles) Run(context map[string]interface{}, ctx *types.Context) error {
+func (s *AddMissingBuildPropertiesFromParentPlatformTxtFiles) Run(ctx *types.Context) error {
 	packages := ctx.Hardware
 	targetPackage := ctx.TargetPackage
 	buildProperties := ctx.BuildProperties

src/arduino.cc/builder/additional_sketch_files_copier.go

@@ -40,7 +40,7 @@ import (
 
 type AdditionalSketchFilesCopier struct{}
 
-func (s *AdditionalSketchFilesCopier) Run(context map[string]interface{}, ctx *types.Context) error {
+func (s *AdditionalSketchFilesCopier) Run(ctx *types.Context) error {
 	sketch := ctx.Sketch
 	sketchBuildPath := ctx.SketchBuildPath
 

src/arduino.cc/builder/builder.go

@@ -66,7 +66,7 @@ const DEFAULT_BUILD_CORE = "arduino"
 
 type Builder struct{}
 
-func (s *Builder) Run(context map[string]interface{}, ctx *types.Context) error {
+func (s *Builder) Run(ctx *types.Context) error {
 	commands := []types.Command{
 		&GenerateBuildPathIfMissing{},
 		&EnsureBuildPathExists{},
@@ -113,14 +113,14 @@ func (s *Builder) Run(context map[string]interface{}, ctx *types.Context) error
 		&RecipeByPrefixSuffixRunner{Prefix: constants.HOOKS_POSTBUILD, Suffix: constants.HOOKS_PATTERN_SUFFIX},
 	}
 
-	mainErr := runCommands(context, ctx, commands, true)
+	mainErr := runCommands(ctx, commands, true)
 
 	commands = []types.Command{
 		&PrintUsedAndNotUsedLibraries{},
 
 		&PrintUsedLibrariesIfVerbose{},
 	}
-	otherErr := runCommands(context, ctx, commands, false)
+	otherErr := runCommands(ctx, commands, false)
 
 	if mainErr != nil {
 		return mainErr
@@ -131,7 +131,7 @@ func (s *Builder) Run(context map[string]interface{}, ctx *types.Context) error
 
 type Preprocess struct{}
 
-func (s *Preprocess) Run(context map[string]interface{}, ctx *types.Context) error {
+func (s *Preprocess) Run(ctx *types.Context) error {
 	commands := []types.Command{
 		&GenerateBuildPathIfMissing{},
 		&EnsureBuildPathExists{},
@@ -153,12 +153,12 @@ func (s *Preprocess) Run(context map[string]interface{}, ctx *types.Context) err
 		&PrintPreprocessedSource{},
 	}
 
-	return runCommands(context, ctx, commands, true)
+	return runCommands(ctx, commands, true)
 }
 
 type ParseHardwareAndDumpBuildProperties struct{}
 
-func (s *ParseHardwareAndDumpBuildProperties) Run(context map[string]interface{}, ctx *types.Context) error {
+func (s *ParseHardwareAndDumpBuildProperties) Run(ctx *types.Context) error {
 	commands := []types.Command{
 		&GenerateBuildPathIfMissing{},
 
@@ -167,18 +167,18 @@ func (s *ParseHardwareAndDumpBuildProperties) Run(context map[string]interface{}
 		&DumpBuildProperties{},
 	}
 
-	return runCommands(context, ctx, commands, true)
+	return runCommands(ctx, commands, true)
 }
 
-func runCommands(context map[string]interface{}, ctx *types.Context, commands []types.Command, progressEnabled bool) error {
+func runCommands(ctx *types.Context, commands []types.Command, progressEnabled bool) error {
 	commandsLength := len(commands)
 	progressForEachCommand := float32(100) / float32(commandsLength)
 
 	progress := float32(0)
 	for _, command := range commands {
 		PrintRingNameIfDebug(ctx, command)
 		printProgressIfProgressEnabledAndMachineLogger(progressEnabled, ctx, progress)
-		err := command.Run(context, ctx)
+		err := command.Run(ctx)
 		if err != nil {
 			return i18n.WrapError(err)
 		}
@@ -207,17 +207,17 @@ func PrintRingNameIfDebug(ctx *types.Context, command types.Command) {
 	}
 }
 
-func RunBuilder(context map[string]interface{}, ctx *types.Context) error {
+func RunBuilder(ctx *types.Context) error {
 	command := Builder{}
-	return command.Run(context, ctx)
+	return command.Run(ctx)
 }
 
-func RunParseHardwareAndDumpBuildProperties(context map[string]interface{}, ctx *types.Context) error {
+func RunParseHardwareAndDumpBuildProperties(ctx *types.Context) error {
 	command := ParseHardwareAndDumpBuildProperties{}
-	return command.Run(context, ctx)
+	return command.Run(ctx)
 }
 
-func RunPreprocess(context map[string]interface{}, ctx *types.Context) error {
+func RunPreprocess(ctx *types.Context) error {
 	command := Preprocess{}
-	return command.Run(context, ctx)
+	return command.Run(ctx)
 }

src/arduino.cc/builder/collect_all_source_files_from_folders_with_sources.go

@@ -42,7 +42,7 @@ import (
 
 type CollectAllSourceFilesFromFoldersWithSources struct{}
 
-func (s *CollectAllSourceFilesFromFoldersWithSources) Run(context map[string]interface{}, ctx *types.Context) error {
+func (s *CollectAllSourceFilesFromFoldersWithSources) Run(ctx *types.Context) error {
 	foldersWithSources := ctx.FoldersWithSourceFiles
 	sourceFiles := ctx.CollectedSourceFiles
 

src/arduino.cc/builder/collect_ctags_from_sketch_files.go

@@ -37,7 +37,7 @@ import (
 
 type CollectCTagsFromSketchFiles struct{}
 
-func (s *CollectCTagsFromSketchFiles) Run(context map[string]interface{}, ctx *types.Context) error {
+func (s *CollectCTagsFromSketchFiles) Run(ctx *types.Context) error {
 	sketchFileNames := collectSketchFileNamesFrom(ctx.Sketch)
 
 	allCtags := ctx.CTagsOfPreprocessedSource

src/arduino.cc/builder/compare_prototypes_from_source_and_preproc_source.go

@@ -29,11 +29,13 @@
 
 package builder
 
+// XXX: Obsolete?
+
 import "arduino.cc/builder/types"
 
 type ComparePrototypesFromSourceAndPreprocSource struct{}
 
-func (s *ComparePrototypesFromSourceAndPreprocSource) Run(context map[string]interface{}, ctx *types.Context) error {
+func (s *ComparePrototypesFromSourceAndPreprocSource) Run(ctx *types.Context) error {
 	ctagsOfSource := ctx.CTagsOfSource
 	ctagsOfPreprocSource := ctx.CTagsOfPreprocessedSource
 

src/arduino.cc/builder/container_add_prototypes.go

@@ -38,7 +38,7 @@ import (
 
 type ContainerAddPrototypes struct{}
 
-func (s *ContainerAddPrototypes) Run(context map[string]interface{}, ctx *types.Context) error {
+func (s *ContainerAddPrototypes) Run(ctx *types.Context) error {
 	commands := []types.Command{
 		&GCCPreprocRunner{TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},
 		&ReadFileAndStoreInContext{Target: &ctx.SourceGccMinusE},
@@ -53,7 +53,7 @@ func (s *ContainerAddPrototypes) Run(context map[string]interface{}, ctx *types.
 
 	for _, command := range commands {
 		PrintRingNameIfDebug(ctx, command)
-		err := command.Run(context, ctx)
+		err := command.Run(ctx)
 		if err != nil {
 			return i18n.WrapError(err)
 		}