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

Reorder VarSet#expand_varref class checks so the more common ones match earlier - #92

Browse Source
This commit is contained in:
Josh Holtrop 2019-05-08 22:50:34 -04:00
parent 87a15b3868
commit fa14102ba5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/rscons/varset.rb
View File

@ -95,8 +95,6 @@ module Rscons
# Expanded value with "$!{var}" variable references replaced. # Expanded value with "$!{var}" variable references replaced.
def expand_varref(varref, lambda_args) def expand_varref(varref, lambda_args)
case varref case varref
when Symbol, true, false, nil
varref
when String when String
if varref =~ /^(.*)\$\{([^}]+)\}(.*)$/ if varref =~ /^(.*)\$\{([^}]+)\}(.*)$/
prefix, varname, suffix = $1, $2, $3 prefix, varname, suffix = $1, $2, $3
@ -104,18 +102,18 @@ module Rscons
varval = expand_varref(self[varname], lambda_args) varval = expand_varref(self[varname], lambda_args)
# suffix needs no expansion since the regex matches the last occurence # suffix needs no expansion since the regex matches the last occurence
case varval case varval
when Symbol, true, false, nil, String
if prefix.is_a?(Array)
prefix.map {|p| "#{p}#{varval}#{suffix}"}
else
"#{prefix}#{varval}#{suffix}"
end
when Array when Array
if prefix.is_a?(Array) if prefix.is_a?(Array)
varval.map {|vv| prefix.map {|p| "#{p}#{vv}#{suffix}"}}.flatten varval.map {|vv| prefix.map {|p| "#{p}#{vv}#{suffix}"}}.flatten
else else
varval.map {|vv| "#{prefix}#{vv}#{suffix}"} varval.map {|vv| "#{prefix}#{vv}#{suffix}"}
end end
when String, Symbol, true, false, nil
if prefix.is_a?(Array)
prefix.map {|p| "#{p}#{varval}#{suffix}"}
else
"#{prefix}#{varval}#{suffix}"
end
else else
raise "Unknown construction variable type: #{varval.class} (from #{varname.inspect} => #{self[varname].inspect})" raise "Unknown construction variable type: #{varval.class} (from #{varname.inspect} => #{self[varname].inspect})"
end end
@ -126,6 +124,8 @@ module Rscons
varref.map do |ent| varref.map do |ent|
expand_varref(ent, lambda_args) expand_varref(ent, lambda_args)
end.flatten end.flatten
when Symbol, true, false, nil
varref
when Proc when Proc
expand_varref(varref[*lambda_args], lambda_args) expand_varref(varref[*lambda_args], lambda_args)
else else