Simplify bindings.

This commit is contained in:
James Roseborough
2010-04-26 15:59:42 +00:00
parent 7a8562db01
commit 3f727fbe17

View File

@@ -23,6 +23,8 @@ package org.luaj.vm2.lib.jse;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.lib.MathLib;
import org.luaj.vm2.lib.OneArgFunction;
import org.luaj.vm2.lib.TwoArgFunction;
/**
* Math library implementation for use on JSE platform.
@@ -35,19 +37,18 @@ public class JseMathLib extends org.luaj.vm2.lib.MathLib {
public JseMathLib() {}
public LuaValue call(LuaValue arg) {
MathLib ml = new MathLib();
ml.setfenv(env);
LuaValue t = ml.call(arg);
bind1( t, new String[] {
LuaValue t = super.call(arg);
bind( t, JseMathLib1.class, new String[] {
"acos", "asin", "atan", "cosh",
"exp", "log", "log10", "sinh",
"tanh" } );
bind2( t, new String[] {
bind( t, JseMathLib2.class, new String[] {
"atan2", "pow", } );
return t;
}
public LuaValue oncall1(int opcode, LuaValue arg) {
public static final class JseMathLib1 extends OneArgFunction {
public LuaValue call(LuaValue arg) {
switch ( opcode ) {
case 0: return valueOf(Math.acos(arg.todouble()));
case 1: return valueOf(Math.asin(arg.todouble()));
@@ -61,14 +62,17 @@ public class JseMathLib extends org.luaj.vm2.lib.MathLib {
}
return NIL;
}
}
public LuaValue oncall2(int opcode, LuaValue arg1, LuaValue arg2) {
public static final class JseMathLib2 extends TwoArgFunction {
public LuaValue call(LuaValue arg1, LuaValue arg2) {
switch ( opcode ) {
case 0: return valueOf(Math.atan2(arg1.todouble(), arg2.todouble()));
case 1: return valueOf(Math.pow(arg1.todouble(), arg2.todouble()));
}
return NIL;
}
}
/** Faster, better version of pow() used by arithmetic operator ^ */
public double dpow_d(double a, double b) {