# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1361815836 -3600
# Node ID 227192d826825c3cca20bfcb0fbbf5e802c8608b
# Parent  39712168230d3ef1425b172b6da2b17284ee8475# Parent  5652acd48509c03471cb30d9b72d95997927497b
Merging in arithmetic latest fix, which has little to do with arithmetic

diff -r 39712168230d -r 227192d82682 emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/JFXIssuesTest.java
--- a/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/JFXIssuesTest.java	Mon Feb 25 11:18:12 2013 +0100
+++ b/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/JFXIssuesTest.java	Mon Feb 25 19:10:36 2013 +0100
@@ -48,6 +48,13 @@
         return Float.isInfinite(Float.NEGATIVE_INFINITY);
     }
 
+    @Compare public boolean areTimesEqual() {
+        long l1 = System.currentTimeMillis();
+        long l2 = l1 + 0;
+
+        return l1 == l2;
+    }
+
     @Factory public static Object[] create() {
         return VMTest.create(JFXIssuesTest.class);
     }
diff -r 39712168230d -r 227192d82682 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java	Mon Feb 25 11:18:12 2013 +0100
+++ b/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java	Mon Feb 25 19:10:36 2013 +0100
@@ -55,8 +55,12 @@
     public static native byte[] expandArray(byte[] arr, int expectedSize);
 
     @JavaScriptBody(args = {}, body = "return new Date().getTime();")
-    public static native long currentTimeMillis();
-    
+    private static native double currentTimeMillisDouble();
+
+    public static long currentTimeMillis() {
+        return (long) currentTimeMillisDouble();
+    }
+
     public static long nanoTime() {
         return 1000000L * currentTimeMillis();
     }
diff -r 39712168230d -r 227192d82682 vm/src/test/java/org/apidesign/vm4brwsr/SystemTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/SystemTest.java	Mon Feb 25 11:18:12 2013 +0100
+++ b/vm/src/test/java/org/apidesign/vm4brwsr/SystemTest.java	Mon Feb 25 19:10:36 2013 +0100
@@ -32,7 +32,7 @@
         long now = System.currentTimeMillis();
         
         Object js = code.execCode("Get js time", 
-            org.apidesign.bck2brwsr.emul.lang.System.class, "currentTimeMillis__J",
+            org.apidesign.bck2brwsr.emul.lang.System.class, "currentTimeMillisDouble__D",
             null
         );