From 0cfe16bc21697d135c35fcb329c49cdd728da7bb Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 22 Oct 2005 04:48:34 +0000 Subject: * ext/tk/lib/tk/font.rb, ext/tk/lib/tkextlib/ICONS/icons.rb, ext/tk/sample/tkextlib/treectrl/demo.rb, lib/net/imap.rb, lib/rss/parser.rb, test/rss/test_content.rb, test/rss/test_dublincore.rb, test/rss/test_syndication.rb, test/rss/test_trackback.rb, test/ruby/test_eval.rb, test/socket/test_socket.rb, test/socket/test_udp.rb: Object#fcall was renamed as Object#funcall. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ ext/tk/lib/tk/font.rb | 4 ++-- ext/tk/lib/tkextlib/ICONS/icons.rb | 2 +- ext/tk/sample/tkextlib/treectrl/demo.rb | 2 +- lib/net/imap.rb | 10 +++++----- lib/rss/parser.rb | 2 +- test/rss/test_content.rb | 8 ++++---- test/rss/test_dublincore.rb | 4 ++-- test/rss/test_syndication.rb | 8 ++++---- test/rss/test_trackback.rb | 2 +- test/ruby/test_eval.rb | 2 +- test/socket/test_socket.rb | 8 ++++---- test/socket/test_udp.rb | 4 ++-- 13 files changed, 36 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index e95353164e..1019710f9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,14 @@ Sat Oct 22 13:26:57 2005 Nobuyoshi Nakada * time.c (rb_strftime): removed meaningless volatile modifiers, and concatenate successive nul characters at once. [ruby-dev:27472] + * ext/tk/lib/tk/font.rb, ext/tk/lib/tkextlib/ICONS/icons.rb, + ext/tk/sample/tkextlib/treectrl/demo.rb, lib/net/imap.rb, + lib/rss/parser.rb, test/rss/test_content.rb, + test/rss/test_dublincore.rb, test/rss/test_syndication.rb, + test/rss/test_trackback.rb, test/ruby/test_eval.rb, + test/socket/test_socket.rb, test/socket/test_udp.rb: + Object#fcall was renamed as Object#funcall. + Sat Oct 22 10:08:28 2005 Hirokazu Yamamoto * missing.h, missing/*.c: SUSv3 compatible strcasecmp and strncasecmp, diff --git a/ext/tk/lib/tk/font.rb b/ext/tk/lib/tk/font.rb index 73e0ac4682..6fd2406f5a 100644 --- a/ext/tk/lib/tk/font.rb +++ b/ext/tk/lib/tk/font.rb @@ -1186,13 +1186,13 @@ class TkFont def dup src = self obj = super() - obj.fcall(:initialize, src) + obj.funcall(:initialize, src) obj end def clone src = self obj = super() - obj.fcall(:initialize, src) + obj.funcall(:initialize, src) obj end =end diff --git a/ext/tk/lib/tkextlib/ICONS/icons.rb b/ext/tk/lib/tkextlib/ICONS/icons.rb index e02b579d0a..f1b009cd58 100644 --- a/ext/tk/lib/tkextlib/ICONS/icons.rb +++ b/ext/tk/lib/tkextlib/ICONS/icons.rb @@ -78,7 +78,7 @@ module Tk def self.new(name, keys=nil) unless obj = Tk_IMGTBL["::icon::#{name}"] obj = allocate() - obj.fcall(:initialize, name, keys) + obj.funcall(:initialize, name, keys) end obj end diff --git a/ext/tk/sample/tkextlib/treectrl/demo.rb b/ext/tk/sample/tkextlib/treectrl/demo.rb index dc8cfadaf2..f0ccf2dc5f 100644 --- a/ext/tk/sample/tkextlib/treectrl/demo.rb +++ b/ext/tk/sample/tkextlib/treectrl/demo.rb @@ -710,7 +710,7 @@ class TkTreeCtrl_demo systemHighlightText = @SystemHighlightText proc_disp_styles_in_item = proc{|item| - master.fcall(:display_styles_in_item, item) + master.funcall(:display_styles_in_item, item) } @demo_scripts.instance_eval{ diff --git a/lib/net/imap.rb b/lib/net/imap.rb index b4ea72b87c..5323b9333d 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -1227,7 +1227,7 @@ module Net class RawData # :nodoc: def send_data(imap) - imap.fcall(:put_string, @data) + imap.funcall(:put_string, @data) end private @@ -1239,7 +1239,7 @@ module Net class Atom # :nodoc: def send_data(imap) - imap.fcall(:put_string, @data) + imap.funcall(:put_string, @data) end private @@ -1251,7 +1251,7 @@ module Net class QuotedString # :nodoc: def send_data(imap) - imap.fcall(:send_quoted_string, @data) + imap.funcall(:send_quoted_string, @data) end private @@ -1263,7 +1263,7 @@ module Net class Literal # :nodoc: def send_data(imap) - imap.fcall(:send_literal, @data) + imap.funcall(:send_literal, @data) end private @@ -1275,7 +1275,7 @@ module Net class MessageSet # :nodoc: def send_data(imap) - imap.fcall(:put_string, format_internal(@data)) + imap.funcall(:put_string, format_internal(@data)) end private diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb index af54a91e31..6a0a79cef6 100644 --- a/lib/rss/parser.rb +++ b/lib/rss/parser.rb @@ -409,7 +409,7 @@ module RSS next_element.do_validate = @do_validate prefix = "" prefix << "#{klass.required_prefix}_" if klass.required_prefix - previous.fcall(:set_next_element, prefix, tag_name, next_element) + previous.funcall(:set_next_element, prefix, tag_name, next_element) @last_element = next_element @proc_stack.push Proc.new { |text, tags| p(@last_element.class) if DEBUG diff --git a/test/rss/test_content.rb b/test/rss/test_content.rb index e7e43885be..ae1ff6230f 100644 --- a/test/rss/test_content.rb +++ b/test/rss/test_content.rb @@ -61,9 +61,9 @@ EOR @elems.each do |name, value| @parents.each do |parent| meth = "#{RSS::CONTENT_PREFIX}_#{name}" - assert_equal(value, @rss.send(parent).fcall(meth)) - @rss.send(parent).fcall("#{meth}=", new_value[name].to_s) - assert_equal(new_value[name], @rss.send(parent).fcall(meth)) + assert_equal(value, @rss.send(parent).funcall(meth)) + @rss.send(parent).funcall("#{meth}=", new_value[name].to_s) + assert_equal(new_value[name], @rss.send(parent).funcall(meth)) end end @@ -75,7 +75,7 @@ EOR excepted = "<#{@prefix}:#{name}>#{CGI.escapeHTML(value)}" @parents.each do |parent| meth = "#{RSS::CONTENT_PREFIX}_#{name}_element" - assert_equal(excepted, @rss.send(parent).fcall(meth)) + assert_equal(excepted, @rss.send(parent).funcall(meth)) end end diff --git a/test/rss/test_dublincore.rb b/test/rss/test_dublincore.rb index 614c25eebe..dcb4896c42 100644 --- a/test/rss/test_dublincore.rb +++ b/test/rss/test_dublincore.rb @@ -151,7 +151,7 @@ EOR @elems.each do |name, value| excepted = "<#{@prefix}:#{name}>#{value}" @parents.each do |parent| - assert_equal(excepted, @rss.send(parent).fcall("dc_#{name}_elements")) + assert_equal(excepted, @rss.send(parent).funcall("dc_#{name}_elements")) end excepted = Array.new(2, excepted).join("\n") @@ -161,7 +161,7 @@ EOR klass_name = "DublinCore#{Utils.to_class_name(name.to_s)}" klass = DublinCoreModel.const_get(klass_name) elems << klass.new(@rss.send(parent).send("dc_#{name}")) - assert_equal(excepted, @rss.send(parent).fcall("dc_#{name}_elements")) + assert_equal(excepted, @rss.send(parent).funcall("dc_#{name}_elements")) end end diff --git a/test/rss/test_syndication.rb b/test/rss/test_syndication.rb index cfe898256d..efbf24e080 100644 --- a/test/rss/test_syndication.rb +++ b/test/rss/test_syndication.rb @@ -74,9 +74,9 @@ EOR @elems.each do |name, value| @parents.each do |parent| - assert_equal(value, @rss.send(parent).fcall("sy_#{name}")) - @rss.send(parent).fcall("sy_#{name}=", new_value[name].to_s) - assert_equal(new_value[name], @rss.send(parent).fcall("sy_#{name}")) + assert_equal(value, @rss.send(parent).funcall("sy_#{name}")) + @rss.send(parent).funcall("sy_#{name}=", new_value[name].to_s) + assert_equal(new_value[name], @rss.send(parent).funcall("sy_#{name}")) end end @@ -103,7 +103,7 @@ EOR @elems.each do |name, value| excepted = "<#{@prefix}:#{name}>#{value}" @parents.each do |parent| - assert_equal(excepted, @rss.send(parent).fcall("sy_#{name}_element")) + assert_equal(excepted, @rss.send(parent).funcall("sy_#{name}_element")) end end diff --git a/test/rss/test_trackback.rb b/test/rss/test_trackback.rb index 2f92a0b1fe..a00ddc0ec1 100644 --- a/test/rss/test_trackback.rb +++ b/test/rss/test_trackback.rb @@ -114,7 +114,7 @@ EOR @parents.each do |parent| meth = "#{RSS::TRACKBACK_PREFIX}_#{name}_element" meth << "s" if name == :about - assert_equal(excepted, @rss.send(parent).fcall(meth)) + assert_equal(excepted, @rss.send(parent).funcall(meth)) end end diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb index 273b3172b9..28e5cd2c25 100644 --- a/test/ruby/test_eval.rb +++ b/test/ruby/test_eval.rb @@ -146,7 +146,7 @@ class TestEval < Test::Unit::TestCase assert_nothing_raised { def temporally_method_for_test_eval_and_define_method(&block) lambda { - class << Object.new; self end.fcall(:define_method, :zzz, &block) + class << Object.new; self end.funcall(:define_method, :zzz, &block) } end v = eval("temporally_method_for_test_eval_and_define_method {}") diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index 5724938f6b..954a748b86 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -19,7 +19,7 @@ class TestBasicSocket < Test::Unit::TestCase n = s.getsockopt(Socket::SOL_SOCKET, Socket::SO_ERROR) assert_equal([0].pack("i"), n) val = Object.new - class << val; self end.fcall(:define_method, :to_int) { + class << val; self end.funcall(:define_method, :to_int) { s.close Socket::SO_TYPE } @@ -34,7 +34,7 @@ class TestBasicSocket < Test::Unit::TestCase linger = [0, 0].pack("ii") val = Object.new - class << val; self end.fcall(:define_method, :to_str) { + class << val; self end.funcall(:define_method, :to_str) { s.close linger } @@ -47,7 +47,7 @@ class TestBasicSocket < Test::Unit::TestCase end val = Object.new - class << val; self end.fcall(:define_method, :to_int) { + class << val; self end.funcall(:define_method, :to_int) { s.close Socket::SO_LINGER } @@ -61,7 +61,7 @@ class TestBasicSocket < Test::Unit::TestCase def test_listen s = nil log = Object.new - class << log; self end.fcall(:define_method, :to_int) { + class << log; self end.funcall(:define_method, :to_int) { s.close 2 } diff --git a/test/socket/test_udp.rb b/test/socket/test_udp.rb index 3f5f55a467..22eee783dd 100644 --- a/test/socket/test_udp.rb +++ b/test/socket/test_udp.rb @@ -9,7 +9,7 @@ class TestUDPSocket < Test::Unit::TestCase def test_connect # [ruby-dev:25045] s = UDPSocket.new host = Object.new - class << host; self end.fcall(:define_method, :to_str) { + class << host; self end.funcall(:define_method, :to_str) { s.close "127.0.0.1" } @@ -21,7 +21,7 @@ class TestUDPSocket < Test::Unit::TestCase def test_bind # [ruby-dev:25057] s = UDPSocket.new host = Object.new - class << host; self end.fcall(:define_method, :to_str) { + class << host; self end.funcall(:define_method, :to_str) { s.close "127.0.0.1" } -- cgit v1.2.3