Add CommentGroups

Follows blueprint change https://github.com/google/blueprint/pull/104/commits/1e73794d421a8017dbbc1d80913d93571d46d1b6

Change-Id: If3539e2d9370a0224a2364608c496a1e4385dbbf

1 files changed, 21 insertions, 18 deletions

diff --git a/androidmk/cmd/androidmk/androidmk.go b/androidmk/cmd/androidmk/androidmk.go
index 75a53815..bc3295a0 100644
--- a/androidmk/cmd/androidmk/androidmk.go
+++ b/androidmk/cmd/androidmk/androidmk.go
@@ -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: