Skip to content

Commit 169bcd9

Browse files
committed
Moved "gcc -M" output in Context
It seems legacy, shall we remove it? eventually may turn out to be useful in the future? Signed-off-by: Cristian Maglie <[email protected]>
1 parent 6784cbf commit 169bcd9

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ const CTAGS = "ctags"
7676
const CTX_ARCHIVE_FILE_PATH_CORE = "archiveFileCore"
7777
const CTX_BUILD_CORE = "buildCore"
7878
const CTX_FILE_PATH_TO_READ = "filePathToRead"
79-
const CTX_GCC_MINUS_M_OUTPUT = "gccMinusMOutput"
8079
const CTX_HARDWARE_REWRITE_RESULTS = "hardwareRewriteResults"
8180
const CTX_INCLUDE_SECTION = "includeSection"
8281
const CTX_INCLUDES_JUST_FOUND = "includesJustFound"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
type GCCMinusMOutputParser struct{}
4040

4141
func (s *GCCMinusMOutputParser) Run(context map[string]interface{}, ctx *types.Context) error {
42-
output := context[constants.CTX_GCC_MINUS_M_OUTPUT].(string)
42+
output := ctx.OutputGccMinusM
4343

4444
rows := strings.Split(output, "\n")
4545
includes := make([]string, 0)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (s *IncludesFinderWithGCC) Run(context map[string]interface{}, ctx *types.C
6565
return i18n.WrapError(err)
6666
}
6767

68-
context[constants.CTX_GCC_MINUS_M_OUTPUT] = string(output)
68+
ctx.OutputGccMinusM = string(output)
6969

7070
return nil
7171
}

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ package test
3131

3232
import (
3333
"arduino.cc/builder"
34-
"arduino.cc/builder/constants"
3534
"arduino.cc/builder/types"
3635
"github.com/stretchr/testify/require"
3736
"testing"
@@ -49,7 +48,7 @@ func TestGCCMinusMOutputParser(t *testing.T) {
4948
"\n" +
5049
"Bridge.h:\n"
5150

52-
context[constants.CTX_GCC_MINUS_M_OUTPUT] = output
51+
ctx.OutputGccMinusM = output
5352

5453
parser := builder.GCCMinusMOutputParser{}
5554
err := parser.Run(context, ctx)
@@ -68,7 +67,7 @@ func TestGCCMinusMOutputParserEmptyOutput(t *testing.T) {
6867

6968
output := "sketch.ino.o: /tmp/test699709208/sketch/sketch.ino.cpp"
7069

71-
context[constants.CTX_GCC_MINUS_M_OUTPUT] = output
70+
ctx.OutputGccMinusM = output
7271

7372
parser := builder.GCCMinusMOutputParser{}
7473
err := parser.Run(context, ctx)
@@ -93,7 +92,7 @@ func TestGCCMinusMOutputParserFirstLineOnMultipleLines(t *testing.T) {
9392
"\n" +
9493
"Bridge.h:\n"
9594

96-
context[constants.CTX_GCC_MINUS_M_OUTPUT] = output
95+
ctx.OutputGccMinusM = output
9796

9897
parser := builder.GCCMinusMOutputParser{}
9998
err := parser.Run(context, ctx)

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

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ type Context struct {
5151
ImportedLibraries []*Library
5252
LibrariesResolutionResults map[string]LibraryResolutionResult
5353
IncludeFolders []string
54+
OutputGccMinusM string
5455

5556
// C++ Parsing
5657
CTagsOutput string

0 commit comments

Comments
 (0)