* string.c (rb_str_slice_bang): if there's no corresponding

  substring, slice! should return nil without exception.

* array.c (rb_ary_insert): type fixed.

* string.c (rb_str_split_m): accept separator value nil as well.

* string.c (rb_str_become): was leaking memory.

* class.c (rb_include_module): should not alter other
  classes/modules by inclusion.  by this fix, local order may not
  be preserved for some cases.

* class.c (include_class_new): module may be T_ICLASS; retrieve
  original module information.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 9 insertions, 2 deletions

diff --git a/lib/pstore.rb b/lib/pstore.rb
index 23b2d878a..dfec76e47 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -42,10 +42,17 @@ class PStore
 
   def [](name)
     in_transaction
+    @table[name]
+  end
+  def fetch(name, default=PStore::Error)
     unless @table.key? name
-      raise PStore::Error, format("undefined root name `%s'", name)
+      if default==PStore::Error
+	raise PStore::Error, format("undefined root name `%s'", name)
+      else
+	default
+      end
     end
-    @table[name]
+    self[name]
   end
   def []=(name, value)
     in_transaction