Removed DebugPreprocessor from builder ctx

Author: cmaglie

Diff for: legacy/builder/container_add_prototypes.go

@@ -73,8 +73,7 @@ func PreprocessSketchWithCtags(ctx *types.Context) error {
 	if err != nil {
 		return err
 	}
-	ctx.SketchSourceAfterArduinoPreprocessing = PrototypesAdder(
-		ctx.Sketch, ctx.SketchSourceMerged, ctagsStdout, ctx.LineOffset, ctx.DebugPreprocessor)
+	ctx.SketchSourceAfterArduinoPreprocessing = PrototypesAdder(ctx.Sketch, ctx.SketchSourceMerged, ctagsStdout, ctx.LineOffset)
 
 	if err := bldr.SketchSaveItemCpp(ctx.Sketch.MainFile, []byte(ctx.SketchSourceAfterArduinoPreprocessing), ctx.SketchBuildPath); err != nil {
 		return errors.WithStack(err)

Diff for: legacy/builder/prototypes_adder.go

@@ -26,7 +26,9 @@ import (
 	"github.com/arduino/arduino-cli/legacy/builder/utils"
 )
 
-func PrototypesAdder(sketch *sketch.Sketch, source string, ctagsStdout []byte, lineOffset int, debugOutput bool) string {
+var DebugPreprocessor bool
+
+func PrototypesAdder(sketch *sketch.Sketch, source string, ctagsStdout []byte, lineOffset int) string {
 	parser := &ctags.CTagsParser{}
 	parser.Parse(ctagsStdout, sketch.MainFile)
 	parser.FixCLinkageTagsDeclarations()
@@ -48,7 +50,7 @@ func PrototypesAdder(sketch *sketch.Sketch, source string, ctagsStdout []byte, l
 	prototypeSection := composePrototypeSection(firstFunctionLine, prototypes)
 	preprocessedSource := source[:firstFunctionChar] + prototypeSection + source[firstFunctionChar:]
 
-	if debugOutput {
+	if DebugPreprocessor {
 		fmt.Println("#PREPROCESSED SOURCE")
 		prototypesRows := strings.Split(prototypeSection, "\n")
 		prototypesRows = prototypesRows[:len(prototypesRows)-1]

Diff for: legacy/builder/test/try_build_of_problematic_sketch_test.go

@@ -202,13 +202,13 @@ func TestTryBuild042(t *testing.T) {
 }
 
 func makeDefaultContext() *types.Context {
+	builder.DebugPreprocessor = true
 	return &types.Context{
 		HardwareDirs:         paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware", "downloaded_board_manager_stuff"),
 		BuiltInToolsDirs:     paths.NewPathList("downloaded_tools"),
 		BuiltInLibrariesDirs: paths.New("downloaded_libraries"),
 		OtherLibrariesDirs:   paths.NewPathList("libraries"),
 		Verbose:              true,
-		DebugPreprocessor:    true,
 	}
 }
 

Diff for: legacy/builder/types/context.go

@@ -121,8 +121,7 @@ type Context struct {
 	LineOffset int
 
 	// Verbosity settings
-	Verbose           bool
-	DebugPreprocessor bool
+	Verbose bool
 
 	// Dry run, only create progress map
 	Progress ProgressStruct