diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-26 05:41:11 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-26 05:41:11 +0000 |
| commit | 0f577aac54c6baf5ece22de989761d1ac50f1bf8 (patch) | |
| tree | a931cca89275a54d5b165732f694f8ead8944608 /lib | |
| parent | 7d20f65ce8cc01752cba51bf16095a9843322a9d (diff) | |
| download | ruby-0f577aac54c6baf5ece22de989761d1ac50f1bf8.tar.gz ruby-0f577aac54c6baf5ece22de989761d1ac50f1bf8.tar.xz ruby-0f577aac54c6baf5ece22de989761d1ac50f1bf8.zip | |
* parse.y (block_append): update nd_end for "real" head node.
[ruby-list:39058]
* eval.c (proc_eq): Proc with empty body may not be equal.
[ruby-dev:22590]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cgi.rb | 2 | ||||
| -rw-r--r-- | lib/delegate.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb index 7f1f42260..f8158858f 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -923,7 +923,7 @@ class CGI %w[ CONTENT_LENGTH SERVER_PORT ].each do |env| define_method(env.sub(/^HTTP_/n, '').downcase) do - val = env_table[env] && Integer(val) + (val = env_table[env]) && Integer(val) end end diff --git a/lib/delegate.rb b/lib/delegate.rb index 1ba4cf1e1..006910962 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -27,6 +27,7 @@ class Delegator preserved |= t.protected_instance_methods(false) break if t == Delegator end + preserved << "singleton_method_added" for method in obj.methods next if preserved.include? method begin @@ -37,7 +38,7 @@ class Delegator rescue Exception $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #` $@.delete_if{|s| /^\\(eval\\):/ =~ s} - raise + Kernel::raise end end EOS |