[Truffle] Implement Kernel#remove_instance_variable.

jruby · Oct 12, 2015 · 5e7b193 · chrisseaton · Oct 12, 2015 · eregon
1 parent 25f27e5
commit 5e7b193
Showing 4 changed files with 35 additions and 10 deletions.
diff --git a/spec/truffle/tags/core/kernel/remove_instance_variable_tags.txt b/spec/truffle/tags/core/kernel/remove_instance_variable_tags.txt
diff --git a/spec/truffle/tags/core/marshal/dump_tags.txt b/spec/truffle/tags/core/marshal/dump_tags.txt
@@ -1,5 +1,4 @@
 fails:Marshal.dump dumps an extended_object
-fails:Marshal.dump dumps an object that has had an ivar added and removed as though the ivar never was set
 fails:Marshal.dump with a Float dumps a Float
 fails:Marshal.dump with a String dumps a String extended with a Module
 fails:Marshal.dump with a Regexp dumps a Regexp

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -1037,6 +1037,36 @@ public Object instanceVariableSet(DynamicObject object, String name, Object valu
 
     }
 
+    @CoreMethod(names = "remove_instance_variable", raiseIfFrozenSelf = true, required = 1)
+    @NodeChildren({
+            @NodeChild(type = RubyNode.class, value = "object"),
+            @NodeChild(type = RubyNode.class, value = "name")
+    })
+    public abstract static class RemoveInstanceVariableNode extends CoreMethodNode {
+
+        public RemoveInstanceVariableNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        @CreateCast("name")
+        public RubyNode coerceToString(RubyNode name) {
+            return NameToJavaStringNodeGen.create(getContext(), getSourceSection(), name);
+        }
+
+        @TruffleBoundary
+        @Specialization
+        public Object removeInstanceVariable(DynamicObject object, String name) {
+            final String ivar = RubyContext.checkInstanceVariableName(getContext(), name, this);
+            final Object value = object.get(ivar, nil());
+            if (!object.delete(name)) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RaiseException(getContext().getCoreLibrary().nameErrorInstanceVariableNotDefined(name, this));
+            }
+            return value;
+        }
+
+    }
+
     @CoreMethod(names = { "instance_variables", "__instance_variables__" })
     public abstract static class InstanceVariablesNode extends CoreMethodArrayArgumentsNode {
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
@@ -1067,6 +1067,11 @@ public DynamicObject nameErrorInstanceNameNotAllowable(String name, Node current
         return nameError(String.format("`%s' is not allowable as an instance variable name", name), name, currentNode);
     }
 
+    public DynamicObject nameErrorInstanceVariableNotDefined(String name, Node currentNode) {
+        CompilerAsserts.neverPartOfCompilation();
+        return nameError(String.format("instance variable %s not defined", name), name, currentNode);
+    }
+
     public DynamicObject nameErrorReadOnly(String name, Node currentNode) {
         CompilerAsserts.neverPartOfCompilation();
         return nameError(String.format("%s is a read-only variable", name), name, currentNode);