comparison parser.js @ 83:fdb9785d2c93

Add logical operators to grammar. Allow vertical whitespace after funcall expression in object.
author Mike Pavone <pavone@retrodev.com>
date Sat, 21 Jul 2012 22:29:16 -0700
parents 3a169ebb3224
children ce6a81b3be70
comparison
equal deleted inserted replaced
82:48daa1d3e052 83:fdb9785d2c93
48 } 48 }
49 49
50 function object(messages) 50 function object(messages)
51 { 51 {
52 this.messages = messages; 52 this.messages = messages;
53 this.name = null;
53 } 54 }
54 55
55 function lambda(args, expressions) 56 function lambda(args, expressions)
56 { 57 {
57 this.args = args ? args : []; 58 this.args = args ? args : [];
72 var grammar = 73 var grammar =
73 'start = ws module:(object / lambda) ws { return module; };' + 74 'start = ws module:(object / lambda) ws { return module; };' +
74 'ws = ([ \\t\\n\\r] / "//" [^\\n]* "\\n")*;' + 75 'ws = ([ \\t\\n\\r] / "//" [^\\n]* "\\n")*;' +
75 'hws = ([ \\t] / "/*" ([^*] / "*" ! "/")* "*/" )*;' + 76 'hws = ([ \\t] / "/*" ([^*] / "*" ! "/")* "*/" )*;' +
76 'expr = e:(funcall / methcall / opexpr) ws { return e; };' + 77 'expr = e:(funcall / methcall / opexpr) ws { return e; };' +
77 'opexpr = left:addsub pieces:(hws ("<=" / ">=" / "<" / ">" / "=" / "!=") hws addsub)* { 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; } };'+ 78 '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; } };'+
79 'compareop = left:addsub pieces:(hws ("<=" / ">=" / "<" / ">" / "=" / "!=") hws addsub)* { 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; } };'+
78 'addsub = left:muldiv pieces:(hws ("+"/"-"/".") hws muldiv)* { 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 'addsub = left:muldiv pieces:(hws ("+"/"-"/".") hws muldiv)* { 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; } };'+ 81 '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 / hex / binary / int / string / symbol / object / array / list / lambda / "(" ws expr:expr hws ")" { return expr; }) { return val; };' + 82 'primlitsym = hws val:(float / hex / binary / int / string / symbol / object / array / list / lambda / "(" ws 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("")); };' + 83 '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(""))); };' + 84 'float = digits:[0-9]+ "." decimals:[0-9]+ { return new floatlit(parseFloat(digits.join("") + "." + decimals.join(""))); };' +
84 'hex = "0x" digits:[0-9a-fA-F]+ { return new intlit(parseInt(digits.join(""), 16)); };' + 86 'hex = "0x" digits:[0-9a-fA-F]+ { return new intlit(parseInt(digits.join(""), 16)); };' +
85 'int = sign:"-"? digits:[0-9]+ { return new intlit(parseInt(sign + digits.join(""), 10)); };' + 87 'int = sign:"-"? digits:[0-9]+ { return new intlit(parseInt(sign + digits.join(""), 10)); };' +
86 'string = "\\"" text:(strpart/escape)* "\\"" { return new strlit(text.join("")); };' + 88 'string = "\\"" text:(strpart/escape)* "\\"" { return new strlit(text.join("")); };' +
87 'strpart = text:[^\\"\\\\]+ { return text.join(""); };' + 89 'strpart = text:[^\\"\\\\]+ { return text.join(""); };' +
88 'escape = "\\\\" char:[nt\\"r\\\\] { if (char == "n") { return "\\n"; } if (char == "r") { return "\\r"; } return char; };' + 90 'escape = "\\\\" char:[nt\\"r\\\\] { if (char == "n") { return "\\n"; } if (char == "r") { return "\\r"; } return char; };' +
89 'object = "#{" ws messages:(assignment / funcall)* "}" { return new object(messages); };' + 91 'object = "#{" ws messages:(assignment / funexpr)* "}" { return new object(messages); };' +
90 'array = "#[" ws els:opexpr* "]" { return new arraylit(els); };' + 92 'array = "#[" ws els:opexpr* "]" { return new arraylit(els); };' +
91 'list = "[" ws els:opexpr* "]" { return new listlit(els); };' + 93 'list = "[" ws els:opexpr* "]" { return new listlit(els); };' +
92 'assignment = ws sym:symbol hws "<-" expr:expr ws { return new assignment(sym, expr); }' + 94 'assignment = ws sym:symbol hws "<-" expr:expr ws { return new assignment(sym, expr); }' +
93 'lambda = args:((& ":") argname+ )? "{" ws exprs:(assignment / expr)* "}" { return new lambda(args[1], exprs); };' + 95 'lambda = args:((& ":") argname+ )? "{" ws exprs:(assignment / expr)* "}" { return new lambda(args[1], exprs); };' +
94 'argname = init:":"? chars:[a-zA-Z_!?@]+ trailing:[a-zA-Z_!?@0-9]* hws { return new symbol(init + chars.join("") + trailing.join("")); };' + 96 'argname = init:":"? chars:[a-zA-Z_!?@]+ trailing:[a-zA-Z_!?@0-9]* hws { return new symbol(init + chars.join("") + trailing.join("")); };' +
97 'funexpr = f: funcall ws { return f; };' +
95 '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); };' + 98 '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); };' +
96 'funcallpart = fun:funpart args:opexpr* hws { return { name: fun, args: args}; };' + 99 'funcallpart = fun:funpart args:opexpr* hws { return { name: fun, args: args}; };' +
97 'funpart = chars:[a-zA-Z_!?@]+ middle:[a-zA-Z_!?@0-9]* ":" & [ \\t\\n\\r] { return chars.join("") + middle.join("") + ":"; };' + 100 'funpart = chars:[a-zA-Z_!?@]+ middle:[a-zA-Z_!?@0-9]* ":" & [ \\t\\n\\r] { return chars.join("") + middle.join("") + ":"; };' +
98 'methcall = receiver:opexpr hws info:methcallrest { info.receiver = receiver; return info; };' + 101 'methcall = receiver:opexpr hws info:methcallrest { info.receiver = receiver; return info; };' +
99 'methcallrest = funcall / unarymeth;' + 102 'methcallrest = funcall / unarymeth;' +