Skip to content

Commit 6f37006

Browse files
cmagliecmaglie
committed
Moved CTags preprocess subroutine in proper place
1 parent e59d40f commit 6f37006

File tree

5 files changed

+105
-96
lines changed

5 files changed

+105
-96
lines changed

‎arduino/builder/preprocessor/ctags.go

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,111 @@ package preprocessor
1818
import (
1919
"context"
2020
"fmt"
21+
"strconv"
2122
"strings"
2223

24+
"github.com/arduino/arduino-cli/arduino/builder/preprocessor/ctags"
25+
"github.com/arduino/arduino-cli/arduino/sketch"
2326
"github.com/arduino/arduino-cli/executils"
2427
"github.com/arduino/arduino-cli/i18n"
28+
"github.com/arduino/arduino-cli/legacy/builder/utils"
2529
"github.com/arduino/go-paths-helper"
2630
"github.com/arduino/go-properties-orderedmap"
2731
"github.com/pkg/errors"
2832
)
2933

3034
var tr = i18n.Tr
35+
var DebugPreprocessor bool
36+
37+
func CTags(sourceFile *paths.Path, targetFile *paths.Path, sketch *sketch.Sketch, lineOffset int, buildProperties *properties.Map) ([]byte, error) {
38+
ctagsOutput, ctagsStdErr, err := RunCTags(sourceFile, buildProperties)
39+
if err != nil {
40+
return ctagsStdErr, err
41+
}
42+
43+
// func PrototypesAdder(sketch *sketch.Sketch, source string, ctagsStdout []byte, lineOffset int) string {
44+
parser := &ctags.CTagsParser{}
45+
prototypes, firstFunctionLine := parser.Parse(ctagsOutput, sketch.MainFile)
46+
if firstFunctionLine == -1 {
47+
firstFunctionLine = 0
48+
}
49+
50+
var source string
51+
if sourceData, err := targetFile.ReadFile(); err != nil {
52+
return nil, err
53+
} else {
54+
source = string(sourceData)
55+
}
56+
source = strings.Replace(source, "\r\n", "\n", -1)
57+
source = strings.Replace(source, "\r", "\n", -1)
58+
sourceRows := strings.Split(source, "\n")
59+
if isFirstFunctionOutsideOfSource(firstFunctionLine, sourceRows) {
60+
return nil, nil
61+
}
62+
63+
insertionLine := firstFunctionLine + lineOffset - 1
64+
firstFunctionChar := len(strings.Join(sourceRows[:insertionLine], "\n")) + 1
65+
prototypeSection := composePrototypeSection(firstFunctionLine, prototypes)
66+
preprocessedSource := source[:firstFunctionChar] + prototypeSection + source[firstFunctionChar:]
67+
68+
if DebugPreprocessor {
69+
fmt.Println("#PREPROCESSED SOURCE")
70+
prototypesRows := strings.Split(prototypeSection, "\n")
71+
prototypesRows = prototypesRows[:len(prototypesRows)-1]
72+
for i := 0; i < len(sourceRows)+len(prototypesRows); i++ {
73+
if i < insertionLine {
74+
fmt.Printf(" |%s\n", sourceRows[i])
75+
} else if i < insertionLine+len(prototypesRows) {
76+
fmt.Printf("PRO|%s\n", prototypesRows[i-insertionLine])
77+
} else {
78+
fmt.Printf(" |%s\n", sourceRows[i-len(prototypesRows)])
79+
}
80+
}
81+
fmt.Println("#END OF PREPROCESSED SOURCE")
82+
}
83+
84+
err = targetFile.WriteFile([]byte(preprocessedSource))
85+
return ctagsStdErr, err
86+
}
87+
88+
func composePrototypeSection(line int, prototypes []*ctags.Prototype) string {
89+
if len(prototypes) == 0 {
90+
return ""
91+
}
92+
93+
str := joinPrototypes(prototypes)
94+
str += "\n#line "
95+
str += strconv.Itoa(line)
96+
str += " " + utils.QuoteCppString(prototypes[0].File)
97+
str += "\n"
98+
99+
return str
100+
}
101+
102+
func joinPrototypes(prototypes []*ctags.Prototype) string {
103+
prototypesSlice := []string{}
104+
for _, proto := range prototypes {
105+
if signatureContainsaDefaultArg(proto) {
106+
continue
107+
}
108+
prototypesSlice = append(prototypesSlice, "#line "+strconv.Itoa(proto.Line)+" "+utils.QuoteCppString(proto.File))
109+
prototypeParts := []string{}
110+
if proto.Modifiers != "" {
111+
prototypeParts = append(prototypeParts, proto.Modifiers)
112+
}
113+
prototypeParts = append(prototypeParts, proto.Prototype)
114+
prototypesSlice = append(prototypesSlice, strings.Join(prototypeParts, " "))
115+
}
116+
return strings.Join(prototypesSlice, "\n")
117+
}
118+
119+
func signatureContainsaDefaultArg(proto *ctags.Prototype) bool {
120+
return strings.Contains(proto.Prototype, "=")
121+
}
122+
123+
func isFirstFunctionOutsideOfSource(firstFunctionLine int, sourceRows []string) bool {
124+
return firstFunctionLine > len(sourceRows)-1
125+
}
31126

