[Truffle] Time#- should use real rather than integral seconds.

jruby · Oct 12, 2014 · a870e57 · a870e57
1 parent 440ee53
commit a870e57
Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/TimeNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/TimeNodes.java
@@ -33,7 +33,7 @@ public SubNode(SubNode prev) {
 
         @Specialization
         public double sub(RubyTime a, RubyTime b) {
-            return a.getSeconds() - b.getSeconds();
+            return a.getRealSeconds() - b.getRealSeconds();
         }
 
     }

diff --git a/core/src/main/java/org/jruby/truffle/runtime/core/RubyTime.java b/core/src/main/java/org/jruby/truffle/runtime/core/RubyTime.java
@@ -48,10 +48,14 @@ public RubyTime(RubyClass timeClass, long seconds, long nanoseconds) {
         this.nanoseconds = nanoseconds;
     }
 
-    public long getSeconds() {
+    public long getWholeSeconds() {
         return seconds;
     }
 
+    public double getRealSeconds() {
+        return seconds + nanosecondsToSecond(nanoseconds);
+    }
+
     public static RubyTime fromDate(RubyClass timeClass, long timeMiliseconds) {
         return new RubyTime(timeClass, milisecondsToSeconds(timeMiliseconds), milisecondsToNanoseconds(timeMiliseconds));
     }