Mercurial > repos > tabletprog
comparison parser.js @ 68:3a169ebb3224
Change strategy for handling true and false to avoid some initialization order problems and improve performance. Add support for negative integer literals. Update samples to reflect true/false change.
author | Mike Pavone <pavone@retrodev.com> |
---|---|
date | Sat, 14 Jul 2012 16:14:01 -0700 |
parents | 42d5660b30b4 |
children | fdb9785d2c93 |
comparison
equal
deleted
inserted
replaced
67:42d5660b30b4 | 68:3a169ebb3224 |
---|---|
80 'primlitsym = hws val:(float / hex / binary / int / string / symbol / object / array / list / lambda / "(" ws expr:expr hws ")" { return expr; }) { return val; };' + | 80 '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("")); };' + | 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 'binary = "0b" digits:[01]+ { return new intlit(parseInt(digits.join(""), 2)); };' + | 83 'binary = "0b" digits:[01]+ { return new intlit(parseInt(digits.join(""), 2)); };' + |
84 'hex = "0x" digits:[0-9a-fA-F]+ { return new intlit(parseInt(digits.join(""), 16)); };' + | 84 'hex = "0x" digits:[0-9a-fA-F]+ { return new intlit(parseInt(digits.join(""), 16)); };' + |
85 'int = digits:[0-9]+ { return new intlit(parseInt(digits.join(""), 10)); };' + | 85 'int = sign:"-"? digits:[0-9]+ { return new intlit(parseInt(sign + digits.join(""), 10)); };' + |
86 'string = "\\"" text:(strpart/escape)* "\\"" { return new strlit(text.join("")); };' + | 86 'string = "\\"" text:(strpart/escape)* "\\"" { return new strlit(text.join("")); };' + |
87 'strpart = text:[^\\"\\\\]+ { return text.join(""); };' + | 87 'strpart = text:[^\\"\\\\]+ { return text.join(""); };' + |
88 'escape = "\\\\" char:[nt\\"r\\\\] { if (char == "n") { return "\\n"; } if (char == "r") { return "\\r"; } return char; };' + | 88 '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); };' + | 89 'object = "#{" ws messages:(assignment / funcall)* "}" { return new object(messages); };' + |
90 'array = "#[" ws els:opexpr* "]" { return new arraylit(els); };' + | 90 'array = "#[" ws els:opexpr* "]" { return new arraylit(els); };' + |