StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add CommentGroups

Browse Source 
Follows blueprint change 1e73794d42

Change-Id: If3539e2d9370a0224a2364608c496a1e4385dbbf
This commit is contained in:
Colin Cross
2016-06-10 17:34:07 -07:00
parent e538e410cb
commit 7b6ba5c7fa
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
androidmk/cmd/androidmk/androidmk.go
View File

@@ -16,7 +16,7 @@ import (
// TODO: non-expanded variables with expressions
type bpFile struct {
comments []bpparser.Comment
comments []*bpparser.CommentGroup
defs []bpparser.Definition
localAssignments map[string]*bpparser.Property
globalAssignments map[string]*bpparser.Expression
@@ -29,21 +29,32 @@ type bpFile struct {
inModule bool
}
func (f *bpFile) insertComment(s string) {
f.comments = append(f.comments, &bpparser.CommentGroup{
Comments: []*bpparser.Comment{
&bpparser.Comment{
Comment: []string{s},
Slash: f.bpPos,
},
},
})
f.bpPos.Offset += len(s)
}
func (f *bpFile) insertExtraComment(s string) {
f.insertComment(s)
f.bpPos.Line++
}
func (f *bpFile) errorf(node mkparser.Node, s string, args ...interface{}) {
orig := node.Dump()
s = fmt.Sprintf(s, args...)
c := bpparser.Comment{
Comment: []string{fmt.Sprintf("// ANDROIDMK TRANSLATION ERROR: %s", s)},
Slash: f.bpPos,
}
f.insertExtraComment(fmt.Sprintf("// ANDROIDMK TRANSLATION ERROR: %s", s))
lines := strings.Split(orig, "\n")
for _, l := range lines {
c.Comment = append(c.Comment, "// "+l)
f.insertExtraComment("// " + l)
}
f.incBpPos(len(lines))
f.comments = append(f.comments, c)
}
func (f *bpFile) setMkPos(pos, end scanner.Position) {
@@ -54,11 +65,6 @@ func (f *bpFile) setMkPos(pos, end scanner.Position) {
f.mkPos = end
}
// Called when inserting extra lines into the blueprint file
func (f *bpFile) incBpPos(lines int) {
f.bpPos.Line += lines
}
type conditional struct {
cond string
eq bool
@@ -104,10 +110,7 @@ func convertFile(filename string, buffer *bytes.Buffer) (string, []error) {
switch x := node.(type) {
case *mkparser.Comment:
file.comments = append(file.comments, bpparser.Comment{
Slash: file.bpPos,
Comment: []string{"//" + x.Comment},
})
file.insertComment("//" + x.Comment)
case *mkparser.Assignment:
handleAssignment(file, x, assignmentCond)
case *mkparser.Directive: