diff parser.js @ 25:4d87c38404d6

List literals, fixes to implicit self property lookup, import statement and editor improvements
author Mike Pavone <pavone@retrodev.com>
date Mon, 02 Apr 2012 22:28:48 -0700
parents 40a85f135be5
children e7be612fd3ae
line wrap: on
line diff
--- a/parser.js	Tue Mar 27 00:39:32 2012 -0700
+++ b/parser.js	Mon Apr 02 22:28:48 2012 -0700
@@ -30,6 +30,11 @@
 	this.val = val;
 }
 
+function listlit(val)
+{
+	this.val = val;
+}
+
 function funcall(name, args)
 {
 	this.name = name;
@@ -54,6 +59,11 @@
 	this.expression = expr;
 }
 
+function isLambda(node)
+{
+	return node instanceof lambda;
+}
+
 var grammar = 
 'start = ws module:(object / lambda) ws { return module; };' +
 'ws = ([ \\t\\n\\r] / "//" [^\\n]* "\\n")*;' +
@@ -62,13 +72,14 @@
 'opexpr = left:addsub hws opn:("<=" / ">=" / "<" / ">" / "=") hws right:opexpr { return new op(left, opn, right); } / addsub;' +
 'addsub = left:muldiv hws opn:("+"/"-") hws right:addsub { return new op(left, opn, right); } / muldiv;'+
 'muldiv = left:primlitsym hws opn:("*"/"/") hws right:muldiv { return new op(left, opn, right); } / primlitsym;'+
-'primlitsym = hws val:(float / int / string / symbol / object / lambda / "(" expr:expr hws ")" { return expr; }) { return val; };' +
+'primlitsym = hws val:(float / int / string / symbol / object / list / lambda / "(" 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(""))); };' +
 'int = digits:[0-9]+ { return new intlit(parseInt(digits.join(""), 10)); };' +
 'string = "\\"" text:[^\\"]* "\\"" { return new strlit(text.join("")); };' +
 'object = "#{" ws messages:(assignment / funcall)* "}" { return new object(messages); };' +
-'assignment = hws sym:symbol hws "<-" expr:expr ws { return new assignment(sym, expr); }' +
+'list = "[" ws els:opexpr* "]" { return new listlit(els); };' +
+'assignment = ws 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("")); };' +
 'funcall = hws parts: funcallpart+ { var fun = ""; var args = []; for (var i in parts) { fun += parts[i].name; args = args.concat(parts[i].args); } return new funcall(fun, args); };' +