Moved Source and SourceGccMinusE into Context

cmaglie · cmaglie · commit 67a198ff2ebe · 2016-05-03T11:45:30.000+02:00
Some helper "Command" now accepts directly the address of the target
string to work on instead of the key of the context map that contains
the string. Those "arguments" are, I guess, legacy from old
preprocessing and library discovery and IMHO they can be removed with a
bit of refactoring.

Anyway, I've intentionally limited the scope of this commit and left
further optimization for the future.

Signed-off-by: Cristian Maglie &lt;c.maglie@arduino.cc&gt;
diff --git a/src/arduino.cc/builder/constants/constants.go b/src/arduino.cc/builder/constants/constants.go
@@ -76,7 +76,6 @@ const CTAGS = "ctags"
 const CTX_ARCHIVE_FILE_PATH_CORE = "archiveFileCore"
 const CTX_BUILD_CORE = "buildCore"
 const CTX_FILE_PATH_TO_READ = "filePathToRead"
-const CTX_GCC_MINUS_E_SOURCE = "gccMinusESource"
 const CTX_GCC_MINUS_M_OUTPUT = "gccMinusMOutput"
 const CTX_HARDWARE = "hardware"
 const CTX_HARDWARE_REWRITE_RESULTS = "hardwareRewriteResults"
@@ -87,7 +86,6 @@ const CTX_OBJECT_FILES_CORE = "objectFilesCore"
 const CTX_OBJECT_FILES_LIBRARIES = "objectFilesLibraries"
 const CTX_OBJECT_FILES_SKETCH = "objectFilesSketch"
 const CTX_PLATFORM_KEYS_REWRITE = "platformKeysRewrite"
-const CTX_SOURCE = "source"
 const CTX_TOOLS = "tools"
 const CTX_VIDPID = "VIDPID"
 const EMPTY_STRING = ""
