open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix mathlib min, max and atan2 behaviour

Browse Source
This commit is contained in:
Enrico Horn
2021-07-09 23:06:29 +02:00
parent 179062493d
commit 6b9dece367
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
luaj-core/src/main/java/org/luaj/vm2/lib/MathLib.java
View File

@@ -269,9 +269,9 @@ public class MathLib extends TwoArgFunction {
static class max extends VarArgFunction { static class max extends VarArgFunction {
@Override @Override
public Varargs invoke(Varargs args) { public Varargs invoke(Varargs args) {
LuaValue m = args.checkvalue(1); LuaValue m = args.checknumber(1);
for (int i = 2, n = args.narg(); i <= n; ++i) { for (int i = 2, n = args.narg(); i <= n; ++i) {
LuaValue v = args.checkvalue(i); LuaValue v = args.checknumber(i);
if (m.lt_b(v)) if (m.lt_b(v))
m = v; m = v;
} }
@@ -282,9 +282,9 @@ public class MathLib extends TwoArgFunction {
static class min extends VarArgFunction { static class min extends VarArgFunction {
@Override @Override
public Varargs invoke(Varargs args) { public Varargs invoke(Varargs args) {
LuaValue m = args.checkvalue(1); LuaValue m = args.checknumber(1);
for (int i = 2, n = args.narg(); i <= n; ++i) { for (int i = 2, n = args.narg(); i <= n; ++i) {
LuaValue v = args.checkvalue(i); LuaValue v = args.checknumber(i);
if (v.lt_b(m)) if (v.lt_b(m))
m = v; m = v;
} }

14
luaj-jse/src/main/java/org/luaj/vm2/lib/jse/JseMathLib.java
View File

@@ -96,9 +96,8 @@ public class JseMathLib extends org.luaj.vm2.lib.MathLib {
LuaValue math = env.get("math"); LuaValue math = env.get("math");
math.set("acos", new acos()); math.set("acos", new acos());
math.set("asin", new asin()); math.set("asin", new asin());
LuaValue atan = new atan2(); math.set("atan", new atan());
math.set("atan", atan); math.set("atan2", new atan2());
math.set("atan2", atan);
math.set("cosh", new cosh()); math.set("cosh", new cosh());
math.set("exp", new exp()); math.set("exp", new exp());
math.set("log", new log()); math.set("log", new log());
@@ -118,13 +117,20 @@ public class JseMathLib extends org.luaj.vm2.lib.MathLib {
protected double call(double d) { return Math.asin(d); } protected double call(double d) { return Math.asin(d); }
} }
static final class atan2 extends TwoArgFunction { static final class atan extends TwoArgFunction {
@Override @Override
public LuaValue call(LuaValue x, LuaValue y) { public LuaValue call(LuaValue x, LuaValue y) {
return valueOf(Math.atan2(x.checkdouble(), y.optdouble(1))); return valueOf(Math.atan2(x.checkdouble(), y.optdouble(1)));
} }
} }
static final class atan2 extends TwoArgFunction {
@Override
public LuaValue call(LuaValue x, LuaValue y) {
return valueOf(Math.atan2(x.checkdouble(), y.checkdouble()));
}
}
static final class cosh extends UnaryOp { static final class cosh extends UnaryOp {
@Override @Override
protected double call(double d) { return Math.cosh(d); } protected double call(double d) { return Math.cosh(d); }