Mercurial > repos > tabletprog
diff parser.js @ 44:9dd370530f69
Fix escape codes in string literals. Don't print out the return value of main method. Fixup fib example to use print: method. Cleanup error handling in compiler slightly
author | Mike Pavone <pavone@retrodev.com> |
---|---|
date | Thu, 12 Jul 2012 22:49:08 -0700 |
parents | 27a2167663dd |
children | f2cda2e6f70e |
line wrap: on
line diff
--- a/parser.js Thu Jul 12 22:10:58 2012 -0700 +++ b/parser.js Thu Jul 12 22:49:08 2012 -0700 @@ -81,7 +81,9 @@ '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("")); };' + 'float = digits:[0-9]+ "." decimals:[0-9]+ { return new floatlit(parseFloat(digits.join("") + "." + decimals.join(""))); };' + 'int = digits:[0-9]+ { return new intlit(parseInt(digits.join(""), 10)); };' + -'string = "\\"" text:[^\\"]* "\\"" { return new strlit(text.join("")); };' + +'string = "\\"" text:(strpart/escape)* "\\"" { return new strlit(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 / funcall)* "}" { return new object(messages); };' + 'array = "#[" ws els:opexpr* "]" { return new arraylit(els); };' + 'list = "[" ws els:opexpr* "]" { return new listlit(els); };' +