jruby · Apr 28, 2016 · Apr 28, 2016 · Apr 28, 2016 · Apr 28, 2016
diff --git a/spec/truffle/specs/truffle/fixnum/and_spec.rb b/spec/truffle/specs/truffle/fixnum/and_spec.rb
@@ -11,30 +11,30 @@
 describe "Fixnum#&" do
   before :each do
     @long = (1 << 48) + 1
-    @mask = Truffle.fixnum_lower((1 << 30) - 1)
+    @mask = Truffle::Fixnum.lower((1 << 30) - 1)
   end
 
   it "returns an int for (int, int)" do
     result = (1 & 3)
     result.should == 1
-    Truffle::Runtime.java_class_of(result).should == 'Integer'
+    Truffle.java_class_of(result).should == 'Integer'
   end
 
   it "returns an int for (long, int)" do
-    Truffle::Runtime.java_class_of(@long).should == 'Long'
-    Truffle::Runtime.java_class_of(@mask).should == 'Integer'
+    Truffle.java_class_of(@long).should == 'Long'
+    Truffle.java_class_of(@mask).should == 'Integer'
 
     result = (@long & @mask)
     result.should == 1
-    Truffle::Runtime.java_class_of(result).should == 'Integer'
+    Truffle.java_class_of(result).should == 'Integer'
   end
 
   it "returns an int for (int, long)" do
-    Truffle::Runtime.java_class_of(@long).should == 'Long'
-    Truffle::Runtime.java_class_of(@mask).should == 'Integer'
+    Truffle.java_class_of(@long).should == 'Long'
+    Truffle.java_class_of(@mask).should == 'Integer'
 
     result = (@mask & @long)
     result.should == 1
-    Truffle::Runtime.java_class_of(result).should == 'Integer'
+    Truffle.java_class_of(result).should == 'Integer'
   end
 end
diff --git a/...ecs/truffle/runtime/java_class_of_spec.rb → ...uffle/specs/truffle/java_class_of_spec.rb b/...ecs/truffle/runtime/java_class_of_spec.rb → ...uffle/specs/truffle/java_class_of_spec.rb
@@ -6,36 +6,36 @@
 # GNU General Public License version 2
 # GNU Lesser General Public License version 2.1
 
-require_relative '../../../../ruby/spec_helper'
+require_relative '../../../ruby/spec_helper'
 
-describe "Truffle::Runtime.java_class_of" do
+describe "Truffle.java_class_of" do
 
   it "returns a String" do
-    Truffle::Runtime.java_class_of(14).should be_kind_of(String)
+    Truffle.java_class_of(14).should be_kind_of(String)
   end
 
   it "returns 'Boolean' for true" do
-    Truffle::Runtime.java_class_of(true).should == 'Boolean'
+    Truffle.java_class_of(true).should == 'Boolean'
   end
 
   it "returns 'Boolean' for false" do
-    Truffle::Runtime.java_class_of(false).should == 'Boolean'
+    Truffle.java_class_of(false).should == 'Boolean'
   end
 
   it "returns 'Integer' for a small Fixnum" do
-    Truffle::Runtime.java_class_of(14).should == 'Integer'
+    Truffle.java_class_of(14).should == 'Integer'
   end
 
   it "returns 'Long' for a large Fixnum" do
-    Truffle::Runtime.java_class_of(0xffffffffffff).should == 'Long'
+    Truffle.java_class_of(0xffffffffffff).should == 'Long'
   end
 
   it "returns 'Double' for a Float" do
-    Truffle::Runtime.java_class_of(3.14).should == 'Double'
+    Truffle.java_class_of(3.14).should == 'Double'
   end
 
   it "returns 'DynamicObject*' for a String" do
-    Truffle::Runtime.java_class_of('test').start_with?('DynamicObject').should be_true
+    Truffle.java_class_of('test').start_with?('DynamicObject').should be_true
   end
 
 end
diff --git a/...specs/truffle/runtime/debug_print_spec.rb → ...e/specs/truffle/ropes/debug_print_spec.rb b/...specs/truffle/runtime/debug_print_spec.rb → ...e/specs/truffle/ropes/debug_print_spec.rb
@@ -8,7 +8,7 @@
 
 require_relative '../../../../ruby/spec_helper'
 
-describe "Truffle::Runtime.debug_print" do
+describe "Truffle::Ropes.debug_print" do
 
   it "needs to be reviewed for spec completeness"
 

diff --git a/...specs/truffle/runtime/dump_string_spec.rb → ...e/specs/truffle/ropes/dump_string_spec.rb b/...specs/truffle/runtime/dump_string_spec.rb → ...e/specs/truffle/ropes/dump_string_spec.rb
@@ -8,18 +8,18 @@
 
 require_relative '../../../../ruby/spec_helper'
 
