Moved PlatformRewrite* structures in Context

Probably these structures should be renamed to something more
meaningful

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

Author: cmaglie

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

@@ -72,7 +72,7 @@ func (s *AddAdditionalEntriesToContext) Run(context map[string]interface{}, ctx
 	ctx.FoldersWithSourceFiles = &types.UniqueSourceFolderQueue{}
 
 	ctx.LibrariesResolutionResults = make(map[string]types.LibraryResolutionResult)
-	context[constants.CTX_HARDWARE_REWRITE_RESULTS] = make(map[*types.Platform][]types.PlatforKeyRewrite)
+	ctx.HardwareRewriteResults = make(map[*types.Platform][]types.PlatforKeyRewrite)
 
 	return nil
 }

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

@@ -74,11 +74,9 @@ const BUILD_PROPERTIES_TOOLS_KEY = "tools"
 const BUILD_PROPERTIES_VID = "vid"
 const CTAGS = "ctags"
 const CTX_FILE_PATH_TO_READ = "filePathToRead"
-const CTX_HARDWARE_REWRITE_RESULTS = "hardwareRewriteResults"
 const CTX_INCLUDE_SECTION = "includeSection"
 const CTX_INCLUDES_JUST_FOUND = "includesJustFound"
 const CTX_LINE_OFFSET = "lineOffset"
-const CTX_PLATFORM_KEYS_REWRITE = "platformKeysRewrite"
 const EMPTY_STRING = ""
 const FILE_BOARDS_LOCAL_TXT = "boards.local.txt"
 const FILE_BOARDS_TXT = "boards.txt"

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

@@ -79,7 +79,7 @@ func (s *PlatformKeysRewriteLoader) Run(context map[string]interface{}, ctx *typ
 		}
 	}
 
-	context[constants.CTX_PLATFORM_KEYS_REWRITE] = platformKeysRewrite
+	ctx.PlatformKeyRewrites = platformKeysRewrite
 
 	return nil
 }

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

@@ -32,19 +32,18 @@ package builder
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
 )
 
 type RewriteHardwareKeys struct{}
 
 func (s *RewriteHardwareKeys) Run(context map[string]interface{}, ctx *types.Context) error {
-	if !utils.MapHas(context, constants.CTX_PLATFORM_KEYS_REWRITE) {
+	if ctx.PlatformKeyRewrites.Empty() {
 		return nil
 	}
 
 	packages := ctx.Hardware
-	platformKeysRewrite := context[constants.CTX_PLATFORM_KEYS_REWRITE].(types.PlatforKeysRewrite)
-	hardwareRewriteResults := context[constants.CTX_HARDWARE_REWRITE_RESULTS].(map[*types.Platform][]types.PlatforKeyRewrite)
+	platformKeysRewrite := ctx.PlatformKeyRewrites
+	hardwareRewriteResults := ctx.HardwareRewriteResults
 
 	for _, aPackage := range packages.Packages {
 		for _, platform := range aPackage.Platforms {

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

@@ -53,7 +53,7 @@ func TestLoadPlatformKeysRewrite(t *testing.T) {
 		NoError(t, err)
 	}
 
-	platformKeysRewrite := context[constants.CTX_PLATFORM_KEYS_REWRITE].(types.PlatforKeysRewrite)
+	platformKeysRewrite := ctx.PlatformKeyRewrites
 
 	require.Equal(t, 13, len(platformKeysRewrite.Rewrites))
 	require.Equal(t, constants.BUILD_PROPERTIES_COMPILER_PATH, platformKeysRewrite.Rewrites[0].Key)

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

@@ -57,7 +57,7 @@ func TestRewriteHardwareKeys(t *testing.T) {
 
 	rewrite := types.PlatforKeyRewrite{Key: constants.BUILD_PROPERTIES_COMPILER_PATH, OldValue: "{runtime.ide.path}/hardware/tools/avr/bin/", NewValue: "{runtime.tools.avr-gcc.path}/bin/"}
 	platformKeysRewrite := types.PlatforKeysRewrite{Rewrites: []types.PlatforKeyRewrite{rewrite}}
-	context[constants.CTX_PLATFORM_KEYS_REWRITE] = platformKeysRewrite
+	ctx.PlatformKeyRewrites = platformKeysRewrite
 
 	commands := []types.Command{
 		&builder.AddAdditionalEntriesToContext{},
@@ -94,7 +94,7 @@ func TestRewriteHardwareKeysWithRewritingDisabled(t *testing.T) {
 	rewrite := types.PlatforKeyRewrite{Key: constants.BUILD_PROPERTIES_COMPILER_PATH, OldValue: "{runtime.ide.path}/hardware/tools/avr/bin/", NewValue: "{runtime.tools.avr-gcc.path}/bin/"}
 	platformKeysRewrite := types.PlatforKeysRewrite{Rewrites: []types.PlatforKeyRewrite{rewrite}}
 
-	context[constants.CTX_PLATFORM_KEYS_REWRITE] = platformKeysRewrite
+	ctx.PlatformKeyRewrites = platformKeysRewrite
 
 	commands := []types.Command{
 		&builder.AddAdditionalEntriesToContext{},

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

@@ -28,6 +28,9 @@ type Context struct {
 	ActualPlatform *Platform
 	USBVidPid      string
 
+	PlatformKeyRewrites    PlatforKeysRewrite
+	HardwareRewriteResults map[*Platform][]PlatforKeyRewrite
+
 	BuildProperties      props.PropertiesMap
 	BuildCore            string
 	BuildPath            string

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

@@ -140,6 +140,10 @@ type PlatforKeysRewrite struct {
 	Rewrites []PlatforKeyRewrite
 }
 
+func (p *PlatforKeysRewrite) Empty() bool {
+	return len(p.Rewrites) == 0
+}
+
 type PlatforKeyRewrite struct {
 	Key      string
 	OldValue string

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

@@ -43,7 +43,7 @@ func (s *WarnAboutPlatformRewrites) Run(context map[string]interface{}, ctx *typ
 	}
 
 	logger := ctx.GetLogger()
-	hardwareRewriteResults := context[constants.CTX_HARDWARE_REWRITE_RESULTS].(map[*types.Platform][]types.PlatforKeyRewrite)
+	hardwareRewriteResults := ctx.HardwareRewriteResults
 	targetPlatform := ctx.TargetPlatform
 	actualPlatform := ctx.ActualPlatform