removed SketchSourceMerger

legacy/builder/container_merge_copy_sketch_files.go

@@ -39,14 +39,14 @@ import (
 type ContainerMergeCopySketchFiles struct{}
 
 func (s *ContainerMergeCopySketchFiles) Run(ctx *types.Context) error {
-	offset, source := bldr.MergeSketchSources(types.SketchFromLegacy(ctx.Sketch))
+	sk := types.SketchFromLegacy(ctx.Sketch)
+	if sk == nil {
+		return i18n.WrapError("unable to convert legacy sketch to the new type")
+	}
+	offset, source := bldr.MergeSketchSources(sk)
 	ctx.LineOffset = offset
 	ctx.Source = source
 
-	if err := new(SketchSourceMerger).Run(ctx); err != nil {
-		return i18n.WrapError(err)
-	}
-
 	if err := bldr.SaveSketchItemCpp(&sketch.Item{ctx.Sketch.MainFile.Name.String(), []byte(ctx.Source)}, ctx.SketchBuildPath.String()); err != nil {
 		return i18n.WrapError(err)
 	}

legacy/builder/sketch_source_merger.go

-/*
- * This file is part of Arduino Builder.
- *
- * Arduino Builder is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction.  Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License.  This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- *
- * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
- * Copyright 2015 Matthijs Kooijman
- */
-
-package builder
-
-import (
-	"regexp"
-
-	"github.com/arduino/arduino-cli/legacy/builder/types"
-	"github.com/arduino/arduino-cli/legacy/builder/utils"
-)
-
-type SketchSourceMerger struct{}
-
-func (s *SketchSourceMerger) Run(ctx *types.Context) error {
-	sketch := ctx.Sketch
-
-	lineOffset := 0
-	includeSection := ""
-	if !sketchIncludesArduinoH(&sketch.MainFile) {
-		includeSection += "#include <Arduino.h>\n"
-		lineOffset++
-	}
-	includeSection += "#line 1 " + utils.QuoteCppString(sketch.MainFile.Name.String()) + "\n"
-	lineOffset++
-	ctx.IncludeSection = includeSection
-
-	source := includeSection
-	source += addSourceWrappedWithLineDirective(&sketch.MainFile)
-	lineOffset += 1
-	for _, file := range sketch.OtherSketchFiles {
-		source += addSourceWrappedWithLineDirective(&file)
-	}
-
-	ctx.LineOffset = lineOffset
-	ctx.Source = source
-
-	return nil
-}
-
-func sketchIncludesArduinoH(sketch *types.SketchFile) bool {
-	if matched, err := regexp.MatchString("(?m)^\\s*#\\s*include\\s*[<\"]Arduino\\.h[>\"]", sketch.Source); err != nil {
-		panic(err)
-	} else {
-		return matched
-	}
-}
-
-func addSourceWrappedWithLineDirective(sketch *types.SketchFile) string {
-	source := "#line 1 " + utils.QuoteCppString(sketch.Name.String()) + "\n"
-	source += sketch.Source
-	source += "\n"
-
-	return source
-}