From 08ec02b92b45464df3dbf79022bb15b853ab0428 Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 28 Dec 2000 05:00:47 +0000 Subject: changes from personal modifies -- matz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/configsub.rb | 6 +++--- ext/extmk.rb.in | 12 ++++++------ ext/tk/sample/tkbiff.rb | 16 ++++++++-------- ext/tk/sample/tkfrom.rb | 14 +++++++------- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'ext') diff --git a/ext/configsub.rb b/ext/configsub.rb index 315cdaf868..0dc525515a 100644 --- a/ext/configsub.rb +++ b/ext/configsub.rb @@ -10,9 +10,9 @@ BEGIN { CONFIG['TEENY'] = $3 end - File.foreach($config || "config.status") do |$_| - next if /^#/ - if /^s%@(\w+)@%(.*)%g/ + File.foreach($config || "config.status") do |line| + next if /^#/ =~ line + if /^s%@(\w+)@%(.*)%g/ =~ line name = $1 val = $2 || "" next if /^(INSTALL|DEFS|configure_input|srcdir)$/ =~ name diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index ff6f04b4b6..52debd47cc 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -654,15 +654,15 @@ $static_ext = {} for setup in ["@setup@", "#{$top_srcdir}/ext/@setup@"] if File.file? setup f = open(setup) - while f.gets() - $_.chomp! - sub!(/#.*$/, '') - next if /^\s*$/ - if /^option +nodynamic/ + while line = f.gets() + line.chomp! + line.sub!(/#.*$/, '') + next if /^\s*$/ =~ line + if /^option +nodynamic/ =~ line $nodynamic = true next end - target = $_.split[0] + target = line.split[0] target = target.downcase if /mswin32/ =~ RUBY_PLATFORM $static_ext[target] = true end diff --git a/ext/tk/sample/tkbiff.rb b/ext/tk/sample/tkbiff.rb index d2d7bf7beb..ac27184437 100644 --- a/ext/tk/sample/tkbiff.rb +++ b/ext/tk/sample/tkbiff.rb @@ -38,11 +38,11 @@ class Mail def initialize(f) @header = {} @body = [] - while f.gets() - $_.chop! - next if /^From / # skip From-line - break if /^$/ # end of header - if /^(\S+):\s*(.*)/ + while line = f.gets() + line.chop! + next if /^From / =~ line # skip From-line + break if /^$/ =~ line # end of header + if /^(\S+):\s*(.*)/ =~ line @header[attr = $1.capitalize] = $2 elsif attr sub(/^\s*/, '') @@ -50,10 +50,10 @@ class Mail end end - return if ! $_ + return unless $_ - while f.gets() - break if /^From / + while line = f.gets() + break if /^From / =~ line @body.push($_) end end diff --git a/ext/tk/sample/tkfrom.rb b/ext/tk/sample/tkfrom.rb index ba0e547799..8c3efb8137 100644 --- a/ext/tk/sample/tkfrom.rb +++ b/ext/tk/sample/tkfrom.rb @@ -20,11 +20,11 @@ class Mail def initialize(f) @header = {} @body = [] - while f.gets() + while line = f.gets() $_.chop! - next if /^From / # skip From-line - break if /^$/ # end of header - if /^(\S+):\s*(.*)/ + next if /^From / =~ line # skip From-line + break if /^$/ =~ line # end of header + if /^(\S+):\s*(.*)/ =~ line @header[attr = $1.capitalize] = $2 elsif attr sub(/^\s*/, '') @@ -32,10 +32,10 @@ class Mail end end - return if ! $_ + return unless $_ - while f.gets() - break if /^From / + while line = f.gets() + break if /^From / =~ line @body.push($_) end end -- cgit v1.2.3