summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-27 09:16:20 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-27 09:16:20 +0000
commit55ec8ed2958a8159777157f7a4f91210279fe548 (patch)
tree49ef99e2eb178bd48e8ca50db077267c13f1b3c5 /lib
parentece87af00c6e31181b7092980a351929c5421a43 (diff)
* gc.c (gc_sweep): recover ruby_in_compile variable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7120 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/ostruct.rb8
-rw-r--r--lib/pstore.rb12
2 files changed, 16 insertions, 4 deletions
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index d603c04759..d92ee503ad 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -52,6 +52,13 @@ class OpenStruct
end
end
+ def new_ostruct_member(name)
+ self.instance_eval %{
+ def #{name}; @table[:#{name}]; end
+ def #{name}=(x); @table[:#{name}] = x; end
+ }
+ end
+
def method_missing(mid, *args) # :nodoc:
mname = mid.id2name
len = args.length
@@ -64,6 +71,7 @@ class OpenStruct
end
mname.chop!
@table[mname.intern] = args[0]
+ self.new_ostruct_member(mname)
elsif len == 0
@table[mid]
else
diff --git a/lib/pstore.rb b/lib/pstore.rb
index 50313dcb8f..51cef6e134 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -104,10 +104,14 @@ class PStore
commit_new(file) if FileTest.exist?(new_file)
content = file.read()
else
- file = File.open(@filename, File::RDONLY)
- file.binmode
- file.flock(File::LOCK_SH)
- content = (File.read(new_file) rescue file.read())
+ begin
+ file = File.open(@filename, File::RDONLY)
+ file.binmode
+ file.flock(File::LOCK_SH)
+ content = (File.read(new_file) rescue file.read())
+ rescue Errno::ENOENT
+ content = ""
+ end
end
if content != ""