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

Variable expansion bug.

Browse source
This commit is contained in:
Daniel Jones 2013-03-10 00:34:42 -08:00
parent 8cbbe9c53c
commit 587bdd6c63
8 changed files with 99 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

7
expand.go
View file

@ -13,12 +13,13 @@ func expand(input string, vars map[string][]string, expandBackticks bool) []stri
expanded := ""
var i, j int
for i = 0; i < len(input); {
j = i + strings.IndexAny(input[i:], "\"'`$\\")
j = strings.IndexAny(input[i:], "\"'`$\\")
if j < 0 {
expanded += input[i:]
break
}
j += i
expanded += input[i:j]
c, w := utf8.DecodeRuneInString(input[j:])
@ -155,8 +156,8 @@ func expandSigil(input string, vars map[string][]string) ([]string, int) {
if ok {
return varvals, offset
} else {
return []string{"$" + input[:offset]}, offset
}
return []string{"$" + input[:offset]}, offset
}
}
return []string{"$" + input}, len(input)