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

Improve makefile parser

Browse Source 
Improve the androidmk makefile parser based on ideas from go/ast and
friends:
   - Use type switching instead of the As* mess
   - Don't store endPos for every node, compute it based on the last
     known position in the node plus the length of the last token
   - Store positions as only the offset into the file, and then unpack
     them into Line/Column scanner.Position objects later

Change-Id: I87eb6661859951e6c2ea5a85db6229fa5561d615
This commit is contained in:
Colin Cross
2016-05-25 17:25:40 -07:00
parent 7fd911f713
commit 08693d2bf2
7 changed files with 245 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
androidmk/parser/make_strings_test.go
View File

@@ -3,7 +3,6 @@ package parser
import (
"strings"
"testing"
"text/scanner"
)
var splitNTestCases = []struct {
@@ -20,31 +19,31 @@ var splitNTestCases = []struct {
" h i j",
},
Variables: []Variable{
Variable{Name: SimpleMakeString("var1", scanner.Position{})},
Variable{Name: SimpleMakeString("var2", scanner.Position{})},
Variable{Name: SimpleMakeString("var1", NoPos)},
Variable{Name: SimpleMakeString("var2", NoPos)},
},
},
sep: " ",
n: -1,
expected: []*MakeString{
SimpleMakeString("a", scanner.Position{}),
SimpleMakeString("b", scanner.Position{}),
SimpleMakeString("a", NoPos),
SimpleMakeString("b", NoPos),
&MakeString{
Strings: []string{"c", "d"},
Variables: []Variable{
Variable{Name: SimpleMakeString("var1", scanner.Position{})},
Variable{Name: SimpleMakeString("var1", NoPos)},
},
},
SimpleMakeString("e", scanner.Position{}),
SimpleMakeString("e", NoPos),
&MakeString{
Strings: []string{"f", ""},
Variables: []Variable{
Variable{Name: SimpleMakeString("var2", scanner.Position{})},
Variable{Name: SimpleMakeString("var2", NoPos)},
},
},
SimpleMakeString("h", scanner.Position{}),
SimpleMakeString("i", scanner.Position{}),
SimpleMakeString("j", scanner.Position{}),
SimpleMakeString("h", NoPos),
SimpleMakeString("i", NoPos),
SimpleMakeString("j", NoPos),
},
},
{
@@ -55,20 +54,20 @@ var splitNTestCases = []struct {
" h i j",
},
Variables: []Variable{
Variable{Name: SimpleMakeString("var1", scanner.Position{})},
Variable{Name: SimpleMakeString("var2", scanner.Position{})},
Variable{Name: SimpleMakeString("var1", NoPos)},
Variable{Name: SimpleMakeString("var2", NoPos)},
},
},
sep: " ",
n: 3,
expected: []*MakeString{
SimpleMakeString("a", scanner.Position{}),
SimpleMakeString("b", scanner.Position{}),
SimpleMakeString("a", NoPos),
SimpleMakeString("b", NoPos),
&MakeString{
Strings: []string{"c", "d e f", " h i j"},
Variables: []Variable{
Variable{Name: SimpleMakeString("var1", scanner.Position{})},
Variable{Name: SimpleMakeString("var2", scanner.Position{})},
Variable{Name: SimpleMakeString("var1", NoPos)},
Variable{Name: SimpleMakeString("var2", NoPos)},
},
},
},