-describe "Truffle::Runtime.dump_string" do
+describe "Truffle::Ropes.dump_string" do
 
   it "returns a String" do
-    Truffle::Runtime.dump_string('foo').should be_kind_of(String)
+    Truffle::Ropes.dump_string('foo').should be_kind_of(String)
   end
 
   it "returns a sequence of escaped bytes in lower case" do
-    Truffle::Runtime.dump_string('foo').should =~ /(\\x[0-9a-f][0-9a-f])+/
+    Truffle::Ropes.dump_string('foo').should =~ /(\\x[0-9a-f][0-9a-f])+/
   end
 
   it "returns correct bytes for the given string" do
-    Truffle::Runtime.dump_string('foo').should == "\\x66\\x6f\\x6f"
+    Truffle::Ropes.dump_string('foo').should == "\\x66\\x6f\\x6f"
   end
 
 end
diff --git a/spec/truffle/tags/truffle/runtime/java_class_of_tags.txt b/spec/truffle/tags/truffle/runtime/java_class_of_tags.txt
@@ -1 +1 @@
-graalvm:Truffle::Runtime.java_class_of returns 'DynamicObject*' for a String
+graalvm:Truffle.java_class_of returns 'DynamicObject*' for a String
diff --git a/test/truffle/integration/safe.sh b/test/truffle/integration/safe.sh
@@ -18,11 +18,11 @@ safe -e 14
 
 # Check our safe_puts is safe
 
-safe -e "Truffle.safe_puts 'hello, world'"
+safe -e "Truffle::Safe.puts 'hello, world'"
 
 # But we can make that unsafe as well if really don't want any output
 
-unsafe -Xtruffle.platform.safe_puts=false -e "Truffle.safe_puts 'hello, world'"
+unsafe -Xtruffle.platform.safe_puts=false -e "Truffle::Safe.puts 'hello, world'"
 
 # Try some unsafe operations
 
@@ -38,7 +38,7 @@ safe -Xtruffle.platform.safe.exit=true -e 'exit!'
 
 # Check that safe_puts sanitises correctly
 
-if [[ `run -e "Truffle.safe_puts 'foo © bar'"` != 'foo ? bar' ]]
+if [[ `run -e "Truffle::Safe.puts 'foo © bar'"` != 'foo ? bar' ]]
 then
   echo safe_puts is not sanitising output
   exit 1

diff --git a/tool/truffle/callgraph2html.rb b/tool/truffle/callgraph2html.rb
@@ -55,7 +55,7 @@ def core?
     end
 
     def hidden?
-      source.file == 'run_jruby_root' || source.file == 'context' || name == 'Truffle#run_jruby_root' || name == 'Truffle#context'
+      source.file == 'run_jruby_root' || source.file == 'context' || name == 'Truffle::Boot#run_jruby_root' || name == 'Truffle::Boot#context'
     end
 
     def reachable

