pips/mk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement variable expansion in includes

Browse source 
Signed-off-by: Florian Limberger <flo@purplekraken.com>
This commit is contained in:
Florian Limberger 2020-04-23 12:36:47 +02:00
parent 73d1b31466
commit cf75e9e7b8
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
parse.go
View file

@ -52,8 +52,8 @@ func (p *parser) clear() {
type parserStateFun func(*parser, token) parserStateFun
// Parse a mkfile, returning a new ruleSet.
func parse(input string, name string, path string) *ruleSet {
rules := &ruleSet{make(map[string][]string),
func parse(input string, name string, path string, env map[string][]string) *ruleSet {
rules := &ruleSet{env,
make([]rule, 0),
make(map[string][]int)}
parseInto(input, name, rules, path)
@ -115,7 +115,12 @@ func parsePipeInclude(p *parser, t token) parserStateFun {
args := make([]string, len(p.tokenbuf))
for i := 0; i < len(p.tokenbuf); i++ {
args[i] = p.tokenbuf[i].val
s := p.tokenbuf[i].val
expanded := expand(s, p.rules.vars, false)
if len(expanded) > 0 {
s = expanded[0]
}
args[i] = s
}
output, success := subprocess("sh", args, "", true)
@ -155,6 +160,11 @@ func parseRedirInclude(p *parser, t token) parserStateFun {
for i := range p.tokenbuf {
filename += p.tokenbuf[i].val
}
expanded := expand(filename, p.rules.vars, false)
if len(expanded) > 0 {
filename = expanded[0]
}
fmt.Printf("parsed filename: %v\nexpanded filename: %v\n", filename, expanded)
file, err := os.Open(filename)
if err != nil {
p.basicErrorAtToken(fmt.Sprintf("cannot open %s", filename), p.tokenbuf[0])