jruby · Feb 13, 2015 · Feb 13, 2015 · Feb 13, 2015
diff --git a/spec/truffle/tags/core/module/remove_const_tags.txt b/spec/truffle/tags/core/module/remove_const_tags.txt
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 # Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:

diff --git a/truffle/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java b/truffle/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
@@ -85,7 +85,6 @@ public void init() {
         CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, ProcNodesFactory.getFactories());
         CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, RangeNodesFactory.getFactories());
         CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, RegexpNodesFactory.getFactories());
-        CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, SignalNodesFactory.getFactories());
         CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, StringNodesFactory.getFactories());
         CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, SymbolNodesFactory.getFactories());
         CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, ThreadNodesFactory.getFactories());

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
@@ -24,8 +24,11 @@
 import org.jruby.truffle.nodes.RubyRootNode;
 import org.jruby.truffle.nodes.cast.BooleanCastNode;
 import org.jruby.truffle.nodes.cast.BooleanCastNodeFactory;
+import org.jruby.truffle.nodes.coerce.ToStrNode;
+import org.jruby.truffle.nodes.coerce.ToStrNodeFactory;
 import org.jruby.truffle.nodes.control.SequenceNode;
 import org.jruby.truffle.nodes.core.KernelNodes.BindingNode;
+import org.jruby.truffle.nodes.core.StringNodes.StringNodesHelper;
 import org.jruby.truffle.nodes.dispatch.*;
 import org.jruby.truffle.nodes.methods.SetMethodDeclarationContext;
 import org.jruby.truffle.nodes.methods.arguments.CheckArityNode;
@@ -1405,6 +1408,57 @@ public RubyModule removeClassVariable(RubyModule module, RubySymbol name) {
 
     }
 
