compatible loader

* marshal.c (r_object0): also load TYPE_USRMARSHAL, TYPE_DATA using
  compatible loader.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 32 insertions, 0 deletions

diff --git a/ext/-test-/marshal/compat/usrcompat.c b/ext/-test-/marshal/compat/usrcompat.c
new file mode 100644
index 0000000000..f812df5631
--- /dev/null
+++ b/ext/-test-/marshal/compat/usrcompat.c
@@ -0,0 +1,32 @@
+#include <ruby.h>
+
+static VALUE
+usr_dumper(VALUE self)
+{
+    return self;
+}
+
+static VALUE
+usr_loader(VALUE self, VALUE m)
+{
+    VALUE val = rb_ivar_get(m, rb_intern("@value"));
+    *(int *)DATA_PTR(self) = NUM2INT(val);
+    return self;
+}
+
+static VALUE
+compat_mload(VALUE self, VALUE data)
+{
+    rb_ivar_set(self, rb_intern("@value"), data);
+    return self;
+}
+
+void
+Init_compat(void)
+{
+    VALUE newclass = rb_path2class("Bug::Marshal::UsrMarshal");
+    VALUE oldclass = rb_define_class_under(newclass, "compat", rb_cObject);
+
+    rb_define_method(oldclass, "marshal_load", compat_mload, 1);
+    rb_marshal_define_compat(newclass, oldclass, usr_dumper, usr_loader);
+}