diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-15 10:46:38 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-15 10:46:38 +0000 |
| commit | c93dd36e0ef8bb07c96614ca6f3948eef72ca058 (patch) | |
| tree | eb5719fe482f13f25d1f6508464d716784074b36 /lib/mkmf.rb | |
| parent | b5cda0ffb61a2552e45d64728329a211fe51413a (diff) | |
| download | ruby-c93dd36e0ef8bb07c96614ca6f3948eef72ca058.tar.gz | |
revert previous commit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
| -rw-r--r-- | lib/mkmf.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d801a6ad8b..1eb52047a3 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2050,11 +2050,8 @@ RULES suffixes << m[1] << m[2] implicit = [[m[1], m[2]], [m.post_match]] next - elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line - line.sub!(%r'(\s)*\#.*$', '') - comment = $& || '' - line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2} - line = line.chomp + comment + "\n" + elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line + line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2} end depout << line end |