# HG changeset patch
# User William Morgan <bill@mrgn.org>
# Date 1342297865 25200
# Node ID 42d5660b30b4b211fff539bb906abd31d91a850b
# Parent  25b697c916299ad7f28e078d1e698c7141b41c93
added remainder operator

diff -r 25b697c91629 -r 42d5660b30b4 cbackend.js
--- a/cbackend.js	Sat Jul 14 12:30:25 2012 -0700
+++ b/cbackend.js	Sat Jul 14 13:31:05 2012 -0700
@@ -40,7 +40,7 @@
 }
 
 op.prototype.toC = function(isReceiver) {
-	var optoMeth = {'+': 'ADD_', '-': 'SUB_', '*': 'MUL_', '/': 'DIV_', '=': 'EQ_', '!=': 'NEQ_', '<': 'LT_', '>': 'GT_', '>=': 'GEQ_', '<=': 'LEQ_', '.': 'CAT_'};
+	var optoMeth = {'+': 'ADD_', '-': 'SUB_', '*': 'MUL_', '/': 'DIV_', '%': 'MOD_', '=': 'EQ_', '!=': 'NEQ_', '<': 'LT_', '>': 'GT_', '>=': 'GEQ_', '<=': 'LEQ_', '.': 'CAT_'};
 	var method = optoMeth[this.op];
 	return 'mcall(' + getMethodId(method) + '/* ' + method + ' */, 2, (object *)' + this.left.toC() + ', ' + this.right.toC() + ')\n';
 };
@@ -415,6 +415,7 @@
 	addBinaryOp(int32, 'SUB_', '-', 'obj_int32');
 	addBinaryOp(int32, 'MUL_', '*', 'obj_int32');
 	addBinaryOp(int32, 'DIV_', '/', 'obj_int32');
+	addBinaryOp(int32, 'MOD_', '%', 'obj_int32');
 	addCompOp(int32, 'LT_', '<', 'obj_int32');
 	addCompOp(int32, 'GT_', '>', 'obj_int32');
 	addCompOp(int32, 'EQ_', '==', 'obj_int32');
diff -r 25b697c91629 -r 42d5660b30b4 parser.js
--- a/parser.js	Sat Jul 14 12:30:25 2012 -0700
+++ b/parser.js	Sat Jul 14 13:31:05 2012 -0700
@@ -76,7 +76,7 @@
 'expr = e:(funcall / methcall / opexpr) ws { return e; };' +
 'opexpr = 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 ("+"/"-"/".") 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; } };'+
+'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 in trailing) { trailing[i] = trailing[i].join(""); } return new symbol(chars.join("") + trailing.join("")); };' +
 'float = digits:[0-9]+ "." decimals:[0-9]+ { return new floatlit(parseFloat(digits.join("") + "." + decimals.join(""))); };' +