Mercurial > repos > tabletprog
comparison parser.js @ 25:4d87c38404d6
List literals, fixes to implicit self property lookup, import statement and editor improvements
author | Mike Pavone <pavone@retrodev.com> |
---|---|
date | Mon, 02 Apr 2012 22:28:48 -0700 |
parents | 40a85f135be5 |
children | e7be612fd3ae |
comparison
equal
deleted
inserted
replaced
24:fe3533494ce9 | 25:4d87c38404d6 |
---|---|
28 function strlit(val) | 28 function strlit(val) |
29 { | 29 { |
30 this.val = val; | 30 this.val = val; |
31 } | 31 } |
32 | 32 |
33 function listlit(val) | |
34 { | |
35 this.val = val; | |
36 } | |
37 | |
33 function funcall(name, args) | 38 function funcall(name, args) |
34 { | 39 { |
35 this.name = name; | 40 this.name = name; |
36 this.args = args; | 41 this.args = args; |
37 this.receiver = null; | 42 this.receiver = null; |
52 { | 57 { |
53 this.symbol = sym; | 58 this.symbol = sym; |
54 this.expression = expr; | 59 this.expression = expr; |
55 } | 60 } |
56 | 61 |
62 function isLambda(node) | |
63 { | |
64 return node instanceof lambda; | |
65 } | |
66 | |
57 var grammar = | 67 var grammar = |
58 'start = ws module:(object / lambda) ws { return module; };' + | 68 'start = ws module:(object / lambda) ws { return module; };' + |
59 'ws = ([ \\t\\n\\r] / "//" [^\\n]* "\\n")*;' + | 69 'ws = ([ \\t\\n\\r] / "//" [^\\n]* "\\n")*;' + |
60 'hws = ([ \\t] / "/*" ([^*] / "*" ! "/")* "*/" )*;' + | 70 'hws = ([ \\t] / "/*" ([^*] / "*" ! "/")* "*/" )*;' + |
61 'expr = e:(funcall / methcall / opexpr) ws { return e; };' + | 71 'expr = e:(funcall / methcall / opexpr) ws { return e; };' + |
62 'opexpr = left:addsub hws opn:("<=" / ">=" / "<" / ">" / "=") hws right:opexpr { return new op(left, opn, right); } / addsub;' + | 72 'opexpr = left:addsub hws opn:("<=" / ">=" / "<" / ">" / "=") hws right:opexpr { return new op(left, opn, right); } / addsub;' + |
63 'addsub = left:muldiv hws opn:("+"/"-") hws right:addsub { return new op(left, opn, right); } / muldiv;'+ | 73 'addsub = left:muldiv hws opn:("+"/"-") hws right:addsub { return new op(left, opn, right); } / muldiv;'+ |
64 'muldiv = left:primlitsym hws opn:("*"/"/") hws right:muldiv { return new op(left, opn, right); } / primlitsym;'+ | 74 'muldiv = left:primlitsym hws opn:("*"/"/") hws right:muldiv { return new op(left, opn, right); } / primlitsym;'+ |
65 'primlitsym = hws val:(float / int / string / symbol / object / lambda / "(" expr:expr hws ")" { return expr; }) { return val; };' + | 75 'primlitsym = hws val:(float / int / string / symbol / object / list / lambda / "(" expr:expr hws ")" { return expr; }) { return val; };' + |
66 '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("")); };' + | 76 '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("")); };' + |
67 'float = digits:[0-9]+ "." decimals:[0-9]+ { return new floatlit(parseFloat(digits.join("") + "." + decimals.join(""))); };' + | 77 'float = digits:[0-9]+ "." decimals:[0-9]+ { return new floatlit(parseFloat(digits.join("") + "." + decimals.join(""))); };' + |
68 'int = digits:[0-9]+ { return new intlit(parseInt(digits.join(""), 10)); };' + | 78 'int = digits:[0-9]+ { return new intlit(parseInt(digits.join(""), 10)); };' + |
69 'string = "\\"" text:[^\\"]* "\\"" { return new strlit(text.join("")); };' + | 79 'string = "\\"" text:[^\\"]* "\\"" { return new strlit(text.join("")); };' + |
70 'object = "#{" ws messages:(assignment / funcall)* "}" { return new object(messages); };' + | 80 'object = "#{" ws messages:(assignment / funcall)* "}" { return new object(messages); };' + |
71 'assignment = hws sym:symbol hws "<-" expr:expr ws { return new assignment(sym, expr); }' + | 81 'list = "[" ws els:opexpr* "]" { return new listlit(els); };' + |
82 'assignment = ws sym:symbol hws "<-" expr:expr ws { return new assignment(sym, expr); }' + | |
72 'lambda = args:((& ":") argname+ )? "{" ws exprs:(assignment / expr)* "}" { return new lambda(args[1], exprs); };' + | 83 'lambda = args:((& ":") argname+ )? "{" ws exprs:(assignment / expr)* "}" { return new lambda(args[1], exprs); };' + |
73 'argname = init:":"? chars:[a-zA-Z_!?@]+ trailing:[a-zA-Z_!?@0-9]* hws { return new symbol(init + chars.join("") + trailing.join("")); };' + | 84 'argname = init:":"? chars:[a-zA-Z_!?@]+ trailing:[a-zA-Z_!?@0-9]* hws { return new symbol(init + chars.join("") + trailing.join("")); };' + |
74 '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); };' + | 85 '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); };' + |
75 'funcallpart = fun:funpart args:opexpr* hws { return { name: fun, args: args}; };' + | 86 'funcallpart = fun:funpart args:opexpr* hws { return { name: fun, args: args}; };' + |
76 'funpart = chars:[a-zA-Z_!?@]+ middle:[a-zA-Z_!?@0-9]* ":" & [ \\t\\n\\r] { return chars.join("") + middle.join("") + ":"; };' + | 87 'funpart = chars:[a-zA-Z_!?@]+ middle:[a-zA-Z_!?@0-9]* ":" & [ \\t\\n\\r] { return chars.join("") + middle.join("") + ":"; };' + |