summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-03 04:56:25 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-03 04:56:25 +0000
commit405a50a5948fecb6ba44efb250a86052f4a406c8 (patch)
treedf3be019a29fca68dc14bd106d074d8f18c21875 /lib
parentda4884e2d4ea78b39cfdea0a747f2b700ccedfbc (diff)
* eval.c (proc_invoke): prepare to pass a block from "call" method
to a Proc generated by Method#to_proc. [ruby-dev:25031] * eval.c (rb_yield_0): actually passes a block given to "call". * object.c (convert_type): use rb_respond_to() again. this fix is based on [ruby-dev:25021] * eval.c (rb_respond_to): funcall respond_to? if it's redefined. [ruby-dev:25021] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/ostruct.rb16
1 files changed, 6 insertions, 10 deletions
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index 7f46682..b30ae64 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -59,21 +59,17 @@ class OpenStruct
@table = @table.dup
end
- module Marshaler
- def marshal_dump
- table = @table
- OpenStruct.new.instance_eval{@table=table; self}
- end
- def marshal_load(x)
- @table = x.instance_variable_get("@table")
- @table.each_key{|key| new_ostruct_member(key)}
- end
+ def marshal_dump
+ @table
+ end
+ def marshal_load(x)
+ @table = x
+ @table.each_key{|key| new_ostruct_member(key)}
end
def new_ostruct_member(name)
unless self.respond_to?(name)
self.instance_eval %{
- extend OpenStruct::Marshaler
def #{name}; @table[:#{name}]; end
def #{name}=(x); @table[:#{name}] = x; end
}