diff options
Diffstat (limited to 'src/lib_math.c')
-rw-r--r-- | src/lib_math.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/lib_math.c b/src/lib_math.c index 9d324d7e..3fd466ca 100644 --- a/src/lib_math.c +++ b/src/lib_math.c | |||
@@ -47,12 +47,6 @@ LJLIB_ASM_(math_tanh) LJLIB_REC(math_htrig IRCALL_tanh) | |||
47 | LJLIB_ASM_(math_frexp) | 47 | LJLIB_ASM_(math_frexp) |
48 | LJLIB_ASM_(math_modf) LJLIB_REC(.) | 48 | LJLIB_ASM_(math_modf) LJLIB_REC(.) |
49 | 49 | ||
50 | LJLIB_PUSH(57.29577951308232) | ||
51 | LJLIB_ASM_(math_deg) LJLIB_REC(math_degrad) | ||
52 | |||
53 | LJLIB_PUSH(0.017453292519943295) | ||
54 | LJLIB_ASM_(math_rad) LJLIB_REC(math_degrad) | ||
55 | |||
56 | LJLIB_ASM(math_log) LJLIB_REC(math_log) | 50 | LJLIB_ASM(math_log) LJLIB_REC(math_log) |
57 | { | 51 | { |
58 | double x = lj_lib_checknum(L, 1); | 52 | double x = lj_lib_checknum(L, 1); |
@@ -63,12 +57,15 @@ LJLIB_ASM(math_log) LJLIB_REC(math_log) | |||
63 | #else | 57 | #else |
64 | x = lj_vm_log2(x); y = 1.0 / lj_vm_log2(y); | 58 | x = lj_vm_log2(x); y = 1.0 / lj_vm_log2(y); |
65 | #endif | 59 | #endif |
66 | setnumV(L->base-1, x*y); /* Do NOT join the expression to x / y. */ | 60 | setnumV(L->base-1-LJ_FR2, x*y); /* Do NOT join the expression to x / y. */ |
67 | return FFH_RES(1); | 61 | return FFH_RES(1); |
68 | } | 62 | } |
69 | return FFH_RETRY; | 63 | return FFH_RETRY; |
70 | } | 64 | } |
71 | 65 | ||
66 | LJLIB_LUA(math_deg) /* function(x) return x * 57.29577951308232 end */ | ||
67 | LJLIB_LUA(math_rad) /* function(x) return x * 0.017453292519943295 end */ | ||
68 | |||
72 | LJLIB_ASM(math_atan2) LJLIB_REC(.) | 69 | LJLIB_ASM(math_atan2) LJLIB_REC(.) |
73 | { | 70 | { |
74 | lj_lib_checknum(L, 1); | 71 | lj_lib_checknum(L, 1); |
@@ -224,10 +221,6 @@ LUALIB_API int luaopen_math(lua_State *L) | |||
224 | rs = (RandomState *)lua_newuserdata(L, sizeof(RandomState)); | 221 | rs = (RandomState *)lua_newuserdata(L, sizeof(RandomState)); |
225 | rs->valid = 0; /* Use lazy initialization to save some time on startup. */ | 222 | rs->valid = 0; /* Use lazy initialization to save some time on startup. */ |
226 | LJ_LIB_REG(L, LUA_MATHLIBNAME, math); | 223 | LJ_LIB_REG(L, LUA_MATHLIBNAME, math); |
227 | #if defined(LUA_COMPAT_MOD) && !LJ_52 | ||
228 | lua_getfield(L, -1, "fmod"); | ||
229 | lua_setfield(L, -2, "mod"); | ||
230 | #endif | ||
231 | return 1; | 224 | return 1; |
232 | } | 225 | } |
233 | 226 | ||