diff --git a/truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java b/truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java
@@ -33,7 +33,7 @@ public JRubyTruffleImpl(Ruby runtime) {
                 .build();
 
         try {
-            context = (RubyContext) engine.eval(Source.fromText("Truffle.context", "context")
+            context = (RubyContext) engine.eval(Source.fromText("Truffle::Boot.context", "context")
                     .withMimeType(RubyLanguage.MIME_TYPE)).get();
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -51,7 +51,7 @@ public Object execute(org.jruby.ast.RootNode rootNode) {
         context.setInitialJRubyRootNode(rootNode);
 
         try {
-            return engine.eval(Source.fromText("Truffle.run_jruby_root", "run_jruby_root")
+            return engine.eval(Source.fromText("Truffle::Boot.run_jruby_root", "run_jruby_root")
                     .withMimeType(RubyLanguage.MIME_TYPE)).get();
         } catch (IOException e) {
             if (e.getCause() instanceof ExitException) {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
@@ -53,13 +53,15 @@
 import org.jruby.truffle.core.numeric.FixnumNodesFactory;
 import org.jruby.truffle.core.numeric.FloatNodesFactory;
 import org.jruby.truffle.core.numeric.IntegerNodesFactory;
+import org.jruby.truffle.core.numeric.TruffleFixnumNodesFactory;
 import org.jruby.truffle.core.objectspace.ObjectSpaceNodesFactory;
 import org.jruby.truffle.core.proc.ProcNodesFactory;
 import org.jruby.truffle.core.queue.QueueNodesFactory;
 import org.jruby.truffle.core.queue.SizedQueueNodesFactory;
 import org.jruby.truffle.core.range.RangeNodesFactory;
 import org.jruby.truffle.core.regexp.MatchDataNodesFactory;
 import org.jruby.truffle.core.regexp.RegexpNodesFactory;
+import org.jruby.truffle.core.rope.TruffleRopesNodesFactory;
 import org.jruby.truffle.core.rubinius.AtomicReferenceNodesFactory;
 import org.jruby.truffle.core.rubinius.ByteArrayNodesFactory;
 import org.jruby.truffle.core.rubinius.PosixNodesFactory;
@@ -80,6 +82,7 @@
 import org.jruby.truffle.language.RubyGuards;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.RubyRootNode;
+import org.jruby.truffle.language.TruffleSafeNodesFactory;
 import org.jruby.truffle.language.backtrace.BacktraceFormatter;
 import org.jruby.truffle.language.control.RaiseException;
 import org.jruby.truffle.language.control.TruffleFatalException;
@@ -88,6 +91,7 @@
 import org.jruby.truffle.language.methods.DeclarationContext;
 import org.jruby.truffle.language.methods.InternalMethod;
 import org.jruby.truffle.language.objects.FreezeNode;
+import org.jruby.truffle.language.BootNodesFactory;
 import org.jruby.truffle.language.objects.FreezeNodeGen;
 import org.jruby.truffle.language.objects.SingletonClassNode;
 import org.jruby.truffle.language.objects.SingletonClassNodeGen;
@@ -569,8 +573,12 @@ public CoreLibrary(RubyContext context) {
         defineModule(truffleModule, "Etc");
         defineModule(truffleModule, "Coverage");
         defineModule(truffleModule, "Graal");
+        defineModule(truffleModule, "Ropes");
         defineModule(truffleModule, "GC");
         defineModule(truffleModule, "Attachments");
+        defineModule(truffleModule, "Boot");
+        defineModule(truffleModule, "Fixnum");
+        defineModule(truffleModule, "Safe");
         psychModule = defineModule("Psych");
         psychParserClass = defineClass(psychModule, objectClass, "Parser");
         final DynamicObject psychHandlerClass = defineClass(psychModule, objectClass, "Handler");
@@ -698,6 +706,7 @@ public void addCoreMethods() {
         coreMethodNodeManager.addCoreMethodNodes(TrueClassNodesFactory.getFactories());
         coreMethodNodeManager.addCoreMethodNodes(TruffleNodesFactory.getFactories());
         coreMethodNodeManager.addCoreMethodNodes(GCNodesFactory.getFactories());
+        coreMethodNodeManager.addCoreMethodNodes(BootNodesFactory.getFactories());
         coreMethodNodeManager.addCoreMethodNodes(AttachmentsNodesFactory.getFactories());
         coreMethodNodeManager.addCoreMethodNodes(GraalNodesFactory.getFactories());
         coreMethodNodeManager.addCoreMethodNodes(EncodingNodesFactory.getFactories());
@@ -720,6 +729,9 @@ public void addCoreMethods() {
         coreMethodNodeManager.addCoreMethodNodes(AtomicReferenceNodesFactory.getFactories());
         coreMethodNodeManager.addCoreMethodNodes(TracePointNodesFactory.getFactories());
         coreMethodNodeManager.addCoreMethodNodes(CoverageNodesFactory.getFactories());
+        coreMethodNodeManager.addCoreMethodNodes(TruffleRopesNodesFactory.getFactories());
+        coreMethodNodeManager.addCoreMethodNodes(TruffleFixnumNodesFactory.getFactories());
+        coreMethodNodeManager.addCoreMethodNodes(TruffleSafeNodesFactory.getFactories());
 
         coreMethodNodeManager.allMethodInstalled();
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/TruffleFixnumNodes.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/TruffleFixnumNodes.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2013, 2016 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
+ */
+package org.jruby.truffle.core.numeric;
+
+import com.oracle.truffle.api.dsl.Specialization;
+import org.jruby.truffle.core.CoreClass;
+import org.jruby.truffle.core.CoreLibrary;
+import org.jruby.truffle.core.CoreMethod;
+import org.jruby.truffle.core.UnaryCoreMethodNode;
+
+@CoreClass(name = "Truffle::Fixnum")
+public abstract class TruffleFixnumNodes {
+
+    @CoreMethod(names = "lower", isModuleFunction = true, required = 1)
+    public abstract static class LowerPrimitiveNode extends UnaryCoreMethodNode {
+
+        @Specialization
+        public int lower(int value) {
+            return value;
+        }
+
+        @Specialization(guards = "canLower(value)")
+        public int lower(long value) {
+            return (int) value;
+        }
+
+        @Specialization(guards = "!canLower(value)")
+        public long lowerFails(long value) {
+            return value;
+        }
+
+        protected static boolean canLower(long value) {
+            return CoreLibrary.fitsIntoInteger(value);
+        }
+
+    }
+
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		graalvm:Truffle::Runtime.java_class_of returns 'DynamicObject*' for a String
		graalvm:Truffle.java_class_of returns 'DynamicObject*' for a String