Skip to content

Commit 583aab1

Browse files
committed
Moving ctags modules into their own package
The following files ctags_parser.go ctags_runner.go ctags_to_prototypes.go have been moved into "ctags" package. Signed-off-by: Cristian Maglie <[email protected]>
1 parent 11efa53 commit 583aab1

8 files changed

+238
-236
lines changed

src/arduino.cc/builder/collect_ctags_from_sketch_files.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ func (s *CollectCTagsFromSketchFiles) Run(context map[string]interface{}) error
4242
sketch := context[constants.CTX_SKETCH].(*types.Sketch)
4343
sketchFileNames := collectSketchFileNamesFrom(sketch)
4444

45-
ctags := context[constants.CTX_CTAGS_OF_PREPROC_SOURCE].([]*types.CTag)
45+
allCtags := context[constants.CTX_CTAGS_OF_PREPROC_SOURCE].([]*types.CTag)
4646
ctagsOfSketch := []*types.CTag{}
47-
for _, ctag := range ctags {
47+
for _, ctag := range allCtags {
4848
if utils.SliceContains(sketchFileNames, strings.Replace(ctag.Filename, "\\\\", "\\", -1)) {
4949
ctagsOfSketch = append(ctagsOfSketch, ctag)
5050
}

src/arduino.cc/builder/container_add_prototypes.go

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

3232
import (
3333
"arduino.cc/builder/constants"
34+
"arduino.cc/builder/ctags"
3435
"arduino.cc/builder/types"
3536
"arduino.cc/builder/utils"
3637
)
@@ -42,10 +43,10 @@ func (s *ContainerAddPrototypes) Run(context map[string]interface{}) error {
4243
&GCCPreprocRunner{TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},
4344
&ReadFileAndStoreInContext{TargetField: constants.CTX_GCC_MINUS_E_SOURCE},
4445
&CTagsTargetFileSaver{SourceField: constants.CTX_GCC_MINUS_E_SOURCE, TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},
45-
&CTagsRunner{},
46-
&CTagsParser{},
46+
&ctags.CTagsRunner{},
47+
&ctags.CTagsParser{},
4748
&CollectCTagsFromSketchFiles{},
48-
&CTagsToPrototypes{},
49+
&ctags.CTagsToPrototypes{},
4950
&PrototypesAdder{},
5051
&SketchSaver{},
5152
}

src/arduino.cc/builder/ctags_parser.go renamed to src/arduino.cc/builder/ctags/ctags_parser.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* Copyright 2015 Arduino LLC (http://www.arduino.cc/)
2828
*/
2929

30-
package builder
30+
package ctags
3131

3232
import (
3333
"arduino.cc/builder/constants"

src/arduino.cc/builder/ctags_runner.go renamed to src/arduino.cc/builder/ctags/ctags_runner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* Copyright 2015 Arduino LLC (http://www.arduino.cc/)
2828
*/
2929

30-
package builder
30+
package ctags
3131

3232
import (
3333
"arduino.cc/builder/constants"

src/arduino.cc/builder/ctags_to_prototypes.go renamed to src/arduino.cc/builder/ctags/ctags_to_prototypes.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* Copyright 2015 Arduino LLC (http://www.arduino.cc/)
2828
*/
2929

30-
package builder
30+
package ctags
3131

3232
import (
3333
"arduino.cc/builder/constants"

0 commit comments

Comments
 (0)