diff --git a/build/build.sh b/build/build.sh
index d6883b97..b50b590b 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -34,5 +34,5 @@ then
 	mkdir ../dist/
 fi
 
-./preprocess.sh $MODE ../src/paper.js '{ "browser": true }' ../src/constants.js ../dist/paper.js
+./preprocess.sh $MODE ../src/paper.js '{ "browser": true, "parser": "acorn" }' ../src/constants.js ../dist/paper.js
 #./preprocess.sh $MODE ../src/paper.js '{ "server": true }' ../src/constants.js ../dist/paper-server.js 
diff --git a/build/docs.sh b/build/docs.sh
index 4eaa387b..ece9c765 100755
--- a/build/docs.sh
+++ b/build/docs.sh
@@ -33,5 +33,5 @@ cd ..
 if [ $MODE = "docs" ]
 then
 	# Build paper.js library for documentation
-	./preprocess.sh stripped ../src/paper.js '{ "browser": true }' ../src/constants.js ../dist/docs/resources/js/paper.js
+	./preprocess.sh stripped ../src/paper.js '{ "browser": true, "parser": "acorn" }' ../src/constants.js ../dist/docs/resources/js/paper.js
 fi
diff --git a/lib/acorn-min.js b/lib/acorn-min.js
index 9bfae99e..528001bf 100644
--- a/lib/acorn-min.js
+++ b/lib/acorn-min.js
@@ -12,4 +12,4 @@
 // Please use the [github bug tracker][ghbt] to report issues.
 //
 // [ghbt]: https://github.com/marijnh/acorn/issues
