Mercurial > repos > tabletprog
changeset 134:34e0befbdd77
Add bitwise operations to int32 in the C backend
| author | Mike Pavone <pavone@retrodev.com> |
|---|---|
| date | Thu, 08 Aug 2013 19:19:19 -0700 |
| parents | 966a09d226e3 |
| children | f98790d8a53d |
| files | cbackend.js parser.js |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/cbackend.js Wed Aug 07 23:22:09 2013 -0700 +++ b/cbackend.js Thu Aug 08 19:19:19 2013 -0700 @@ -607,6 +607,11 @@ addBinaryOp(int32, 'MUL_', '*', 'obj_int32'); addBinaryOp(int32, 'DIV_', '/', 'obj_int32'); addBinaryOp(int32, 'MOD_', '%', 'obj_int32'); + addBinaryOp(int32, 'or', '|', 'obj_int32'); + addBinaryOp(int32, 'xor', '^', 'obj_int32'); + addBinaryOp(int32, 'and', '&', 'obj_int32'); + addBinaryOp(int32, 'lshift:by', '<<', 'obj_int32'); + addBinaryOp(int32, 'rshift:by', '>>', 'obj_int32'); addCompOp(int32, 'LT_', '<', 'obj_int32'); addCompOp(int32, 'GT_', '>', 'obj_int32'); addCompOp(int32, 'EQ_', '==', 'obj_int32');
--- a/parser.js Wed Aug 07 23:22:09 2013 -0700 +++ b/parser.js Thu Aug 08 19:19:19 2013 -0700 @@ -77,7 +77,7 @@ 'expr = e:(funcall / methcall / opexpr) ws { return e; };' + 'opexpr = left:compareop pieces:(hws ("&&" / "||") hws compareop)* { if (pieces.length) { var cur = new op(left, pieces[0][1], pieces[0][3]); for (var i = 1; i < pieces.length; i++) { cur = new op(cur, pieces[i][1], pieces[i][3]); } return cur; } else { return left; } };'+ 'compareop = left:addsub pieces:(hws ("<=" / ">=" / "<" / ">" / "=" / "!=") hws addsub)* { if (pieces.length) { var cur = new op(left, pieces[0][1], pieces[0][3]); for (var i = 1; i < pieces.length; i++) { cur = new op(cur, pieces[i][1], pieces[i][3]); } return cur; } else { return left; } };'+ -'addsub = left:muldiv pieces:(hws ("+"/"-"/"xor"/".") hws muldiv)* { if (pieces.length) { var cur = new op(left, pieces[0][1], pieces[0][3]); for (var i = 1; i < pieces.length; i++) { cur = new op(cur, pieces[i][1], pieces[i][3]); } return cur; } else { return left; } };'+ +'addsub = left:muldiv pieces:(hws ("+"/"-"/"xor"/"and"/"or"/".") hws muldiv)* { if (pieces.length) { var cur = new op(left, pieces[0][1], pieces[0][3]); for (var i = 1; i < pieces.length; i++) { cur = new op(cur, pieces[i][1], pieces[i][3]); } return cur; } else { return left; } };'+ 'muldiv = left:primlitsym pieces:(hws ("*"/"/"/"%") hws primlitsym)* { if (pieces.length) { var cur = new op(left, pieces[0][1], pieces[0][3]); for (var i = 1; i < pieces.length; i++) { cur = new op(cur, pieces[i][1], pieces[i][3]); } return cur; } else { return left; } };'+ 'primlitsym = hws val:(float / hex / binary / int / string / symbol / object / array / list / lambda / "(" ws expr:expr hws ")" { return expr; }) { return val; };' + 'symbol = chars:[a-zA-Z_!?@]+ trailing:(":"? [a-zA-Z_!?@0-9])* ! ":" { for (var i = 0; i < trailing.length; i++) { trailing[i] = trailing[i].join(""); } return new symbol(chars.join("") + trailing.join("")); };' +