comparison parser.js @ 171:869399ff7faa

Merge
author Mike Pavone <pavone@retrodev.com>
date Tue, 13 Aug 2013 22:01:00 -0700
parents 18598163e3ef 9de2572a34a7
children ab204751d1e7
comparison
equal deleted inserted replaced
170:18598163e3ef 171:869399ff7faa
13 } 13 }
14 symbol.prototype.cleanName = function() { 14 symbol.prototype.cleanName = function() {
15 return this.name[0] == ':' ? this.name.substr(1) : this.name; 15 return this.name[0] == ':' ? this.name.substr(1) : this.name;
16 } 16 }
17 17
18 function intlit(val, bits) 18 function intlit(val, bits, unsigned)
19 { 19 {
20 if (!bits) { 20 if (!bits) {
21 bits = 32; 21 bits = 32;
22 } 22 }
23 if (unsigned === undefined) {
24 unsigned = false;
25 }
26 this.unsigned = unsigned;
23 this.bits = bits; 27 this.bits = bits;
24 this.val = val; 28 this.val = val;
25 } 29 }
26 30
27 function floatlit(val) 31 function floatlit(val)
87 '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; } };'+ 91 '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; } };'+
88 'primlitsym = hws val:(float / hex / binary / int / string / symbol / object / array / list / lambda / "(" ws expr:expr hws ")" { return expr; }) { return val; };' + 92 'primlitsym = hws val:(float / hex / binary / int / string / symbol / object / array / list / lambda / "(" ws expr:expr hws ")" { return expr; }) { return val; };' +
89 'symbol = chars:[a-zA-Z_!?@]+ trailing:(":"? [a-zA-Z_!?@0-9])* ! ":" { for (var i = 0; i < trailing.length; i++) { trailing[i] = trailing[i].join(""); } return new symbol(chars.join("") + trailing.join("")); };' + 93 'symbol = chars:[a-zA-Z_!?@]+ trailing:(":"? [a-zA-Z_!?@0-9])* ! ":" { for (var i = 0; i < trailing.length; i++) { trailing[i] = trailing[i].join(""); } return new symbol(chars.join("") + trailing.join("")); };' +
90 'float = digits:[0-9]+ "." decimals:[0-9]+ { return new floatlit(parseFloat(digits.join("") + "." + decimals.join(""))); };' + 94 'float = digits:[0-9]+ "." decimals:[0-9]+ { return new floatlit(parseFloat(digits.join("") + "." + decimals.join(""))); };' +
91 'binary = "0b" digits:[01]+ { return new intlit(parseInt(digits.join(""), 2)); };' + 95 'binary = "0b" digits:[01]+ { return new intlit(parseInt(digits.join(""), 2)); };' +
92 'hex = "0x" digits:[0-9a-fA-F]+ size:("i" ("8" / "16" / "32" / "64"))? { var bits = size ? parseInt(size[1], 10) : 0; return new intlit(parseInt(digits.join(""), 16), bits); };' + 96 'hex = "0x" digits:[0-9a-fA-F]+ size:([iu] ("8" / "16" / "32" / "64"))? { var bits = size ? parseInt(size[1], 10) : 0; return new intlit(parseInt(digits.join(""), 16), bits, size[0] == "u"); };' +
93 'int = sign:"-"? digits:[0-9]+ size:("i" ("8" / "16" / "32" / "64"))? { var bits = size ? parseInt(size[1], 10) : 0; return new intlit(parseInt(sign + digits.join(""), 10), bits); };' + 97 'int = sign:"-"? digits:[0-9]+ size:([iu] ("8" / "16" / "32" / "64"))? { var bits = size ? parseInt(size[1], 10) : 0; return new intlit(parseInt(sign + digits.join(""), 10), bits, size[0] == "u"); };' +
94 'string = "\\"" text:(strpart/escape)* "\\"" { return new strlit(text.join("")); };' + 98 'string = "\\"" text:(strpart/escape)* "\\"" { return new strlit(text.join("")); };' +
95 'strpart = text:[^\\"\\\\]+ { return text.join(""); };' + 99 'strpart = text:[^\\"\\\\]+ { return text.join(""); };' +
96 'escape = "\\\\" char:[nt\\"r\\\\] { if (char == "n") { return "\\n"; } if (char == "r") { return "\\r"; } return char; };' + 100 'escape = "\\\\" char:[nt\\"r\\\\] { if (char == "n") { return "\\n"; } if (char == "r") { return "\\r"; } return char; };' +
97 'object = "#{" ws messages:(assignment / funexpr)* "}" { return new object(messages); };' + 101 'object = "#{" ws messages:(assignment / funexpr)* "}" { return new object(messages); };' +
98 'array = "#[" ws els:opexpr* "]" { return new arraylit(els); };' + 102 'array = "#[" ws els:opexpr* "]" { return new arraylit(els); };' +