diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2013-04-26 10:08:29 -0300 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2013-04-26 10:08:29 -0300 |
| commit | a2f5c28a802ae99f2045ab96585fade2c65b2037 (patch) | |
| tree | eb2ab3d1fc8dc2084505ed4286502ed75b6721ba /lparser.c | |
| parent | a80a2b5e561b50c1f64e96c3692614611a325aba (diff) | |
| download | lua-a2f5c28a802ae99f2045ab96585fade2c65b2037.tar.gz lua-a2f5c28a802ae99f2045ab96585fade2c65b2037.tar.bz2 lua-a2f5c28a802ae99f2045ab96585fade2c65b2037.zip | |
new operation '//' (integer division)
Diffstat (limited to 'lparser.c')
| -rw-r--r-- | lparser.c | 6 |
1 files changed, 4 insertions, 2 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lparser.c,v 2.131 2013/04/16 18:46:28 roberto Exp roberto $ | 2 | ** $Id: lparser.c,v 2.132 2013/04/25 19:35:19 roberto Exp roberto $ |
| 3 | ** Lua Parser | 3 | ** Lua Parser |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -1005,6 +1005,7 @@ static BinOpr getbinopr (int op) { | |||
| 1005 | case '-': return OPR_SUB; | 1005 | case '-': return OPR_SUB; |
| 1006 | case '*': return OPR_MUL; | 1006 | case '*': return OPR_MUL; |
| 1007 | case '/': return OPR_DIV; | 1007 | case '/': return OPR_DIV; |
| 1008 | case TK_IDIV: return OPR_IDIV; | ||
| 1008 | case '%': return OPR_MOD; | 1009 | case '%': return OPR_MOD; |
| 1009 | case '^': return OPR_POW; | 1010 | case '^': return OPR_POW; |
| 1010 | case TK_CONCAT: return OPR_CONCAT; | 1011 | case TK_CONCAT: return OPR_CONCAT; |
| @@ -1025,7 +1026,8 @@ static const struct { | |||
| 1025 | lu_byte left; /* left priority for each binary operator */ | 1026 | lu_byte left; /* left priority for each binary operator */ |
| 1026 | lu_byte right; /* right priority */ | 1027 | lu_byte right; /* right priority */ |
| 1027 | } priority[] = { /* ORDER OPR */ | 1028 | } priority[] = { /* ORDER OPR */ |
| 1028 | {6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7}, /* `+' `-' `*' `/' `%' */ | 1029 | {6, 6}, {6, 6}, /* '+' '-' */ |
| 1030 | {7, 7}, {7, 7}, {7, 7}, {7, 7}, /* '*' '/' '//' '%' */ | ||
| 1029 | {10, 9}, {5, 4}, /* ^, .. (right associative) */ | 1031 | {10, 9}, {5, 4}, /* ^, .. (right associative) */ |
| 1030 | {3, 3}, {3, 3}, {3, 3}, /* ==, <, <= */ | 1032 | {3, 3}, {3, 3}, {3, 3}, /* ==, <, <= */ |
| 1031 | {3, 3}, {3, 3}, {3, 3}, /* ~=, >, >= */ | 1033 | {3, 3}, {3, 3}, {3, 3}, /* ~=, >, >= */ |