+    @CoreMethod(names = "remove_const", required = 1, visibility = Visibility.PRIVATE)
+    public abstract static class RemoveConstNode extends CoreMethodNode {
+
+        @Child private ToStrNode toStrNode;
+
+        public RemoveConstNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public RemoveConstNode(RemoveConstNode prev) {
+            super(prev);
+        }
+
+        @Specialization
+        public Object removeConst(RubyModule module, RubyString name) {
+            notDesignedForCompilation();
+
+            return removeConstant(module, name.toString());
+        }
+
+        @Specialization
+        public Object removeConst(RubyModule module, RubySymbol name) {
+            notDesignedForCompilation();
+
+            return removeConstant(module, name.toString());
+        }
+
+        @Specialization(guards = "!isRubySymbol(arguments[1])")
+        public Object removeConst(VirtualFrame frame, RubyModule module, Object name) {
+            notDesignedForCompilation();
+
+            if (toStrNode == null) {
+                CompilerDirectives.transferToInterpreter();
+                toStrNode = insert(ToStrNodeFactory.create(getContext(), getSourceSection(), null));
+            }
+
+            return removeConstant(module, toStrNode.executeRubyString(frame, name).toString());
+        }
+
+        private Object removeConstant(RubyModule module, String name) {
+            RubyConstant oldConstant = module.removeConstant(this, name);
+            if (oldConstant == null) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RaiseException(getContext().getCoreLibrary().nameErrorConstantNotDefined(module, name, this));
+            } else {
+                return oldConstant.getValue();
+            }
+        }
+
+    }
+
     @CoreMethod(names = "remove_method", required = 1)
     public abstract static class RemoveMethodNode extends CoreMethodNode {
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/SignalNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/SignalNodes.java
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
@@ -31,6 +31,7 @@
 import org.jruby.truffle.runtime.control.TruffleFatalException;
 import org.jruby.truffle.runtime.hash.HashOperations;
 import org.jruby.truffle.runtime.hash.KeyValue;
+import org.jruby.truffle.runtime.signal.SignalOperations;
 import org.jruby.truffle.translator.NodeWrapper;
 import org.jruby.truffle.translator.TranslatorDriver;
 import org.jruby.util.cli.Options;
@@ -324,6 +325,7 @@ public void initialize() {
         initializeGlobalVariables();
         initializeConstants();
         initializeEncodingConstants();
+        initializeSignalConstants();
 
         // Common symbols
         eachSymbol = getContext().getSymbolTable().getSymbol("each");
@@ -388,6 +390,20 @@ private void initializeConstants() {
         fileClass.setConstant(null, "FNM_SYSCASE", 0);
     }
 
+    private void initializeSignalConstants() {
+        RubyNode.notDesignedForCompilation();
+
+        Object[] signals = new Object[SignalOperations.SIGNALS_LIST.size()];
+
+        int i = 0;
+        for (Map.Entry<String, Integer> signal : SignalOperations.SIGNALS_LIST.entrySet()) {
+            RubyString signalName = context.makeString(signal.getKey());
+            signals[i++] = RubyArray.fromObjects(arrayClass, signalName, signal.getValue());
+        }
+
+        signalModule.setConstant(null, "SIGNAL_LIST", new RubyArray(arrayClass, signals, signals.length));
+    }
+
     private RubyClass defineClass(String name) {
         return defineClass(objectClass, name, objectClass.getAllocator());
     }
@@ -713,6 +729,11 @@ public RubyException nameError(String message, Node currentNode) {
         return new RubyException(nameErrorClass, context.makeString(message), RubyCallStack.getBacktrace(currentNode));
     }
 
+    public RubyException nameErrorConstantNotDefined(RubyModule module, String name, Node currentNode) {
+        CompilerAsserts.neverPartOfCompilation();
+        return nameError(String.format("constant %s::%s not defined", module.getName(), name), currentNode);
+    }
+
     public RubyException nameErrorUninitializedConstant(RubyModule module, String name, Node currentNode) {
         CompilerAsserts.neverPartOfCompilation();
         return nameError(String.format("uninitialized constant %s::%s", module.getName(), name), currentNode);

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
@@ -201,12 +201,13 @@ public void setConstant(RubyNode currentNode, String name, Object value) {
     }
 
     @TruffleBoundary
-    public void removeConstant(RubyNode currentNode, String data) {
+    public RubyConstant removeConstant(RubyNode currentNode, String name) {
         RubyNode.notDesignedForCompilation();
 
         checkFrozen(currentNode);
-        getConstants().remove(data);
+        RubyConstant oldConstant = getConstants().remove(name);
         newLexicalVersion();
+        return oldConstant;
     }
 
     @TruffleBoundary

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/signal/SignalOperations.java b/truffle/src/main/java/org/jruby/truffle/runtime/signal/SignalOperations.java
@@ -9,6 +9,7 @@
  */
 package org.jruby.truffle.runtime.signal;
 
+import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -23,7 +24,7 @@ public class SignalOperations {
 
     private static final ConcurrentMap<Signal, SignalHandler> ORIGINAL_HANDLERS = new ConcurrentHashMap<Signal, SignalHandler>();
 
-    public static final Map<String, Integer> SIGNALS_LIST = RubySignal.list();
+    public static final Map<String, Integer> SIGNALS_LIST = Collections.unmodifiableMap(RubySignal.list());
 
     public static final SignalHandler IGNORE_HANDLER = new SignalHandler() {
         @Override

diff --git a/truffle/src/main/ruby/core.rb b/truffle/src/main/ruby/core.rb
@@ -77,6 +77,7 @@
 require_relative 'core/math'
 require_relative 'core/method'
 require_relative 'core/module'
+require_relative 'core/signal'
 require_relative 'core/string'
 require_relative 'core/thread'
 require_relative 'core/unbound_method'

diff --git a/truffle/src/main/ruby/core/rubinius/common/signal.rb b/truffle/src/main/ruby/core/rubinius/common/signal.rb
@@ -24,8 +24,6 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Only part of Rubinius' signal.rb
-
 module Signal
   Names = {
     "EXIT" => 0
@@ -101,10 +99,4 @@ def self.list
     Names.dup
   end
 
-  # Added for Truffle
-  setup_signal_list do |name, number|
-    Names[name] = number
-    Numbers[number] = name
-  end
-
 end
diff --git a/truffle/src/main/ruby/core/signal.rb b/truffle/src/main/ruby/core/signal.rb
@@ -0,0 +1,18 @@
+# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+# 
+# Eclipse Public License version 1.0
+# GNU General Public License version 2
+# GNU Lesser General Public License version 2.1
+
+module Signal
+
+  # Fill the Names and Numbers Hash.
+  SIGNAL_LIST.each do |name, number|
+    Names[name] = number
+    Numbers[number] = name
+  end
+  remove_const :SIGNAL_LIST
+
+end