summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-11 07:00:32 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-11 07:00:32 +0000
commitc001b601f7363347ec1ebb5c8977aef4036a8d51 (patch)
tree1d4557123499c292c46777202853b46e7810d8d2 /lib
parent400390e507804c4ee14bde3f441df8c0a47d0958 (diff)
downloadruby-c001b601f7363347ec1ebb5c8977aef4036a8d51.tar.gz
ruby-c001b601f7363347ec1ebb5c8977aef4036a8d51.tar.xz
ruby-c001b601f7363347ec1ebb5c8977aef4036a8d51.zip
* eval.c (break_jump): break should not cross functions.
[ruby-list:40818] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/date.rb3
-rw-r--r--lib/delegate.rb6
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/date.rb b/lib/date.rb
index 1cd4e0804..9d3319823 100644
--- a/lib/date.rb
+++ b/lib/date.rb
@@ -806,12 +806,15 @@ class Date
# Get the minute of this date.
def min() time[1] end
+ alias :minute :min
# Get the second of this date.
def sec() time[2] end
+ alias :second :sec
# Get the fraction-of-a-second of this date.
def sec_fraction() time[3] end
+ alias :second_fraction :sec_fraction
private :hour, :min, :sec, :sec_fraction
diff --git a/lib/delegate.rb b/lib/delegate.rb
index bc200d212..b2e86de6a 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -16,11 +16,11 @@
# ...
# end
-class Delegator
+class Delegator<BasicObject
def initialize(obj)
- preserved = ::Kernel.public_instance_methods(false)
- preserved -= ["to_s","to_a","inspect","==","=~","==="]
+ preserved = ::BasicObject.public_instance_methods(false)
+ ::Kernel::p preserved
for t in self.class.ancestors
preserved |= t.public_instance_methods(false)
preserved |= t.private_instance_methods(false)