-(function(e){"use strict";function k(e,t){throw typeof e=="number"&&(e=o(n,e)),t+=" ("+e.line+":"+e.column+")",new SyntaxError(t)}function Mt(e){function s(e){if(e.length==1)return t+="return str === "+JSON.stringify(e[0])+";";t+="switch(str){";for(var n=0;n<e.length;++n)t+="case "+JSON.stringify(e[n])+":";t+="return true}return false;"}e=e.split(" ");var t="",n=[];e:for(var r=0;r<e.length;++r){for(var i=0;i<n.length;++i)if(n[i][0].length==e[r].length){n[i].push(e[r]);continue e}n.push([e[r]])}if(n.length>3){n.sort(function(e,t){return t.length-e.length}),t+="switch(str.length){";for(var r=0;r<n.length;++r){var o=n[r];t+="case "+o[0].length+":",s(o)}t+="}"}else s(e);return new Function("str",t)}function Wt(e){return e<65?e===36:e<91?!0:e<97?e===95:e<123?!0:e>=170&&qt.test(String.fromCharCode(e))}function Xt(e){return e<48?e===36:e<58?!0:e<65?!1:e<91?!0:e<97?e===95:e<123?!0:e>=170&&Rt.test(String.fromCharCode(e))}function Vt(){zt.lastIndex=b;var e=zt.exec(n);return e?e.index+e[0].length:n.length+1}function $t(){while(w<=u)++y,b=w,w=Vt();return{line:y,column:u-b}}function Jt(){y=1,u=b=0,w=Vt(),m=!0,g=null,Yt()}function Kt(e,n){f=u,t.locations&&(c=$t()),h=e,Yt(),p=n,v=g,m=e.beforeExpr}function Qt(){var e=n.indexOf("*/",u+=2);e===-1&&k(u-2,"Unterminated comment"),t.trackComments&&(g||(g=[])).push(n.slice(u,e)),u=e+2}function Gt(){var e=u,i=n.charCodeAt(u+=2);while(u<r&&i!==10&&i!==13&&i!==8232&&i!==8329)++u,i=n.charCodeAt(u);t.trackComments&&(g||(g=[])).push(n.slice(e,u))}function Yt(){g=null;while(u<r){var e=n.charCodeAt(u);if(e===47){var t=n.charCodeAt(u+1);if(t===42)Qt();else{if(t!==47)break;Gt()}}else if(e<14&&e>8)++u;else if(e===32||e===160)++u;else{if(!(e>=5760&&jt.test(String.fromCharCode(e))))break;++u}}}function Zt(e){a=u,t.locations&&(l=$t()),d=g;if(e)return tn();if(u>=r)return Kt(_);var i=n.charCodeAt(u);if(Wt(i)||i===92)return ln();var s=n.charCodeAt(u+1);switch(i){case 46:if(s>=48&&s<=57)return sn(String.fromCharCode(i));return++u,Kt(dt);case 40:return++u,Kt(ft);case 41:return++u,Kt(lt);case 59:return++u,Kt(ht);case 44:return++u,Kt(ct);case 91:return++u,Kt(st);case 93:return++u,Kt(ot);case 123:return++u,Kt(ut);case 125:return++u,Kt(at);case 58:return++u,Kt(pt);case 63:return++u,Kt(vt);case 48:if(s===120||s===88)return rn();case 49:case 50:case 51:case 52:case 53:case 54:case 55:case 56:case 57:return sn(String.fromCharCode(i));case 34:case 39:return on(i);case 47:if(m)return++u,tn();if(s===61)return en(yt,2);return en(mt,1);case 37:case 42:if(s===61)return en(yt,2);return en(Ot,1);case 124:case 38:if(s===i)return en(i===124?St:xt,2);if(s===61)return en(yt,2);return en(i===124?Tt:Ct,1);case 94:if(s===61)return en(yt,2);return en(Nt,1);case 43:case 45:if(s===i)return en(wt,2);if(s===61)return en(yt,2);return en(bt,1);case 60:case 62:var o=1;if(s===i)return o=i===62&&n.charCodeAt(u+2)===62?3:2,n.charCodeAt(u+o)===61?en(yt,o+1):en(At,o);return s===61&&(o=n.charCodeAt(u+2)===61?3:2),en(Lt,o);case 61:case 33:if(s===61)return en(kt,n.charCodeAt(u+2)===61?3:2);return en(i===61?gt:Et,1);case 126:return en(Et,1)}var f=String.fromCharCode(i);if(f==="\\"||qt.test(f))return ln();k(u,"Unexpected character '"+f+"'")}function en(e,t){var r=n.slice(u,u+t);u+=t,Kt(e,r)}function tn(){var e="",t,i,s=u;for(;;){u>=r&&k(s,"Unterminated regular expression");var o=n.charAt(u);Ut.test(o)&&k(s,"Unterminated regular expression");if(!t){if(o==="[")i=!0;else if(o==="]"&&i)i=!1;else if(o==="/"&&!i)break;t=o==="\\"}else t=!1;++u}var e=n.slice(s,u);++u;var a=fn();return a&&!/^[gmsiy]*$/.test(a)&&k(s,"Invalid regexp flag"),Kt(A,new RegExp(e,a))}function nn(e,t){var r=u,i=0;for(;;){var s=n.charCodeAt(u),o;s>=97?o=s-97+10:s>=65?o=s-65+10:s>=48&&s<=57?o=s-48:o=Infinity;if(o>=e)break;++u,i=i*e+o}return u===r||t!=null&&u-r!==t?null:i}function rn(){u+=2;var e=nn(16);return e==null&&k(a+2,"Expected hexadecimal number"),Wt(n.charCodeAt(u))&&k(u,"Identifier directly after number"),Kt(L,e)}function sn(e){var t=u,r=e===".";!r&&nn(10)==null&&k(t,"Invalid number");if(r||n.charAt(u)==="."){var i=n.charAt(++u);(i==="-"||i==="+")&&++u,nn(10)===null&&e==="."&&k(t,"Invalid number"),r=!0}if(/e/i.test(n.charAt(u))){var i=n.charAt(++u);(i==="-"||i==="+")&&++u,nn(10)===null&&k(t,"Invalid number"),r=!0}Wt(n.charCodeAt(u))&&k(u,"Identifier directly after number");var s=n.slice(t,u),o;return r?o=parseFloat(s):e!=="0"||s.length===1?o=parseInt(s,10):/[89]/.test(s)||C?k(t,"Invalid number"):o=parseInt(s,8),Kt(L,o)}function on(e){u++;var t=[];for(;;){u>=r&&k(a,"Unterminated string constant");var i=n.charCodeAt(u);if(i===e)return++u,Kt(O,String.fromCharCode.apply(null,t));if(i===92){i=n.charCodeAt(++u);var s=/^[0-7]+/.exec(n.slice(u,u+3));s&&(s=s[0]);while(s&&parseInt(s,8)>255)s=s.slice(0,s.length-1);s==="0"&&(s=null),++u;if(s)C&&k(u-2,"Octal literal in strict mode"),t.push(parseInt(s,8)),u+=s.length-1;else switch(i){case 110:t.push(10);break;case 114:t.push(13);break;case 120:t.push(un(2));break;case 117:t.push(un(4));break;case 85:t.push(un(8));break;case 116:t.push(9);break;case 98:t.push(8);break;case 118:t.push(11);break;case 102:t.push(12);break;case 48:t.push(0);break;case 13:n.charCodeAt(u)===10&&++u;case 10:break;default:t.push(i)}}else(i===13||i===10||i===8232||i===8329)&&k(a,"Unterminated string constant"),i!==92&&t.push(i),++u}}function un(e){var t=nn(16,e);return t===null&&k(a,"Bad character escape sequence"),t}function fn(){an=!1;var e,t=!0,r=u;for(;;){var i=n.charCodeAt(u);if(Xt(i))an&&(e+=n.charAt(u)),++u;else{if(i!==92)break;an||(e=n.slice(r,u)),an=!0,n.charCodeAt(++u)!=117&&k(u,"Expecting Unicode escape sequence \\uXXXX"),++u;var s=un(4),o=String.fromCharCode(s);o||k(u-1,"Invalid Unicode escape"),(t?!Wt(s):!Xt(s))&&k(u-4,"Invalid Unicode escape"),e+=o}t=!1}return an?e:n.slice(r,u)}function ln(){var e=fn(),n=M;return an||(Bt(e)?n=it[e]:(t.forbidReserved&&(t.ecmaVersion===3?_t:Dt)(e)||C&&Pt(e))&&k(a,"The keyword '"+e+"' is reserved")),Kt(n,e)}function cn(){E=a,S=f,x=c,Zt()}function hn(e){C=e,u=S,Yt(),Zt()}function pn(){var e={type:null,start:a,end:null};return t.trackComments&&d&&(e.commentsBefore=d,d=null),t.locations&&(e.loc={start:l,end:null,source:i}),t.ranges&&(e.range=[a,0]),e}function dn(e){var n={type:null,start:e.start};return e.commentsBefore&&(n.commentsBefore=e.commentsBefore,e.commentsBefore=null),t.locations&&(n.loc={start:e.loc.start,end:null,source:e.loc.source}),t.ranges&&(n.range=[e.range[0],0]),n}function mn(e,n){return e.type=n,e.end=S,t.trackComments&&(v?(e.commentsAfter=v,v=null):vn&&vn.end===S&&vn.commentsAfter&&(e.commentsAfter=vn.commentsAfter,vn.commentsAfter=null),vn=e),t.locations&&(e.loc.end=x),t.ranges&&(e.range[1]=S),e}function gn(e){return t.ecmaVersion>=5&&e.type==="ExpressionStatement"&&e.expression.type==="Literal"&&e.expression.value==="use strict"}function yn(e){if(h===e)return cn(),!0}function bn(){return!t.strictSemicolons&&(h===_||h===at||Ut.test(n.slice(S,a)))}function wn(){!yn(ht)&&!bn()&&Sn()}function En(e){h===e?cn():Sn()}function Sn(){k(a,"Unexpected token")}function xn(e){e.type!=="Identifier"&&e.type!=="MemberExpression"&&k(e.start,"Assigning to rvalue"),C&&e.type==="Identifier"&&Ht(e.name)&&k(e.start,"Assigning to "+e.name+" in strict mode")}function Tn(e){Jt(),E=S=u,t.locations&&(x=$t()),T=C=null,N=[],Zt();var n=e||pn(),r=!0;e||(n.body=[]);while(h!==_){var i=kn();n.body.push(i),r&&gn(i)&&hn(!0),r=!1}return mn(n,"Program")}function kn(){h===mt&&Zt(!0);var e=h,t=pn();switch(e){case D:case B:cn();var r=e===D;yn(ht)||bn()?t.label=null:h!==M?Sn():(t.label=$n(),wn());for(var i=0;i<N.length;++i){var s=N[i];if(t.label==null||s.name===t.label.name){if(!(s.kind==null||!r&&s.kind!=="loop"))break;if(t.label&&r)break}}return i===N.length&&k(t.start,"Unsyntactic "+e.keyword),mn(t,r?"BreakStatement":"ContinueStatement");case j:return cn(),mn(t,"DebuggerStatement");case I:return cn(),N.push(Nn),t.body=kn(),N.pop(),En(Q),t.test=Ln(),wn(),mn(t,"DoWhileStatement");case U:cn(),N.push(Nn),En(ft);if(h===ht)return On(t,null);if(h===K){var o=pn();return cn(),_n(o,!0),o.declarations.length===1&&yn(rt)?Mn(t,o):On(t,o)}var o=Dn(!1,!0);if(yn(rt))return xn(o),Mn(t,o);return On(t,o);case z:return cn(),Xn(t,!0);case W:return cn(),t.test=Ln(),t.consequent=kn(),t.alternate=yn(q)?kn():null,mn(t,"IfStatement");case X:return T||k(a,"'return' outside of function"),cn(),yn(ht)||bn()?t.argument=null:(t.argument=Dn(),wn()),mn(t,"ReturnStatement");case V:cn(),t.discriminant=Ln(),t.cases=[],En(ut),N.push(Cn);for(var u,f;h!=at;)if(h===P||h===F){var l=h===P;u&&mn(u,"SwitchCase"),t.cases.push(u=pn()),u.consequent=[],cn(),l?u.test=Dn():(f&&k(E,"Multiple default clauses"),f=!0,u.test=null),En(pt)}else u||Sn(),u.consequent.push(kn());return u&&mn(u,"SwitchCase"),cn(),N.pop(),mn(t,"SwitchStatement");case $:return cn(),Ut.test(n.slice(S,a))&&k(S,"Illegal newline after throw"),t.argument=Dn(),mn(t,"ThrowStatement");case J:cn(),t.block=An(),t.handlers=[];while(h===H){var c=pn();cn(),En(ft),c.param=$n(),C&&Ht(c.param.name)&&k(c.param.start,"Binding "+c.param.name+" in strict mode"),En(lt),c.guard=null,c.body=An(),t.handlers.push(mn(c,"CatchClause"))}return t.finalizer=yn(R)?An():null,!t.handlers.length&&!t.finalizer&&k(t.start,"Missing catch or finally clause"),mn(t,"TryStatement");case K:return cn(),t=_n(t),wn(),t;case Q:return cn(),t.test=Ln(),N.push(Nn),t.body=kn(),N.pop(),mn(t,"WhileStatement");case G:return C&&k(a,"'with' in strict mode"),cn(),t.object=Ln(),t.body=kn(),mn(t,"WithStatement");case ut:return An();case ht:return cn(),mn(t,"EmptyStatement");default:var d=p,v=Dn();if(e===M&&v.type==="Identifier"&&yn(pt)){for(var i=0;i<N.length;++i)N[i].name===d&&k(v.start,"Label '"+d+"' is already declared");var m=h.isLoop?"loop":h===V?"switch":null;return N.push({name:d,kind:m}),t.body=kn(),t.label=v,mn(t,"LabeledStatement")}return t.expression=v,wn(),mn(t,"ExpressionStatement")}}function Ln(){En(ft);var e=Dn();return En(lt),e}function An(e){var t=pn(),n=!0,r=!1,i;t.body=[],En(ut);while(!yn(at)){var s=kn();t.body.push(s),n&&gn(s)&&(i=r,hn(r=!0)),n=!1}return r&&!i&&hn(!1),mn(t,"BlockStatement")}function On(e,t){return e.init=t,En(ht),e.test=h===ht?null:Dn(),En(ht),e.update=h===lt?null:Dn(),En(lt),e.body=kn(),N.pop(),mn(e,"ForStatement")}function Mn(e,t){return e.left=t,e.right=Dn(),En(lt),e.body=kn(),N.pop(),mn(e,"ForInStatement")}function _n(e,t){e.declarations=[],e.kind="var";for(;;){var n=pn();n.id=$n(),C&&Ht(n.id.name)&&k(n.id.start,"Binding "+n.id.name+" in strict mode"),n.init=yn(gt)?Dn(!0,t):null,e.declarations.push(mn(n,"VariableDeclarator"));if(!yn(ct))break}return mn(e,"VariableDeclaration")}function Dn(e,t){var n=Pn(t);if(!e&&h===ct){var r=dn(n);r.expressions=[n];while(yn(ct))r.expressions.push(Pn(t));return mn(r,"SequenceExpression")}return n}function Pn(e){var t=Hn(e);if(h.isAssign){var n=dn(t);return n.operator=p,n.left=t,cn(),n.right=Pn(e),xn(t),mn(n,"AssignmentExpression")}return t}function Hn(e){var t=Bn(e);if(yn(vt)){var n=dn(t);return n.test=t,n.consequent=Dn(!0),En(pt),n.alternate=Dn(!0,e),mn(n,"ConditionalExpression")}return t}function Bn(e){return jn(Fn(e),-1,e)}function jn(e,t,n){var r=h.binop;if(r!=null&&(!n||h!==rt)&&r>t){var i=dn(e);i.left=e,i.operator=p,cn(),i.right=jn(Fn(n),r,n);var i=mn(i,/&&|\|\|/.test(i.operator)?"LogicalExpression":"BinaryExpression");return jn(i,t,n)}return e}function Fn(e){if(h.prefix){var t=pn(),n=h.isUpdate;return t.operator=p,t.prefix=!0,cn(),t.argument=Fn(e),n?xn(t.argument):C&&t.operator==="delete"&&t.argument.type==="Identifier"&&k(t.start,"Deleting local variable in strict mode"),mn(t,n?"UpdateExpression":"UnaryExpression")}var r=In();while(h.postfix&&!bn()){var t=dn(r);t.operator=p,t.prefix=!1,t.argument=r,xn(r),cn(),r=mn(t,"UpdateExpression")}return r}function In(){return qn(Rn())}function qn(e,t){if(yn(dt)){var n=dn(e);return n.object=e,n.property=$n(!0),n.computed=!1,qn(mn(n,"MemberExpression"),t)}if(yn(st)){var n=dn(e);return n.object=e,n.property=Dn(),n.computed=!0,En(ot),qn(mn(n,"MemberExpression"),t)}if(!t&&yn(ft)){var n=dn(e);return n.callee=e,n.arguments=Vn(lt,!1),qn(mn(n,"CallExpression"),t)}return e}function Rn(){switch(h){case Z:var e=pn();return cn(),mn(e,"ThisExpression");case M:return $n();case L:case O:case A:var e=pn();return e.value=p,e.raw=n.slice(a,f),cn(),mn(e,"Literal");case et:case tt:case nt:var e=pn();return e.value=h.atomValue,cn(),mn(e,"Literal");case ft:cn();var t=Dn();return En(lt),t;case st:var e=pn();return cn(),e.elements=Vn(ot,!0,!0),mn(e,"ArrayExpression");case ut:return zn();case z:var e=pn();return cn(),Xn(e,!1);case Y:return Un();default:Sn()}}function Un(){var e=pn();return cn(),e.callee=qn(Rn(!1),!0),yn(ft)?e.arguments=Vn(lt,!1):e.arguments=[],mn(e,"NewExpression")}function zn(){var e=pn(),n=!0,r=!1;e.properties=[],cn();while(!yn(at)){if(!n){En(ct);if(t.allowTrailingCommas&&yn(at))break}else n=!1;var i={key:Wn()},s=!1,o;yn(pt)?(i.value=Dn(!0),o=i.kind="init"):t.ecmaVersion>=5&&i.key.type==="Identifier"&&(i.key.name==="get"||i.key.name==="set")?(s=r=!0,o=i.kind=i.key.name,i.key=Wn(),!h===ft&&Sn(),i.value=Xn(pn(),!1)):Sn();if(i.key.type==="Identifier"&&(C||r))for(var u=0;u<e.properties.length;++u){var a=e.properties[u];if(a.key.name===i.key.name){var f=o==a.kind||s&&a.kind==="init"||o==="init"&&(a.kind==="get"||a.kind==="set");f&&!C&&o==="init"&&a.kind==="init"&&(f=!1),f&&k(i.key.start,"Redefinition of property")}}e.properties.push(i)}return mn(e,"ObjectExpression")}function Wn(){return h===L||h===O?Rn():$n(!0)}function Xn(e,t){h===M?e.id=$n():t?Sn():e.id=null,e.params=[];var n=!0;En(ft);while(!yn(lt))n?n=!1:En(ct),e.params.push($n());var r=T,i=N;T=!0,N=[],e.body=An(!0),T=r,N=i;if(C||e.body.body.length&&gn(e.body.body[0]))for(var s=e.id?-1:0;s<e.params.length;++s){var o=s<0?e.id:e.params[s];(Pt(o.name)||Ht(o.name))&&k(o.start,"Defining '"+o.name+"' in strict mode");if(s>=0)for(var u=0;u<s;++u)o.name===e.params[u].name&&k(o.start,"Argument name clash in strict mode")}return mn(e,t?"FunctionDeclaration":"FunctionExpression")}function Vn(e,n,r){var i=[],s=!0;while(!yn(e)){if(!s){En(ct);if(n&&t.allowTrailingCommas&&yn(e))break}else s=!1;r&&h===ct?i.push(null):i.push(Dn(!0))}return i}function $n(e){var n=pn();return n.name=h===M?p:e&&!t.forbidReserved&&h.keyword||Sn(),cn(),mn(n,"Identifier")}e.version="0.0.1";var t,n,r,i;e.parse=function(e,o){n=String(e),r=n.length,t=o||{};for(var u in s)t.hasOwnProperty(u)||(t[u]=s[u]);return i=t.sourceFile||null,Tn(t.program)};var s=e.defaultOptions={ecmaVersion:5,strictSemicolons:!1,allowTrailingCommas:!0,forbidReserved:!1,trackComments:!1,locations:!1,ranges:!1,program:null,sourceFile:null},o=e.getLineInfo=function(e,t){for(var n=1,r=0;;){zt.lastIndex=r;var i=zt.exec(e);if(!(i&&i.index<t))break;++n,r=i.index+i[0].length}return{line:n,column:t-r}},u,a,f,l,c,h,p,d,v,m,g,y,b,w,E,S,x,T,N,C,L={type:"num"},A={type:"regexp"},O={type:"string"},M={type:"name"},_={type:"eof"},D={keyword:"break"},P={keyword:"case",beforeExpr:!0},H={keyword:"catch"},B={keyword:"continue"},j={keyword:"debugger"},F={keyword:"default"},I={keyword:"do",isLoop:!0},q={keyword:"else",beforeExpr:!0},R={keyword:"finally"},U={keyword:"for",isLoop:!0},z={keyword:"function"},W={keyword:"if"},X={keyword:"return",beforeExpr:!0},V={keyword:"switch"},$={keyword:"throw",beforeExpr:!0},J={keyword:"try"},K={keyword:"var"},Q={keyword:"while",isLoop:!0},G={keyword:"with"},Y={keyword:"new",beforeExpr:!0},Z={keyword:"this"},et={keyword:"null",atomValue:null},tt={keyword:"true",atomValue:!0},nt={keyword:"false",atomValue:!1},rt={keyword:"in",binop:7,beforeExpr:!0},it={"break":D,"case":P,"catch":H,"continue":B,"debugger":j,"default":F,"do":I,"else":q,"finally":R,"for":U,"function":z,"if":W,"return":X,"switch":V,"throw":$,"try":J,"var":K,"while":Q,"with":G,"null":et,"true":tt,"false":nt,"new":Y,"in":rt,"instanceof":{keyword:"instanceof",binop:7},"this":Z,"typeof":{keyword:"typeof",prefix:!0},"void":{keyword:"void",prefix:!0},"delete":{keyword:"delete",prefix:!0}},st={type:"[",beforeExpr:!0},ot={type:"]"},ut={type:"{",beforeExpr:!0},at={type:"}"},ft={type:"(",beforeExpr:!0},lt={type:")"},ct={type:",",beforeExpr:!0},ht={type:";",beforeExpr:!0},pt={type:":",beforeExpr:!0},dt={type:"."},vt={type:"?",beforeExpr:!0},mt={binop:10,beforeExpr:!0},gt={isAssign:!0,beforeExpr:!0},yt={isAssign:!0,beforeExpr:!0},bt={binop:9,prefix:!0,beforeExpr:!0},wt={postfix:!0,prefix:!0,isUpdate:!0},Et={prefix:!0,beforeExpr:!0},St={binop:1,beforeExpr:!0},xt={binop:2,beforeExpr:!0},Tt={binop:3,beforeExpr:!0},Nt={binop:4,beforeExpr:!0},Ct={binop:5,beforeExpr:!0},kt={binop:6,beforeExpr:!0},Lt={binop:7,beforeExpr:!0},At={binop:8,beforeExpr:!0},Ot={binop:10,beforeExpr:!0},_t=Mt("abstract boolean byte char class double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile"),Dt=Mt("class enum extends super const export import"),Pt=Mt("implements interface let package private protected public static yield"),Ht=Mt("eval arguments"),Bt=Mt("break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this"),jt=/[\u1680\u180e\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]/,Ft="ªµºÀ-ÖØ-öø-ˁˆ-ˑˠ-ˤˬˮͰ-ʹͶͷͺ-ͽΆΈ-ΊΌΎ-ΡΣ-ϵϷ-ҁҊ-ԧԱ-Ֆՙա-ևא-תװ-ײؠ-يٮٯٱ-ۓەۥۦۮۯۺ-ۼۿܐܒ-ܯݍ-ޥޱߊ-ߪߴߵߺࠀ-ࠕࠚࠤࠨࡀ-ࡘࢠࢢ-ࢬऄ-हऽॐक़-ॡॱ-ॷॹ-ॿঅ-ঌএঐও-নপ-রলশ-হঽৎড়ঢ়য়-ৡৰৱਅ-ਊਏਐਓ-ਨਪ-ਰਲਲ਼ਵਸ਼ਸਹਖ਼-ੜਫ਼ੲ-ੴઅ-ઍએ-ઑઓ-નપ-રલળવ-હઽૐૠૡଅ-ଌଏଐଓ-ନପ-ରଲଳଵ-ହଽଡ଼ଢ଼ୟ-ୡୱஃஅ-ஊஎ-ஐஒ-கஙசஜஞடணதந-பம-ஹௐఅ-ఌఎ-ఐఒ-నప-ళవ-హఽౘౙౠౡಅ-ಌಎ-ಐಒ-ನಪ-ಳವ-ಹಽೞೠೡೱೲഅ-ഌഎ-ഐഒ-ഺഽൎൠൡൺ-ൿඅ-ඖක-නඳ-රලව-ෆก-ะาำเ-ๆກຂຄງຈຊຍດ-ທນ-ຟມ-ຣລວສຫອ-ະາຳຽເ-ໄໆໜ-ໟༀཀ-ཇཉ-ཬྈ-ྌက-ဪဿၐ-ၕၚ-ၝၡၥၦၮ-ၰၵ-ႁႎႠ-ჅჇჍა-ჺჼ-ቈቊ-ቍቐ-ቖቘቚ-ቝበ-ኈኊ-ኍነ-ኰኲ-ኵኸ-ኾዀዂ-ዅወ-ዖዘ-ጐጒ-ጕጘ-ፚᎀ-ᎏᎠ-Ᏼᐁ-ᙬᙯ-ᙿᚁ-ᚚᚠ-ᛪᛮ-ᛰᜀ-ᜌᜎ-ᜑᜠ-ᜱᝀ-ᝑᝠ-ᝬᝮ-ᝰក-ឳៗៜᠠ-ᡷᢀ-ᢨᢪᢰ-ᣵᤀ-ᤜᥐ-ᥭᥰ-ᥴᦀ-ᦫᧁ-ᧇᨀ-ᨖᨠ-ᩔᪧᬅ-ᬳᭅ-ᭋᮃ-ᮠᮮᮯᮺ-ᯥᰀ-ᰣᱍ-ᱏᱚ-ᱽᳩ-ᳬᳮ-ᳱᳵᳶᴀ-ᶿḀ-ἕἘ-Ἕἠ-ὅὈ-Ὅὐ-ὗὙὛὝὟ-ώᾀ-ᾴᾶ-ᾼιῂ-ῄῆ-ῌῐ-ΐῖ-Ίῠ-Ῥῲ-ῴῶ-ῼⁱⁿₐ-ₜℂℇℊ-ℓℕℙ-ℝℤΩℨK-ℭℯ-ℹℼ-ℿⅅ-ⅉⅎⅠ-ↈⰀ-Ⱞⰰ-ⱞⱠ-ⳤⳫ-ⳮⳲⳳⴀ-ⴥⴧⴭⴰ-ⵧⵯⶀ-ⶖⶠ-ⶦⶨ-ⶮⶰ-ⶶⶸ-ⶾⷀ-ⷆⷈ-ⷎⷐ-ⷖⷘ-ⷞⸯ々-〇〡-〩〱-〵〸-〼ぁ-ゖゝ-ゟァ-ヺー-ヿㄅ-ㄭㄱ-ㆎㆠ-ㆺㇰ-ㇿ㐀-䶵一-鿌ꀀ-ꒌꓐ-ꓽꔀ-ꘌꘐ-ꘟꘪꘫꙀ-ꙮꙿ-ꚗꚠ-ꛯꜗ-ꜟꜢ-ꞈꞋ-ꞎꞐ-ꞓꞠ-Ɦꟸ-ꠁꠃ-ꠅꠇ-ꠊꠌ-ꠢꡀ-ꡳꢂ-ꢳꣲ-ꣷꣻꤊ-ꤥꤰ-ꥆꥠ-ꥼꦄ-ꦲꧏꨀ-ꨨꩀ-ꩂꩄ-ꩋꩠ-ꩶꩺꪀ-ꪯꪱꪵꪶꪹ-ꪽꫀꫂꫛ-ꫝꫠ-ꫪꫲ-ꫴꬁ-ꬆꬉ-ꬎꬑ-ꬖꬠ-ꬦꬨ-ꬮꯀ-ꯢ가-힣ힰ-ퟆퟋ-ퟻ豈-舘並-龎ff-stﬓ-ﬗיִײַ-ﬨשׁ-זּטּ-לּמּנּסּףּפּצּ-ﮱﯓ-ﴽﵐ-ﶏﶒ-ﷇﷰ-ﷻﹰ-ﹴﹶ-ﻼＡ-Ｚａ-ｚｦ-ﾾￂ-ￇￊ-ￏￒ-ￗￚ-ￜ",It="ͱ-ʹ҃-֑҇-ׇֽֿׁׂׅׄؐ-ؚؠ-ىٲ-ۓۧ-ۨۻ-ۼܰ-݊ࠀ-ࠔࠛ-ࠣࠥ-ࠧࠩ-࠭ࡀ-ࡗࣤ-ࣾऀ-ःऺ-़ा-ॏ॑-ॗॢ-ॣ०-९ঁ-ঃ়া-ৄেৈৗয়-ৠਁ-ਃ਼ਾ-ੂੇੈੋ-੍ੑ੦-ੱੵઁ-ઃ઼ા-ૅે-ૉો-્ૢ-ૣ૦-૯ଁ-ଃ଼ା-ୄେୈୋ-୍ୖୗୟ-ୠ୦-୯ஂா-ூெ-ைொ-்ௗ௦-௯ఁ-ఃె-ైొ-్ౕౖౢ-ౣ౦-౯ಂಃ಼ಾ-ೄೆ-ೈೊ-್ೕೖೢ-ೣ೦-೯ംഃെ-ൈൗൢ-ൣ൦-൯ංඃ්ා-ුූෘ-ෟෲෳิ-ฺเ-ๅ๐-๙ິ-ູ່-ໍ໐-໙༘༙༠-༩༹༵༷ཁ-ཇཱ-྄྆-྇ྍ-ྗྙ-ྼ࿆က-ဩ၀-၉ၧ-ၭၱ-ၴႂ-ႍႏ-ႝ፝-፟ᜎ-ᜐᜠ-ᜰᝀ-ᝐᝲᝳក-ឲ៝០-៩᠋-᠍᠐-᠙ᤠ-ᤫᤰ-᤻ᥑ-ᥭᦰ-ᧀᧈ-ᧉ᧐-᧙ᨀ-ᨕᨠ-ᩓ᩠-᩿᩼-᪉᪐-᪙ᭆ-ᭋ᭐-᭙᭫-᭳᮰-᮹᯦-᯳ᰀ-ᰢ᱀-᱉ᱛ-ᱽ᳐-᳒ᴀ-ᶾḁ-ἕ‌‍‿⁀⁔⃐-⃥⃜⃡-⃰ⶁ-ⶖⷠ-ⷿ〡-〨゙゚Ꙁ-ꙭꙴ-꙽ꚟ꛰-꛱ꟸ-ꠀ꠆ꠋꠣ-ꠧꢀ-ꢁꢴ-꣄꣐-꣙ꣳ-ꣷ꤀-꤉ꤦ-꤭ꤰ-ꥅꦀ-ꦃ꦳-꧀ꨀ-ꨧꩀ-ꩁꩌ-ꩍ꩐-꩙ꩻꫠ-ꫩꫲ-ꫳꯀ-ꯡ꯬꯭꯰-꯹ﬠ-ﬨ︀-️︠-︦︳︴﹍-﹏０-９＿",qt=new RegExp("["+Ft+"]"),Rt=new RegExp("["+Ft+It+"]"),Ut=/[\n\r\u2028\u2029]/,zt=/\r\n|[\n\r\u2028\u2029]/g,an,vn,Nn={kind:"loop"},Cn={kind:"switch"}})(typeof exports=="undefined"?window.acorn={}:exports);
\ No newline at end of file
+(function(e){"use strict";function k(e,t){throw typeof e=="number"&&(e=o(n,e)),t+=" ("+e.line+":"+e.column+")",new SyntaxError(t)}function Mt(e){function s(e){if(e.length==1)return t+="return str === "+JSON.stringify(e[0])+";";t+="switch(str){";for(var n=0;n<e.length;++n)t+="case "+JSON.stringify(e[n])+":";t+="return true}return false;"}e=e.split(" ");var t="",n=[];e:for(var r=0;r<e.length;++r){for(var i=0;i<n.length;++i)if(n[i][0].length==e[r].length){n[i].push(e[r]);continue e}n.push([e[r]])}if(n.length>3){n.sort(function(e,t){return t.length-e.length}),t+="switch(str.length){";for(var r=0;r<n.length;++r){var o=n[r];t+="case "+o[0].length+":",s(o)}t+="}"}else s(e);return new Function("str",t)}function Wt(e){return e<65?e===36:e<91?!0:e<97?e===95:e<123?!0:e>=170&&qt.test(String.fromCharCode(e))}function Xt(e){return e<48?e===36:e<58?!0:e<65?!1:e<91?!0:e<97?e===95:e<123?!0:e>=170&&Rt.test(String.fromCharCode(e))}function Vt(){zt.lastIndex=b;var e=zt.exec(n);return e?e.index+e[0].length:n.length+1}function $t(){while(w<=u)++y,b=w,w=Vt();return{line:y,column:u-b}}function Jt(){y=1,u=b=0,w=Vt(),m=!0,g=null,Yt()}function Kt(e,n){f=u,t.locations&&(c=$t()),h=e,Yt(),p=n,v=g,m=e.beforeExpr}function Qt(){var e=n.indexOf("*/",u+=2);e===-1&&k(u-2,"Unterminated comment"),t.trackComments&&(g||(g=[])).push(n.slice(u,e)),u=e+2}function Gt(){var e=u,i=n.charCodeAt(u+=2);while(u<r&&i!==10&&i!==13&&i!==8232&&i!==8329)++u,i=n.charCodeAt(u);t.trackComments&&(g||(g=[])).push(n.slice(e,u))}function Yt(){g=null;while(u<r){var e=n.charCodeAt(u);if(e===47){var t=n.charCodeAt(u+1);if(t===42)Qt();else{if(t!==47)break;Gt()}}else if(e<14&&e>8)++u;else if(e===32||e===160)++u;else{if(!(e>=5760&&jt.test(String.fromCharCode(e))))break;++u}}}function Zt(e){a=u,t.locations&&(l=$t()),d=g;if(e)return tn();if(u>=r)return Kt(_);var i=n.charCodeAt(u);if(Wt(i)||i===92)return ln();var s=n.charCodeAt(u+1);switch(i){case 46:if(s>=48&&s<=57)return sn(String.fromCharCode(i));return++u,Kt(dt);case 40:return++u,Kt(ft);case 41:return++u,Kt(lt);case 59:return++u,Kt(ht);case 44:return++u,Kt(ct);case 91:return++u,Kt(st);case 93:return++u,Kt(ot);case 123:return++u,Kt(ut);case 125:return++u,Kt(at);case 58:return++u,Kt(pt);case 63:return++u,Kt(vt);case 48:if(s===120||s===88)return rn();case 49:case 50:case 51:case 52:case 53:case 54:case 55:case 56:case 57:return sn(String.fromCharCode(i));case 34:case 39:return on(i);case 47:if(m)return++u,tn();if(s===61)return en(yt,2);return en(mt,1);case 37:case 42:if(s===61)return en(yt,2);return en(Ot,1);case 124:case 38:if(s===i)return en(i===124?St:xt,2);if(s===61)return en(yt,2);return en(i===124?Tt:Ct,1);case 94:if(s===61)return en(yt,2);return en(Nt,1);case 43:case 45:if(s===i)return en(wt,2);if(s===61)return en(yt,2);return en(bt,1);case 60:case 62:var o=1;if(s===i)return o=i===62&&n.charCodeAt(u+2)===62?3:2,n.charCodeAt(u+o)===61?en(yt,o+1):en(At,o);return s===61&&(o=n.charCodeAt(u+2)===61?3:2),en(Lt,o);case 61:case 33:if(s===61)return en(kt,n.charCodeAt(u+2)===61?3:2);return en(i===61?gt:Et,1);case 126:return en(Et,1)}var f=String.fromCharCode(i);if(f==="\\"||qt.test(f))return ln();k(u,"Unexpected character '"+f+"'")}function en(e,t){var r=n.slice(u,u+t);u+=t,Kt(e,r)}function tn(){var e="",t,i,s=u;for(;;){u>=r&&k(s,"Unterminated regular expression");var o=n.charAt(u);Ut.test(o)&&k(s,"Unterminated regular expression");if(!t){if(o==="[")i=!0;else if(o==="]"&&i)i=!1;else if(o==="/"&&!i)break;t=o==="\\"}else t=!1;++u}var e=n.slice(s,u);++u;var a=fn();return a&&!/^[gmsiy]*$/.test(a)&&k(s,"Invalid regexp flag"),Kt(A,new RegExp(e,a))}function nn(e,t){var r=u,i=0;for(;;){var s=n.charCodeAt(u),o;s>=97?o=s-97+10:s>=65?o=s-65+10:s>=48&&s<=57?o=s-48:o=Infinity;if(o>=e)break;++u,i=i*e+o}return u===r||t!=null&&u-r!==t?null:i}function rn(){u+=2;var e=nn(16);return e==null&&k(a+2,"Expected hexadecimal number"),Wt(n.charCodeAt(u))&&k(u,"Identifier directly after number"),Kt(L,e)}function sn(e){var t=u,r=e===".";!r&&nn(10)==null&&k(t,"Invalid number");if(r||n.charAt(u)==="."){var i=n.charAt(++u);(i==="-"||i==="+")&&++u,nn(10)===null&&e==="."&&k(t,"Invalid number"),r=!0}if(/e/i.test(n.charAt(u))){var i=n.charAt(++u);(i==="-"||i==="+")&&++u,nn(10)===null&&k(t,"Invalid number"),r=!0}Wt(n.charCodeAt(u))&&k(u,"Identifier directly after number");var s=n.slice(t,u),o;return r?o=parseFloat(s):e!=="0"||s.length===1?o=parseInt(s,10):/[89]/.test(s)||C?k(t,"Invalid number"):o=parseInt(s,8),Kt(L,o)}function on(e){u++;var t=[];for(;;){u>=r&&k(a,"Unterminated string constant");var i=n.charCodeAt(u);if(i===e)return++u,Kt(O,String.fromCharCode.apply(null,t));if(i===92){i=n.charCodeAt(++u);var s=/^[0-7]+/.exec(n.slice(u,u+3));s&&(s=s[0]);while(s&&parseInt(s,8)>255)s=s.slice(0,s.length-1);s==="0"&&(s=null),++u;if(s)C&&k(u-2,"Octal literal in strict mode"),t.push(parseInt(s,8)),u+=s.length-1;else switch(i){case 110:t.push(10);break;case 114:t.push(13);break;case 120:t.push(un(2));break;case 117:t.push(un(4));break;case 85:t.push(un(8));break;case 116:t.push(9);break;case 98:t.push(8);break;case 118:t.push(11);break;case 102:t.push(12);break;case 48:t.push(0);break;case 13:n.charCodeAt(u)===10&&++u;case 10:break;default:t.push(i)}}else(i===13||i===10||i===8232||i===8329)&&k(a,"Unterminated string constant"),i!==92&&t.push(i),++u}}function un(e){var t=nn(16,e);return t===null&&k(a,"Bad character escape sequence"),t}function fn(){an=!1;var e,t=!0,r=u;for(;;){var i=n.charCodeAt(u);if(Xt(i))an&&(e+=n.charAt(u)),++u;else{if(i!==92)break;an||(e=n.slice(r,u)),an=!0,n.charCodeAt(++u)!=117&&k(u,"Expecting Unicode escape sequence \\uXXXX"),++u;var s=un(4),o=String.fromCharCode(s);o||k(u-1,"Invalid Unicode escape"),(t?!Wt(s):!Xt(s))&&k(u-4,"Invalid Unicode escape"),e+=o}t=!1}return an?e:n.slice(r,u)}function ln(){var e=fn(),n=M;return an||(Bt(e)?n=it[e]:(t.forbidReserved&&(t.ecmaVersion===3?_t:Dt)(e)||C&&Pt(e))&&k(a,"The keyword '"+e+"' is reserved")),Kt(n,e)}function cn(){E=a,S=f,x=c,Zt()}function hn(e){C=e,u=S,Yt(),Zt()}function pn(){var e={type:null,start:a,end:null};return t.trackComments&&d&&(e.commentsBefore=d,d=null),t.locations&&(e.loc={start:l,end:null,source:i}),t.ranges&&(e.range=[a,0]),e}function dn(e){var n={type:null,start:e.start};return e.commentsBefore&&(n.commentsBefore=e.commentsBefore,e.commentsBefore=null),t.locations&&(n.loc={start:e.loc.start,end:null,source:e.loc.source}),t.ranges&&(n.range=[e.range[0],0]),n}function mn(e,n){return e.type=n,e.end=S,t.trackComments&&(v?(e.commentsAfter=v,v=null):vn&&vn.end===S&&vn.commentsAfter&&(e.commentsAfter=vn.commentsAfter,vn.commentsAfter=null),vn=e),t.locations&&(e.loc.end=x),t.ranges&&(e.range[1]=S),e}function gn(e){return t.ecmaVersion>=5&&e.type==="ExpressionStatement"&&e.expression.type==="Literal"&&e.expression.value==="use strict"}function yn(e){if(h===e)return cn(),!0}function bn(){return!t.strictSemicolons&&(h===_||h===at||Ut.test(n.slice(S,a)))}function wn(){!yn(ht)&&!bn()&&Sn()}function En(e){h===e?cn():Sn()}function Sn(){k(a,"Unexpected token")}function xn(e){e.type!=="Identifier"&&e.type!=="MemberExpression"&&k(e.start,"Assigning to rvalue"),C&&e.type==="Identifier"&&Ht(e.name)&&k(e.start,"Assigning to "+e.name+" in strict mode")}function Tn(e){Jt(),E=S=u,t.locations&&(x=$t()),T=C=null,N=[],Zt();var n=e||pn(),r=!0;e||(n.body=[]);while(h!==_){var i=kn();n.body.push(i),r&&gn(i)&&hn(!0),r=!1}return mn(n,"Program")}function kn(){h===mt&&Zt(!0);var e=h,t=pn();switch(e){case D:case B:cn();var r=e===D;yn(ht)||bn()?t.label=null:h!==M?Sn():(t.label=$n(),wn());for(var i=0;i<N.length;++i){var s=N[i];if(t.label==null||s.name===t.label.name){if(!(s.kind==null||!r&&s.kind!=="loop"))break;if(t.label&&r)break}}return i===N.length&&k(t.start,"Unsyntactic "+e.keyword),mn(t,r?"BreakStatement":"ContinueStatement");case j:return cn(),mn(t,"DebuggerStatement");case I:return cn(),N.push(Nn),t.body=kn(),N.pop(),En(Q),t.test=Ln(),wn(),mn(t,"DoWhileStatement");case U:cn(),N.push(Nn),En(ft);if(h===ht)return On(t,null);if(h===K){var o=pn();return cn(),_n(o,!0),o.declarations.length===1&&yn(rt)?Mn(t,o):On(t,o)}var o=Dn(!1,!0);if(yn(rt))return xn(o),Mn(t,o);return On(t,o);case z:return cn(),Xn(t,!0);case W:return cn(),t.test=Ln(),t.consequent=kn(),t.alternate=yn(q)?kn():null,mn(t,"IfStatement");case X:return T||k(a,"'return' outside of function"),cn(),yn(ht)||bn()?t.argument=null:(t.argument=Dn(),wn()),mn(t,"ReturnStatement");case V:cn(),t.discriminant=Ln(),t.cases=[],En(ut),N.push(Cn);for(var u,f;h!=at;)if(h===P||h===F){var l=h===P;u&&mn(u,"SwitchCase"),t.cases.push(u=pn()),u.consequent=[],cn(),l?u.test=Dn():(f&&k(E,"Multiple default clauses"),f=!0,u.test=null),En(pt)}else u||Sn(),u.consequent.push(kn());return u&&mn(u,"SwitchCase"),cn(),N.pop(),mn(t,"SwitchStatement");case $:return cn(),Ut.test(n.slice(S,a))&&k(S,"Illegal newline after throw"),t.argument=Dn(),mn(t,"ThrowStatement");case J:cn(),t.block=An(),t.handlers=[];while(h===H){var c=pn();cn(),En(ft),c.param=$n(),C&&Ht(c.param.name)&&k(c.param.start,"Binding "+c.param.name+" in strict mode"),En(lt),c.guard=null,c.body=An(),t.handlers.push(mn(c,"CatchClause"))}return t.finalizer=yn(R)?An():null,!t.handlers.length&&!t.finalizer&&k(t.start,"Missing catch or finally clause"),mn(t,"TryStatement");case K:return cn(),t=_n(t),wn(),t;case Q:return cn(),t.test=Ln(),N.push(Nn),t.body=kn(),N.pop(),mn(t,"WhileStatement");case G:return C&&k(a,"'with' in strict mode"),cn(),t.object=Ln(),t.body=kn(),mn(t,"WithStatement");case ut:return An();case ht:return cn(),mn(t,"EmptyStatement");default:var d=p,v=Dn();if(e===M&&v.type==="Identifier"&&yn(pt)){for(var i=0;i<N.length;++i)N[i].name===d&&k(v.start,"Label '"+d+"' is already declared");var m=h.isLoop?"loop":h===V?"switch":null;return N.push({name:d,kind:m}),t.body=kn(),t.label=v,mn(t,"LabeledStatement")}return t.expression=v,wn(),mn(t,"ExpressionStatement")}}function Ln(){En(ft);var e=Dn();return En(lt),e}function An(e){var t=pn(),n=!0,r=!1,i;t.body=[],En(ut);while(!yn(at)){var s=kn();t.body.push(s),n&&gn(s)&&(i=r,hn(r=!0)),n=!1}return r&&!i&&hn(!1),mn(t,"BlockStatement")}function On(e,t){return e.init=t,En(ht),e.test=h===ht?null:Dn(),En(ht),e.update=h===lt?null:Dn(),En(lt),e.body=kn(),N.pop(),mn(e,"ForStatement")}function Mn(e,t){return e.left=t,e.right=Dn(),En(lt),e.body=kn(),N.pop(),mn(e,"ForInStatement")}function _n(e,t){e.declarations=[],e.kind="var";for(;;){var n=pn();n.id=$n(),C&&Ht(n.id.name)&&k(n.id.start,"Binding "+n.id.name+" in strict mode"),n.init=yn(gt)?Dn(!0,t):null,e.declarations.push(mn(n,"VariableDeclarator"));if(!yn(ct))break}return mn(e,"VariableDeclaration")}function Dn(e,t){var n=Pn(t);if(!e&&h===ct){var r=dn(n);r.expressions=[n];while(yn(ct))r.expressions.push(Pn(t));return mn(r,"SequenceExpression")}return n}function Pn(e){var t=Hn(e);if(h.isAssign){var n=dn(t);return n.operator=p,n.left=t,cn(),n.right=Pn(e),xn(t),mn(n,"AssignmentExpression")}return t}function Hn(e){var t=Bn(e);if(yn(vt)){var n=dn(t);return n.test=t,n.consequent=Dn(!0),En(pt),n.alternate=Dn(!0,e),mn(n,"ConditionalExpression")}return t}function Bn(e){return jn(Fn(e),-1,e)}function jn(e,t,n){var r=h.binop;if(r!=null&&(!n||h!==rt)&&r>t){var i=dn(e);i.left=e,i.operator=p,cn(),i.right=jn(Fn(n),r,n);var i=mn(i,/&&|\|\|/.test(i.operator)?"LogicalExpression":"BinaryExpression");return jn(i,t,n)}return e}function Fn(e){if(h.prefix){var t=pn(),n=h.isUpdate;return t.operator=p,t.prefix=!0,cn(),t.argument=Fn(e),n?xn(t.argument):C&&t.operator==="delete"&&t.argument.type==="Identifier"&&k(t.start,"Deleting local variable in strict mode"),mn(t,n?"UpdateExpression":"UnaryExpression")}var r=In();while(h.postfix&&!bn()){var t=dn(r);t.operator=p,t.prefix=!1,t.argument=r,xn(r),cn(),r=mn(t,"UpdateExpression")}return r}function In(){return qn(Rn())}function qn(e,t){if(yn(dt)){var n=dn(e);return n.object=e,n.property=$n(!0),n.computed=!1,qn(mn(n,"MemberExpression"),t)}if(yn(st)){var n=dn(e);return n.object=e,n.property=Dn(),n.computed=!0,En(ot),qn(mn(n,"MemberExpression"),t)}if(!t&&yn(ft)){var n=dn(e);return n.callee=e,n.arguments=Vn(lt,!1),qn(mn(n,"CallExpression"),t)}return e}function Rn(){switch(h){case Z:var e=pn();return cn(),mn(e,"ThisExpression");case M:return $n();case L:case O:case A:var e=pn();return e.value=p,e.raw=n.slice(a,f),cn(),mn(e,"Literal");case et:case tt:case nt:var e=pn();return e.value=h.atomValue,cn(),mn(e,"Literal");case ft:var r=l,i=a;cn();var s=Dn();return s.start=i,s.end=f,t.locations&&(s.loc.start=r,s.loc.end=c),t.ranges&&(s.range=[i,f]),En(lt),s;case st:var e=pn();return cn(),e.elements=Vn(ot,!0,!0),mn(e,"ArrayExpression");case ut:return zn();case z:var e=pn();return cn(),Xn(e,!1);case Y:return Un();default:Sn()}}function Un(){var e=pn();return cn(),e.callee=qn(Rn(!1),!0),yn(ft)?e.arguments=Vn(lt,!1):e.arguments=[],mn(e,"NewExpression")}function zn(){var e=pn(),n=!0,r=!1;e.properties=[],cn();while(!yn(at)){if(!n){En(ct);if(t.allowTrailingCommas&&yn(at))break}else n=!1;var i={key:Wn()},s=!1,o;yn(pt)?(i.value=Dn(!0),o=i.kind="init"):t.ecmaVersion>=5&&i.key.type==="Identifier"&&(i.key.name==="get"||i.key.name==="set")?(s=r=!0,o=i.kind=i.key.name,i.key=Wn(),!h===ft&&Sn(),i.value=Xn(pn(),!1)):Sn();if(i.key.type==="Identifier"&&(C||r))for(var u=0;u<e.properties.length;++u){var a=e.properties[u];if(a.key.name===i.key.name){var f=o==a.kind||s&&a.kind==="init"||o==="init"&&(a.kind==="get"||a.kind==="set");f&&!C&&o==="init"&&a.kind==="init"&&(f=!1),f&&k(i.key.start,"Redefinition of property")}}e.properties.push(i)}return mn(e,"ObjectExpression")}function Wn(){return h===L||h===O?Rn():$n(!0)}function Xn(e,t){h===M?e.id=$n():t?Sn():e.id=null,e.params=[];var n=!0;En(ft);while(!yn(lt))n?n=!1:En(ct),e.params.push($n());var r=T,i=N;T=!0,N=[],e.body=An(!0),T=r,N=i;if(C||e.body.body.length&&gn(e.body.body[0]))for(var s=e.id?-1:0;s<e.params.length;++s){var o=s<0?e.id:e.params[s];(Pt(o.name)||Ht(o.name))&&k(o.start,"Defining '"+o.name+"' in strict mode");if(s>=0)for(var u=0;u<s;++u)o.name===e.params[u].name&&k(o.start,"Argument name clash in strict mode")}return mn(e,t?"FunctionDeclaration":"FunctionExpression")}function Vn(e,n,r){var i=[],s=!0;while(!yn(e)){if(!s){En(ct);if(n&&t.allowTrailingCommas&&yn(e))break}else s=!1;r&&h===ct?i.push(null):i.push(Dn(!0))}return i}function $n(e){var n=pn();return n.name=h===M?p:e&&!t.forbidReserved&&h.keyword||Sn(),cn(),mn(n,"Identifier")}e.version="0.0.1";var t,n,r,i;e.parse=function(e,o){n=String(e),r=n.length,t=o||{};for(var u in s)t.hasOwnProperty(u)||(t[u]=s[u]);return i=t.sourceFile||null,Tn(t.program)};var s=e.defaultOptions={ecmaVersion:5,strictSemicolons:!1,allowTrailingCommas:!0,forbidReserved:!1,trackComments:!1,locations:!1,ranges:!1,program:null,sourceFile:null},o=e.getLineInfo=function(e,t){for(var n=1,r=0;;){zt.lastIndex=r;var i=zt.exec(e);if(!(i&&i.index<t))break;++n,r=i.index+i[0].length}return{line:n,column:t-r}},u,a,f,l,c,h,p,d,v,m,g,y,b,w,E,S,x,T,N,C,L={type:"num"},A={type:"regexp"},O={type:"string"},M={type:"name"},_={type:"eof"},D={keyword:"break"},P={keyword:"case",beforeExpr:!0},H={keyword:"catch"},B={keyword:"continue"},j={keyword:"debugger"},F={keyword:"default"},I={keyword:"do",isLoop:!0},q={keyword:"else",beforeExpr:!0},R={keyword:"finally"},U={keyword:"for",isLoop:!0},z={keyword:"function"},W={keyword:"if"},X={keyword:"return",beforeExpr:!0},V={keyword:"switch"},$={keyword:"throw",beforeExpr:!0},J={keyword:"try"},K={keyword:"var"},Q={keyword:"while",isLoop:!0},G={keyword:"with"},Y={keyword:"new",beforeExpr:!0},Z={keyword:"this"},et={keyword:"null",atomValue:null},tt={keyword:"true",atomValue:!0},nt={keyword:"false",atomValue:!1},rt={keyword:"in",binop:7,beforeExpr:!0},it={"break":D,"case":P,"catch":H,"continue":B,"debugger":j,"default":F,"do":I,"else":q,"finally":R,"for":U,"function":z,"if":W,"return":X,"switch":V,"throw":$,"try":J,"var":K,"while":Q,"with":G,"null":et,"true":tt,"false":nt,"new":Y,"in":rt,"instanceof":{keyword:"instanceof",binop:7},"this":Z,"typeof":{keyword:"typeof",prefix:!0},"void":{keyword:"void",prefix:!0},"delete":{keyword:"delete",prefix:!0}},st={type:"[",beforeExpr:!0},ot={type:"]"},ut={type:"{",beforeExpr:!0},at={type:"}"},ft={type:"(",beforeExpr:!0},lt={type:")"},ct={type:",",beforeExpr:!0},ht={type:";",beforeExpr:!0},pt={type:":",beforeExpr:!0},dt={type:"."},vt={type:"?",beforeExpr:!0},mt={binop:10,beforeExpr:!0},gt={isAssign:!0,beforeExpr:!0},yt={isAssign:!0,beforeExpr:!0},bt={binop:9,prefix:!0,beforeExpr:!0},wt={postfix:!0,prefix:!0,isUpdate:!0},Et={prefix:!0,beforeExpr:!0},St={binop:1,beforeExpr:!0},xt={binop:2,beforeExpr:!0},Tt={binop:3,beforeExpr:!0},Nt={binop:4,beforeExpr:!0},Ct={binop:5,beforeExpr:!0},kt={binop:6,beforeExpr:!0},Lt={binop:7,beforeExpr:!0},At={binop:8,beforeExpr:!0},Ot={binop:10,beforeExpr:!0},_t=Mt("abstract boolean byte char class double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile"),Dt=Mt("class enum extends super const export import"),Pt=Mt("implements interface let package private protected public static yield"),Ht=Mt("eval arguments"),Bt=Mt("break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this"),jt=/[\u1680\u180e\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]/,Ft="ªµºÀ-ÖØ-öø-ˁˆ-ˑˠ-ˤˬˮͰ-ʹͶͷͺ-ͽΆΈ-ΊΌΎ-ΡΣ-ϵϷ-ҁҊ-ԧԱ-Ֆՙա-ևא-תװ-ײؠ-يٮٯٱ-ۓەۥۦۮۯۺ-ۼۿܐܒ-ܯݍ-ޥޱߊ-ߪߴߵߺࠀ-ࠕࠚࠤࠨࡀ-ࡘࢠࢢ-ࢬऄ-हऽॐक़-ॡॱ-ॷॹ-ॿঅ-ঌএঐও-নপ-রলশ-হঽৎড়ঢ়য়-ৡৰৱਅ-ਊਏਐਓ-ਨਪ-ਰਲਲ਼ਵਸ਼ਸਹਖ਼-ੜਫ਼ੲ-ੴઅ-ઍએ-ઑઓ-નપ-રલળવ-હઽૐૠૡଅ-ଌଏଐଓ-ନପ-ରଲଳଵ-ହଽଡ଼ଢ଼ୟ-ୡୱஃஅ-ஊஎ-ஐஒ-கஙசஜஞடணதந-பம-ஹௐఅ-ఌఎ-ఐఒ-నప-ళవ-హఽౘౙౠౡಅ-ಌಎ-ಐಒ-ನಪ-ಳವ-ಹಽೞೠೡೱೲഅ-ഌഎ-ഐഒ-ഺഽൎൠൡൺ-ൿඅ-ඖක-නඳ-රලව-ෆก-ะาำเ-ๆກຂຄງຈຊຍດ-ທນ-ຟມ-ຣລວສຫອ-ະາຳຽເ-ໄໆໜ-ໟༀཀ-ཇཉ-ཬྈ-ྌက-ဪဿၐ-ၕၚ-ၝၡၥၦၮ-ၰၵ-ႁႎႠ-ჅჇჍა-ჺჼ-ቈቊ-ቍቐ-ቖቘቚ-ቝበ-ኈኊ-ኍነ-ኰኲ-ኵኸ-ኾዀዂ-ዅወ-ዖዘ-ጐጒ-ጕጘ-ፚᎀ-ᎏᎠ-Ᏼᐁ-ᙬᙯ-ᙿᚁ-ᚚᚠ-ᛪᛮ-ᛰᜀ-ᜌᜎ-ᜑᜠ-ᜱᝀ-ᝑᝠ-ᝬᝮ-ᝰក-ឳៗៜᠠ-ᡷᢀ-ᢨᢪᢰ-ᣵᤀ-ᤜᥐ-ᥭᥰ-ᥴᦀ-ᦫᧁ-ᧇᨀ-ᨖᨠ-ᩔᪧᬅ-ᬳᭅ-ᭋᮃ-ᮠᮮᮯᮺ-ᯥᰀ-ᰣᱍ-ᱏᱚ-ᱽᳩ-ᳬᳮ-ᳱᳵᳶᴀ-ᶿḀ-ἕἘ-Ἕἠ-ὅὈ-Ὅὐ-ὗὙὛὝὟ-ώᾀ-ᾴᾶ-ᾼιῂ-ῄῆ-ῌῐ-ΐῖ-Ίῠ-Ῥῲ-ῴῶ-ῼⁱⁿₐ-ₜℂℇℊ-ℓℕℙ-ℝℤΩℨK-ℭℯ-ℹℼ-ℿⅅ-ⅉⅎⅠ-ↈⰀ-Ⱞⰰ-ⱞⱠ-ⳤⳫ-ⳮⳲⳳⴀ-ⴥⴧⴭⴰ-ⵧⵯⶀ-ⶖⶠ-ⶦⶨ-ⶮⶰ-ⶶⶸ-ⶾⷀ-ⷆⷈ-ⷎⷐ-ⷖⷘ-ⷞⸯ々-〇〡-〩〱-〵〸-〼ぁ-ゖゝ-ゟァ-ヺー-ヿㄅ-ㄭㄱ-ㆎㆠ-ㆺㇰ-ㇿ㐀-䶵一-鿌ꀀ-ꒌꓐ-ꓽꔀ-ꘌꘐ-ꘟꘪꘫꙀ-ꙮꙿ-ꚗꚠ-ꛯꜗ-ꜟꜢ-ꞈꞋ-ꞎꞐ-ꞓꞠ-Ɦꟸ-ꠁꠃ-ꠅꠇ-ꠊꠌ-ꠢꡀ-ꡳꢂ-ꢳꣲ-ꣷꣻꤊ-ꤥꤰ-ꥆꥠ-ꥼꦄ-ꦲꧏꨀ-ꨨꩀ-ꩂꩄ-ꩋꩠ-ꩶꩺꪀ-ꪯꪱꪵꪶꪹ-ꪽꫀꫂꫛ-ꫝꫠ-ꫪꫲ-ꫴꬁ-ꬆꬉ-ꬎꬑ-ꬖꬠ-ꬦꬨ-ꬮꯀ-ꯢ가-힣ힰ-ퟆퟋ-ퟻ豈-舘並-龎ff-stﬓ-ﬗיִײַ-ﬨשׁ-זּטּ-לּמּנּסּףּפּצּ-ﮱﯓ-ﴽﵐ-ﶏﶒ-ﷇﷰ-ﷻﹰ-ﹴﹶ-ﻼＡ-Ｚａ-ｚｦ-ﾾￂ-ￇￊ-ￏￒ-ￗￚ-ￜ",It="ͱ-ʹ҃-֑҇-ׇֽֿׁׂׅׄؐ-ؚؠ-ىٲ-ۓۧ-ۨۻ-ۼܰ-݊ࠀ-ࠔࠛ-ࠣࠥ-ࠧࠩ-࠭ࡀ-ࡗࣤ-ࣾऀ-ःऺ-़ा-ॏ॑-ॗॢ-ॣ०-९ঁ-ঃ়া-ৄেৈৗয়-ৠਁ-ਃ਼ਾ-ੂੇੈੋ-੍ੑ੦-ੱੵઁ-ઃ઼ા-ૅે-ૉો-્ૢ-ૣ૦-૯ଁ-ଃ଼ା-ୄେୈୋ-୍ୖୗୟ-ୠ୦-୯ஂா-ூெ-ைொ-்ௗ௦-௯ఁ-ఃె-ైొ-్ౕౖౢ-ౣ౦-౯ಂಃ಼ಾ-ೄೆ-ೈೊ-್ೕೖೢ-ೣ೦-೯ംഃെ-ൈൗൢ-ൣ൦-൯ංඃ්ා-ුූෘ-ෟෲෳิ-ฺเ-ๅ๐-๙ິ-ູ່-ໍ໐-໙༘༙༠-༩༹༵༷ཁ-ཇཱ-྄྆-྇ྍ-ྗྙ-ྼ࿆က-ဩ၀-၉ၧ-ၭၱ-ၴႂ-ႍႏ-ႝ፝-፟ᜎ-ᜐᜠ-ᜰᝀ-ᝐᝲᝳក-ឲ៝០-៩᠋-᠍᠐-᠙ᤠ-ᤫᤰ-᤻ᥑ-ᥭᦰ-ᧀᧈ-ᧉ᧐-᧙ᨀ-ᨕᨠ-ᩓ᩠-᩿᩼-᪉᪐-᪙ᭆ-ᭋ᭐-᭙᭫-᭳᮰-᮹᯦-᯳ᰀ-ᰢ᱀-᱉ᱛ-ᱽ᳐-᳒ᴀ-ᶾḁ-ἕ‌‍‿⁀⁔⃐-⃥⃜⃡-⃰ⶁ-ⶖⷠ-ⷿ〡-〨゙゚Ꙁ-ꙭꙴ-꙽ꚟ꛰-꛱ꟸ-ꠀ꠆ꠋꠣ-ꠧꢀ-ꢁꢴ-꣄꣐-꣙ꣳ-ꣷ꤀-꤉ꤦ-꤭ꤰ-ꥅꦀ-ꦃ꦳-꧀ꨀ-ꨧꩀ-ꩁꩌ-ꩍ꩐-꩙ꩻꫠ-ꫩꫲ-ꫳꯀ-ꯡ꯬꯭꯰-꯹ﬠ-ﬨ︀-️︠-︦︳︴﹍-﹏０-９＿",qt=new RegExp("["+Ft+"]"),Rt=new RegExp("["+Ft+It+"]"),Ut=/[\n\r\u2028\u2029]/,zt=/\r\n|[\n\r\u2028\u2029]/g,an,vn,Nn={kind:"loop"},Cn={kind:"switch"}})(typeof exports=="undefined"?window.acorn={}:exports);
\ No newline at end of file
diff --git a/lib/acorn.js b/lib/acorn.js
index a31f1743..deac5bcf 100644
--- a/lib/acorn.js
+++ b/lib/acorn.js
@@ -1433,8 +1433,17 @@
       return finishNode(node, "Literal");
 
     case _parenL:
+      var tokStartLoc1 = tokStartLoc, tokStart1 = tokStart;
       next();
       var val = parseExpression();
+      val.start = tokStart1;
+      val.end = tokEnd;
+      if (options.locations) {
+        val.loc.start = tokStartLoc1;
+        val.loc.end = tokEndLoc;
+      }
+      if (options.ranges)
+        val.range = [tokStart1, tokEnd];
       expect(_parenR);
       return val;
 
@@ -1592,4 +1601,4 @@
     return finishNode(node, "Identifier");
   }
 
-})(typeof exports === "undefined" ? (window.acorn = {}) : exports);
\ No newline at end of file
+})(typeof exports === "undefined" ? (window.acorn = {}) : exports);
diff --git a/node.js/index.js b/node.js/index.js
index 243a9d1b..36301066 100644
--- a/node.js/index.js
+++ b/node.js/index.js
@@ -9,6 +9,7 @@ __dirname = path.resolve(__dirname, '../src/');
 var context = vm.createContext({
 	options: {
 		server: true,
+		parser: 'acorn',
 		version: 'dev'
 	},
 	fs: fs,
diff --git a/src/core/PaperScript.js b/src/core/PaperScript.js
index b44da870..345edad4 100644
--- a/src/core/PaperScript.js
+++ b/src/core/PaperScript.js
@@ -21,7 +21,7 @@
 
 /*#*/ if (options.parser == 'acorn') {
 /*#*/ include('../../lib/acorn-min.js');
-/*#*/ } else {
+/*#*/ } else if (options.parser == 'esprima') {
 /*#*/ include('../../lib/esprima-min.js');
 /*#*/ }
 
@@ -189,7 +189,7 @@ var PaperScript = this.PaperScript = new function() {
 		// Now do the parsing magic
 /*#*/ if (options.parser == 'acorn') {
 		walkAst(acorn.parse(code, { ranges: true }));
-/*#*/ } else {
+/*#*/ } else if (options.parser == 'esprima') {
 		walkAst(esprima.parse(code, { range: true }));
 /*#*/ }
 		return code;
diff --git a/src/load.js b/src/load.js
index dd6e230a..cb864fae 100644
--- a/src/load.js
+++ b/src/load.js
@@ -22,7 +22,8 @@
 var options = {
 	browser: true,
 	stats: true,
-	version: 'dev'
+	version: 'dev',
+	parser: 'acorn'
 };
 
 // This folder is specified relatively to the lib folder from which prepro.js is