32127
func RunCTags(sourceFile *paths.Path, buildProperties *properties.Map) ([]byte, []byte, error) {
33128
ctagsBuildProperties := properties.NewMap()

‎legacy/builder/container_add_prototypes.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,20 @@ func PreprocessSketchWithCtags(ctx *types.Context) error {
6464
return err
6565
}
6666

67-
ctagsStdout, ctagsStderr, err := preprocessor.RunCTags(targetFilePath, ctx.BuildProperties)
67+
sketchCpp := ctx.SketchBuildPath.Join(fmt.Sprintf("%s.cpp", ctx.Sketch.MainFile.Base()))
68+
ctagsStderr, err := preprocessor.CTags(targetFilePath, sketchCpp, ctx.Sketch, ctx.LineOffset, ctx.BuildProperties)
6869
if ctx.Verbose {
6970
ctx.WriteStderr(ctagsStderr)
7071
}
7172
if err != nil {
7273
return err
7374
}
74-
ctx.SketchSourceAfterArduinoPreprocessing = PrototypesAdder(ctx.Sketch, ctx.SketchSourceMerged, ctagsStdout, ctx.LineOffset)
7575

76-
if err := bldr.SketchSaveItemCpp(ctx.Sketch.MainFile, []byte(ctx.SketchSourceAfterArduinoPreprocessing), ctx.SketchBuildPath); err != nil {
77-
return errors.WithStack(err)
76+
// Save preprocesssed source in context
77+
if d, err := sketchCpp.ReadFile(); err != nil {
78+
return err
79+
} else {
80+
ctx.SketchSourceAfterArduinoPreprocessing = string(d)
7881
}
79-
8082
return nil
8183
}

‎legacy/builder/preprocess_sketch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,5 @@ func PreprocessSketchWithArduinoPreprocessor(ctx *types.Context) error {
8888

8989
//fmt.Printf("PREPROCESSOR OUTPUT:\n%s\n", output)
9090
ctx.SketchSourceAfterArduinoPreprocessing = string(result)
91-
return bldr.SketchSaveItemCpp(ctx.Sketch.MainFile, []byte(ctx.SketchSourceAfterArduinoPreprocessing), ctx.SketchBuildPath)
91+
return bldr.SketchSaveItemCpp(ctx.Sketch.MainFile, result, ctx.SketchBuildPath)
9292
}

‎legacy/builder/prototypes_adder.go

Lines changed: 0 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -14,92 +14,3 @@
1414
// To purchase a commercial license, send an email to [email protected].
1515

1616
package builder
17-
18-
import (
19-
"fmt"
20-
"strconv"
21-
"strings"
22-
23-
"github.com/arduino/arduino-cli/arduino/builder/preprocessor/ctags"
24-
"github.com/arduino/arduino-cli/arduino/sketch"
25-
"github.com/arduino/arduino-cli/legacy/builder/constants"
26-
"github.com/arduino/arduino-cli/legacy/builder/utils"
27-
)
28-
29-
var DebugPreprocessor bool
30-
31-
func PrototypesAdder(sketch *sketch.Sketch, source string, ctagsStdout []byte, lineOffset int) string {
32-
parser := &ctags.CTagsParser{}
33-
prototypes, firstFunctionLine := parser.Parse(ctagsStdout, sketch.MainFile)
34-
if firstFunctionLine == -1 {
35-
firstFunctionLine = 0
36-
}
37-
38-
source = strings.Replace(source, "\r\n", "\n", -1)
39-
source = strings.Replace(source, "\r", "\n", -1)
40-
sourceRows := strings.Split(source, "\n")
41-
if isFirstFunctionOutsideOfSource(firstFunctionLine, sourceRows) {
42-
return ""
43-
}
44-
45-
insertionLine := firstFunctionLine + lineOffset - 1
46-
firstFunctionChar := len(strings.Join(sourceRows[:insertionLine], "\n")) + 1
47-
prototypeSection := composePrototypeSection(firstFunctionLine, prototypes)
48-
preprocessedSource := source[:firstFunctionChar] + prototypeSection + source[firstFunctionChar:]
49-
50-
if DebugPreprocessor {
51-
fmt.Println("#PREPROCESSED SOURCE")
52-
prototypesRows := strings.Split(prototypeSection, "\n")
53-
prototypesRows = prototypesRows[:len(prototypesRows)-1]
54-
for i := 0; i < len(sourceRows)+len(prototypesRows); i++ {
55-
if i < insertionLine {
56-
fmt.Printf(" |%s\n", sourceRows[i])
57-
} else if i < insertionLine+len(prototypesRows) {
58-
fmt.Printf("PRO|%s\n", prototypesRows[i-insertionLine])
59-
} else {
60-
fmt.Printf(" |%s\n", sourceRows[i-len(prototypesRows)])
61-
}
62-
}
63-
fmt.Println("#END OF PREPROCESSED SOURCE")
64-
}
65-
return preprocessedSource
66-
}
67-
68-
func composePrototypeSection(line int, prototypes []*ctags.Prototype) string {
69-
if len(prototypes) == 0 {
70-
return constants.EMPTY_STRING
71-
}
72-
73-
str := joinPrototypes(prototypes)
74-
str += "\n#line "
75-
str += strconv.Itoa(line)
76-
str += " " + utils.QuoteCppString(prototypes[0].File)
77-
str += "\n"
78-
79-
return str
80-
}
81-
82-
func joinPrototypes(prototypes []*ctags.Prototype) string {
83-
prototypesSlice := []string{}
84-
for _, proto := range prototypes {
85-
if signatureContainsaDefaultArg(proto) {
86-
continue
87-
}
88-
prototypesSlice = append(prototypesSlice, "#line "+strconv.Itoa(proto.Line)+" "+utils.QuoteCppString(proto.File))
89-
prototypeParts := []string{}
90-
if proto.Modifiers != "" {
91-
prototypeParts = append(prototypeParts, proto.Modifiers)
92-
}
93-
prototypeParts = append(prototypeParts, proto.Prototype)
94-
prototypesSlice = append(prototypesSlice, strings.Join(prototypeParts, " "))
95-
}
96-
return strings.Join(prototypesSlice, "\n")
97-
}
98-
99-
func signatureContainsaDefaultArg(proto *ctags.Prototype) bool {
100-
return strings.Contains(proto.Prototype, "=")
101-
}
102-
103-
func isFirstFunctionOutsideOfSource(firstFunctionLine int, sourceRows []string) bool {
104-
return firstFunctionLine > len(sourceRows)-1
105-
}

‎legacy/builder/test/try_build_of_problematic_sketch_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"path/filepath"
2121
"testing"
2222

23+
"github.com/arduino/arduino-cli/arduino/builder/preprocessor"
2324
"github.com/arduino/arduino-cli/legacy/builder"
2425
"github.com/arduino/arduino-cli/legacy/builder/types"
2526
paths "github.com/arduino/go-paths-helper"
@@ -202,7 +203,7 @@ func TestTryBuild042(t *testing.T) {
202203
}
203204

204205
func makeDefaultContext() *types.Context {
205-
builder.DebugPreprocessor = true
206+
preprocessor.DebugPreprocessor = true
206207
return &types.Context{
207208
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware", "downloaded_board_manager_stuff"),
208209
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),

0 commit comments

Comments
 (0)