diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2010-01-11 15:38:30 -0200 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2010-01-11 15:38:30 -0200 |
| commit | cef96b73e1820e0f0d65f1616284ec40502e5e44 (patch) | |
| tree | 7036713ddbf9fe30e363c5092e38e14cbc95d47a | |
| parent | 427e01eb63079e8cf3a41ec03e7aad7d79fc6406 (diff) | |
| download | lua-cef96b73e1820e0f0d65f1616284ec40502e5e44.tar.gz lua-cef96b73e1820e0f0d65f1616284ec40502e5e44.tar.bz2 lua-cef96b73e1820e0f0d65f1616284ec40502e5e44.zip | |
added casts from int to enumerations to follow C++ rules
| -rw-r--r-- | lapi.c | 5 | ||||
| -rw-r--r-- | lcode.c | 8 |
2 files changed, 7 insertions, 6 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lapi.c,v 2.108 2010/01/04 18:17:51 roberto Exp roberto $ | 2 | ** $Id: lapi.c,v 2.109 2010/01/08 15:16:56 roberto Exp roberto $ |
| 3 | ** Lua API | 3 | ** Lua API |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -300,7 +300,8 @@ LUA_API void lua_arith (lua_State *L, int op) { | |||
| 300 | luaO_arith(op, nvalue(L->top - 2), nvalue(L->top - 1))); | 300 | luaO_arith(op, nvalue(L->top - 2), nvalue(L->top - 1))); |
| 301 | } | 301 | } |
| 302 | else | 302 | else |
| 303 | luaV_arith(L, L->top - 2, L->top - 2, L->top - 1, op - LUA_OPADD + TM_ADD); | 303 | luaV_arith(L, L->top - 2, L->top - 2, L->top - 1, |
| 304 | cast(TMS, op - LUA_OPADD + TM_ADD)); | ||
| 304 | L->top--; | 305 | L->top--; |
| 305 | lua_unlock(L); | 306 | lua_unlock(L); |
| 306 | } | 307 | } |
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lcode.c,v 2.41 2009/08/10 15:31:44 roberto Exp roberto $ | 2 | ** $Id: lcode.c,v 2.42 2009/09/23 20:33:05 roberto Exp roberto $ |
| 3 | ** Code generator for Lua | 3 | ** Code generator for Lua |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -830,15 +830,15 @@ void luaK_posfix (FuncState *fs, BinOpr op, expdesc *e1, expdesc *e2) { | |||
| 830 | } | 830 | } |
| 831 | case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV: | 831 | case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV: |
| 832 | case OPR_MOD: case OPR_POW: { | 832 | case OPR_MOD: case OPR_POW: { |
| 833 | codearith(fs, op - OPR_ADD + OP_ADD, e1, e2); | 833 | codearith(fs, cast(OpCode, op - OPR_ADD + OP_ADD), e1, e2); |
| 834 | break; | 834 | break; |
| 835 | } | 835 | } |
| 836 | case OPR_EQ: case OPR_LT: case OPR_LE: { | 836 | case OPR_EQ: case OPR_LT: case OPR_LE: { |
| 837 | codecomp(fs, op - OPR_EQ + OP_EQ, 1, e1, e2); | 837 | codecomp(fs, cast(OpCode, op - OPR_EQ + OP_EQ), 1, e1, e2); |
| 838 | break; | 838 | break; |
| 839 | } | 839 | } |
| 840 | case OPR_NE: case OPR_GT: case OPR_GE: { | 840 | case OPR_NE: case OPR_GT: case OPR_GE: { |
| 841 | codecomp(fs, op - OPR_NE + OP_EQ, 0, e1, e2); | 841 | codecomp(fs, cast(OpCode, op - OPR_NE + OP_EQ), 0, e1, e2); |
| 842 | break; | 842 | break; |
| 843 | } | 843 | } |
| 844 | default: lua_assert(0); | 844 | default: lua_assert(0); |
