# HG changeset patch # User Mike Pavone # Date 1332745573 25200 # Node ID 40a85f135be550d528bafb189080b9ed9e5e7bd9 # Parent 6c8ae6b47ab5c19480b9740683f540c43bd4ae44 Support funcall syntax inside object definition to allow import: statements diff -r 6c8ae6b47ab5 -r 40a85f135be5 parser.js --- a/parser.js Sun Mar 25 21:11:10 2012 -0700 +++ b/parser.js Mon Mar 26 00:06:13 2012 -0700 @@ -67,7 +67,7 @@ 'float = digits:[0-9]+ "." decimals:[0-9]+ { return new floatlit(parseFloat(digits.join("") + "." + decimals.join(""))); };' + 'int = digits:[0-9]+ { return new intlit(parseInt(digits.join(""), 10)); };' + 'string = "\\"" text:[^\\"]* "\\"" { return new strlit(text.join("")); };' + -'object = "#{" ws messages:assignment* "}" { return new object(messages); };' + +'object = "#{" ws messages:(assignment / funcall)* "}" { return new object(messages); };' + 'assignment = hws sym:symbol hws "<-" expr:expr ws { return new assignment(sym, expr); }' + 'lambda = args:((& ":") argname+ )? "{" ws exprs:(assignment / 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("")); };' +