From db5ea25e305e1e592a91bbcf3172ac7003a21436 Mon Sep 17 00:00:00 2001
From: Onoshko Dan <dangreen@mbp-dangreen.lan>
Date: Thu, 17 Apr 2014 01:39:27 +0700
Subject: [PATCH] Refactoring

Step 2
---
 lib/index.html |   11 +-
 lib/parse.js   | 1858 ++++++++++++++++++++++++------------------------
 2 files changed, 947 insertions(+), 922 deletions(-)

diff --git a/lib/index.html b/lib/index.html
index 450d0f70..248a6e2e 100644
--- a/lib/index.html
+++ b/lib/index.html
@@ -47,26 +47,29 @@
 		<textarea id="source" onkeyup="compile()"></textarea>
 		<textarea id="translation"></textarea>
 		<textarea id="result"></textarea>
-		<div id="controls"><button id="exec" onclick="exec()">Execute</button></div>
+		<div id="controls"><button id="exec" onclick="exec()">Execute</button><input type="checkbox" id="is_js" onclick="compile()"><label for="is_js">js parser</label></div>
 	</body>
 	<script>
 		var sourceArea = document.getElementById("source"), 
 			translationArea = document.getElementById("translation"), 
 			resultArea = document.getElementById("result"), 
+            isjs = document.getElementById("is_js"),
 			source;
 		sourceArea.value = source = localStorage.source;
+        isjs.checked = localStorage.isjs == "t";
 
 		function compile(){
 			source = sourceArea.value;
 			localStorage.source = source;
+            localStorage.isjs = isjs.checked ? "t" : "f";
 
 			stream = OutputStream({ beautify : true });
 			compressor = Compressor();
 
 			try {
 				// 1. compile
-				ast = Cola.parse(source);
-				ast = translate(ast);
+				ast = Cola.parse(source, null, isjs.checked);
+				if(!isjs.checked) ast = translate(ast);
 				ast.print(stream);
 				translationArea.value = stream.toString();
 
@@ -96,7 +99,7 @@
 
 		function Translate(){
 			stream = OutputStream({ beautify : true });
-			translate(Cola.parse(source)).print(stream);
+			translate(Cola.parse(source, null, isjs.checked)).print(stream);
 			return stream.toString();
 		}
 
diff --git a/lib/parse.js b/lib/parse.js
index 688d7cb6..d6240529 100644
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -239,7 +239,7 @@ Cola.is_token = function (token, type, val) {
 
 Cola.EX_EOF = {};
 
-Cola.tokenizer = function ($TEXT, filename, html5_comments) {
+Cola.Tokenizer = function ($TEXT, filename, is_js, html5_comments) {
     this.S = {
         text            : $TEXT.replace(/\r\n?|[\n\u2028\u2029]/g, "\n").replace(/\uFEFF/g, ''),
         filename        : filename,
@@ -251,20 +251,20 @@ Cola.tokenizer = function ($TEXT, filename, html5_comments) {
         tokcol          : 0,
         newline_before  : false,
         regex_allowed   : false,
-        string          : {
-            at    : [ new Cola.tokenizer.StringInfo() ],
-            level : 0
-        },
-        in_string       : false,
-        string_quote    : '',
         comments_before : []
     };
 
+    if(!is_js) this.S.string = {
+        at    : [ new Cola.Tokenizer.StringInfo() ],
+        level : 0
+    };
+
+    this.is_js = !!is_js;
     this.html5_comments = html5_comments;
     this.prev_was_dot = false;
 };
 
-Cola.tokenizer.StringInfo = function () {
+Cola.Tokenizer.StringInfo = function () {
     this.quote = '';
     this.inside = false;
     this.after_at = false;
@@ -273,10 +273,10 @@ Cola.tokenizer.StringInfo = function () {
     this.balance = 0;
 };
 
-Cola.tokenizer.with_eof_error = function (eof_error, cont) {
+Cola.Tokenizer.with_eof_error = function (eof_error, cont) {
     return function(x) {
         try {
-            return cont(x);
+            return cont.call(this, x);
         } catch(ex) {
             if (ex === Cola.EX_EOF) this.parse_error(eof_error);
             else throw ex;
@@ -284,9 +284,9 @@ Cola.tokenizer.with_eof_error = function (eof_error, cont) {
     };
 };
 
-Cola.tokenizer.prototype.peek = function (offset) { return this.S.text.charAt(this.S.pos + (offset ? offset : 0)); };
+Cola.Tokenizer.prototype.peek = function (offset) { return this.S.text.charAt(this.S.pos + (offset ? offset : 0)); };
 
-Cola.tokenizer.prototype.next = function (signal_eof, in_string) {
+Cola.Tokenizer.prototype.next = function (signal_eof, in_string) {
     var ch = this.S.text.charAt(this.S.pos++);
     if (signal_eof && !ch)
         throw Cola.EX_EOF;
@@ -300,27 +300,27 @@ Cola.tokenizer.prototype.next = function (signal_eof, in_string) {
     return ch;
 };
 
-Cola.tokenizer.prototype.forward = function (i) {
+Cola.Tokenizer.prototype.forward = function (i) {
     while (i-- > 0) this.next();
 };
 
-Cola.tokenizer.prototype.looking_at = function (str) {
+Cola.Tokenizer.prototype.looking_at = function (str) {
     return this.S.text.substr(this.S.pos, str.length) == str;
 };
 
-Cola.tokenizer.prototype.find = function (what, signal_eof) {
+Cola.Tokenizer.prototype.find = function (what, signal_eof) {
     var pos = this.S.text.indexOf(what, this.S.pos);
     if (signal_eof && pos == -1) throw Cola.EX_EOF;
     return pos;
 };
 
-Cola.tokenizer.prototype.start_token = function () {
+Cola.Tokenizer.prototype.start_token = function () {
     this.S.tokline = this.S.line;
     this.S.tokcol = this.S.col;
     this.S.tokpos = this.S.pos;
 };
 
-Cola.tokenizer.prototype.token = function (type, value, is_comment) {
+Cola.Tokenizer.prototype.token = function (type, value, is_comment) {
     this.S.regex_allowed = ((type == "operator" && !Cola.UNARY_POSTFIX(value)) ||
                        (type == "keyword" && Cola.KEYWORDS_BEFORE_EXPRESSION(value)) ||
                        (type == "punc" && Cola.PUNC_BEFORE_EXPRESSION(value)));
@@ -347,23 +347,23 @@ Cola.tokenizer.prototype.token = function (type, value, is_comment) {
     return new Cola.AST_Token(ret);
 };
 
-Cola.tokenizer.prototype.skip_whitespace = function () {
+Cola.Tokenizer.prototype.skip_whitespace = function () {
     while (Cola.WHITESPACE_CHARS(this.peek()))
         this.next();
 };
 
-Cola.tokenizer.prototype.read_while = function (pred) {
+Cola.Tokenizer.prototype.read_while = function (pred) {
     var ret = "", ch, i = 0;
     while ((ch = this.peek()) && pred(ch, i++))
         ret += this.next();
     return ret;
 };
 
-Cola.tokenizer.prototype.parse_error = function (err) {
+Cola.Tokenizer.prototype.parse_error = function (err) {
     Cola.js_error(err, this.S.filename, this.S.tokline, this.S.tokcol, this.S.tokpos);
 };
 
-Cola.tokenizer.prototype.read_num = function (prefix) {
+Cola.Tokenizer.prototype.read_num = function (prefix) {
     var has_e = false, after_e = false, has_x = false, has_dot = prefix == ".";
     var num = this.read_while(function(ch, i){
         var code = ch.charCodeAt(0);
@@ -390,7 +390,7 @@ Cola.tokenizer.prototype.read_num = function (prefix) {
     }
 };
 
-Cola.tokenizer.prototype.read_escaped_char = function (in_string) {
+Cola.Tokenizer.prototype.read_escaped_char = function (in_string) {
     var ch = this.next(true, in_string);
     switch (ch.charCodeAt(0)) {
       case 110 : return "\n";
@@ -407,7 +407,7 @@ Cola.tokenizer.prototype.read_escaped_char = function (in_string) {
     }
 };
 
-Cola.tokenizer.prototype.hex_bytes = function (n) {
+Cola.Tokenizer.prototype.hex_bytes = function (n) {
     var num = 0;
     for (; n > 0; --n) {
         var digit = parseInt(this.next(true), 16);
@@ -418,13 +418,13 @@ Cola.tokenizer.prototype.hex_bytes = function (n) {
     return num;
 };
 
-Cola.tokenizer.prototype.read_string = Cola.tokenizer.with_eof_error("Unterminated string constant", function(raw){
+Cola.Tokenizer.prototype.read_string = Cola.Tokenizer.with_eof_error("Unterminated string constant", function(raw){
     var quote = this.next(), ret = "";
 
-    if (!raw) {
+    if (!this.is_js && !raw) {
         if (this.S.string.at[this.S.string.level].inside && (this.S.string.at[this.S.string.level].inside_at || this.S.string.at[this.S.string.level].inside_braces)) {
             this.S.string.level++;
-            this.S.string.at[this.S.string.level] = new Cola.tokenizer.StringInfo();
+            this.S.string.at[this.S.string.level] = new Cola.Tokenizer.StringInfo();
         }
         this.S.string.at[this.S.string.level].inside = true;
 
@@ -449,7 +449,7 @@ Cola.tokenizer.prototype.read_string = Cola.tokenizer.with_eof_error("Unterminat
 
     for (;;) {
         var ch = this.next(true);
-        if (!raw && ch == "\\") {
+        if ((!raw || this.is_js) && ch == "\\") {
             // read OctalEscapeSequence (XXX: deprecated if "strict mode")
             // https://github.com/mishoo/UglifyJS/issues/178
             var octal_len = 0, first = null;
@@ -468,7 +468,7 @@ Cola.tokenizer.prototype.read_string = Cola.tokenizer.with_eof_error("Unterminat
             else ch = this.read_escaped_char(true);
         }
         else if (ch == quote) {
-            if(!raw){
+            if(!this.is_js && !raw){
                 this.S.string.at[this.S.string.level].inside = false;
                 this.S.string.at[this.S.string.level].quote = '';
                 if(this.S.string.level != 0){
@@ -479,13 +479,13 @@ Cola.tokenizer.prototype.read_string = Cola.tokenizer.with_eof_error("Unterminat
             break;
         } 
         ret += ch;
-        if (!raw && (this.peek() == '@' || this.peek() == '{' && this.peek(1) == '{')) break;
+        if (!this.is_js && !raw && (this.peek() == '@' || this.peek() == '{' && this.peek(1) == '{')) break;
     } 
 
     return this.token("string", ret);
 });
 
-Cola.tokenizer.prototype.read_at = function (){
+Cola.Tokenizer.prototype.read_at = function (){
     var at = this.next();
 
     if (this.S.string.at[this.S.string.level].inside && Cola.is_identifier_char(this.peek())) {
@@ -502,14 +502,14 @@ Cola.tokenizer.prototype.read_at = function (){
     this.parse_error('Unexpected character "@"');
 }
 
-Cola.tokenizer.prototype.read_braces = function (){
+Cola.Tokenizer.prototype.read_braces = function (){
     this.next(), this.next();
     this.S.string.at[this.S.string.level].inside_braces = true;
     this.S.string.at[this.S.string.level].balance = 1;
     return this.token("punc", "{{");        
 }
 
-Cola.tokenizer.prototype.skip_line_comment = function (type) {
+Cola.Tokenizer.prototype.skip_line_comment = function (type) {
     var regex_allowed = this.S.regex_allowed;
     var i = this.find("\n"), ret;
     if (i == -1) {
@@ -524,7 +524,7 @@ Cola.tokenizer.prototype.skip_line_comment = function (type) {
     return this.next_token();
 };
 
-Cola.tokenizer.prototype.skip_multiline_comment = Cola.tokenizer.with_eof_error("Unterminated multiline comment", function(){
+Cola.Tokenizer.prototype.skip_multiline_comment = Cola.Tokenizer.with_eof_error("Unterminated multiline comment", function(){
     var regex_allowed = this.S.regex_allowed;
     var i = this.find("*/", true);
     var text = this.S.text.substring(this.S.pos, i);
@@ -542,7 +542,7 @@ Cola.tokenizer.prototype.skip_multiline_comment = Cola.tokenizer.with_eof_error(
     return this.next_token();
 });
 
-Cola.tokenizer.prototype.read_name = function () {
+Cola.Tokenizer.prototype.read_name = function () {
     var backslash = false, name = "", ch, escaped = false, hex;
     while ((ch = this.peek()) != null) {
         if (!backslash) {
@@ -562,11 +562,11 @@ Cola.tokenizer.prototype.read_name = function () {
         hex = name.charCodeAt(0).toString(16).toUpperCase();
         name = "\\u" + "0000".substr(hex.length) + hex + name.slice(1);
     }
-    if (this.S.string.at[this.S.string.level].inside && this.S.string.at[this.S.string.level].after_at) this.S.string.at[this.S.string.level].after_at = false;
+    if (!this.is_js && this.S.string.at[this.S.string.level].inside && this.S.string.at[this.S.string.level].after_at) this.S.string.at[this.S.string.level].after_at = false;
     return name;
 };
 
-Cola.tokenizer.prototype.read_regexp = Cola.tokenizer.with_eof_error("Unterminated regular expression", function(regexp){
+Cola.Tokenizer.prototype.read_regexp = Cola.Tokenizer.with_eof_error("Unterminated regular expression", function(regexp){
     var prev_backslash = false, ch, in_class = false;
     while ((ch = this.next(true))) if (prev_backslash) {
         regexp += "\\" + ch;
@@ -585,15 +585,16 @@ Cola.tokenizer.prototype.read_regexp = Cola.tokenizer.with_eof_error("Unterminat
         regexp += ch;
     }
     var mods = this.read_name();
-    return this.token("regexp", /* new RegExp(regexp, mods) ColaScript */ "/" + regexp + "/" + mods);
+    return this.token("regexp", this.is_js ? new RegExp(regexp, mods) : "/" + regexp + "/" + mods);
 });
 
-Cola.tokenizer.prototype.read_operator = function (prefix) {
+Cola.Tokenizer.prototype.read_operator = function (prefix) {
+    var _this = this;
     function grow(op) {
-        if (!this.peek()) return op;
-        var bigger = op + this.peek();
+        if (!_this.peek()) return op;
+        var bigger = op + _this.peek();
         if (Cola.OPERATORS(bigger)) {
-            this.next();
+            _this.next();
             return grow(bigger);
         } else {
             return op;
@@ -602,7 +603,7 @@ Cola.tokenizer.prototype.read_operator = function (prefix) {
     return this.token("operator", grow(prefix || this.next()));
 };
 
-Cola.tokenizer.prototype.handle_slash = function () {
+Cola.Tokenizer.prototype.handle_slash = function () {
     this.next();
     switch (this.peek()) {
       case "/":
@@ -615,14 +616,14 @@ Cola.tokenizer.prototype.handle_slash = function () {
     return this.S.regex_allowed ? this.read_regexp("") : this.read_operator("/");
 };
 
-Cola.tokenizer.prototype.handle_dot = function () {
+Cola.Tokenizer.prototype.handle_dot = function () {
     this.next();
     return Cola.is_digit(this.peek().charCodeAt(0))
         ? this.read_num(".")
         : this.token("punc", ".");
     };
 
-Cola.tokenizer.prototype.read_word = function () {
+Cola.Tokenizer.prototype.read_word = function () {
     var word = this.read_name();
     if (this.prev_was_dot) return this.token("name", word);
     return Cola.KEYWORDS_ATOM(word) ? this.token("atom", word)
@@ -631,12 +632,12 @@ Cola.tokenizer.prototype.read_word = function () {
         : this.token("keyword", word);
     };
 
-Cola.tokenizer.prototype.next_token = function (force_regexp) {
+Cola.Tokenizer.prototype.next_token = function (force_regexp) {
     if (force_regexp != null)
     return this.read_regexp(force_regexp);
 
     var ch;
-    if (this.S.string.at[this.S.string.level].inside && !this.S.string.at[this.S.string.level].after_at && !this.S.string.at[this.S.string.level].inside_at && !this.S.string.at[this.S.string.level].inside_braces) {
+    if (!this.is_js && this.S.string.at[this.S.string.level].inside && !this.S.string.at[this.S.string.level].after_at && !this.S.string.at[this.S.string.level].inside_at && !this.S.string.at[this.S.string.level].inside_braces) {
         ch = this.peek();
         if (ch == '@') return this.read_at();
         if (ch == '{' && this.peek(1) == '{') return this.read_braces();
@@ -658,14 +659,15 @@ Cola.tokenizer.prototype.next_token = function (force_regexp) {
     ch = this.peek();
     if (!ch) return this.token("eof");
     var code = ch.charCodeAt(0);
-    switch (code) {
-      case 34: case 39: /* ColaScript */ case 96: return this.read_string();
+    if(!this.is_js && code == 96) this.read_string();
+    else switch (code) {
+      case 34: case 39: return this.read_string();
       case 46: return this.handle_dot();
       case 47: return this.handle_slash();
     }
     if (Cola.is_digit(code)) return this.read_num();
     if (Cola.PUNC_CHARS(ch)){
-        if (this.S.string.at[this.S.string.level].inside && (this.S.string.at[this.S.string.level].inside_at || this.S.string.at[this.S.string.level].inside_braces)) {
+        if (!this.is_js && this.S.string.at[this.S.string.level].inside && (this.S.string.at[this.S.string.level].inside_at || this.S.string.at[this.S.string.level].inside_braces)) {
             if (ch == '{') this.S.string.at[this.S.string.level].balance++;
             else if (ch == '}') this.S.string.at[this.S.string.level].balance--;
 
@@ -679,14 +681,14 @@ Cola.tokenizer.prototype.next_token = function (force_regexp) {
 
         return this.token("punc", this.next());
     }
-    if (ch == '@') return this.read_at();
+    if (!this.is_js && ch == '@') return this.read_at();
     if (Cola.OPERATOR_CHARS(ch)) return this.read_operator();
-    if (ch == 'r' && (this.peek(1) == '"' || this.peek(1) == "'" || this.peek(1) == '`')) return this.next(), this.read_string(true);
+    if (!this.is_js && ch == 'r' && (this.peek(1) == '"' || this.peek(1) == "'" || this.peek(1) == '`')) return this.next(), this.read_string(true);
     if (code == 92 || Cola.is_identifier_start(code)) return this.read_word();
     this.parse_error("Unexpected character '" + ch + "'");
 };
 
-Cola.tokenizer.prototype.next_token.context = function(nc) {
+Cola.Tokenizer.prototype.context = function(nc) {
     if (nc) this.S = nc;
     return this.S;
 };
@@ -768,9 +770,16 @@ Cola.ATOMIC_START_TOKEN = Cola.array_to_hash([ "atom", "num", "string", "regexp"
 
 /* -----[ Parser ]----- */
 
-Cola.parse = function ($TEXT, options) {
+Cola.parse = function ($TEXT, options, is_js) {
+    return (new Cola.Parser($TEXT, options, is_js)).parse();
+};
 
-    options = Cola.defaults(options, {
+Cola.Parser = function ($TEXT, options, is_js) {
+    var _this = this;
+
+    this.is_js = !!is_js;
+
+    this.options = Cola.defaults(options, {
         strict         : false,
         filename       : null,
         toplevel       : null,
@@ -778,10 +787,10 @@ Cola.parse = function ($TEXT, options) {
         html5_comments : true
     });
 
-    var tzr = typeof $TEXT == "string" ? new Cola.tokenizer($TEXT, options.filename, options.html5_comments) : $TEXT;
+    this.tokenizer = typeof $TEXT == "string" ? new Cola.Tokenizer($TEXT, this.options.filename, is_js, this.options.html5_comments) : $TEXT;
 
-    var S = {
-        input : function(){ return tzr.next_token() },
+    this.S = {
+        input : function(){ return _this.tokenizer.next_token() },
         token         : null,
         prev          : null,
         peeked        : null,
@@ -790,879 +799,892 @@ Cola.parse = function ($TEXT, options) {
         in_loop       : 0,
         labels        : []
     };
+    this.S.input.context = function(){ return _this.tokenizer.context() };
 
-    S.token = next();
+    this.S.token = this.next();
+};
 
-    function is(type, value) {
-        return Cola.is_token(S.token, type, value);
-    };
-
-    function peek() { return S.peeked || (S.peeked = S.input()); };
-
-    function next() {
-        S.prev = S.token;
-        if (S.peeked) {
-            S.token = S.peeked;
-            S.peeked = null;
-        } else {
-            S.token = S.input();
-        }
-        S.in_directives = S.in_directives && (
-            S.token.type == "string" || is("punc", ";")
-        );
-        return S.token;
-    };
-
-    function prev() {
-        return S.prev;
-    };
-
-    function croak(msg, line, col, pos) {
-        var ctx = S.input.context();
-        Cola.js_error(msg,
-                 ctx.filename,
-                 line != null ? line : ctx.tokline,
-                 col != null ? col : ctx.tokcol,
-                 pos != null ? pos : ctx.tokpos);
-    };
-
-    function token_error(token, msg) {
-        croak(msg, token.line, token.col);
-    };
-
-    function unexpected(token) {
-        if (token == null)
-            token = S.token;
-        token_error(token, "Unexpected token: " + token.type + " (" + token.value + ")");
-    };
-
-    function expect_token(type, val) {
-        if (is(type, val)) {
-            return next();
-        }
-        token_error(S.token, "Unexpected token " + S.token.type + " «" + S.token.value + "»" + ", expected " + type + " «" + val + "»");
-    };
-
-    function expect(punc) { return expect_token("punc", punc); };
-
-    function can_insert_semicolon() {
-        return false; // ColaScript
-        return !options.strict && (
-            S.token.nlb || is("eof") || is("punc", "}")
-        );
-    };
-
-    function semicolon() {
-        if (is("punc", ";")) next();
-        else if (!can_insert_semicolon()) unexpected();
-    };
-
-    function parenthesised() {
-        expect("(");
-        var exp = expression(true);
-        expect(")");
-        return exp;
-    };
-
-    function embed_tokens(parser) {
-        return function() {
-            var start = S.token;
-            var expr = parser();
-            var end = prev();
-            expr.start = start;
-            expr.end = end;
-            return expr;
-        };
-    };
-
-    function handle_regexp() {
-        if (is("operator", "/") || is("operator", "/=")) {
-            S.peeked = null;
-            S.token = S.input(S.token.value.substr(1)); // force regexp
-        }
-    };
-
-    var statement = embed_tokens(function() {
-        var tmp;
-        handle_regexp();
-        switch (S.token.type) {
-          case "string":
-            var dir = S.in_directives, stat = simple_statement();
-            // XXXv2: decide how to fix directives
-            if (dir && stat.body instanceof Cola.AST_String && !is("punc", ","))
-                return new Cola.AST_Directive({ value: stat.body.value });
-            return stat;
-          case "num":
-          case "regexp":
-          case "operator":
-          case "atom":
-            return simple_statement();
-
-          case "name":
-            return Cola.is_token(peek(), "punc", ":")
-                ? labeled_statement()
-                : simple_statement();
-
-          case "punc":
-            switch (S.token.value) {
-              case "{":
-                return new Cola.AST_BlockStatement({
-                    start : S.token,
-                    body  : block_(),
-                    end   : prev()
-                });
-              case "[":
-              case "(":
-                return simple_statement();
-              case ";":
-                next();
-                return new Cola.AST_EmptyStatement();
-              default:
-                unexpected();
-            }
-
-          case "keyword":
-            switch (tmp = S.token.value, next(), tmp) {
-              case "break":
-                return break_cont(Cola.AST_Break);
-
-              case "continue":
-                return break_cont(Cola.AST_Continue);
-
-              case "debugger":
-                semicolon();
-                return new Cola.AST_Debugger();
-
-              case "do":
-                return new Cola.AST_Do({
-                    body      : in_loop(statement),
-                    condition : (expect_token("keyword", "while"), tmp = parenthesised(), semicolon(), tmp)
-                });
-
-              case "while":
-                return new Cola.AST_While({
-                    condition : parenthesised(),
-                    body      : in_loop(statement)
-                });
-
-              case "for":
-                return for_();
-
-              case "function":
-                return function_(Cola.AST_Defun);
-
-              case "if":
-                return if_();
-
-              case "return":
-                if (S.in_function == 0)
-                    croak("'return' outside of function");
-                return new Cola.AST_Return({
-                    value: ( is("punc", ";")
-                             ? (next(), null)
-                             : can_insert_semicolon()
-                             ? null
-                             : (tmp = expression(true), semicolon(), tmp) )
-                });
-
-              case "switch":
-                return new Cola.AST_Switch({
-                    expression : parenthesised(),
-                    body       : in_loop(switch_body_)
-                });
-
-              case "throw":
-                if (S.token.nlb)
-                    croak("Illegal newline after 'throw'");
-                return new Cola.AST_Throw({
-                    value: (tmp = expression(true), semicolon(), tmp)
-                });
-
-              case "try":
-                return try_();
-
-              case "var":
-                return tmp = var_(), semicolon(), tmp;
-
-              case "const":
-                return tmp = const_(), semicolon(), tmp;
-
-              case "with":
-                return new Cola.AST_With({
-                    expression : parenthesised(),
-                    body       : statement()
-                });
-
-              default:
-                unexpected();
-            }
-        }
-    });
-
-    function labeled_statement() {
-        var label = as_symbol(Cola.AST_Label);
-        if (Cola.find_if(function(l){ return l.name == label.name }, S.labels)) {
-            // ECMA-262, 12.12: An ECMAScript program is considered
-            // syntactically incorrect if it contains a
-            // LabelledStatement that is enclosed by a
-            // LabelledStatement with the same Identifier as label.
-            croak("Label " + label.name + " defined twice");
-        }
-        expect(":");
-        S.labels.push(label);
-        var stat = statement();
-        S.labels.pop();
-        if (!(stat instanceof Cola.AST_IterationStatement)) {
-            // check for `continue` that refers to this label.
-            // those should be reported as syntax errors.
-            // https://github.com/mishoo/UglifyJS2/issues/287
-            label.references.forEach(function(ref){
-                if (ref instanceof Cola.AST_Continue) {
-                    ref = ref.label.start;
-                    croak("Continue label `" + label.name + "` refers to non-IterationStatement.",
-                          ref.line, ref.col, ref.pos);
-                }
-            });
-        }
-        return new Cola.AST_LabeledStatement({ body: stat, label: label });
-    };
-
-    function simple_statement(tmp) {
-        return new Cola.AST_SimpleStatement({ body: (tmp = expression(true), semicolon(), tmp) });
-    };
-
-    function break_cont(type) {
-        var label = null, ldef;
-        if (!can_insert_semicolon()) {
-            label = as_symbol(Cola.AST_LabelRef, true);
-        }
-        if (label != null) {
-            ldef = Cola.find_if(function(l){ return l.name == label.name }, S.labels);
-            if (!ldef)
-                croak("Undefined label " + label.name);
-            label.thedef = ldef;
-        }
-        else if (S.in_loop == 0)
-            croak(type.TYPE + " not inside a loop or switch");
-        semicolon();
-        var stat = new type({ label: label });
-        if (ldef) ldef.references.push(stat);
-        return stat;
-    };
-
-    function for_() {
-        expect("(");
-        var init = null;
-        if (!is("punc", ";")) {
-            init = is("keyword", "var")
-                ? (next(), var_(true))
-                : expression(true, true);
-            if (is("operator", "in")) {
-                if (init instanceof Cola.AST_Var && init.definitions.length > 1)
-                    croak("Only one variable declaration allowed in for..in loop");
-                next();
-                return for_in(init);
-            }
-        }
-        return regular_for(init);
-    };
-
-    function regular_for(init) {
-        expect(";");
-        var test = is("punc", ";") ? null : expression(true);
-        expect(";");
-        var step = is("punc", ")") ? null : expression(true);
-        expect(")");
-        return new Cola.AST_For({
-            init      : init,
-            condition : test,
-            step      : step,
-            body      : in_loop(statement)
-        });
-    };
-
-    function for_in(init) {
-        var lhs = init instanceof Cola.AST_Var ? init.definitions[0].name : null;
-        var obj = expression(true);
-        expect(")");
-        return new Cola.AST_ForIn({
-            init   : init,
-            name   : lhs,
-            object : obj,
-            body   : in_loop(statement)
-        });
-    };
-
-    var function_ = function(ctor) {
-        var in_statement = ctor === Cola.AST_Defun;
-        var name = is("name") ? as_symbol(in_statement ? Cola.AST_SymbolDefun : Cola.AST_SymbolLambda) : null;
-        if (in_statement && !name)
-            unexpected();
-        expect("(");
-        return new ctor({
-            name: name,
-            argnames: (function(first, a){
-                while (!is("punc", ")")) {
-                    if (first) first = false; else expect(",");
-                    a.push(as_symbol(Cola.AST_SymbolFunarg));
-                }
-                next();
-                return a;
-            })(true, []),
-            body: (function(loop, labels){
-                ++S.in_function;
-                S.in_directives = true;
-                S.in_loop = 0;
-                S.labels = [];
-                var a = block_();
-                --S.in_function;
-                S.in_loop = loop;
-                S.labels = labels;
-                return a;
-            })(S.in_loop, S.labels)
-        });
-    };
-
-    function if_() {
-        var cond = parenthesised(), body = statement(), belse = null;
-        if (is("keyword", "else")) {
-            next();
-            belse = statement();
-        }
-        return new Cola.AST_If({
-            condition   : cond,
-            body        : body,
-            alternative : belse
-        });
-    };
-
-    function block_() {
-        expect("{");
-        var a = [];
-        while (!is("punc", "}")) {
-            if (is("eof")) unexpected();
-            a.push(statement());
-        }
-        next();
-        return a;
-    };
-
-    function switch_body_() {
-        expect("{");
-        var a = [], cur = null, branch = null, tmp;
-        while (!is("punc", "}")) {
-            if (is("eof")) unexpected();
-            if (is("keyword", "case")) {
-                if (branch) branch.end = prev();
-                cur = [];
-                branch = new Cola.AST_Case({
-                    start      : (tmp = S.token, next(), tmp),
-                    expression : expression(true),
-                    body       : cur
-                });
-                a.push(branch);
-                expect(":");
-            }
-            else if (is("keyword", "default")) {
-                if (branch) branch.end = prev();
-                cur = [];
-                branch = new Cola.AST_Default({
-                    start : (tmp = S.token, next(), expect(":"), tmp),
-                    body  : cur
-                });
-                a.push(branch);
-            }
-            else {
-                if (!cur) unexpected();
-                cur.push(statement());
-            }
-        }
-        if (branch) branch.end = prev();
-        next();
-        return a;
-    };
-
-    function try_() {
-        var body = block_(), bcatch = null, bfinally = null;
-        if (is("keyword", "catch")) {
-            var start = S.token;
-            next();
-            expect("(");
-            var name = as_symbol(Cola.AST_SymbolCatch);
-            expect(")");
-            bcatch = new Cola.AST_Catch({
-                start   : start,
-                argname : name,
-                body    : block_(),
-                end     : prev()
-            });
-        }
-        if (is("keyword", "finally")) {
-            var start = S.token;
-            next();
-            bfinally = new Cola.AST_Finally({
-                start : start,
-                body  : block_(),
-                end   : prev()
-            });
-        }
-        if (!bcatch && !bfinally)
-            croak("Missing catch/finally blocks");
-        return new Cola.AST_Try({
-            body     : body,
-            bcatch   : bcatch,
-            bfinally : bfinally
-        });
-    };
-
-    function vardefs(no_in, in_const) {
-        var a = [];
-        for (;;) {
-            a.push(new Cola.AST_VarDef({
-                start : S.token,
-                name  : as_symbol(in_const ? Cola.AST_SymbolConst : Cola.AST_SymbolVar),
-                value : is("operator", "=") ? (next(), expression(false, no_in)) : null,
-                end   : prev()
-            }));
-            if (!is("punc", ","))
-                break;
-            next();
-        }
-        return a;
-    };
-
-    var var_ = function(no_in) {
-        return new Cola.AST_Var({
-            start       : prev(),
-            definitions : vardefs(no_in, false),
-            end         : prev()
-        });
-    };
-
-    var const_ = function() {
-        return new Cola.AST_Const({
-            start       : prev(),
-            definitions : vardefs(false, true),
-            end         : prev()
-        });
-    };
-
-    var new_ = function() {
-        var start = S.token;
-        expect_token("operator", "new");
-        var newexp = expr_atom(false), args;
-        if (is("punc", "(")) {
-            next();
-            args = expr_list(")");
-        } else {
-            args = [];
-        }
-        return subscripts(new Cola.AST_New({
-            start      : start,
-            expression : newexp,
-            args       : args,
-            end        : prev()
-        }), true);
-    };
-
-    function string_template_(start_token) {
-        var body = [new Cola.AST_String({ start: start_token, end: start_token, value: start_token.value })];
-        next();
-
-        //if (!is('punc', '@') && !is('punc', '@{')) return body[0];
-        while (is('punc', '@') || is('punc', '@{') || is('punc', '{{') || is('string', null))
-            if (is('string', null)) {
-                body.push(new Cola.AST_String({ start: S.token, end: S.token, value: S.token.value }));
-                next();
-            } else
-
-            if (is('punc', '@')) {
-                next();
-                body.push(_make_symbol(Cola.AST_SymbolRef));
-                next();
-            } else 
-
-            if (is('punc', '@{')) {
-                next();
-                body.push(expression(true));
-                expect('}');
-            } else 
-            
-            if (is('punc', '{{')) {
-                next();
-                body.push(expression(true));
-                expect('}}');
-            }
-
-        var last = body[body.length - 1];
-        body[0].value = body[0].value.replace(/^[ \t]*[\n\r]/,'');
-        if (last instanceof Cola.AST_String) {
-            var offstr = last.value.match(/[\n\r][ \t]*$/);
-            if(offstr){
-                offstr = offstr[0];
-                for(var i in body) if(body[i] instanceof Cola.AST_String){
-                    body[i].value = body[i].value.replace(new RegExp(offstr, 'g'), '\n');
-                    body[i].value = body[i].value.replace(/\n/g, '\n');
-                }
-                last.value = last.value.replace(/[\n\r]$/,'');
-            }
-        }
-
-        if (body.length == 1) return body[0];
-        return new Cola.AST_StringTemplate({
-            start : start_token,
-            end   : prev(),
-            body  : body
-        });
-    }
-
-    function as_atom_node() {
-        var tok = S.token, ret;
-        switch (tok.type) {
-          case "name":
-          case "keyword":
-            ret = _make_symbol(Cola.AST_SymbolRef);
-            break;
-          case "num":
-            ret = new Cola.AST_Number({ start: tok, end: tok, value: tok.value });
-            break;
-          case "string":
-            return string_template_(tok);//new Cola.AST_String({ start: tok, end: tok, value: tok.value });
-            //break;
-          case "regexp":
-            ret = new Cola.AST_RegExp({ start: tok, end: tok, value: tok.value });
-            break;
-          case "atom":
-            switch (tok.value) {
-              case "false": /* ColaScript */ case "off": case "no":  
-                ret = new Cola.AST_False({ start: tok, end: tok });
-                break;
-              case "true": /* ColaScript */ case "on": case "yes":
-                ret = new Cola.AST_True({ start: tok, end: tok });
-                break;
-              case "null":
-                ret = new Cola.AST_Null({ start: tok, end: tok });
-                break;
-            }
-            break;
-        }
-        next();
-        return ret;
-    };
-
-    var expr_atom = function(allow_calls) {
-        if (is("operator", "new")) {
-            return new_();
-        }
-        var start = S.token;
-        if (is("punc")) {
-            switch (start.value) {
-              case "(":
-                next();
-                var ex = expression(true);
-                ex.start = start;
-                ex.end = S.token;
-                expect(")");
-                return subscripts(ex, allow_calls);
-              case "[":
-                return subscripts(array_(), allow_calls);
-              case "{":
-                return subscripts(object_(), allow_calls);
-            }
-            unexpected();
-        }
-        if (is("keyword", "function")) {
-            next();
-            var func = function_(Cola.AST_Function);
-            func.start = start;
-            func.end = prev();
-            return subscripts(func, allow_calls);
-        }
-        if (Cola.ATOMIC_START_TOKEN[S.token.type]) {
-            return subscripts(as_atom_node(), allow_calls);
-        }
-        unexpected();
-    };
-
-    function expr_list(closing, allow_trailing_comma, allow_empty) {
-        var first = true, a = [];
-        while (!is("punc", closing)) {
-            if (first) first = false; else expect(",");
-            if (allow_trailing_comma && is("punc", closing)) break;
-            if (is("punc", ",") && allow_empty) {
-                a.push(new Cola.AST_Hole({ start: S.token, end: S.token }));
-            } else {
-                a.push(expression(false));
-            }
-        }
-        next();
-        return a;
-    };
-
-    var array_ = embed_tokens(function() {
-        expect("[");
-        return new Cola.AST_Array({
-            elements: expr_list("]", !options.strict, true)
-        });
-    });
-
-    var object_ = embed_tokens(function() {
-        expect("{");
-        var first = true, a = [];
-        while (!is("punc", "}")) {
-            if (first) first = false; else expect(",");
-            if (!options.strict && is("punc", "}"))
-                // allow trailing comma
-                break;
-            var start = S.token;
-            var type = start.type;
-            var name = as_property_name();
-            if (type == "name" && !is("punc", ":")) {
-                if (name == "get") {
-                    a.push(new Cola.AST_ObjectGetter({
-                        start : start,
-                        key   : as_atom_node(),
-                        value : function_(Cola.AST_Accessor),
-                        end   : prev()
-                    }));
-                    continue;
-                }
-                if (name == "set") {
-                    a.push(new Cola.AST_ObjectSetter({
-                        start : start,
-                        key   : as_atom_node(),
-                        value : function_(Cola.AST_Accessor),
-                        end   : prev()
-                    }));
-                    continue;
-                }
-            }
-            expect(":");
-            a.push(new Cola.AST_ObjectKeyVal({
-                start : start,
-                key   : name,
-                value : expression(false),
-                end   : prev()
-            }));
-        }
-        next();
-        return new Cola.AST_Object({ properties: a });
-    });
-
-    function as_property_name() {
-        var tmp = S.token;
-        next();
-        switch (tmp.type) {
-          case "num":
-          case "string":
-          case "name":
-          case "operator":
-          case "keyword":
-          case "atom":
-            return tmp.value;
-          default:
-            unexpected();
-        }
-    };
-
-    function as_name() {
-        var tmp = S.token;
-        next();
-        switch (tmp.type) {
-          case "name":
-          case "operator":
-          case "keyword":
-          case "atom":
-            return tmp.value;
-          default:
-            unexpected();
-        }
-    };
-
-    function _make_symbol(type) {
-        var name = S.token.value;
-        return new (name == "this" ? Cola.AST_This : type)({
-            name  : String(name),
-            start : S.token,
-            end   : S.token
-        });
-    };
-
-    function as_symbol(type, noerror) {
-        if (!is("name")) {
-            if (!noerror) croak("Name expected");
-            return null;
-        }
-        var sym = _make_symbol(type);
-        next();
-        return sym;
-    };
-
-    var subscripts = function(expr, allow_calls) {
-        var start = expr.start;
-        if (is("punc", ".")) {
-            next();
-            return subscripts(new Cola.AST_Dot({
-                start      : start,
-                expression : expr,
-                property   : as_name(),
-                end        : prev()
-            }), allow_calls);
-        }
-        if (is("punc", "[")) {
-            next();
-            var prop = expression(true);
-            expect("]");
-            return subscripts(new Cola.AST_Sub({
-                start      : start,
-                expression : expr,
-                property   : prop,
-                end        : prev()
-            }), allow_calls);
-        }
-        if (allow_calls && is("punc", "(")) {
-            next();
-            return subscripts(new Cola.AST_Call({
-                start      : start,
-                expression : expr,
-                args       : expr_list(")"),
-                end        : prev()
-            }), true);
-        }
-        return expr;
-    };
-
-    var maybe_unary = function(allow_calls) {
-        var start = S.token;
-        if (is("operator") && Cola.UNARY_PREFIX(start.value)) {
-            next();
-            handle_regexp();
-            var ex = make_unary(Cola.AST_UnaryPrefix, start.value, maybe_unary(allow_calls));
-            ex.start = start;
-            ex.end = prev();
-            return ex;
-        }
-        var val = expr_atom(allow_calls);
-        while (is("operator") && Cola.UNARY_POSTFIX(S.token.value) && !S.token.nlb) {
-            val = make_unary(Cola.AST_UnaryPostfix, S.token.value, val);
-            val.start = start;
-            val.end = S.token;
-            next();
-        }
-        return val;
-    };
-
-    function make_unary(ctor, op, expr) {
-        if ((op == "++" || op == "--") && !is_assignable(expr))
-            croak("Invalid use of " + op + " operator");
-        return new ctor({ operator: op, expression: expr });
-    };
-
-    var expr_op = function(left, min_prec, no_in) {
-        var op = is("operator") ? S.token.value : null;
-        if (op == "in" && no_in) op = null;
-        var prec = op != null ? Cola.PRECEDENCE[op] : null;
-        if (prec != null && prec > min_prec) {
-            next();
-            var right = expr_op(maybe_unary(true), prec, no_in);
-            return expr_op(new Cola.AST_Binary({
-                start    : left.start,
-                left     : left,
-                operator : op,
-                right    : right,
-                end      : right.end
-            }), min_prec, no_in);
-        }
-        return left;
-    };
-
-    function expr_ops(no_in) {
-        return expr_op(maybe_unary(true), 0, no_in);
-    };
-
-    var maybe_conditional = function(no_in) {
-        var start = S.token;
-        var expr = expr_ops(no_in);
-        if (is("operator", "?")) {
-            next();
-            var yes = expression(false);
-            expect(":");
-            return new Cola.AST_Conditional({
-                start       : start,
-                condition   : expr,
-                consequent  : yes,
-                alternative : expression(false, no_in),
-                end         : prev()
-            });
-        }
-        return expr;
-    };
-
-    function is_assignable(expr) {
-        if (!options.strict) return true;
-        if (expr instanceof Cola.AST_This) return false;
-        return (expr instanceof Cola.AST_PropAccess || expr instanceof Cola.AST_Symbol);
-    };
-
-    var maybe_assign = function(no_in) {
-        var start = S.token;
-        var left = maybe_conditional(no_in), val = S.token.value;
-        if (is("operator") && Cola.ASSIGNMENT(val)) {
-            if (is_assignable(left)) {
-                next();
-                return new Cola.AST_Assign({
-                    start    : start,
-                    left     : left,
-                    operator : val,
-                    right    : maybe_assign(no_in),
-                    end      : prev()
-                });
-            }
-            croak("Invalid assignment");
-        }
-        return left;
-    };
-
-    var expression = function(commas, no_in) {
-        var start = S.token;
-        var expr = maybe_assign(no_in);
-        if (commas && is("punc", ",")) {
-            next();
-            return new Cola.AST_Seq({
-                start  : start,
-                car    : expr,
-                cdr    : expression(true, no_in),
-                end    : peek()
-            });
-        }
-        return expr;
-    };
-
-    function in_loop(cont) {
-        ++S.in_loop;
-        var ret = cont();
-        --S.in_loop;
-        return ret;
-    };
-
-    if (options.expression) {
-        return expression(true);
+Cola.Parser.prototype.parse = function () {
+    var _this = this;
+    if (this.options.expression) {
+        return this.expression(true);
     }
 
     return (function(){
-        var start = S.token;
+        var start = _this.S.token;
         var body = [];
-        while (!is("eof"))
-            body.push(statement());
-        var end = prev();
-        var toplevel = options.toplevel;
+        while (!_this.is("eof"))
+            body.push(_this.statement());
+        var end = _this.prev();
+        var toplevel = _this.options.toplevel;
         if (toplevel) {
             toplevel.body = toplevel.body.concat(body);
             toplevel.end = end;
         } else {
             toplevel = new Cola.AST_Toplevel({ start: start, body: body, end: end });
         }
+        toplevel.language = _this.is_js ? 'js' : 'cola';
         return toplevel;
     })();
-
+};
+
+Cola.Parser.prototype.is = function (type, value) {
+    return Cola.is_token(this.S.token, type, value);
+};
+
+Cola.Parser.prototype.peek = function () { return this.S.peeked || (this.S.peeked = this.S.input()); };
+
+Cola.Parser.prototype.next = function () {
+    this.S.prev = this.S.token;
+    if (this.S.peeked) {
+        this.S.token = this.S.peeked;
+        this.S.peeked = null;
+    } else {
+        this.S.token = this.S.input();
+    }
+    this.S.in_directives = this.S.in_directives && (
+        this.S.token.type == "string" || this.is("punc", ";")
+    );
+    return this.S.token;
+};
+
+Cola.Parser.prototype.prev = function () {
+    return this.S.prev;
+};
+
+Cola.Parser.prototype.croak = function (msg, line, col, pos) {
+    var ctx = this.S.input.context();
+    Cola.js_error(msg,
+             ctx.filename,
+             line != null ? line : ctx.tokline,
+             col != null ? col : ctx.tokcol,
+             pos != null ? pos : ctx.tokpos);
+};
+
+Cola.Parser.prototype.token_error = function (token, msg) {
+    this.croak(msg, token.line, token.col);
+};
+
+Cola.Parser.prototype.unexpected = function (token) {
+    if (token == null)
+        token = this.S.token;
+    this.token_error(token, "Unexpected token: " + token.type + " `" + token.value + "`");
+};
+
+Cola.Parser.prototype.expect_token = function (type, val) {
+    if (this.is(type, val)) {
+        return this.next();
+    }
+    this.token_error(this.S.token, "Unexpected token " + this.S.token.type + " `" + this.S.token.value + "`" + ", expected " + type + " `" + val + "`");
+};
+
+Cola.Parser.prototype.expect = function (punc) { return this.expect_token("punc", punc); };
+
+Cola.Parser.prototype.can_insert_semicolon = function () {
+    return false; // ColaScript
+    return !this.options.strict && (
+        this.S.token.nlb || this.is("eof") || this.is("punc", "}")
+    );
+};
+
+Cola.Parser.prototype.semicolon = function () {
+    if (this.is("punc", ";")) this.next();
+    else if (!this.can_insert_semicolon()) this.unexpected();
+};
+
+Cola.Parser.prototype.parenthesised = function () {
+    this.expect("(");
+    var exp = this.expression(true);
+    this.expect(")");
+    return exp;
+};
+
+Cola.Parser.embed_tokens = function (parser) {
+    return function() {
+        var start = this.S.token;
+        var expr = parser.call(this);
+        var end = this.prev();
+        expr.start = start;
+        expr.end = end;
+        return expr;
+    };
+};
+
+Cola.Parser.prototype.handle_regexp = function () {
+    if (this.is("operator", "/") || this.is("operator", "/=")) {
+        this.S.peeked = null;
+        this.S.token = this.S.input(this.S.token.value.substr(1)); // force regexp
+    }
+};
+
+Cola.Parser.prototype.statement = Cola.Parser.embed_tokens(function() {
+    var tmp;
+    this.handle_regexp();
+    switch (this.S.token.type) {
+      case "string":
+        var dir = this.S.in_directives, stat = this.simple_statement();
+        // XXXv2: decide how to fix directives
+        if (dir && stat.body instanceof Cola.AST_String && !this.is("punc", ","))
+            return new Cola.AST_Directive({ value: stat.body.value });
+        return stat;
+      case "num":
+      case "regexp":
+      case "operator":
+      case "atom":
+        return this.simple_statement();
+
+      case "name":
+        return Cola.is_token(this.peek(), "punc", ":")
+            ? this.labeled_statement()
+            : this.simple_statement();
+
+      case "punc":
+        switch (this.S.token.value) {
+          case "{":
+            return new Cola.AST_BlockStatement({
+                start : this.S.token,
+                body  : this.block_(),
+                end   : this.prev()
+            });
+          case "[":
+          case "(":
+            return this.simple_statement();
+          case ";":
+            this.next();
+            return new Cola.AST_EmptyStatement();
+          default:
+            this.unexpected();
+        }
+
+      case "keyword":
+        switch (tmp = this.S.token.value, this.next(), tmp) {
+          case "break":
+            return this.break_cont(Cola.AST_Break);
+
+          case "continue":
+            return this.break_cont(Cola.AST_Continue);
+
+          case "debugger":
+            this.semicolon();
+            return new Cola.AST_Debugger();
+
+          case "do":
+            return new Cola.AST_Do({
+                body      : this.in_loop(statement),
+                condition : (this.expect_token("keyword", "while"), tmp = this.parenthesised(), this.semicolon(), tmp)
+            });
+
+          case "while":
+            return new Cola.AST_While({
+                condition : this.parenthesised(),
+                body      : this.in_loop(statement)
+            });
+
+          case "for":
+            return this.for_();
+
+          case "function":
+            return this.function_(Cola.AST_Defun);
+
+          case "if":
+            return this.if_();
+
+          case "return":
+            if (this.S.in_function == 0)
+                this.croak("'return' outside of function");
+            return new Cola.AST_Return({
+                value: ( this.is("punc", ";")
+                         ? (this.next(), null)
+                         : this.can_insert_semicolon()
+                         ? null
+                         : (tmp = this.expression(true), this.semicolon(), tmp) )
+            });
+
+          case "switch":
+            return new Cola.AST_Switch({
+                expression : this.parenthesised(),
+                body       : this.in_loop(switch_body_)
+            });
+
+          case "throw":
+            if (this.S.token.nlb)
+                this.croak("Illegal newline after 'throw'");
+            return new Cola.AST_Throw({
+                value: (tmp = this.expression(true), this.semicolon(), tmp)
+            });
+
+          case "try":
+            return this.try_();
+
+          case "var":
+            return tmp = this.var_(), this.semicolon(), tmp;
+
+          case "const":
+            return tmp = this.const_(), this.semicolon(), tmp;
+
+          case "with":
+            return new Cola.AST_With({
+                expression : this.parenthesised(),
+                body       : this.statement()
+            });
+
+          default:
+            this.unexpected();
+        }
+    }
+});
+
+Cola.Parser.prototype.labeled_statement = function () {
+    var label = this.as_symbol(Cola.AST_Label), _this = this;
+    if (Cola.find_if(function(l){ return l.name == label.name }, this.S.labels)) {
+        // ECMA-262, 12.12: An ECMAScript program is considered
+        // syntactically incorrect if it contains a
+        // LabelledStatement that is enclosed by a
+        // LabelledStatement with the same Identifier as label.
+        this.croak("Label " + label.name + " defined twice");
+    }
+    this.expect(":");
+    this.S.labels.push(label);
+    var stat = this.statement();
+    this.S.labels.pop();
+    if (!(stat instanceof Cola.AST_IterationStatement)) {
+        // check for `continue` that refers to this label.
+        // those should be reported as syntax errors.
+        // https://github.com/mishoo/UglifyJS2/issues/287
+        label.references.forEach(function(ref){
+            if (ref instanceof Cola.AST_Continue) {
+                ref = ref.label.start;
+                _this.croak("Continue label `" + label.name + "` refers to non-IterationStatement.",
+                      ref.line, ref.col, ref.pos);
+            }
+        });
+    }
+    return new Cola.AST_LabeledStatement({ body: stat, label: label });
+};
+
+Cola.Parser.prototype.simple_statement = function (tmp) {
+    return new Cola.AST_SimpleStatement({ body: (tmp = this.expression(true), this.semicolon(), tmp) });
+};
+
+Cola.Parser.prototype.break_cont = function (type) {
+    var label = null, ldef;
+    if (!this.can_insert_semicolon()) {
+        label = this.as_symbol(Cola.AST_LabelRef, true);
+    }
+    if (label != null) {
+        ldef = Cola.find_if(function(l){ return l.name == label.name }, this.S.labels);
+        if (!ldef)
+            this.croak("Undefined label " + label.name);
+        label.thedef = ldef;
+    }
+    else if (this.S.in_loop == 0)
+        this.croak(type.TYPE + " not inside a loop or switch");
+    this.semicolon();
+    var stat = new type({ label: label });
+    if (ldef) ldef.references.push(stat);
+    return stat;
+};
+
+Cola.Parser.prototype.for_ = function () {
+    this.expect("(");
+    var init = null;
+    if (!this.is("punc", ";")) {
+        init = this.is("keyword", "var")
+            ? (this.next(), this.var_(true))
+            : this.expression(true, true);
+        if (this.is("operator", "in")) {
+            if (init instanceof Cola.AST_Var && init.definitions.length > 1)
+                this.croak("Only one variable declaration allowed in for..in loop");
+            this.next();
+            return this.for_in(init);
+        }
+    }
+    return this.regular_for(init);
+};
+
+Cola.Parser.prototype.regular_for = function (init) {
+    this.expect(";");
+    var test = this.is("punc", ";") ? null : this.expression(true);
+    this.expect(";");
+    var step = this.is("punc", ")") ? null : this.expression(true);
+    this.expect(")");
+    return new Cola.AST_For({
+        init      : init,
+        condition : test,
+        step      : step,
+        body      : this.in_loop(statement)
+    });
+};
+
+Cola.Parser.prototype.for_in = function (init) {
+    var lhs = init instanceof Cola.AST_Var ? init.definitions[0].name : null;
+    var obj = this.expression(true);
+    this.expect(")");
+    return new Cola.AST_ForIn({
+        init   : init,
+        name   : lhs,
+        object : obj,
+        body   : this.in_loop(statement)
+    });
+};
+
+Cola.Parser.prototype.function_ = function(ctor) {
+    var in_statement = ctor === Cola.AST_Defun, _this = this;
+    var name = this.is("name") ? this.as_symbol(in_statement ? Cola.AST_SymbolDefun : Cola.AST_SymbolLambda) : null;
+    if (in_statement && !name)
+        this.unexpected();
+    this.expect("(");
+    return new ctor({
+        name: name,
+        argnames: (function(first, a){
+            while (!_this.is("punc", ")")) {
+                if (first) first = false; else _this.expect(",");
+                a.push(_this.as_symbol(Cola.AST_SymbolFunarg));
+            }
+            _this.next();
+            return a;
+        })(true, []),
+        body: (function(loop, labels){
+            ++_this.S.in_function;
+            _this.S.in_directives = true;
+            _this.S.in_loop = 0;
+            _this.S.labels = [];
+            var a = _this.block_();
+            --_this.S.in_function;
+            _this.S.in_loop = loop;
+            _this.S.labels = labels;
+            return a;
+        })(this.S.in_loop, this.S.labels)
+    });
+};
+
+Cola.Parser.prototype.if_ = function () {
+    var cond = this.parenthesised(), body = this.statement(), belse = null;
+    if (this.is("keyword", "else")) {
+        this.next();
+        belse = this.statement();
+    }
+    return new Cola.AST_If({
+        condition   : cond,
+        body        : body,
+        alternative : belse
+    });
+};
+
+Cola.Parser.prototype.block_ = function () {
+    this.expect("{");
+    var a = [];
+    while (!this.is("punc", "}")) {
+        if (this.is("eof")) this.unexpected();
+        a.push(this.statement());
+    }
+    this.next();
+    return a;
+};
+
+Cola.Parser.prototype.switch_body_ = function () {
+    this.expect("{");
+    var a = [], cur = null, branch = null, tmp;
+    while (!this.is("punc", "}")) {
+        if (this.is("eof")) this.unexpected();
+        if (this.is("keyword", "case")) {
+            if (branch) branch.end = this.prev();
+            cur = [];
+            branch = new Cola.AST_Case({
+                start      : (tmp = this.S.token, this.next(), tmp),
+                expression : this.expression(true),
+                body       : cur
+            });
+            a.push(branch);
+            this.expect(":");
+        }
+        else if (this.is("keyword", "default")) {
+            if (branch) branch.end = this.prev();
+            cur = [];
+            branch = new Cola.AST_Default({
+                start : (tmp = this.S.token, this.next(), this.expect(":"), tmp),
+                body  : cur
+            });
+            a.push(branch);
+        }
+        else {
+            if (!cur) this.unexpected();
+            cur.push(this.statement());
+        }
+    }
+    if (branch) branch.end = this.prev();
+    this.next();
+    return a;
+};
+
+Cola.Parser.prototype.try_ = function () {
+    var body = this.block_(), bcatch = null, bfinally = null;
+    if (this.is("keyword", "catch")) {
+        var start = this.S.token;
+        this.next();
+        this.expect("(");
+        var name = this.as_symbol(Cola.AST_SymbolCatch);
+        this.expect(")");
+        bcatch = new Cola.AST_Catch({
+            start   : start,
+            argname : name,
+            body    : this.block_(),
+            end     : this.prev()
+        });
+    }
+    if (this.is("keyword", "finally")) {
+        var start = this.S.token;
+        this.next();
+        bfinally = new Cola.AST_Finally({
+            start : start,
+            body  : this.block_(),
+            end   : this.prev()
+        });
+    }
+    if (!bcatch && !bfinally)
+        this.croak("Missing catch/finally blocks");
+    return new Cola.AST_Try({
+        body     : body,
+        bcatch   : bcatch,
+        bfinally : bfinally
+    });
+};
+
+Cola.Parser.prototype.vardefs = function (no_in, in_const) {
+    var a = [];
+    for (;;) {
+        a.push(new Cola.AST_VarDef({
+            start : this.S.token,
+            name  : this.as_symbol(in_const ? Cola.AST_SymbolConst : Cola.AST_SymbolVar),
+            value : this.is("operator", "=") ? (this.next(), this.expression(false, no_in)) : null,
+            end   : this.prev()
+        }));
+        if (!this.is("punc", ","))
+            break;
+        this.next();
+    }
+    return a;
+};
+
+Cola.Parser.prototype.var_ = function(no_in) {
+    return new Cola.AST_Var({
+        start       : this.prev(),
+        definitions : this.vardefs(no_in, false),
+        end         : this.prev()
+    });
+};
+
+Cola.Parser.prototype.const_ = function() {
+    return new Cola.AST_Const({
+        start       : this.prev(),
+        definitions : this.vardefs(false, true),
+        end         : this.prev()
+    });
+};
+
+Cola.Parser.prototype.new_ = function() {
+    var start = this.S.token;
+    this.expect_token("operator", "new");
+    var newexp = this.expr_atom(false), args;
+    if (this.is("punc", "(")) {
+        this.next();
+        args = this.expr_list(")");
+    } else {
+        args = [];
+    }
+    return this.subscripts(new Cola.AST_New({
+        start      : start,
+        expression : newexp,
+        args       : args,
+        end        : this.prev()
+    }), true);
+};
+
+Cola.Parser.prototype.string_template_ = function (start_token) {
+    var body = [new Cola.AST_String({ start: start_token, end: start_token, value: start_token.value })];
+    this.next();
+
+    while (this.is('punc', '@') || this.is('punc', '@{') || this.is('punc', '{{') || this.is('string', null))
+        if (this.is('string', null)) {
+            body.push(new Cola.AST_String({ start: this.S.token, end: this.S.token, value: this.S.token.value }));
+            this.next();
+        } else
+
+        if (this.is('punc', '@')) {
+            this.next();
+            body.push(this._make_symbol(Cola.AST_SymbolRef));
+            this.next();
+        } else 
+
+        if (this.is('punc', '@{')) {
+            this.next();
+            body.push(this.expression(true));
+            this.expect('}');
+        } else 
+        
+        if (this.is('punc', '{{')) {
+            this.next();
+            body.push(this.expression(true));
+            this.expect('}}');
+        }
+
+    var last = body[body.length - 1];
+    body[0].value = body[0].value.replace(/^[ \t]*[\n\r]/,'');
+    if (last instanceof Cola.AST_String) {
+        var offstr = last.value.match(/[\n\r][ \t]*$/);
+        if(offstr){
+            offstr = offstr[0];
+            for(var i in body) if(body[i] instanceof Cola.AST_String){
+                body[i].value = body[i].value.replace(new RegExp(offstr, 'g'), '\n');
+                body[i].value = body[i].value.replace(/\n/g, '\n');
+            }
+            last.value = last.value.replace(/[\n\r]$/,'');
+        }
+    }
+
+    if (body.length == 1) return body[0];
+    return new Cola.AST_StringTemplate({
+        start : start_token,
+        end   : this.prev(),
+        body  : body
+    });
+}
+
+Cola.Parser.prototype.as_atom_node = function () {
+    var tok = this.S.token, ret;
+    switch (tok.type) {
+      case "name":
+      case "keyword":
+        ret = this._make_symbol(Cola.AST_SymbolRef);
+        break;
+      case "num":
+        ret = new Cola.AST_Number({ start: tok, end: tok, value: tok.value });
+        break;
+      case "string":
+        if(this.is_js){
+            ret = new Cola.AST_String({ start: tok, end: tok, value: tok.value });
+            break;
+        } else return this.string_template_(tok);
+      case "regexp":
+        ret = new Cola.AST_RegExp({ start: tok, end: tok, value: tok.value });
+        break;
+      case "atom":
+        if(!this.is_js) switch (tok.value) {
+          case "off": case "no":  
+            ret = new Cola.AST_False({ start: tok, end: tok });
+            break;
+          case "on": case "yes":
+            ret = new Cola.AST_True({ start: tok, end: tok });
+            break;
+        }
+        switch (tok.value) {
+          case "false":
+            ret = new Cola.AST_False({ start: tok, end: tok });
+            break;
+          case "true":
+            ret = new Cola.AST_True({ start: tok, end: tok });
+            break;
+          case "null":
+            ret = new Cola.AST_Null({ start: tok, end: tok });
+            break;
+        }
+        break;
+    }
+    this.next();
+    return ret;
+};
+
+Cola.Parser.prototype.expr_atom = function(allow_calls) {
+    if (this.is("operator", "new")) {
+        return this.new_();
+    }
+    var start = this.S.token;
+    if (this.is("punc")) {
+        switch (start.value) {
+          case "(":
+            this.next();
+            var ex = this.expression(true);
+            ex.start = start;
+            ex.end = this.S.token;
+            this.expect(")");
+            return this.subscripts(ex, allow_calls);
+          case "[":
+            return this.subscripts(this.array_(), allow_calls);
+          case "{":
+            return this.subscripts(this.object_(), allow_calls);
+        }
+        this.unexpected();
+    }
+    if (this.is("keyword", "function")) {
+        this.next();
+        var func = this.function_(Cola.AST_Function);
+        func.start = start;
+        func.end = this.prev();
+        return this.subscripts(func, allow_calls);
+    }
+    if (Cola.ATOMIC_START_TOKEN[this.S.token.type]) {
+        return this.subscripts(this.as_atom_node(), allow_calls);
+    }
+    this.unexpected();
+};
+
+Cola.Parser.prototype.expr_list = function (closing, allow_trailing_comma, allow_empty) {
+    var first = true, a = [];
+    while (!this.is("punc", closing)) {
+        if (first) first = false; else this.expect(",");
+        if (allow_trailing_comma && this.is("punc", closing)) break;
+        if (this.is("punc", ",") && allow_empty) {
+            a.push(new Cola.AST_Hole({ start: this.S.token, end: this.S.token }));
+        } else {
+            a.push(this.expression(false));
+        }
+    }
+    this.next();
+    return a;
+};
+
+Cola.Parser.prototype.array_ = Cola.Parser.embed_tokens(function() {
+    this.expect("[");
+    return new Cola.AST_Array({
+        elements: this.expr_list("]", !this.options.strict, true)
+    });
+});
+
+Cola.Parser.prototype.object_ = Cola.Parser.embed_tokens(function() {
+    this.expect("{");
+    var first = true, a = [];
+    while (!this.is("punc", "}")) {
+        if (first) first = false; else this.expect(",");
+        if (!this.options.strict && this.is("punc", "}"))
+            // allow trailing comma
+            break;
+        var start = this.S.token;
+        var type = start.type;
+        var name = this.as_property_name();
+        if (type == "name" && !this.is("punc", ":")) {
+            if (name == "get") {
+                a.push(new Cola.AST_ObjectGetter({
+                    start : start,
+                    key   : this.as_atom_node(),
+                    value : this.function_(Cola.AST_Accessor),
+                    end   : this.prev()
+                }));
+                continue;
+            }
+            if (name == "set") {
+                a.push(new Cola.AST_ObjectSetter({
+                    start : start,
+                    key   : this.as_atom_node(),
+                    value : this.function_(Cola.AST_Accessor),
+                    end   : this.prev()
+                }));
+                continue;
+            }
+        }
+        this.expect(":");
+        a.push(new Cola.AST_ObjectKeyVal({
+            start : start,
+            key   : name,
+            value : this.expression(false),
+            end   : this.prev()
+        }));
+    }
+    this.next();
+    return new Cola.AST_Object({ properties: a });
+});
+
+Cola.Parser.prototype.as_property_name = function () {
+    var tmp = this.S.token;
+    this.next();
+    switch (tmp.type) {
+      case "num":
+      case "string":
+      case "name":
+      case "operator":
+      case "keyword":
+      case "atom":
+        return tmp.value;
+      default:
+        this.unexpected();
+    }
+};
+
+Cola.Parser.prototype.as_name = function () {
+    var tmp = this.S.token;
+    this.next();
+    switch (tmp.type) {
+      case "name":
+      case "operator":
+      case "keyword":
+      case "atom":
+        return tmp.value;
+      default:
+        this.unexpected();
+    }
+};
+
+Cola.Parser.prototype._make_symbol = function (type) {
+    var name = this.S.token.value;
+    return new (name == "this" ? Cola.AST_This : type)({
+        name  : String(name),
+        start : this.S.token,
+        end   : this.S.token
+    });
+};
+
+Cola.Parser.prototype.as_symbol = function (type, noerror) {
+    if (!this.is("name")) {
+        if (!noerror) this.croak("Name expected");
+        return null;
+    }
+    var sym = this._make_symbol(type);
+    this.next();
+    return sym;
+};
+
+Cola.Parser.prototype.subscripts = function(expr, allow_calls) {
+    var start = expr.start;
+    if (this.is("punc", ".")) {
+        this.next();
+        return this.subscripts(new Cola.AST_Dot({
+            start      : start,
+            expression : expr,
+            property   : this.as_name(),
+            end        : this.prev()
+        }), allow_calls);
+    }
+    if (this.is("punc", "[")) {
+        this.next();
+        var prop = this.expression(true);
+        this.expect("]");
+        return this.subscripts(new Cola.AST_Sub({
+            start      : start,
+            expression : expr,
+            property   : prop,
+            end        : this.prev()
+        }), allow_calls);
+    }
+    if (allow_calls && this.is("punc", "(")) {
+        this.next();
+        return this.subscripts(new Cola.AST_Call({
+            start      : start,
+            expression : expr,
+            args       : this.expr_list(")"),
+            end        : this.prev()
+        }), true);
+    }
+    return expr;
+};
+
+Cola.Parser.prototype.maybe_unary = function(allow_calls) {
+    var start = this.S.token;
+    if (this.is("operator") && Cola.UNARY_PREFIX(start.value)) {
+        this.next();
+        this.handle_regexp();
+        var ex = this.make_unary(Cola.AST_UnaryPrefix, start.value, this.maybe_unary(allow_calls));
+        ex.start = start;
+        ex.end = this.prev();
+        return ex;
+    }
+    var val = this.expr_atom(allow_calls);
+    while (this.is("operator") && Cola.UNARY_POSTFIX(this.S.token.value) && !this.S.token.nlb) {
+        val = this.make_unary(Cola.AST_UnaryPostfix, this.S.token.value, val);
+        val.start = start;
+        val.end = this.S.token;
+        this.next();
+    }
+    return val;
+};
+
+Cola.Parser.prototype.make_unary = function (ctor, op, expr) {
+    if ((op == "++" || op == "--") && !this.is_assignable(expr))
+        this.croak("Invalid use of " + op + " operator");
+    return new ctor({ operator: op, expression: expr });
+};
+
+Cola.Parser.prototype.expr_op = function(left, min_prec, no_in) {
+    var op = this.is("operator") ? this.S.token.value : null;
+    if (op == "in" && no_in) op = null;
+    var prec = op != null ? Cola.PRECEDENCE[op] : null;
+    if (prec != null && prec > min_prec) {
+        this.next();
+        var right = this.expr_op(this.maybe_unary(true), prec, no_in);
+        return this.expr_op(new Cola.AST_Binary({
+            start    : left.start,
+            left     : left,
+            operator : op,
+            right    : right,
+            end      : right.end
+        }), min_prec, no_in);
+    }
+    return left;
+};
+
+Cola.Parser.prototype.expr_ops = function (no_in) {
+    return this.expr_op(this.maybe_unary(true), 0, no_in);
+};
+
+Cola.Parser.prototype.maybe_conditional = function(no_in) {
+    var start = this.S.token;
+    var expr = this.expr_ops(no_in);
+    if (this.is("operator", "?")) {
+        this.next();
+        var yes = this.expression(false);
+        this.expect(":");
+        return new Cola.AST_Conditional({
+            start       : start,
+            condition   : expr,
+            consequent  : yes,
+            alternative : this.expression(false, no_in),
+            end         : this.prev()
+        });
+    }
+    return expr;
+};
+
+Cola.Parser.prototype.is_assignable = function (expr) {
+    if (!this.options.strict) return true;
+    if (expr instanceof Cola.AST_This) return false;
+    return (expr instanceof Cola.AST_PropAccess || expr instanceof Cola.AST_Symbol);
+};
+
+Cola.Parser.prototype.maybe_assign = function(no_in) {
+    var start = this.S.token;
+    var left = this.maybe_conditional(no_in), val = this.S.token.value;
+    if (this.is("operator") && Cola.ASSIGNMENT(val)) {
+        if (this.is_assignable(left)) {
+            this.next();
+            return new Cola.AST_Assign({
+                start    : start,
+                left     : left,
+                operator : val,
+                right    : this.maybe_assign(no_in),
+                end      : this.prev()
+            });
+        }
+        this.croak("Invalid assignment");
+    }
+    return left;
+};
+
+Cola.Parser.prototype.expression = function(commas, no_in) {
+    var start = this.S.token;
+    var expr = this.maybe_assign(no_in);
+    if (commas && this.is("punc", ",")) {
+        this.next();
+        return new Cola.AST_Seq({
+            start  : start,
+            car    : expr,
+            cdr    : this.expression(true, no_in),
+            end    : this.peek()
+        });
+    }
+    return expr;
+};
+
+Cola.Parser.prototype.in_loop = function (cont) {
+    ++this.S.in_loop;
+    var ret = cont();
+    --this.S.in_loop;
+    return ret;
 };