josh/rscons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

expand variable references recursively

Browse Source
This commit is contained in:
Josh Holtrop 2013-07-17 20:40:29 -04:00
parent 2f2de3b709
commit 1b6c74bfd5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/rscons/varset.rb
View File

@ -41,7 +41,7 @@ module Rscons
if varref =~ /^(.*)\$\[(\w+)\](.*)$/ if varref =~ /^(.*)\$\[(\w+)\](.*)$/
# expand array with given prefix, suffix # expand array with given prefix, suffix
prefix, varname, suffix = $1, $2, $3 prefix, varname, suffix = $1, $2, $3
varval = @vars[varname] varval = expand_varref(@vars[varname])
unless varval.is_a?(Array) unless varval.is_a?(Array)
raise "Array expected for $#{varname}" raise "Array expected for $#{varname}"
end end
@ -49,7 +49,7 @@ module Rscons
elsif varref =~ /^\$(.*)$/ elsif varref =~ /^\$(.*)$/
# expand a single variable reference # expand a single variable reference
varname = $1 varname = $1
varval = @vars[varname] varval = expand_varref(@vars[varname])
varval or raise "Could not find variable #{varname.inspect}" varval or raise "Could not find variable #{varname.inspect}"
expand_varref(varval) expand_varref(varval)
else else