diff options
| author | Mike Pall <mike> | 2012-09-12 11:20:47 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2012-09-12 11:20:47 +0200 |
| commit | 23932a6c8b7ef434bc963139b4160b1058fa6f7f (patch) | |
| tree | 37a8396d51de634046efe72bff36d9a6fb1324c4 /src/lj_record.c | |
| parent | 039bf85e2610927119254b9c922eab484820e6a7 (diff) | |
| download | luajit-23932a6c8b7ef434bc963139b4160b1058fa6f7f.tar.gz luajit-23932a6c8b7ef434bc963139b4160b1058fa6f7f.tar.bz2 luajit-23932a6c8b7ef434bc963139b4160b1058fa6f7f.zip | |
Use 0/1 macro for Lua 5.2 compatibility.
Diffstat (limited to 'src/lj_record.c')
| -rw-r--r-- | src/lj_record.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index ce25f29e..8718f8bb 100644 --- a/src/lj_record.c +++ b/src/lj_record.c | |||
| @@ -906,17 +906,15 @@ static TRef rec_mm_len(jit_State *J, TRef tr, TValue *tv) | |||
| 906 | TValue *basev = J->L->base + func; | 906 | TValue *basev = J->L->base + func; |
| 907 | base[0] = ix.mobj; copyTV(J->L, basev+0, &ix.mobjv); | 907 | base[0] = ix.mobj; copyTV(J->L, basev+0, &ix.mobjv); |
| 908 | base[1] = tr; copyTV(J->L, basev+1, tv); | 908 | base[1] = tr; copyTV(J->L, basev+1, tv); |
| 909 | #ifdef LUAJIT_ENABLE_LUA52COMPAT | 909 | #if LJ_52 |
| 910 | base[2] = tr; copyTV(J->L, basev+2, tv); | 910 | base[2] = tr; copyTV(J->L, basev+2, tv); |
| 911 | #else | 911 | #else |
| 912 | base[2] = TREF_NIL; setnilV(basev+2); | 912 | base[2] = TREF_NIL; setnilV(basev+2); |
| 913 | #endif | 913 | #endif |
| 914 | lj_record_call(J, func, 2); | 914 | lj_record_call(J, func, 2); |
| 915 | } else { | 915 | } else { |
| 916 | #ifdef LUAJIT_ENABLE_LUA52COMPAT | 916 | if (LJ_52 && tref_istab(tr)) |
| 917 | if (tref_istab(tr)) | ||
| 918 | return lj_ir_call(J, IRCALL_lj_tab_len, tr); | 917 | return lj_ir_call(J, IRCALL_lj_tab_len, tr); |
| 919 | #endif | ||
| 920 | lj_trace_err(J, LJ_TRERR_NOMM); | 918 | lj_trace_err(J, LJ_TRERR_NOMM); |
| 921 | } | 919 | } |
| 922 | return 0; /* No result yet. */ | 920 | return 0; /* No result yet. */ |
| @@ -1815,10 +1813,8 @@ void lj_record_ins(jit_State *J) | |||
| 1815 | case BC_LEN: | 1813 | case BC_LEN: |
| 1816 | if (tref_isstr(rc)) | 1814 | if (tref_isstr(rc)) |
| 1817 | rc = emitir(IRTI(IR_FLOAD), rc, IRFL_STR_LEN); | 1815 | rc = emitir(IRTI(IR_FLOAD), rc, IRFL_STR_LEN); |
| 1818 | #ifndef LUAJIT_ENABLE_LUA52COMPAT | 1816 | else if (!LJ_52 && tref_istab(rc)) |
| 1819 | else if (tref_istab(rc)) | ||
| 1820 | rc = lj_ir_call(J, IRCALL_lj_tab_len, rc); | 1817 | rc = lj_ir_call(J, IRCALL_lj_tab_len, rc); |
| 1821 | #endif | ||
| 1822 | else | 1818 | else |
| 1823 | rc = rec_mm_len(J, rc, rcv); | 1819 | rc = rec_mm_len(J, rc, rcv); |
| 1824 | break; | 1820 | break; |