зеркало из https://github.com/github/ruby.git
* 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
This commit is contained in:
Родитель
fbeb59ac28
Коммит
0cfe16bc21
|
@ -8,6 +8,14 @@ Sat Oct 22 13:26:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
|||
* 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 <ocean@m2.ccsnet.ne.jp>
|
||||
|
||||
* missing.h, missing/*.c: SUSv3 compatible strcasecmp and strncasecmp,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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{
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)}</#{@prefix}:#{name}>"
|
||||
@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
|
||||
|
||||
|
|
|
@ -151,7 +151,7 @@ EOR
|
|||
@elems.each do |name, value|
|
||||
excepted = "<#{@prefix}:#{name}>#{value}</#{@prefix}:#{name}>"
|
||||
@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
|
||||
|
||||
|
|
|
@ -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}</#{@prefix}:#{name}>"
|
||||
@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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 {}")
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче