diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-12 06:28:23 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-12 06:28:23 +0000 |
| commit | dae780ba0b567f3faef4e8c1439c6c0841532bff (patch) | |
| tree | 463ad4ea26443ca63f2cb58844b03531b756282a /mkconfig.rb | |
| parent | 5aa55903a6c20a0989723bf2f84f8932da3a85e4 (diff) | |
| download | ruby-dae780ba0b567f3faef4e8c1439c6c0841532bff.tar.gz ruby-dae780ba0b567f3faef4e8c1439c6c0841532bff.tar.xz ruby-dae780ba0b567f3faef4e8c1439c6c0841532bff.zip | |
* bootstraptest/runner.rb, bootstraptest/test_method.rb, enc/depend,
instruby.rb, lib/mkmf.rb, lib/test/unit/util/procwrapper.rb,
mkconfig.rb, sample/test.rb, template/vm.inc.tmpl,
test/ruby/test_stringchar.rb: fixes arround String#gsub.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'mkconfig.rb')
| -rwxr-xr-x | mkconfig.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkconfig.rb b/mkconfig.rb index 7815dd1ee..e39307b48 100755 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -150,7 +150,8 @@ print <<EOS MAKEFILE_CONFIG = {} CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} def RbConfig::expand(val, config = CONFIG) - val.gsub!(/\\$\\$|\\$\\(([^()]+)\\)|\\$\\{([^{}]+)\\}/) do |var| + val.gsub!(/\\$\\$|\\$\\(([^()]+)\\)|\\$\\{([^{}]+)\\}/) do + var = $& if !(v = $1 || $2) '$' elsif key = config[v = v[/\\A[^:]+(?=(?::(.*?)=(.*))?\\z)/]] @@ -158,7 +159,7 @@ print <<EOS config[v] = false RbConfig::expand(key, config) config[v] = key - key = key.gsub(/\#{Regexp.quote(pat)}(?=\\s|\\z)/n) {sub} if pat + key = key.gsub(/\#{Regexp.quote(pat)}(?=\\s|\\z)/n, sub) if pat key else var |