Mercurial > repos > tabletprog
diff parser.js @ 122:9820ecd4eed4
Add support for implementing operators on user defined objects
author | Mike Pavone <pavone@retrodev.com> |
---|---|
date | Sat, 03 Aug 2013 00:13:09 -0700 |
parents | 648659961e0e |
children | 34e0befbdd77 |
line wrap: on
line diff
--- a/parser.js Thu Aug 01 19:10:48 2013 -0700 +++ b/parser.js Sat Aug 03 00:13:09 2013 -0700 @@ -70,7 +70,7 @@ return node instanceof lambda; } -var grammar = +var grammar = 'start = ws module:(object / lambda) ws { return module; };' + 'ws = ([ \\t\\n\\r] / "//" [^\\n]* "\\n")*;' + 'hws = ([ \\t] / "/*" ([^*] / "*" ! "/")* "*/" )*;' + @@ -86,12 +86,13 @@ 'hex = "0x" digits:[0-9a-fA-F]+ { return new intlit(parseInt(digits.join(""), 16)); };' + 'int = sign:"-"? digits:[0-9]+ { return new intlit(parseInt(sign + digits.join(""), 10)); };' + 'string = "\\"" text:(strpart/escape)* "\\"" { return new strlit(text.join("")); };' + -'strpart = text:[^\\"\\\\]+ { return text.join(""); };' + +'strpart = text:[^\\"\\\\]+ { return text.join(""); };' + 'escape = "\\\\" char:[nt\\"r\\\\] { if (char == "n") { return "\\n"; } if (char == "r") { return "\\r"; } return char; };' + 'object = "#{" ws messages:(assignment / funexpr)* "}" { return new object(messages); };' + 'array = "#[" ws els:opexpr* "]" { return new arraylit(els); };' + 'list = "[" ws els:opexpr* "]" { return new listlit(els); };' + -'assignment = ws sym:symbol hws "<-" expr:expr ws { return new assignment(sym, expr); }' + +'opsym = name:("&&" / "||" / "<=" / ">=" / "<" / ">" / "=" / "!=" / "+" / "-" / "." / "*" / "/" / "%") { return new symbol(name); };' + +'assignment = ws sym:(symbol / opsym) 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("")); };' + 'funexpr = f: funcall ws { return f; };' +