diff --git a/src/arduino.cc/builder/container_add_prototypes.go b/src/arduino.cc/builder/container_add_prototypes.go
@@ -41,8 +41,8 @@ type ContainerAddPrototypes struct{}
 func (s *ContainerAddPrototypes) Run(context map[string]interface{}, ctx *types.Context) error {
 	commands := []types.Command{
 		&GCCPreprocRunner{TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},
-		&ReadFileAndStoreInContext{TargetField: constants.CTX_GCC_MINUS_E_SOURCE},
-		&CTagsTargetFileSaver{SourceField: constants.CTX_GCC_MINUS_E_SOURCE, TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},
+		&ReadFileAndStoreInContext{Target: &ctx.SourceGccMinusE},
+		&CTagsTargetFileSaver{Source: &ctx.SourceGccMinusE, TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},
 		&ctags.CTagsRunner{},
 		&ctags.CTagsParser{},
 		&CollectCTagsFromSketchFiles{},
diff --git a/src/arduino.cc/builder/container_find_includes.go b/src/arduino.cc/builder/container_find_includes.go
@@ -105,7 +105,7 @@ func findIncludesUntilDone(context map[string]interface{}, ctx *types.Context, s
 	for !done {
 		commands := []types.Command{
 			&GCCPreprocRunnerForDiscoveringIncludes{SourceFilePath: sourceFilePath, TargetFilePath: targetFilePath},
-			&IncludesFinderWithRegExp{ContextField: constants.CTX_GCC_MINUS_E_SOURCE},
+			&IncludesFinderWithRegExp{Source: &ctx.SourceGccMinusE},
 			&IncludesToIncludeFolders{},
 		}
 		for _, command := range commands {
diff --git a/src/arduino.cc/builder/ctags_target_file_saver.go b/src/arduino.cc/builder/ctags_target_file_saver.go
@@ -37,12 +37,12 @@ import (
 )
 
 type CTagsTargetFileSaver struct {
-	SourceField    string
+	Source         *string
 	TargetFileName string
 }
 
 func (s *CTagsTargetFileSaver) Run(context map[string]interface{}, ctx *types.Context) error {
-	source := context[s.SourceField].(string)
+	source := *s.Source
 
 	preprocPath := ctx.PreprocPath
 	err := utils.EnsureFolderExists(preprocPath)
diff --git a/src/arduino.cc/builder/external_include_replacer.go b/src/arduino.cc/builder/external_include_replacer.go
@@ -36,22 +36,22 @@ import (
 )
 
 type ExternalIncludeReplacer struct {
-	SourceKey string
-	TargetKey string
-	From      string
-	To        string
+	Source *string
+	Target *string
+	From   string
+	To     string
 }
 
 func (s *ExternalIncludeReplacer) Run(context map[string]interface{}, ctx *types.Context) error {
-	source := context[s.SourceKey].(string)
+	source := *s.Source
 	nonAbsoluteIncludes := findNonAbsoluteIncludes(ctx.Includes)
 
 	for _, include := range nonAbsoluteIncludes {
 		source = strings.Replace(source, s.From+"<"+include+">", s.To+"<"+include+">", -1)
 		source = strings.Replace(source, s.From+"\""+include+"\"", s.To+"\""+include+"\"", -1)
 	}
 
-	context[s.TargetKey] = source
+	*s.Target = source
 
 	return nil
 }
diff --git a/src/arduino.cc/builder/gcc_preproc_runner.go b/src/arduino.cc/builder/gcc_preproc_runner.go
@@ -93,7 +93,7 @@ func (s *GCCPreprocRunnerForDiscoveringIncludes) Run(context map[string]interfac
 		return i18n.WrapError(err)
 	}
 
-	context[constants.CTX_GCC_MINUS_E_SOURCE] = string(stderr)
+	ctx.SourceGccMinusE = string(stderr)
 
 	return nil
 }
diff --git a/src/arduino.cc/builder/gcc_preproc_source_saver.go b/src/arduino.cc/builder/gcc_preproc_source_saver.go
@@ -46,8 +46,6 @@ func (s *GCCPreprocSourceSaver) Run(context map[string]interface{}, ctx *types.C
 		return i18n.WrapError(err)
 	}
 
-	source := context[constants.CTX_SOURCE].(string)
-
-	err = utils.WriteFile(filepath.Join(preprocPath, constants.FILE_GCC_PREPROC_TARGET), source)
+	err = utils.WriteFile(filepath.Join(preprocPath, constants.FILE_GCC_PREPROC_TARGET), ctx.Source)
 	return i18n.WrapError(err)
 }
diff --git a/src/arduino.cc/builder/includes_finder_with_regexp.go b/src/arduino.cc/builder/includes_finder_with_regexp.go
@@ -40,11 +40,11 @@ import (
 var INCLUDE_REGEXP = regexp.MustCompile("(?ms)^\\s*#[ \t]*include\\s*[<\"](\\S+)[\">]")
 
 type IncludesFinderWithRegExp struct {
-	ContextField string
+	Source *string
 }
 
 func (s *IncludesFinderWithRegExp) Run(context map[string]interface{}, ctx *types.Context) error {
-	source := context[s.ContextField].(string)
+	source := *s.Source
 
 	matches := INCLUDE_REGEXP.FindAllStringSubmatch(source, -1)
 	includes := []string{}
diff --git a/src/arduino.cc/builder/print_preprocessed_source.go b/src/arduino.cc/builder/print_preprocessed_source.go
@@ -30,17 +30,13 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
 	"arduino.cc/builder/types"
 	"fmt"
 )
 
 type PrintPreprocessedSource struct{}
 
 func (s *PrintPreprocessedSource) Run(context map[string]interface{}, ctx *types.Context) error {
-	source := context[constants.CTX_GCC_MINUS_E_SOURCE].(string)
-
-	fmt.Println(source)
-
+	fmt.Println(ctx.SourceGccMinusE)
 	return nil
 }
diff --git a/src/arduino.cc/builder/prototypes_adder.go b/src/arduino.cc/builder/prototypes_adder.go
@@ -41,7 +41,7 @@ type PrototypesAdder struct{}
 
 func (s *PrototypesAdder) Run(context map[string]interface{}, ctx *types.Context) error {
 	debugOutput := ctx.DebugPreprocessor
-	source := context[constants.CTX_SOURCE].(string)
+	source := ctx.Source
 
 	source = strings.Replace(source, "\r\n", "\n", -1)
 	source = strings.Replace(source, "\r", "\n", -1)
@@ -74,7 +74,7 @@ func (s *PrototypesAdder) Run(context map[string]interface{}, ctx *types.Context
 		}
 		fmt.Println("#END OF PREPROCESSED SOURCE")
 	}
-	context[constants.CTX_SOURCE] = source
+	ctx.Source = source
 
 	return nil
 }
diff --git a/src/arduino.cc/builder/read_file_and_store_in_context.go b/src/arduino.cc/builder/read_file_and_store_in_context.go
@@ -37,7 +37,7 @@ import (
 )
 
 type ReadFileAndStoreInContext struct {
-	TargetField string
+	Target *string
 }
 
 func (s *ReadFileAndStoreInContext) Run(context map[string]interface{}, ctx *types.Context) error {
@@ -46,7 +46,7 @@ func (s *ReadFileAndStoreInContext) Run(context map[string]interface{}, ctx *typ
 		return i18n.WrapError(err)
 	}
 
-	context[s.TargetField] = string(bytes)
+	*s.Target = string(bytes)
 
 	return nil
 }
diff --git a/src/arduino.cc/builder/sketch_saver.go b/src/arduino.cc/builder/sketch_saver.go
@@ -30,7 +30,6 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
@@ -42,13 +41,12 @@ type SketchSaver struct{}
 func (s *SketchSaver) Run(context map[string]interface{}, ctx *types.Context) error {
 	sketch := ctx.Sketch
 	sketchBuildPath := ctx.SketchBuildPath
-	source := context[constants.CTX_SOURCE].(string)
 
 	err := utils.EnsureFolderExists(sketchBuildPath)
 	if err != nil {
 		return i18n.WrapError(err)
 	}
 
-	err = utils.WriteFile(filepath.Join(sketchBuildPath, filepath.Base(sketch.MainFile.Name)+".cpp"), source)
+	err = utils.WriteFile(filepath.Join(sketchBuildPath, filepath.Base(sketch.MainFile.Name)+".cpp"), ctx.Source)
 	return i18n.WrapError(err)
 }
diff --git a/src/arduino.cc/builder/sketch_source_merger.go b/src/arduino.cc/builder/sketch_source_merger.go
@@ -60,7 +60,7 @@ func (s *SketchSourceMerger) Run(context map[string]interface{}, ctx *types.Cont
 	}
 
 	context[constants.CTX_LINE_OFFSET] = lineOffset
-	context[constants.CTX_SOURCE] = source
+	ctx.Source = source
 
 	return nil
 }
diff --git a/src/arduino.cc/builder/test/ctags_runner_test.go b/src/arduino.cc/builder/test/ctags_runner_test.go
@@ -71,7 +71,7 @@ func TestCTagsRunner(t *testing.T) {
 
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
-		&builder.CTagsTargetFileSaver{SourceField: constants.CTX_SOURCE, TargetFileName: constants.FILE_CTAGS_TARGET},
+		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
 		&ctags.CTagsRunner{},
 	}
 
@@ -122,7 +122,7 @@ func TestCTagsRunnerSketchWithClass(t *testing.T) {
 
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
-		&builder.CTagsTargetFileSaver{SourceField: constants.CTX_SOURCE, TargetFileName: constants.FILE_CTAGS_TARGET},
+		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
 		&ctags.CTagsRunner{},
 	}
 
@@ -171,7 +171,7 @@ func TestCTagsRunnerSketchWithTypename(t *testing.T) {
 
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
-		&builder.CTagsTargetFileSaver{SourceField: constants.CTX_SOURCE, TargetFileName: constants.FILE_CTAGS_TARGET},
+		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
 		&ctags.CTagsRunner{},
 	}
 
@@ -219,7 +219,7 @@ func TestCTagsRunnerSketchWithNamespace(t *testing.T) {
 
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
-		&builder.CTagsTargetFileSaver{SourceField: constants.CTX_SOURCE, TargetFileName: constants.FILE_CTAGS_TARGET},
+		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
 		&ctags.CTagsRunner{},
 	}
 
@@ -266,7 +266,7 @@ func TestCTagsRunnerSketchWithTemplates(t *testing.T) {
 
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
-		&builder.CTagsTargetFileSaver{SourceField: constants.CTX_SOURCE, TargetFileName: constants.FILE_CTAGS_TARGET},
+		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
 		&ctags.CTagsRunner{},
 	}
 
diff --git a/src/arduino.cc/builder/test/external_include_replacer_test.go b/src/arduino.cc/builder/test/external_include_replacer_test.go
@@ -31,7 +31,6 @@ package test
 
 import (
 	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
 	"arduino.cc/builder/types"
 	"github.com/stretchr/testify/require"
 	"testing"
@@ -74,27 +73,27 @@ var sourceWithPragmas = "#line 1 \"sketch_with_config.ino\"\n" +
 func TestExternalIncludeReplacerIncludeToPragma(t *testing.T) {
 	context := make(map[string]interface{})
 	ctx := &types.Context{}
-	context[constants.CTX_SOURCE] = sourceWithIncludes
+	ctx.Source = sourceWithIncludes
 	ctx.Includes = []string{"/tmp/test184599776/sketch/config.h", "/tmp/test184599776/sketch/includes/de bug.h", "Bridge.h"}
 
-	replacer := builder.ExternalIncludeReplacer{SourceKey: constants.CTX_SOURCE, TargetKey: constants.CTX_GCC_MINUS_E_SOURCE, From: "#include ", To: "#pragma ___MY_INCLUDE___ "}
+	replacer := builder.ExternalIncludeReplacer{Source: &ctx.Source, Target: &ctx.SourceGccMinusE, From: "#include ", To: "#pragma ___MY_INCLUDE___ "}
 	err := replacer.Run(context, ctx)
 	NoError(t, err)
 
-	require.Equal(t, sourceWithIncludes, context[constants.CTX_SOURCE].(string))
-	require.Equal(t, sourceWithPragmas, context[constants.CTX_GCC_MINUS_E_SOURCE].(string))
+	require.Equal(t, sourceWithIncludes, ctx.Source)
+	require.Equal(t, sourceWithPragmas, ctx.SourceGccMinusE)
 }
 
 func TestExternalIncludeReplacerPragmaToInclude(t *testing.T) {
 	context := make(map[string]interface{})
 	ctx := &types.Context{}
-	context[constants.CTX_GCC_MINUS_E_SOURCE] = sourceWithPragmas
+	ctx.SourceGccMinusE = sourceWithPragmas
 	ctx.Includes = []string{"/tmp/test184599776/sketch/config.h", "/tmp/test184599776/sketch/includes/de bug.h", "Bridge.h"}
 
-	replacer := builder.ExternalIncludeReplacer{SourceKey: constants.CTX_GCC_MINUS_E_SOURCE, TargetKey: constants.CTX_GCC_MINUS_E_SOURCE, From: "#pragma ___MY_INCLUDE___ ", To: "#include "}
+	replacer := builder.ExternalIncludeReplacer{Source: &ctx.SourceGccMinusE, Target: &ctx.SourceGccMinusE, From: "#pragma ___MY_INCLUDE___ ", To: "#include "}
 	err := replacer.Run(context, ctx)
 	NoError(t, err)
 
-	require.Nil(t, context[constants.CTX_SOURCE])
-	require.Equal(t, sourceWithIncludes, context[constants.CTX_GCC_MINUS_E_SOURCE].(string))
+	require.Empty(t, ctx.Source)
+	require.Equal(t, sourceWithIncludes, ctx.SourceGccMinusE)
 }
diff --git a/src/arduino.cc/builder/test/includes_finder_with_regexp_test.go b/src/arduino.cc/builder/test/includes_finder_with_regexp_test.go
@@ -31,7 +31,6 @@ package test
 
 import (
 	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
 	"arduino.cc/builder/types"
 	"github.com/stretchr/testify/require"
 	"sort"
@@ -46,9 +45,9 @@ func TestIncludesFinderWithRegExp(t *testing.T) {
 		"#include <SPI.h>\n" +
 		"^\n" +
 		"compilation terminated."
-	context[constants.CTX_SOURCE] = output
+	ctx.Source = output
 
-	parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
+	parser := builder.IncludesFinderWithRegExp{Source: &ctx.Source}
 	err := parser.Run(context, ctx)
 	NoError(t, err)
 
@@ -63,9 +62,9 @@ func TestIncludesFinderWithRegExpEmptyOutput(t *testing.T) {
 
 	output := ""
 
-	context[constants.CTX_SOURCE] = output
+	ctx.Source = output
 
-	parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
+	parser := builder.IncludesFinderWithRegExp{Source: &ctx.Source}
 	err := parser.Run(context, ctx)
 	NoError(t, err)
 
@@ -84,9 +83,9 @@ func TestIncludesFinderWithRegExpPreviousIncludes(t *testing.T) {
 		"^\n" +
 		"compilation terminated."
 
-	context[constants.CTX_SOURCE] = output
+	ctx.Source = output
 
-	parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
+	parser := builder.IncludesFinderWithRegExp{Source: &ctx.Source}
 	err := parser.Run(context, ctx)
 	NoError(t, err)
 
@@ -105,9 +104,9 @@ func TestIncludesFinderWithRegExpPaddedIncludes(t *testing.T) {
 		" #               include <Wire.h>\n" +
 		"                                 ^\n" +
 		"compilation terminated.\n"
-	context[constants.CTX_SOURCE] = output
+	ctx.Source = output
 
-	parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
+	parser := builder.IncludesFinderWithRegExp{Source: &ctx.Source}
 	err := parser.Run(context, ctx)
 	NoError(t, err)
 
@@ -125,9 +124,9 @@ func TestIncludesFinderWithRegExpPaddedIncludes2(t *testing.T) {
 		" #\t\t\tinclude <Wire.h>\n" +
 		"                                 ^\n" +
 		"compilation terminated.\n"
-	context[constants.CTX_SOURCE] = output
+	ctx.Source = output
 
-	parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
+	parser := builder.IncludesFinderWithRegExp{Source: &ctx.Source}
 	err := parser.Run(context, ctx)
 	NoError(t, err)
 
@@ -144,9 +143,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"
 
-	context[constants.CTX_SOURCE] = output
+	ctx.Source = output
 
-	parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
+	parser := builder.IncludesFinderWithRegExp{Source: &ctx.Source}
 	err := parser.Run(context, ctx)
 	NoError(t, err)
 
diff --git a/src/arduino.cc/builder/test/prototypes_adder_test.go b/src/arduino.cc/builder/test/prototypes_adder_test.go
diff --git a/src/arduino.cc/builder/test/read_file_and_store_in_context_test.go b/src/arduino.cc/builder/test/read_file_and_store_in_context_test.go
diff --git a/src/arduino.cc/builder/test/sketch_source_merger_test.go b/src/arduino.cc/builder/test/sketch_source_merger_test.go
diff --git a/src/arduino.cc/builder/types/context.go b/src/arduino.cc/builder/types/context.go

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ func findIncludesUntilDone(context map[string]interface{}, ctx *types.Context, s`
`105`	`105`	`for !done {`
`106`	`106`	`commands := []types.Command{`
`107`	`107`	`&GCCPreprocRunnerForDiscoveringIncludes{SourceFilePath: sourceFilePath, TargetFilePath: targetFilePath},`
`108`		`- &IncludesFinderWithRegExp{ContextField: constants.CTX_GCC_MINUS_E_SOURCE},`
	`108`	`+ &IncludesFinderWithRegExp{Source: &ctx.SourceGccMinusE},`
`109`	`109`	`&IncludesToIncludeFolders{},`
`110`	`110`	`}`
`111`	`111`	`for _, command := range commands {`
Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,12 @@ import (`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`type CTagsTargetFileSaver struct {`
`40`		`- SourceField string`
	`40`	`+ Source *string`
`41`	`41`	`TargetFileName string`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`func (s CTagsTargetFileSaver) Run(context map[string]interface{}, ctx types.Context) error {`
`45`		`- source := context[s.SourceField].(string)`
	`45`	`+ source := *s.Source`
`46`	`46`
`47`	`47`	`preprocPath := ctx.PreprocPath`
`48`	`48`	`err := utils.EnsureFolderExists(preprocPath)`
Original file line number	Diff line number	Diff line change
`@@ -36,22 +36,22 @@ import (`
`36`	`36`	`)`
`37`	`37`
`38`	`38`	`type ExternalIncludeReplacer struct {`
`39`		`- SourceKey string`
`40`		`- TargetKey string`
`41`		`- From string`
`42`		`- To string`
	`39`	`+ Source *string`
	`40`	`+ Target *string`
	`41`	`+ From string`
	`42`	`+ To string`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`func (s ExternalIncludeReplacer) Run(context map[string]interface{}, ctx types.Context) error {`
`46`		`- source := context[s.SourceKey].(string)`
	`46`	`+ source := *s.Source`
`47`	`47`	`nonAbsoluteIncludes := findNonAbsoluteIncludes(ctx.Includes)`
`48`	`48`
`49`	`49`	`for _, include := range nonAbsoluteIncludes {`
`50`	`50`	`source = strings.Replace(source, s.From+"<"+include+">", s.To+"<"+include+">", -1)`
`51`	`51`	`source = strings.Replace(source, s.From+"\""+include+"\"", s.To+"\""+include+"\"", -1)`
`52`	`52`	`}`
`53`	`53`
`54`		`- context[s.TargetKey] = source`
	`54`	`+ *s.Target = source`
`55`	`55`
`56`	`56`	`return nil`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func (s *GCCPreprocRunnerForDiscoveringIncludes) Run(context map[string]interfac`
`93`	`93`	`return i18n.WrapError(err)`
`94`	`94`	`}`
`95`	`95`
`96`		`- context[constants.CTX_GCC_MINUS_E_SOURCE] = string(stderr)`
	`96`	`+ ctx.SourceGccMinusE = string(stderr)`
`97`	`97`
`98`	`98`	`return nil`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,6 @@ func (s GCCPreprocSourceSaver) Run(context map[string]interface{}, ctx types.C`
`46`	`46`	`return i18n.WrapError(err)`
`47`	`47`	`}`
`48`	`48`
`49`		`- source := context[constants.CTX_SOURCE].(string)`
`50`		`-`
`51`		`- err = utils.WriteFile(filepath.Join(preprocPath, constants.FILE_GCC_PREPROC_TARGET), source)`
	`49`	`+ err = utils.WriteFile(filepath.Join(preprocPath, constants.FILE_GCC_PREPROC_TARGET), ctx.Source)`
`52`	`50`	`return i18n.WrapError(err)`
`53`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ type PrototypesAdder struct{}`
`41`	`41`
`42`	`42`	`func (s PrototypesAdder) Run(context map[string]interface{}, ctx types.Context) error {`
`43`	`43`	`debugOutput := ctx.DebugPreprocessor`
`44`		`- source := context[constants.CTX_SOURCE].(string)`
	`44`	`+ source := ctx.Source`
`45`	`45`
`46`	`46`	`source = strings.Replace(source, "\r\n", "\n", -1)`
`47`	`47`	`source = strings.Replace(source, "\r", "\n", -1)`
`@@ -74,7 +74,7 @@ func (s PrototypesAdder) Run(context map[string]interface{}, ctx types.Context`
`74`	`74`	`}`
`75`	`75`	`fmt.Println("#END OF PREPROCESSED SOURCE")`
`76`	`76`	`}`
`77`		`- context[constants.CTX_SOURCE] = source`
	`77`	`+ ctx.Source = source`
`78`	`78`
`79`	`79`	`return nil`
`80`	`80`	`}`