[NOTHING CHANGED] Assorted fixes #48

Closed
asiekierka wants to merge 61 commits from asiekierka/master into master
3 changed files with 32 additions and 2 deletions
Showing only changes of commit 6ba28727d2 - Show all commits

View File

@@ -21,6 +21,8 @@
******************************************************************************/
Doridian commented 2019-09-03 01:56:34 +00:00 (Migrated from github.com)
Review

This is not needed and breaks compilation.

This is not needed and breaks compilation.
asiekierka commented 2019-09-03 06:37:58 +00:00 (Migrated from github.com)
Review

Fixed, sorry!

Fixed, sorry!
package org.luaj.vm2;
import jdk.nashorn.internal.objects.Global;
import org.luaj.vm2.compat.JavaCompat;
import org.luaj.vm2.lib.MathLib;
/**
@@ -242,12 +244,12 @@ public class LuaDouble extends LuaNumber {
public String tojstring() {
if ( v == 0.0 ) // never occurs on J2ME
return (Double.doubleToRawLongBits(v)<0? "-0": "0");
return (JavaCompat.INSTANCE.doubleToRawLongBits(v)<0? "-0": "0");
long l = (long) v;
if ( l == v )
return Long.toString(l);
if ( Double.isNaN(v) )
return (Double.doubleToRawLongBits(v)<0? JSTR_NEGNAN: JSTR_NAN);
return (JavaCompat.INSTANCE.doubleToRawLongBits(v)<0? JSTR_NEGNAN: JSTR_NAN);
if ( Double.isInfinite(v) )
return (v<0? JSTR_NEGINF: JSTR_POSINF);
return Float.toString((float)v);

View File

@@ -0,0 +1,19 @@
package org.luaj.vm2.compat;
public class JavaCompat {
public static final JavaCompat INSTANCE;
static {
JavaCompat instance;
try {
instance = (JavaCompat) Class.forName("org.luaj.vm2.lib.jse.JavaCompatJSE").newInstance();
} catch (Throwable t) {
instance = new JavaCompat();
}
INSTANCE = instance;
}
public long doubleToRawLongBits(double x) {
return Double.doubleToLongBits(x);
}
}

View File

@@ -0,0 +1,9 @@
package org.luaj.vm2.lib.jse;
import org.luaj.vm2.compat.JavaCompat;
public class JavaCompatJSE extends JavaCompat {
public long doubleToRawLongBits(double x) {
return Double.doubleToRawLongBits(x);
}
}