From 1b6c74bfd5910c346c90247698df51ed4f225718 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 17 Jul 2013 20:40:29 -0400 Subject: [PATCH] expand variable references recursively --- lib/rscons/varset.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rscons/varset.rb b/lib/rscons/varset.rb index 74fdbce..56be3a0 100644 --- a/lib/rscons/varset.rb +++ b/lib/rscons/varset.rb @@ -41,7 +41,7 @@ module Rscons if varref =~ /^(.*)\$\[(\w+)\](.*)$/ # expand array with given prefix, suffix prefix, varname, suffix = $1, $2, $3 - varval = @vars[varname] + varval = expand_varref(@vars[varname]) unless varval.is_a?(Array) raise "Array expected for $#{varname}" end @@ -49,7 +49,7 @@ module Rscons elsif varref =~ /^\$(.*)$/ # expand a single variable reference varname = $1 - varval = @vars[varname] + varval = expand_varref(@vars[varname]) varval or raise "Could not find variable #{varname.inspect}" expand_varref(varval) else