# HG changeset patch
# User Mike Pavone <pavone@retrodev.com>
# Date 1332223567 25200
# Node ID ed5b563147eceb3c8740db197052947b2ecab8f0
# Parent  a2c3ac7fafa2aabbc104f26ed88a111d47e623c8
Wrote constructors for AST objects

diff -r a2c3ac7fafa2 -r ed5b563147ec parser.js
--- a/parser.js	Mon Mar 19 22:45:03 2012 -0700
+++ b/parser.js	Mon Mar 19 23:06:07 2012 -0700
@@ -1,27 +1,78 @@
+
+function op(left, op, right)
+{
+	this.left = left;
+	this.op = op;
+	this.right = right;
+}
+
+function symbol(name)
+{
+	this.name = name;
+}
+
+function intlit(val)
+{
+	this.val = val;
+}
+
+function floatlit(val)
+{
+	this.val = val;
+}
+
+function strlit(val)
+{
+	this.val = val;
+}
+
+function funcall(name, args)
+{
+	this.name = name;
+	this.args = args;
+	this.receiver = null;
+}
+
+function object(messages)
+{
+	this.messages = messages;
+}
+
+function lambda(args, expressions)
+{
+	this.args = args;
+	this.expressions = expressions;
+}
+
+function assignment(sym, expr)
+{
+	this.symbol = sym;
+	this.expression = expr;
+}
 
 var grammar = 
 'start = ws module:(object / lambda) ws { return module; };' +
 'ws = ([ \\t\\n\\r] / "//" [^\\n]* "\\n")*;' +
 'hws = ([ \\t] / "/*" ([^*] / "*" ! "/")* "*/" )*;' +
 'expr = e:(funcall / methcall / opexpr) ws { return e; };' +
-'opexpr = left:addsub hws op:("<=" / ">=" / "<" / ">" / "=") hws right:opexpr { return {type: "op", left: left, op: op, right: right }; } / addsub;' +
-'addsub = left:muldiv hws op:("+"/"-") hws right:addsub { return {type: "op", left: left, op: op, right: right }; } / muldiv;'+
-'muldiv = left:primlitsym hws op:("*"/"/") hws right:muldiv { return {type: "op", left: left, op: op, right: right }; } / primlitsym;'+
+'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; };' +
-'symbol = chars:[a-zA-Z_!?@]+ trailing:(":"? [a-zA-Z_!?@0-9])* ! ":" { return {type: "symbol", name: chars.join("") + trailing.join("")}; };' +
-'float = digits:[0-9]+ "." decimals:[0-9]+ { return {type: "floatlit", value: parseFloat(digits.join("") + "." + decimals.join("")) }; };' +
-'int = digits:[0-9]+ { return {type: "intlit", value: parseInt(digits.join(""), 10)}; };' +
-'string = "\\"" text:[^\\"]* "\\"" { return {type: "strlit", value: text.join("")}; };' +
-'object = "#{" ws messages:assignment* "}" { return {type: "object", messages: messages}; };' +
-'assignment = hws sym:symbol hws "<-" expr:expr ws { return {type: "assignment", symbol: sym, expression: expr}; }' +
-'lambda = args:((& ":") argname+  )? "{" ws exprs:(assignment / expr)* "}" { return {type: "lambda", args: args[1], expressions: exprs}; };' +
-'argname = init:":"? chars:[a-zA-Z_!?@]+ trailing:[a-zA-Z_!?@0-9]* hws { return {type: "symbol", name: 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 {type: "funcall", name: fun, args: args}; };' +
+'symbol = chars:[a-zA-Z_!?@]+ trailing:(":"? [a-zA-Z_!?@0-9])* ! ":" { 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* "}" { 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("")); };' +
+'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); };' +
 'funcallpart = fun:funpart args:opexpr* hws { return { name: fun, args: args}; };' +
 'funpart = chars:[a-zA-Z_!?@]+ middle:[a-zA-Z_!?@0-9]* ":" & [ \\t\\n\\r] { return chars.join("") + middle.join("") + ":"; };' +
 'methcall = receiver:opexpr hws info:methcallrest { info.receiver = receiver; return info; };' +
 'methcallrest = funcall / unarymeth;' +
-'unarymeth = name:symbol { return {type: "funcall", name:name, args: []}; };';
+'unarymeth = name:symbol { return new funcall(name, []); };';
 var parser = PEG.buildParser(grammar);
 
 //var parser = PEG.buildParser('start = expr; expr = int; int = digits:[0-9]+ { return parseInt(digits.join(""), 10); }');