Whoops main part of patch missing from last commit

jruby · May 19, 2009 · 59a4474 · 59a4474
1 parent c6e784f
commit 59a4474
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/spec/tags/ruby/core/marshal/load_tags.txt b/spec/tags/ruby/core/marshal/load_tags.txt
diff --git a/src/org/jruby/RubyMethod.java b/src/org/jruby/RubyMethod.java
@@ -41,6 +41,7 @@
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.marshal.DataType;
 
 /** 
  * The RubyMethod class represents a RubyMethod object.
@@ -53,7 +54,7 @@
  * @since 0.2.3
  */
 @JRubyClass(name="Method")
-public class RubyMethod extends RubyObject {
+public class RubyMethod extends RubyObject implements DataType {
     protected RubyModule implementationModule;
     protected String methodName;
     protected RubyModule originModule;

diff --git a/src/org/jruby/RubyProc.java b/src/org/jruby/RubyProc.java
@@ -49,12 +49,13 @@
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.marshal.DataType;
 
 /**
  * @author  jpetersen
  */
 @JRubyClass(name="Proc")
-public class RubyProc extends RubyObject implements JumpTarget {
+public class RubyProc extends RubyObject implements JumpTarget, DataType {
     private Block block = Block.NULL_BLOCK;
     private Block.Type type;
     private String file;
@@ -153,6 +154,7 @@ public IRubyObject initialize(ThreadContext context, Block procBlock) {
     }
 
     @JRubyMethod(name = "clone")
+    @Override
     public IRubyObject rbClone() {
     	RubyProc newProc = new RubyProc(getRuntime(), getRuntime().getProc(), type);
     	newProc.block = getBlock();
@@ -163,6 +165,7 @@ public IRubyObject rbClone() {
     }
 
     @JRubyMethod(name = "dup")
+    @Override
     public IRubyObject dup() {
         RubyProc newProc = new RubyProc(getRuntime(), getRuntime().getProc(), type);
         newProc.block = getBlock();
@@ -183,6 +186,7 @@ public IRubyObject op_equal(IRubyObject other) {
     }
 
     @JRubyMethod(name = "to_s")
+    @Override
     public IRubyObject to_s() {
         return RubyString.newString(getRuntime(), 
                 "#<Proc:0x" + Integer.toString(block.hashCode(), 16) + "@" + 
@@ -265,6 +269,7 @@ public RubyProc to_proc() {
     	return this;
     }
 
+    @Override
     public IRubyObject as(Class asClass) {
         final Ruby ruby = getRuntime();
         if (!asClass.isInterface()) {

diff --git a/src/org/jruby/runtime/marshal/MarshalStream.java b/src/org/jruby/runtime/marshal/MarshalStream.java
@@ -203,6 +203,9 @@ private void writeObjectData(IRubyObject value) throws IOException {
         // classes that have extended core native types to piggyback on their
         // marshalling logic.
         if (value instanceof CoreObjectType) {
+            if (value instanceof DataType) {
+                throw value.getRuntime().newTypeError("no marshal_dump is defined for class " + value.getMetaClass().getName());
+            }
             int nativeTypeIndex = ((CoreObjectType)value).getNativeTypeIndex();
 
             switch (nativeTypeIndex) {