Mercurial > repos > tabletprog
comparison parser.js @ 43:27a2167663dd
Improve compiler error reporting. Fix operator associativity. Add some more string operations and a string ops sample
author | Mike Pavone <pavone@retrodev.com> |
---|---|
date | Thu, 12 Jul 2012 22:10:58 -0700 |
parents | 4e983fe32047 |
children | 9dd370530f69 |
comparison
equal
deleted
inserted
replaced
42:4e983fe32047 | 43:27a2167663dd |
---|---|
72 var grammar = | 72 var grammar = |
73 'start = ws module:(object / lambda) ws { return module; };' + | 73 'start = ws module:(object / lambda) ws { return module; };' + |
74 'ws = ([ \\t\\n\\r] / "//" [^\\n]* "\\n")*;' + | 74 'ws = ([ \\t\\n\\r] / "//" [^\\n]* "\\n")*;' + |
75 'hws = ([ \\t] / "/*" ([^*] / "*" ! "/")* "*/" )*;' + | 75 'hws = ([ \\t] / "/*" ([^*] / "*" ! "/")* "*/" )*;' + |
76 'expr = e:(funcall / methcall / opexpr) ws { return e; };' + | 76 'expr = e:(funcall / methcall / opexpr) ws { return e; };' + |
77 'opexpr = left:addsub hws opn:("<=" / ">=" / "<" / ">" / "=") hws right:opexpr { return new op(left, opn, right); } / addsub;' + | 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 'addsub = left:muldiv hws opn:("+"/"-") hws right:addsub { return new op(left, opn, right); } / muldiv;'+ | 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; } };'+ |
79 'muldiv = left:primlitsym hws opn:("*"/"/") hws right:muldiv { return new op(left, opn, right); } / primlitsym;'+ | 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:[^\\"]* "\\"" { return new strlit(text.join("")); };' + |