comparison parser.js @ 44:9dd370530f69

Fix escape codes in string literals. Don't print out the return value of main method. Fixup fib example to use print: method. Cleanup error handling in compiler slightly
author Mike Pavone <pavone@retrodev.com>
date Thu, 12 Jul 2012 22:49:08 -0700
parents 27a2167663dd
children f2cda2e6f70e
comparison
equal deleted inserted replaced
43:27a2167663dd 44:9dd370530f69
79 '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; } };'+ 79 '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; } };'+
80 'primlitsym = hws val:(float / int / string / symbol / object / array / list / lambda / "(" expr:expr hws ")" { return expr; }) { return val; };' + 80 'primlitsym = hws val:(float / int / string / symbol / object / array / list / lambda / "(" expr:expr hws ")" { return expr; }) { return val; };' +
81 '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("")); };' + 81 '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("")); };' +
82 'float = digits:[0-9]+ "." decimals:[0-9]+ { return new floatlit(parseFloat(digits.join("") + "." + decimals.join(""))); };' + 82 'float = digits:[0-9]+ "." decimals:[0-9]+ { return new floatlit(parseFloat(digits.join("") + "." + decimals.join(""))); };' +
83 'int = digits:[0-9]+ { return new intlit(parseInt(digits.join(""), 10)); };' + 83 'int = digits:[0-9]+ { return new intlit(parseInt(digits.join(""), 10)); };' +
84 'string = "\\"" text:[^\\"]* "\\"" { return new strlit(text.join("")); };' + 84 'string = "\\"" text:(strpart/escape)* "\\"" { return new strlit(text.join("")); };' +
85 'strpart = text:[^\\"\\\\]+ { return text.join(""); };' +
86 'escape = "\\\\" char:[nt\\"r] { if (char == "n") { return "\\n"; } if (char == "r") { return "\\r"; } return char; };' +
85 'object = "#{" ws messages:(assignment / funcall)* "}" { return new object(messages); };' + 87 'object = "#{" ws messages:(assignment / funcall)* "}" { return new object(messages); };' +
86 'array = "#[" ws els:opexpr* "]" { return new arraylit(els); };' + 88 'array = "#[" ws els:opexpr* "]" { return new arraylit(els); };' +
87 'list = "[" ws els:opexpr* "]" { return new listlit(els); };' + 89 'list = "[" ws els:opexpr* "]" { return new listlit(els); };' +
88 'assignment = ws sym:symbol hws "<-" expr:expr ws { return new assignment(sym, expr); }' + 90 'assignment = ws sym:symbol hws "<-" expr:expr ws { return new assignment(sym, expr); }' +
89 'lambda = args:((& ":") argname+ )? "{" ws exprs:(assignment / expr)* "}" { return new lambda(args[1], exprs); };' + 91 'lambda = args:((& ":") argname+ )? "{" ws exprs:(assignment / expr)* "}" { return new lambda(args[1], exprs); };' +