# HG changeset patch
# User Michael Pavone <pavone@retrodev.com>
# Date 1386386394 28800
# Node ID e01137a976546c9089afd45169e58a5fbb08619d
# Parent  e00a8bc6361b4254c2e9ec5f36c33bb5dbeb639e
Make assignments an expression in the grammar

diff -r e00a8bc6361b -r e01137a97654 parser.js
--- a/parser.js	Mon Dec 02 00:50:16 2013 -0800
+++ b/parser.js	Fri Dec 06 19:19:54 2013 -0800
@@ -82,7 +82,7 @@
 'start = ws module:(object / lambda) ws { return module; };' +
 'ws = ([ \\t\\n\\r] / "//" [^\\n]* "\\n")*;' +
 'hws = ([ \\t] / "/*" ([^*] / "*" ! "/")* "*/" )*;' +
-'expr = e:(funcall / methcall / opexpr) ws { return e; };' +
+'expr = e:(funcall / methcall / assignment / 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:maybecons pieces:(hws ("<=" / ">=" / "<" / ">" / "=" / "!=") hws maybecons)* { 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; } };'+
 'maybecons = consop / addsub;' +
@@ -103,7 +103,7 @@
 'list = "[" ws els:expr* "]" { return new listlit(els); };' +
 'opsym = name:("&&" / "||" / "<=" / ">=" / "<" / ">" / "=" / "!=" / "+" / "-" / "." / "*" / "/" / "%" / "|") { return new symbol(name); };' +
 'assignment = ws sym:(opsym / symbol) hws "<-" expr:expr ws { return new assignment(sym, expr); }' +
-'lambda = args:((& ":") argname+  )? "{" ws exprs:(assignment / expr)* "}" { return new lambda(args[1], exprs); };' +
+'lambda = args:((& ":") argname+  )? "{" ws exprs:expr* "}" { return new lambda(args[1], exprs); };' +
 'argname = init:":"? chars:[a-zA-Z_!?@]+ trailing:[a-zA-Z_!?@0-9]* hws { return new symbol(init + chars.join("") + trailing.join("")); };' +
 'funexpr = f: funcall ws { return f; };' +
 'funcall = hws parts: funcallpart+ { var fun = ""; var args = []; for (var i = 0; i < parts.length; i++) { fun += parts[i].name; args = args.concat(parts[i].args); } return new funcall(fun, args); };' +