Skip to content

Transform CTags* tasks into a class #190

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
Nov 23, 2016
Merged

Transform CTags* tasks into a class #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a7ee4a
CTagsParser is now a standard go class
cmaglie Nov 16, 2016
f2cf4bd
CTagsToPrototypes is now a class-method
cmaglie Nov 16, 2016
f44e835
TestCTagsRunnerSketchWithClassFunction now tests only the ctags parser
cmaglie Nov 16, 2016
91a9a55
Moved ctags test into ctags package
cmaglie Nov 17, 2016
f1fe3ba
Removed temporary CTags task
cmaglie Nov 17, 2016
a4ede08
Moved CTagsRunner command into builder package
cmaglie Nov 17, 2016
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
5 changes: 1 addition & 4 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 @@ -33,7 +33,6 @@ import (
"path/filepath"

"arduino.cc/builder/constants"
"arduino.cc/builder/ctags"
"arduino.cc/builder/i18n"
"arduino.cc/builder/types"
)
Expand All @@ -47,9 +46,7 @@ func (s *ContainerAddPrototypes) Run(ctx *types.Context) error {
&ReadFileAndStoreInContext{Target: &ctx.SourceGccMinusE},
&FilterSketchSource{Source: &ctx.SourceGccMinusE},
&CTagsTargetFileSaver{Source: &ctx.SourceGccMinusE, TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},
&ctags.CTagsRunner{},
&ctags.CTagsParser{},
&ctags.CTagsToPrototypes{},
&CTagsRunner{},
&PrototypesAdder{},
&SketchSaver{},
}
Expand Down
64 changes: 30 additions & 34 deletions 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 @@ -30,14 +30,12 @@
package ctags

import (
"arduino.cc/builder/constants"
"arduino.cc/builder/types"
"bufio"
"os"
"reflect"
"runtime"
"strconv"
"strings"

"arduino.cc/builder/types"
)

const KIND_PROTOTYPE = "prototype"
Expand All @@ -54,32 +52,30 @@ var KNOWN_TAG_KINDS = map[string]bool{
"function": true,
}

type CTagsParser struct{}

func (s *CTagsParser) Run(ctx *types.Context) error {
rows := strings.Split(ctx.CTagsOutput, "\n")
type CTagsParser struct {
tags []*types.CTag
}

func (p *CTagsParser) Parse(ctagsOutput string) []*types.CTag {
rows := strings.Split(ctagsOutput, "\n")
rows = removeEmpty(rows)

var tags []*types.CTag
for _, row := range rows {
tags = append(tags, parseTag(row))
p.tags = append(p.tags, parseTag(row))
}

skipTagsWhere(tags, tagIsUnknown, ctx)
skipTagsWhere(tags, tagIsUnhandled, ctx)
addPrototypes(tags)
removeDefinedProtypes(tags, ctx)
removeDuplicate(tags)
skipTagsWhere(tags, prototypeAndCodeDontMatch, ctx)

ctx.CTagsOfPreprocessedSource = tags
p.skipTagsWhere(tagIsUnknown)
p.skipTagsWhere(tagIsUnhandled)
p.addPrototypes()
p.removeDefinedProtypes()
p.skipDuplicates()
p.skipTagsWhere(prototypeAndCodeDontMatch)

return nil
return p.tags
}

func addPrototypes(tags []*types.CTag) {
for _, tag := range tags {
func (p *CTagsParser) addPrototypes() {
for _, tag := range p.tags {
if !tag.SkipMe {
addPrototype(tag)
}
Expand Down Expand Up @@ -108,28 +104,28 @@ func addPrototype(tag *types.CTag) {
tag.PrototypeModifiers = strings.TrimSpace(tag.PrototypeModifiers)
}

func removeDefinedProtypes(tags []*types.CTag, ctx *types.Context) {
func (p *CTagsParser) removeDefinedProtypes() {
definedPrototypes := make(map[string]bool)
for _, tag := range tags {
for _, tag := range p.tags {
if tag.Kind == KIND_PROTOTYPE {
definedPrototypes[tag.Prototype] = true
}
}

for _, tag := range tags {
for _, tag := range p.tags {
if definedPrototypes[tag.Prototype] {
if ctx.DebugLevel >= 10 {
ctx.GetLogger().Fprintln(os.Stdout, constants.LOG_LEVEL_DEBUG, constants.MSG_SKIPPING_TAG_ALREADY_DEFINED, tag.FunctionName)
}
//if ctx.DebugLevel >= 10 {
// ctx.GetLogger().Fprintln(os.Stdout, constants.LOG_LEVEL_DEBUG, constants.MSG_SKIPPING_TAG_ALREADY_DEFINED, tag.FunctionName)
//}
tag.SkipMe = true
}
}
}

func removeDuplicate(tags []*types.CTag) {
func (p *CTagsParser) skipDuplicates() {
definedPrototypes := make(map[string]bool)

for _, tag := range tags {
for _, tag := range p.tags {
if !definedPrototypes[tag.Prototype] && tag.SkipMe == false {
definedPrototypes[tag.Prototype] = true
} else {
Expand All @@ -140,13 +136,13 @@ func removeDuplicate(tags []*types.CTag) {

type skipFuncType func(tag *types.CTag) bool

func skipTagsWhere(tags []*types.CTag, skipFunc skipFuncType, ctx *types.Context) {
for _, tag := range tags {
func (p *CTagsParser) skipTagsWhere(skipFunc skipFuncType) {
for _, tag := range p.tags {
if !tag.SkipMe {
skip := skipFunc(tag)
if skip && ctx.DebugLevel >= 10 {
ctx.GetLogger().Fprintln(os.Stdout, constants.LOG_LEVEL_DEBUG, constants.MSG_SKIPPING_TAG_WITH_REASON, tag.FunctionName, runtime.FuncForPC(reflect.ValueOf(skipFunc).Pointer()).Name())
}
//if skip && p.debugLevel >= 10 {
// ctx.GetLogger().Fprintln(os.Stdout, constants.LOG_LEVEL_DEBUG, constants.MSG_SKIPPING_TAG_WITH_REASON, tag.FunctionName, runtime.FuncForPC(reflect.ValueOf(skipFunc).Pointer()).Name())
//}
tag.SkipMe = skip
}
}
Expand Down
Loading