8000 Modularization of ctags and some refactorings by cmaglie · Pull Request #87 · arduino/arduino-builder · GitHub
[go: up one dir, main page]
Skip to content

Modularization of ctags and some refactorings #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 8, 2016
Merged

Modularization of ctags and some refactorings #87

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3cad689
Simplify CTag structure
cmaglie Dec 8, 2015
11efa53
Skip empty prototype generation
cmaglie Dec 20, 2015
583aab1
Moving ctags modules into their own package
cmaglie Dec 12, 2015
505cc4a
Introduce explicit PropertiesMap type
cmaglie Dec 13, 2015
14e2351
Moving check for signatureContainsDefaultArg to prototypes_adder
cmaglie Dec 15, 2015
c205ecd
Some minor cosmetics
cmaglie Dec 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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 <c.maglie@arduino.cc>
  • Loading branch information
@cmaglie
cmaglie committed Dec 25, 2015
commit 583aab145ef3bfcfa803bd0eae345eb70c11f66c
4 changes: 2 additions & 2 deletions src/arduino.cc/builder/collect_ctags_from_sketch_files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ func (s *CollectCTagsFromSketchFiles) Run(context map[string]interface{}) error
sketch := context[constants.CTX_SKETCH].(*types.Sketch)
sketchFileNames := collectSketchFileNamesFrom(sketch)

ctags := context[constants.CTX_CTAGS_OF_PREPROC_SOURCE].([]*types.CTag)
allCtags := context[constants.CTX_CTAGS_OF_PREPROC_SOURCE].([]*types.CTag)
ctagsOfSketch := []*types.CTag{}
for _, ctag := range ctags {
for _, ctag := range allCtags {
if utils.SliceContains(sketchFileNames, strings.Replace(ctag.Filename, "\\\\", "\\", -1)) {
ctagsOfSketch = append(ctagsOfSketch, ctag)
}
Expand Down
7 changes: 4 additions & 3 deletions src/arduino.cc/builder/container_add_prototypes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ package builder

import (
"arduino.cc/builder/constants"
"arduino.cc/builder/ctags"
"arduino.cc/builder/types"
"arduino.cc/builder/utils"
)
Expand All @@ -42,10 +43,10 @@ func (s *ContainerAddPrototypes) Run(context map[string]interface{}) error {
&GCCPreprocRunner{TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},
&ReadFileAndStoreInContext{TargetField: constants.CTX_GCC_MINUS_E_SOURCE},
&CTagsTargetFileSaver{SourceField: constants.CTX_GCC_MINUS_E_SOURCE, TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},
&CTagsRunner{},
&CTagsParser{},
&ctags.CTagsRunner{},
&ctags.CTagsParser{},
&CollectCTagsFromSketchFiles{},
&CTagsToPrototypes{},
&ctags.CTagsToPrototypes{},
&PrototypesAdder{},
&SketchSaver{},
}
Expand Down
2 changes: 1 addition & 1 deletion src/arduino.cc/builder/ctags_parser.go → src/arduino.cc/builder/ctags/ctags_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* Copyright 2015 Arduino LLC (http://www.arduino.cc/)
*/

package builder
package ctags

import (
"arduino.cc/builder/constants"
Expand Down
2 changes: 1 addition & 1 deletion src/arduino.cc/builder/ctags_runner.go → src/arduino.cc/builder/ctags/ctags_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* Copyright 2015 Arduino LLC (http://www.arduino.cc/)
*/

package builder
package ctags

import (
"arduino.cc/builder/constants"
Expand Down
2 changes: 1 addition & 1 deletion ...arduino.cc/builder/ctags_to_prototypes.go → ...o.cc/builder/ctags/ctags_to_prototypes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* Copyright 2015 Arduino LLC (http://www.arduino.cc/)
*/

package builder
package ctags

import (
"arduino.cc/builder/constants"
Expand Down
Loading
0