jruby · Oct 13, 2015 · Oct 13, 2015 · Oct 13, 2015
Showing with 35 additions and 7 deletions.

+4 −0 tool/truffle/jruby_truffle_runner/gem_configurations/activesupport.yaml

+31 −5 truffle/src/main/java/org/jruby/truffle/nodes/ext/BigDecimalNodes.java

+0 −2 truffle/src/main/java/org/jruby/truffle/runtime/util/MethodHandleUtils.java
diff --git a/tool/truffle/jruby_truffle_runner/gem_configurations/activesupport.yaml b/tool/truffle/jruby_truffle_runner/gem_configurations/activesupport.yaml
@@ -16,6 +16,7 @@
               class Symbol
                 alias :to_str :to_s
               end
+
     bundler.rb: "module Bundler; def self.setup; end; end"
     # mock method_source gem
     method_source.rb: nil
@@ -25,3 +26,6 @@
 :run:
   :require:
     - shims
+    - date
+    - bigdecimal
+    - rubygems
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/ext/BigDecimalNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/ext/BigDecimalNodes.java
@@ -41,7 +41,6 @@
 import org.jruby.truffle.runtime.control.RaiseException;
 import org.jruby.truffle.runtime.core.StringOperations;
 import org.jruby.truffle.runtime.layouts.Layouts;
-import org.jruby.util.StringSupport;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -214,8 +213,9 @@ protected RoundingMode getRoundMode(VirtualFrame frame) {
             setupRoundModeCall();
             setupRoundModeIntegerCast();
 
-            return toRoundingMode(roundModeIntegerCast.executeCastInt(// TODO (pitr 21-Jun-2015): read the actual constant
-            roundModeCall.call(frame, getBigDecimalClass(), "mode", null, 256)));
+            return toRoundingMode(roundModeIntegerCast.executeCastInt(
+                    // TODO (pitr 21-Jun-2015): read the actual constant
+                    roundModeCall.call(frame, getBigDecimalClass(), "mode", null, 256)));
         }
 
         protected DynamicObject getBigDecimalClass() {
@@ -338,6 +338,20 @@ public DynamicObject createString(VirtualFrame frame, DynamicObject value, Dynam
             return executeInitialize(frame, getValueFromString(value.toString(), digits), self, digits);
         }
 
+        @Specialization(guards = { "!isRubyBignum(value)", "!isRubyBigDecimal(value)", "!isRubyString(value)" })
+        public DynamicObject create(VirtualFrame frame, DynamicObject value, DynamicObject self, int digits) {
+            final Object castedValue = bigDecimalCast.executeObject(frame, value);
+            if (castedValue == nil()) {
+                throw new RaiseException(getContext().getCoreLibrary().typeError("could not be casted to BigDecimal", this));
+            }
+
+            setBigDecimalValue(
+                    self,
+                    ((BigDecimal) castedValue).round(new MathContext(digits, getRoundMode(frame))));
+
+            return self;
+        }
+
         // TODO (pitr 21-Jun-2015): raise on underflow
 
         private DynamicObject createWithMode(VirtualFrame frame, Type value, DynamicObject self,
@@ -2054,6 +2068,19 @@ public BigDecimal doBigDecimal(DynamicObject value) {
             return Layouts.BIG_DECIMAL.getValue(value);
         }
 
+        @Specialization(guards = {"!isRubyBignum(value)", "!isRubyBigDecimal(value)"})
+        public Object doOther(VirtualFrame frame, DynamicObject value) {
+            final Object result = ruby(
+                    frame,
+                    "value.is_a?(Rational) ? value.to_f : nil",
+                    "value", value);
+            if (result != nil()) {
+                return new BigDecimal((double) result);
+            } else {
+                return result;
+            }
+        }
+
         @Fallback
         public Object doBigDecimalFallback(Object value) {
             return nil();
@@ -2096,7 +2123,7 @@ protected DynamicObject createBigDecimal(VirtualFrame frame, Object value) {
         public abstract DynamicObject executeBigDecimal(VirtualFrame frame, Object value);
 
         @Specialization
-        public Object doBigDecimal(VirtualFrame frame, Object value, BigDecimal cast) {
+        public DynamicObject doBigDecimal(VirtualFrame frame, Object value, BigDecimal cast) {
             return createBigDecimal(frame, cast);
         }
 
@@ -2123,5 +2150,4 @@ public DynamicObject allocate(DynamicObject rubyClass) {
 
     }
 
-
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/util/MethodHandleUtils.java b/truffle/src/main/java/org/jruby/truffle/runtime/util/MethodHandleUtils.java
@@ -12,8 +12,6 @@
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Field;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
 public abstract class MethodHandleUtils {