diff options
| author | Mike Pall <mike> | 2013-05-18 14:14:06 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-05-18 14:14:06 +0200 |
| commit | 82390d1f4f8779afdbb444260badabe057203c05 (patch) | |
| tree | 58249bddc16fac9a14c46e558e30efdac5c14cf0 | |
| parent | e2db3f697c527fdace482adf1d1d8c2980a4df29 (diff) | |
| parent | 1593e7750b29d11b71f20dbde85845b7b0689d1d (diff) | |
| download | luajit-82390d1f4f8779afdbb444260badabe057203c05.tar.gz luajit-82390d1f4f8779afdbb444260badabe057203c05.tar.bz2 luajit-82390d1f4f8779afdbb444260badabe057203c05.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_carith.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_carith.c b/src/lj_carith.c index a93ec685..bb810af8 100644 --- a/src/lj_carith.c +++ b/src/lj_carith.c | |||
| @@ -240,7 +240,7 @@ static int lj_carith_meta(lua_State *L, CTState *cts, CDArith *ca, MMS mm) | |||
| 240 | return 1; | 240 | return 1; |
| 241 | } | 241 | } |
| 242 | for (i = 0; i < 2; i++) { | 242 | for (i = 0; i < 2; i++) { |
| 243 | if (ca->ct[i]) { | 243 | if (ca->ct[i] && tviscdata(L->base+i)) { |
| 244 | if (ctype_isenum(ca->ct[i]->info)) isenum = i; | 244 | if (ctype_isenum(ca->ct[i]->info)) isenum = i; |
| 245 | repr[i] = strdata(lj_ctype_repr(L, ctype_typeid(cts, ca->ct[i]), NULL)); | 245 | repr[i] = strdata(lj_ctype_repr(L, ctype_typeid(cts, ca->ct[i]), NULL)); |
| 246 | } else { | 246 | } else { |