@danielx/civet 0.4.16 → 0.4.18

package/dist/browser.js

@@ -407,6 +407,8 @@ var Civet = (() => {
       var { parse } = parserState({
         Program,
         TopLevelStatement,
+        ExtendedExpression,
+        ExpressionizedStatement,
         Expression,
         Arguments,
         ArgumentsWithTrailingCallExpressions,
@@ -423,10 +425,11 @@ var Civet = (() => {
         UpdateExpression,
         UpdateExpressionSymbol,
         AssignmentExpression,
-        AssignmentExpressionRest,
-        AwaitExpression,
+        AssignmentExpressionTail,
         YieldExpression,
+        YieldTail,
         ArrowFunction,
+        ArrowFunctionTail,
         FatArrow,
         FatArrowBody,
         ConditionalExpression,
@@ -444,7 +447,6 @@ var Civet = (() => {
         This,
         AtAccessor,
         LeftHandSideExpression,
-        NewExpression,
         CallExpression,
         CallExpressionRest,
         OptionalShorthand,
@@ -464,10 +466,14 @@ var Civet = (() => {
         BindingIdentifier,
         BindingPattern,
         ObjectBindingPattern,
+        ObjectBindingPatternContent,
         ArrayBindingPattern,
+        ArrayBindingPatternContent,
+        Elision,
         NestedBindingProperties,
         NestedBindingProperty,
         BindingProperty,
+        NestedBindingRestProperty,
         BindingRestProperty,
         NestedBindingElements,
         NestedBindingElement,
@@ -482,10 +488,11 @@ var Civet = (() => {
         BracedOrEmptyBlock,
         EmptyBlock,
         BracedBlock,
-        SingleNestedExpression,
-        NestedBlockExpressions,
-        BlockExpression,
+        BracedContent,
+        NestedBlockStatements,
+        NestedBlockStatement,
         Literal,
+        LiteralContent,
         NullLiteral,
         BooleanLiteral,
         CoffeeScriptBooleanLiteral,
@@ -494,14 +501,16 @@ var Civet = (() => {
         IdentifierName,
         IdentifierReference,
         ArrayLiteral,
+        ArrayLiteralContent,
         NestedElementList,
         NestedElement,
         ArrayElementDelimiter,
         ElementList,
-        InlineElementList,
+        ElementListRest,
         ArrayElementExpression,
-        Elision,
         ObjectLiteral,
+        BracedObjectLiteral,
+        BracedObjectLiteralContent,
         NestedObjectLiteral,
         NestedPropertyDefinitions,
         NestedPropertyDefinition,
@@ -528,6 +537,10 @@ var Civet = (() => {
         IfStatement,
         IfClause,
         UnlessClause,
+        IfExpression,
+        ExpressionBlock,
+        NestedBlockExpressions,
+        NestedBlockExpression,
         IterationStatement,
         LoopStatement,
         LoopClause,
@@ -537,10 +550,15 @@ var Civet = (() => {
         ForStatement,
         ForClause,
         ForStatementControl,
+        WhenCondition,
+        CoffeeForStatementParameters,
+        CoffeeForDeclaration,
+        ForStatementParameters,
         ForInOfDeclaration,
         ForDeclaration,
         ForBinding,
         SwitchStatement,
+        SwitchExpression,
         CaseBlock,
         NestedCaseClauses,
         NestedCaseClause,
@@ -558,6 +576,8 @@ var Civet = (() => {
         SuppressIndentedApplication,
         ExpressionStatement,
         KeywordStatement,
+        DebuggerExpression,
+        ThrowExpression,
         MaybeNestedExpression,
         ImportDeclaration,
         ImpliedImport,
@@ -623,9 +643,11 @@ var Civet = (() => {
         NonNewlineWhitespace,
         __,
         Whitespace,
+        ExpressionDelimiter,
         StatementDelimiter,
         NonIdContinue,
         Loc,
+        Ampersand,
         As,
         Async,
         Await,
@@ -659,6 +681,7 @@ var Civet = (() => {
         LetOrConst,
         Loop,
         New,
+        Not,
         Of,
         OpenBrace,
         OpenBracket,
@@ -672,6 +695,7 @@ var Civet = (() => {
         SubstitutionStart,
         Switch,
         Target,
+        Then,
         Throw,
         TripleDoubleQuote,
         TripleSingleQuote,
@@ -762,7 +786,11 @@ var Civet = (() => {
         InsertBreak,
         CoffeeCommentEnabled,
         CoffeeBooleansEnabled,
+        CoffeeForLoopsEnabled,
         CoffeeInterpolationEnabled,
+        CoffeeIsntEnabled,
+        CoffeeNotEnabled,
+        CoffeeOfEnabled,
         Reset,
         Init,
         Indent,
@@ -782,149 +810,154 @@ var Civet = (() => {
       var $L6 = $L("this");
       var $L7 = $L("#");
       var $L8 = $L("@");
-      var $L9 = $L("super");
-      var $L10 = $L("import");
-      var $L11 = $L("!");
-      var $L12 = $L("::");
-      var $L13 = $L("super[");
-      var $L14 = $L("import.meta");
-      var $L15 = $L(")");
-      var $L16 = $L("->");
-      var $L17 = $L("null");
-      var $L18 = $L("true");
-      var $L19 = $L("false");
-      var $L20 = $L("yes");
-      var $L21 = $L("on");
-      var $L22 = $L("no");
-      var $L23 = $L("off");
-      var $L24 = $L(",");
-      var $L25 = $L("]");
-      var $L26 = $L("}");
-      var $L27 = $L("**=");
-      var $L28 = $L("*=");
-      var $L29 = $L("/=");
-      var $L30 = $L("%=");
-      var $L31 = $L("+=");
-      var $L32 = $L("-=");
-      var $L33 = $L("<<=");
-      var $L34 = $L(">>>=");
-      var $L35 = $L(">>=");
-      var $L36 = $L("&&=");
-      var $L37 = $L("&=");
-      var $L38 = $L("^=");
-      var $L39 = $L("||=");
-      var $L40 = $L("|=");
-      var $L41 = $L("??=");
-      var $L42 = $L("?=");
-      var $L43 = $L("=");
-      var $L44 = $L("**");
-      var $L45 = $L("*");
-      var $L46 = $L("/");
-      var $L47 = $L("%");
-      var $L48 = $L("+");
-      var $L49 = $L("-");
-      var $L50 = $L("<=");
-      var $L51 = $L(">=");
-      var $L52 = $L("<<");
-      var $L53 = $L(">>>");
-      var $L54 = $L(">>");
-      var $L55 = $L(">");
-      var $L56 = $L("!==");
-      var $L57 = $L("!=");
-      var $L58 = $L("is");
-      var $L59 = $L("===");
-      var $L60 = $L("==");
-      var $L61 = $L("and");
-      var $L62 = $L("&&");
-      var $L63 = $L("or");
-      var $L64 = $L("||");
-      var $L65 = $L("??");
-      var $L66 = $L("instanceof");
-      var $L67 = $L("in");
-      var $L68 = $L("&");
-      var $L69 = $L("^");
-      var $L70 = $L("|");
-      var $L71 = $L(";");
-      var $L72 = $L("finally");
-      var $L73 = $L("break");
-      var $L74 = $L("continue");
-      var $L75 = $L("debugger");
-      var $L76 = $L("import type");
-      var $L77 = $L("default");
-      var $L78 = $L(":=");
-      var $L79 = $L("/*");
-      var $L80 = $L("*/");
-      var $L81 = $L("###");
-      var $L82 = $L("as");
-      var $L83 = $L("async");
-      var $L84 = $L("await");
-      var $L85 = $L("`");
-      var $L86 = $L("case");
-      var $L87 = $L("catch");
-      var $L88 = $L("class");
-      var $L89 = $L("#{");
-      var $L90 = $L(":");
-      var $L91 = $L("delete");
-      var $L92 = $L("do");
-      var $L93 = $L(".");
-      var $L94 = $L("..");
-      var $L95 = $L("...");
-      var $L96 = $L('"');
-      var $L97 = $L("else");
-      var $L98 = $L("export");
-      var $L99 = $L("for");
-      var $L100 = $L("from");
-      var $L101 = $L("function");
-      var $L102 = $L("get");
-      var $L103 = $L("set");
-      var $L104 = $L("if");
-      var $L105 = $L("let");
-      var $L106 = $L("const");
-      var $L107 = $L("loop");
-      var $L108 = $L("new");
-      var $L109 = $L("of");
-      var $L110 = $L("{");
-      var $L111 = $L("[");
-      var $L112 = $L("(");
-      var $L113 = $L("?");
-      var $L114 = $L("return");
-      var $L115 = $L("'");
-      var $L116 = $L("static");
-      var $L117 = $L("${");
-      var $L118 = $L("switch");
-      var $L119 = $L("target");
-      var $L120 = $L("throw");
-      var $L121 = $L('"""');
-      var $L122 = $L("'''");
-      var $L123 = $L("```");
-      var $L124 = $L("try");
-      var $L125 = $L("typeof");
-      var $L126 = $L("unless");
-      var $L127 = $L("until");
-      var $L128 = $L("var");
-      var $L129 = $L("void");
-      var $L130 = $L("when");
-      var $L131 = $L("while");
-      var $L132 = $L("yield");
-      var $L133 = $L("/>");
-      var $L134 = $L("</");
-      var $L135 = $L("<>");
-      var $L136 = $L("</>");
-      var $L137 = $L("declare");
-      var $L138 = $L("type");
-      var $L139 = $L("interface");
-      var $L140 = $L("namespace");
-      var $L141 = $L("readonly");
-      var $L142 = $L("asserts");
-      var $L143 = $L("keyof");
-      var $L144 = $L("infer");
-      var $L145 = $L("[]");
-      var $L146 = $L("civet");
-      var $L147 = $L("  ");
-      var $L148 = $L("	");
-      var $R0 = $R(new RegExp("(of)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
+      var $L9 = $L(".");
+      var $L10 = $L("super");
+      var $L11 = $L("import");
+      var $L12 = $L("!");
+      var $L13 = $L("::");
+      var $L14 = $L("super[");
+      var $L15 = $L("import.meta");
+      var $L16 = $L(")");
+      var $L17 = $L("->");
+      var $L18 = $L("null");
+      var $L19 = $L("true");
+      var $L20 = $L("false");
+      var $L21 = $L("yes");
+      var $L22 = $L("on");
+      var $L23 = $L("no");
+      var $L24 = $L("off");
+      var $L25 = $L(",");
+      var $L26 = $L("]");
+      var $L27 = $L("}");
+      var $L28 = $L("**=");
+      var $L29 = $L("*=");
+      var $L30 = $L("/=");
+      var $L31 = $L("%=");
+      var $L32 = $L("+=");
+      var $L33 = $L("-=");
+      var $L34 = $L("<<=");
+      var $L35 = $L(">>>=");
+      var $L36 = $L(">>=");
+      var $L37 = $L("&&=");
+      var $L38 = $L("&=");
+      var $L39 = $L("^=");
+      var $L40 = $L("||=");
+      var $L41 = $L("|=");
+      var $L42 = $L("??=");
+      var $L43 = $L("?=");
+      var $L44 = $L("=");
+      var $L45 = $L("**");
+      var $L46 = $L("*");
+      var $L47 = $L("/");
+      var $L48 = $L("%");
+      var $L49 = $L("+");
+      var $L50 = $L("-");
+      var $L51 = $L("<=");
+      var $L52 = $L(">=");
+      var $L53 = $L("<<");
+      var $L54 = $L(">>>");
+      var $L55 = $L(">>");
+      var $L56 = $L(">");
+      var $L57 = $L("!==");
+      var $L58 = $L("!=");
+      var $L59 = $L("isnt");
+      var $L60 = $L("is");
+      var $L61 = $L("===");
+      var $L62 = $L("==");
+      var $L63 = $L("and");
+      var $L64 = $L("&&");
+      var $L65 = $L("of");
+      var $L66 = $L("or");
+      var $L67 = $L("||");
+      var $L68 = $L("??");
+      var $L69 = $L("instanceof");
+      var $L70 = $L("in");
+      var $L71 = $L("&");
+      var $L72 = $L("^");
+      var $L73 = $L("|");
+      var $L74 = $L(";");
+      var $L75 = $L("own");
+      var $L76 = $L("finally");
+      var $L77 = $L("break");
+      var $L78 = $L("continue");
+      var $L79 = $L("debugger");
+      var $L80 = $L("import type");
+      var $L81 = $L("default");
+      var $L82 = $L(":=");
+      var $L83 = $L("/*");
+      var $L84 = $L("*/");
+      var $L85 = $L("###");
+      var $L86 = $L("as");
+      var $L87 = $L("async");
+      var $L88 = $L("await");
+      var $L89 = $L("`");
+      var $L90 = $L("case");
+      var $L91 = $L("catch");
+      var $L92 = $L("class");
+      var $L93 = $L("#{");
+      var $L94 = $L(":");
+      var $L95 = $L("delete");
+      var $L96 = $L("do");
+      var $L97 = $L("..");
+      var $L98 = $L("...");
+      var $L99 = $L('"');
+      var $L100 = $L("else");
+      var $L101 = $L("export");
+      var $L102 = $L("for");
+      var $L103 = $L("from");
+      var $L104 = $L("function");
+      var $L105 = $L("get");
+      var $L106 = $L("set");
+      var $L107 = $L("if");
+      var $L108 = $L(" ");
+      var $L109 = $L("let");
+      var $L110 = $L("const");
+      var $L111 = $L("loop");
+      var $L112 = $L("new");
+      var $L113 = $L("not");
+      var $L114 = $L("{");
+      var $L115 = $L("[");
+      var $L116 = $L("(");
+      var $L117 = $L("?");
+      var $L118 = $L("return");
+      var $L119 = $L("'");
+      var $L120 = $L("static");
+      var $L121 = $L("${");
+      var $L122 = $L("switch");
+      var $L123 = $L("target");
+      var $L124 = $L("then");
+      var $L125 = $L("throw");
+      var $L126 = $L('"""');
+      var $L127 = $L("'''");
+      var $L128 = $L("```");
+      var $L129 = $L("try");
+      var $L130 = $L("typeof");
+      var $L131 = $L("unless");
+      var $L132 = $L("until");
+      var $L133 = $L("var");
+      var $L134 = $L("void");
+      var $L135 = $L("when");
+      var $L136 = $L("while");
+      var $L137 = $L("yield");
+      var $L138 = $L("/>");
+      var $L139 = $L("</");
+      var $L140 = $L("<>");
+      var $L141 = $L("</>");
+      var $L142 = $L("declare");
+      var $L143 = $L("type");
+      var $L144 = $L("interface");
+      var $L145 = $L("namespace");
+      var $L146 = $L("readonly");
+      var $L147 = $L("asserts");
+      var $L148 = $L("keyof");
+      var $L149 = $L("infer");
+      var $L150 = $L("[]");
+      var $L151 = $L("civet");
+      var $L152 = $L("  ");
+      var $L153 = $L("	");
+      var $R0 = $R(new RegExp("(of|then|when)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
       var $R1 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
-      var $R2 = $R(new RegExp("[!~+-]", "suy"));
+      var $R2 = $R(new RegExp("[!~+-](?!\\s)", "suy"));
       var $R3 = $R(new RegExp("(?=[\\s\\)])", "suy"));
       var $R4 = $R(new RegExp('[^;"\\s]+', "suy"));
       var $R5 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)n", "suy"));
@@ -946,27 +979,32 @@ var Civet = (() => {
       var $R21 = $R(new RegExp("(?:\\$(?!\\{)|\\\\.|[^$`])+", "suy"));
       var $R22 = $R(new RegExp("(?:\\$(?!\\{)|`(?!``)|\\\\.|[^$`])+", "suy"));
       var $R23 = $R(new RegExp("(?:on|off|yes|no)(?!\\p{ID_Continue})", "suy"));
-      var $R24 = $R(new RegExp("(?:and|as|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|loop|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
-      var $R25 = $R(new RegExp("\\/\\/[^\\r\\n]*", "suy"));
-      var $R26 = $R(new RegExp(".", "suy"));
-      var $R27 = $R(new RegExp("#([^\\r\\n]*)", "suy"));
-      var $R28 = $R(new RegExp("[^\\r\\n]", "suy"));
-      var $R29 = $R(new RegExp("[ \\t]+", "suy"));
-      var $R30 = $R(new RegExp("[\\s]+", "suy"));
-      var $R31 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
-      var $R32 = $R(new RegExp("\\s", "suy"));
-      var $R33 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
-      var $R34 = $R(new RegExp('"[^"]*"', "suy"));
-      var $R35 = $R(new RegExp("'[^']*'", "suy"));
-      var $R36 = $R(new RegExp("[^{}<>]+", "suy"));
-      var $R37 = $R(new RegExp("[+-]?", "suy"));
-      var $R38 = $R(new RegExp("[+-]", "suy"));
-      var $R39 = $R(new RegExp("#![^\\r\\n]*", "suy"));
-      var $R40 = $R(new RegExp("[\\t ]*", "suy"));
-      var $R41 = $R(new RegExp("[\\s]*", "suy"));
-      var $R42 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)", "suy"));
-      var $R43 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-      var Program$0 = $S(Reset, Init, __, $Q(TopLevelStatement), __);
+      var $R24 = $R(new RegExp("(?:isnt)(?!\\p{ID_Continue})", "suy"));
+      var $R25 = $R(new RegExp("(?:and|as|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|loop|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
+      var $R26 = $R(new RegExp("\\/\\/[^\\r\\n]*", "suy"));
+      var $R27 = $R(new RegExp(".", "suy"));
+      var $R28 = $R(new RegExp("#([^\\r\\n]*)", "suy"));
+      var $R29 = $R(new RegExp("[^\\r\\n]", "suy"));
+      var $R30 = $R(new RegExp("[ \\t]+", "suy"));
+      var $R31 = $R(new RegExp("[\\s]+", "suy"));
+      var $R32 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
+      var $R33 = $R(new RegExp("\\s", "suy"));
+      var $R34 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
+      var $R35 = $R(new RegExp('"[^"]*"', "suy"));
+      var $R36 = $R(new RegExp("'[^']*'", "suy"));
+      var $R37 = $R(new RegExp("[^{}<>]+", "suy"));
+      var $R38 = $R(new RegExp("[+-]?", "suy"));
+      var $R39 = $R(new RegExp("[+-]", "suy"));
+      var $R40 = $R(new RegExp("#![^\\r\\n]*", "suy"));
+      var $R41 = $R(new RegExp("[\\t ]*", "suy"));
+      var $R42 = $R(new RegExp("[\\s]*", "suy"));
+      var $R43 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)", "suy"));
+      var $R44 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
+      var Program$0 = $TS($S(Reset, Init, __, $Q(TopLevelStatement), __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        var statements = $4;
+        module.processProgram(statements);
+        return $0;
+      });
       function Program(state) {
         if (state.verbose)
           console.log("ENTER:", "Program");
@@ -986,6 +1024,31 @@ var Civet = (() => {
           return TopLevelStatement$0(state);
         }
       }
+      var ExtendedExpression$0 = $TS($S(__, ExpressionizedStatement), function($skip, $loc, $0, $1, $2) {
+        if ($1.length) {
+          $2.children.splice(0, 0, ...$1);
+        }
+        return $2;
+      });
+      var ExtendedExpression$1 = AssignmentExpression;
+      function ExtendedExpression(state) {
+        if (state.tokenize) {
+          return $TOKEN("ExtendedExpression", state, ExtendedExpression$0(state) || ExtendedExpression$1(state));
+        } else {
+          return ExtendedExpression$0(state) || ExtendedExpression$1(state);
+        }
+      }
+      var ExpressionizedStatement$0 = DebuggerExpression;
+      var ExpressionizedStatement$1 = IfExpression;
+      var ExpressionizedStatement$2 = SwitchExpression;
+      var ExpressionizedStatement$3 = ThrowExpression;
+      function ExpressionizedStatement(state) {
+        if (state.tokenize) {
+          return $TOKEN("ExpressionizedStatement", state, ExpressionizedStatement$0(state) || ExpressionizedStatement$1(state) || ExpressionizedStatement$2(state) || ExpressionizedStatement$3(state));
+        } else {
+          return ExpressionizedStatement$0(state) || ExpressionizedStatement$1(state) || ExpressionizedStatement$2(state) || ExpressionizedStatement$3(state);
+        }
+      }
       var Expression$0 = $TS($S(AssignmentExpression, $Q($S(__, Comma, AssignmentExpression))), function($skip, $loc, $0, $1, $2) {
         if ($2.length == 0)
           return $1;
@@ -1057,7 +1120,7 @@ var Civet = (() => {
           return NestedArgument$0(state);
         }
       }
-      var InlineArgumentExpressions$0 = $TS($S($S($E(DotDotDot), AssignmentExpressionRest), $Q($S(__, Comma, $Q(TrailingComment), $E(DotDotDot), AssignmentExpressionRest))), function($skip, $loc, $0, $1, $2) {
+      var InlineArgumentExpressions$0 = $TS($S($S($E(DotDotDot), ExtendedExpression), $Q($S(__, Comma, $Q(TrailingComment), $E(DotDotDot), ExtendedExpression))), function($skip, $loc, $0, $1, $2) {
         if ($2.length == 0)
           return $1;
         return $0;
@@ -1111,7 +1174,23 @@ var Civet = (() => {
       }
       var BinaryOpExpression$0 = $TS($S(UnaryExpression, $Q($S(__, BinaryOp, __, UnaryExpression))), function($skip, $loc, $0, $1, $2) {
         if ($2.length) {
-          return module.expandChainedComparisons($0);
+          const expandedOps = module.expandChainedComparisons($0);
+          let i = 2;
+          while (i < expandedOps.length) {
+            const op = expandedOps[i];
+            if (op.type === "Ref") {
+              const [a, wsOp, op2, wsB, b] = expandedOps.slice(i - 2, i + 3);
+              module.insertTrimmingSpace(wsOp, "");
+              module.insertTrimmingSpace(wsB, "");
+              expandedOps.splice(i - 2, 5, {
+                type: "Call",
+                children: [wsOp, op2, ".call(", wsB, b, ", ", a, ") >= 0"]
+              });
+            } else {
+              i += 4;
+            }
+          }
+          return expandedOps;
         }
         return $1;
       });
@@ -1185,12 +1264,17 @@ var Civet = (() => {
           return UpdateExpressionSymbol$0(state);
         }
       }
-      var AssignmentExpression$0 = $TS($S($Q(TrailingComment), AssignmentExpressionRest), function($skip, $loc, $0, $1, $2) {
-        if ($1.length)
+      var AssignmentExpression$0 = $TS($S($Q(TrailingComment), AssignmentExpressionTail), function($skip, $loc, $0, $1, $2) {
+        if ($1.length) {
+          if ($2.children) {
+            $2.children.splice(0, 0, ...$1);
+            return $2;
+          }
           return $0;
+        }
         return $2;
       });
-      var AssignmentExpression$1 = $S(__, AssignmentExpressionRest);
+      var AssignmentExpression$1 = $S(__, AssignmentExpressionTail);
       function AssignmentExpression(state) {
         if (state.tokenize) {
           return $TOKEN("AssignmentExpression", state, AssignmentExpression$0(state) || AssignmentExpression$1(state));
@@ -1198,71 +1282,105 @@ var Civet = (() => {
           return AssignmentExpression$0(state) || AssignmentExpression$1(state);
         }
       }
-      var AssignmentExpressionRest$0 = AwaitExpression;
-      var AssignmentExpressionRest$1 = YieldExpression;
-      var AssignmentExpressionRest$2 = $S($E($S(Async, __)), ArrowFunction);
-      var AssignmentExpressionRest$3 = $TS($S($P($S(__, LeftHandSideExpression, __, AssignmentOp)), Expression), function($skip, $loc, $0, $1, $2) {
-        const lastAssignment = $1[$1.length - 1];
-        if (lastAssignment[3].token === "=") {
-          const lhs = lastAssignment[1];
-          if (Array.isArray(lhs) && lhs.length > 1) {
-            const props = lhs[lhs.length - 1];
-            if (Array.isArray(props)) {
-              const lastProp = props[props.length - 1];
-              if (lastProp.type === "SliceExpression") {
-                const { start, end, children: c } = lastProp;
-                c[0].token = ".splice(";
-                c[1] = start;
-                c[2] = ", ";
-                if (end)
-                  c[3] = [end, " - ", start];
-                else
-                  c[3] = ["1/0"];
-                c[4] = [", ...", $2];
-                c[5] = ")";
-                lastAssignment.pop();
-                if (module.isWhitespaceOrEmpty(lastAssignment[2]))
+      var AssignmentExpressionTail$0 = YieldExpression;
+      var AssignmentExpressionTail$1 = ArrowFunction;
+      var AssignmentExpressionTail$2 = $TS($S($P($S(__, LeftHandSideExpression, __, AssignmentOp)), ExtendedExpression), function($skip, $loc, $0, $1, $2) {
+        let tail = [], i = 0, len = $1.length;
+        while (i < len) {
+          const lastAssignment = $1[i++];
+          const [, lhs, , op] = lastAssignment;
+          if (op.token !== "=")
+            continue;
+          if (lhs.type === "ObjectExpression") {
+            lhs.children.splice(0, 0, "(");
+            tail.push(")");
+            break;
+          }
+        }
+        i = len - 1;
+        while (i >= 0) {
+          const lastAssignment = $1[i];
+          if (lastAssignment[3].token === "=") {
+            const lhs = lastAssignment[1];
+            if (Array.isArray(lhs) && lhs.length > 1) {
+              const props = lhs[lhs.length - 1];
+              if (Array.isArray(props)) {
+                const lastProp = props[props.length - 1];
+                if (lastProp.type === "SliceExpression") {
+                  const { start, end, children: c } = lastProp;
+                  c[0].token = ".splice(";
+                  c[1] = start;
+                  c[2] = ", ";
+                  if (end)
+                    c[3] = [end, " - ", start];
+                  else
+                    c[3] = ["1/0"];
+                  c[4] = [", ...", $2];
+                  c[5] = ")";
                   lastAssignment.pop();
-                return $1;
+                  if (module.isWhitespaceOrEmpty(lastAssignment[2]))
+                    lastAssignment.pop();
+                  if ($1.length > 1) {
+                    throw new Error("Not implemented yet! TODO: Handle multiple splice assignments");
+                  }
+                  return $1;
+                }
               }
             }
           }
+          i--;
         }
+        const names = $1.flatMap(([, l]) => l.names || []);
         return {
           type: "AssignmentExpression",
-          children: $0
+          children: [...$0, ...tail],
+          names
         };
       });
-      var AssignmentExpressionRest$4 = ConditionalExpression;
-      function AssignmentExpressionRest(state) {
+      var AssignmentExpressionTail$3 = ConditionalExpression;
+      function AssignmentExpressionTail(state) {
         if (state.tokenize) {
-          return $TOKEN("AssignmentExpressionRest", state, AssignmentExpressionRest$0(state) || AssignmentExpressionRest$1(state) || AssignmentExpressionRest$2(state) || AssignmentExpressionRest$3(state) || AssignmentExpressionRest$4(state));
+          return $TOKEN("AssignmentExpressionTail", state, AssignmentExpressionTail$0(state) || AssignmentExpressionTail$1(state) || AssignmentExpressionTail$2(state) || AssignmentExpressionTail$3(state));
         } else {
-          return AssignmentExpressionRest$0(state) || AssignmentExpressionRest$1(state) || AssignmentExpressionRest$2(state) || AssignmentExpressionRest$3(state) || AssignmentExpressionRest$4(state);
+          return AssignmentExpressionTail$0(state) || AssignmentExpressionTail$1(state) || AssignmentExpressionTail$2(state) || AssignmentExpressionTail$3(state);
         }
       }
-      var AwaitExpression$0 = $S(Await, $Q(TrailingComment), AssignmentExpression);
-      function AwaitExpression(state) {
+      var YieldExpression$0 = $S(Yield, YieldTail);
+      function YieldExpression(state) {
         if (state.verbose)
-          console.log("ENTER:", "AwaitExpression");
+          console.log("ENTER:", "YieldExpression");
         if (state.tokenize) {
-          return $TOKEN("AwaitExpression", state, AwaitExpression$0(state));
+          return $TOKEN("YieldExpression", state, YieldExpression$0(state));
         } else {
-          return AwaitExpression$0(state);
+          return YieldExpression$0(state);
         }
       }
-      var YieldExpression$0 = $S(Yield, $E($S($Q(TrailingComment), Star)), AssignmentExpression);
-      function YieldExpression(state) {
+      var YieldTail$0 = $Y(EOS);
+      var YieldTail$1 = $S($E($S($Q(TrailingComment), Star)), AssignmentExpression);
+      function YieldTail(state) {
+        if (state.tokenize) {
+          return $TOKEN("YieldTail", state, YieldTail$0(state) || YieldTail$1(state));
+        } else {
+          return YieldTail$0(state) || YieldTail$1(state);
+        }
+      }
+      var ArrowFunction$0 = $TS($S($E($S(Async, __)), ArrowFunctionTail), function($skip, $loc, $0, $1, $2) {
+        if ($1)
+          $2.children.unshift($1);
+        return $2;
+      });
+      function ArrowFunction(state) {
         if (state.verbose)
-          console.log("ENTER:", "YieldExpression");
+          console.log("ENTER:", "ArrowFunction");
         if (state.tokenize) {
-          return $TOKEN("YieldExpression", state, YieldExpression$0(state));
+          return $TOKEN("ArrowFunction", state, ArrowFunction$0(state));
         } else {
-          return YieldExpression$0(state);
+          return ArrowFunction$0(state);
         }
       }
-      var ArrowFunction$0 = ThinArrowFunction;
-      var ArrowFunction$1 = $TS($S(Parameters, $E(ReturnTypeSuffix), FatArrow, FatArrowBody), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var ArrowFunctionTail$0 = ThinArrowFunction;
+      var ArrowFunctionTail$1 = $TS($S(Parameters, $E(ReturnTypeSuffix), FatArrow, FatArrowBody), function($skip, $loc, $0, $1, $2, $3, $4) {
+        var parameters = $1;
         var suffix = $2;
         var expOrBlock = $4;
         const isVoid = suffix?.children?.[1]?.[0]?.[1]?.token === "void";
@@ -1271,15 +1389,19 @@ var Civet = (() => {
           module.addImplicitReturns(expOrBlock);
         }
         return {
-          type: "FunctionExpression",
+          type: "ArrowFunction",
+          parameters,
+          returnType: suffix,
+          ts: false,
+          block: expOrBlock,
           children: $0
         };
       });
-      function ArrowFunction(state) {
+      function ArrowFunctionTail(state) {
         if (state.tokenize) {
-          return $TOKEN("ArrowFunction", state, ArrowFunction$0(state) || ArrowFunction$1(state));
+          return $TOKEN("ArrowFunctionTail", state, ArrowFunctionTail$0(state) || ArrowFunctionTail$1(state));
         } else {
-          return ArrowFunction$0(state) || ArrowFunction$1(state);
+          return ArrowFunctionTail$0(state) || ArrowFunctionTail$1(state);
         }
       }
       var FatArrow$0 = $TS($S(__, $EXPECT($L3, fail, 'FatArrow "=>"')), function($skip, $loc, $0, $1, $2) {
@@ -1297,25 +1419,24 @@ var Civet = (() => {
           return FatArrow$0(state);
         }
       }
-      var FatArrowBody$0 = $T($S(__, OpenBrace, EOS, NestedBlockExpressions, __, CloseBrace), function(value) {
+      var FatArrowBody$0 = $T($S(__, OpenBrace, EOS, NestedBlockStatements, __, CloseBrace), function(value) {
         var exps = value[3];
         return { "type": "BlockStatement", "expressions": exps, "children": value };
       });
-      var FatArrowBody$1 = $T($S(InsertOpenBrace, EOS, NestedBlockExpressions, InsertNewline, InsertIndent, InsertCloseBrace), function(value) {
+      var FatArrowBody$1 = $T($S(InsertOpenBrace, EOS, NestedBlockStatements, InsertNewline, InsertIndent, InsertCloseBrace), function(value) {
         var exps = value[2];
         return { "type": "BlockStatement", "expressions": exps, "children": value };
       });
       var FatArrowBody$2 = AssignmentExpression;
-      var FatArrowBody$3 = $S(__, AssignmentExpression);
-      var FatArrowBody$4 = EmptyBlock;
+      var FatArrowBody$3 = EmptyBlock;
       function FatArrowBody(state) {
         if (state.tokenize) {
-          return $TOKEN("FatArrowBody", state, FatArrowBody$0(state) || FatArrowBody$1(state) || FatArrowBody$2(state) || FatArrowBody$3(state) || FatArrowBody$4(state));
+          return $TOKEN("FatArrowBody", state, FatArrowBody$0(state) || FatArrowBody$1(state) || FatArrowBody$2(state) || FatArrowBody$3(state));
         } else {
-          return FatArrowBody$0(state) || FatArrowBody$1(state) || FatArrowBody$2(state) || FatArrowBody$3(state) || FatArrowBody$4(state);
+          return FatArrowBody$0(state) || FatArrowBody$1(state) || FatArrowBody$2(state) || FatArrowBody$3(state);
         }
       }
-      var ConditionalExpression$0 = $TS($S(ShortCircuitExpression, $E($S(__, QuestionMark, AssignmentExpression, __, Colon, AssignmentExpression))), function($skip, $loc, $0, $1, $2) {
+      var ConditionalExpression$0 = $TS($S(ShortCircuitExpression, $E($S(__, QuestionMark, ExtendedExpression, __, Colon, ExtendedExpression))), function($skip, $loc, $0, $1, $2) {
         if ($2)
           return $0;
         return $1;
@@ -1348,7 +1469,7 @@ var Civet = (() => {
       var PrimaryExpression$6 = ClassExpression;
       var PrimaryExpression$7 = RegularExpressionLiteral;
       var PrimaryExpression$8 = TemplateLiteral;
-      var PrimaryExpression$9 = $S(OpenParen, Expression, __, CloseParen);
+      var PrimaryExpression$9 = $S(OpenParen, ExtendedExpression, __, CloseParen);
       var PrimaryExpression$10 = JSXElement;
       var PrimaryExpression$11 = JSXFragment;
       function PrimaryExpression(state) {
@@ -1444,7 +1565,7 @@ var Civet = (() => {
           return ClassElement$0(state) || ClassElement$1(state);
         }
       }
-      var FieldDefinition$0 = $TS($S(InsertReadonly, ClassElementName, $E(TypeSuffix), __, ConstAssignment, AssignmentExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var FieldDefinition$0 = $TS($S(InsertReadonly, ClassElementName, $E(TypeSuffix), __, ConstAssignment, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         var r = $1;
         var ca = $5;
         r.children[0].$loc = {
@@ -1487,27 +1608,22 @@ var Civet = (() => {
           return AtAccessor$0(state);
         }
       }
-      var LeftHandSideExpression$0 = NewExpression;
-      var LeftHandSideExpression$1 = CallExpression;
+      var LeftHandSideExpression$0 = $TS($S($Q($S(New, $N($EXPECT($L9, fail, 'LeftHandSideExpression "."')), __)), CallExpression), function($skip, $loc, $0, $1, $2) {
+        if ($1.length)
+          return $0;
+        return $2;
+      });
       function LeftHandSideExpression(state) {
-        if (state.tokenize) {
-          return $TOKEN("LeftHandSideExpression", state, LeftHandSideExpression$0(state) || LeftHandSideExpression$1(state));
-        } else {
-          return LeftHandSideExpression$0(state) || LeftHandSideExpression$1(state);
-        }
-      }
-      var NewExpression$0 = $S($P($S(New, __)), CallExpression);
-      function NewExpression(state) {
         if (state.verbose)
-          console.log("ENTER:", "NewExpression");
+          console.log("ENTER:", "LeftHandSideExpression");
         if (state.tokenize) {
-          return $TOKEN("NewExpression", state, NewExpression$0(state));
+          return $TOKEN("LeftHandSideExpression", state, LeftHandSideExpression$0(state));
         } else {
-          return NewExpression$0(state);
+          return LeftHandSideExpression$0(state);
         }
       }
-      var CallExpression$0 = $S($EXPECT($L9, fail, 'CallExpression "super"'), ArgumentsWithTrailingCallExpressions);
-      var CallExpression$1 = $S($EXPECT($L10, fail, 'CallExpression "import"'), __, OpenParen, AssignmentExpression, __, CloseParen);
+      var CallExpression$0 = $S($EXPECT($L10, fail, 'CallExpression "super"'), ArgumentsWithTrailingCallExpressions);
+      var CallExpression$1 = $S($EXPECT($L11, fail, 'CallExpression "import"'), __, OpenParen, ExtendedExpression, __, CloseParen);
       var CallExpression$2 = $TS($S(MemberExpression, $Q(CallExpressionRest)), function($skip, $loc, $0, $1, $2) {
         if ($2.length)
           return $0;
@@ -1540,7 +1656,7 @@ var Civet = (() => {
           return OptionalShorthand$0(state);
         }
       }
-      var NonNullAssertion$0 = $T($EXPECT($L11, fail, 'NonNullAssertion "!"'), function(value) {
+      var NonNullAssertion$0 = $T($EXPECT($L12, fail, 'NonNullAssertion "!"'), function(value) {
         return { "ts": true, "children": value };
       });
       function NonNullAssertion(state) {
@@ -1552,7 +1668,7 @@ var Civet = (() => {
           return NonNullAssertion$0(state);
         }
       }
-      var AdditionalReservedWords$0 = $R$0($EXPECT($R0, fail, "AdditionalReservedWords /(of)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
+      var AdditionalReservedWords$0 = $R$0($EXPECT($R0, fail, "AdditionalReservedWords /(of|then|when)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
       function AdditionalReservedWords(state) {
         if (state.verbose)
           console.log("ENTER:", "AdditionalReservedWords");
@@ -1567,8 +1683,8 @@ var Civet = (() => {
           return $0;
         return $1;
       });
-      var MemberExpression$1 = $S($Q(TrailingComment), SuperProperty);
-      var MemberExpression$2 = $S($Q(TrailingComment), MetaProperty);
+      var MemberExpression$1 = SuperProperty;
+      var MemberExpression$2 = MetaProperty;
       function MemberExpression(state) {
         if (state.tokenize) {
           return $TOKEN("MemberExpression", state, MemberExpression$0(state) || MemberExpression$1(state) || MemberExpression$2(state));
@@ -1577,12 +1693,20 @@ var Civet = (() => {
         }
       }
       var MemberExpressionRest$0 = $TS($S($E($C(OptionalShorthand, NonNullAssertion)), MemberBracketContent), function($skip, $loc, $0, $1, $2) {
-        if ($1)
+        if ($1) {
+          if ($1.length === 2 && $2.type === "SliceExpression") {
+            $1.pop();
+          }
           return $0;
+        }
+        return $2;
+      });
+      var MemberExpressionRest$1 = $TS($S($E($S($Y(EOS), IndentedFurther)), PropertyAccess), function($skip, $loc, $0, $1, $2) {
+        if ($1)
+          $2.children.unshift($1[1]);
         return $2;
       });
-      var MemberExpressionRest$1 = $S($E($S($Y(EOS), IndentedFurther)), PropertyAccess);
-      var MemberExpressionRest$2 = $TS($S($E($S($Y(EOS), IndentedFurther)), $EXPECT($L12, fail, 'MemberExpressionRest "::"'), $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
+      var MemberExpressionRest$2 = $TS($S($E($S($Y(EOS), IndentedFurther)), $EXPECT($L13, fail, 'MemberExpressionRest "::"'), $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
         var id = $3;
         if (id)
           return [".prototype.", id];
@@ -1596,7 +1720,7 @@ var Civet = (() => {
           return MemberExpressionRest$0(state) || MemberExpressionRest$1(state) || MemberExpressionRest$2(state) || MemberExpressionRest$3(state);
         }
       }
-      var MemberBracketContent$0 = $TS($S(OpenBracket, Expression, $E($S($C(DotDotDot, DotDot), $E(Expression))), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var MemberBracketContent$0 = $TS($S(OpenBracket, ExtendedExpression, $E($S($C(DotDotDot, DotDot), $E(ExtendedExpression))), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         if ($3) {
           const sep = $3[0];
           const end = $3[1];
@@ -1638,7 +1762,14 @@ var Civet = (() => {
           return MemberBracketContent$0(state);
         }
       }
-      var PropertyAccess$0 = $S($E($C(QuestionMark, NonNullAssertion)), Dot, $C(IdentifierName, PrivateIdentifier));
+      var PropertyAccess$0 = $TS($S($E($C(QuestionMark, NonNullAssertion)), Dot, $C(IdentifierName, PrivateIdentifier)), function($skip, $loc, $0, $1, $2, $3) {
+        var id = $3;
+        id.type = "PropertyAccess";
+        id.children.unshift($2);
+        if ($1)
+          id.children.unshift($1);
+        return id;
+      });
       function PropertyAccess(state) {
         if (state.verbose)
           console.log("ENTER:", "PropertyAccess");
@@ -1648,7 +1779,7 @@ var Civet = (() => {
           return PropertyAccess$0(state);
         }
       }
-      var SuperProperty$0 = $S($EXPECT($L13, fail, 'SuperProperty "super["'), Expression, __, CloseBracket);
+      var SuperProperty$0 = $S($EXPECT($L14, fail, 'SuperProperty "super["'), ExtendedExpression, __, CloseBracket);
       function SuperProperty(state) {
         if (state.verbose)
           console.log("ENTER:", "SuperProperty");
@@ -1659,7 +1790,7 @@ var Civet = (() => {
         }
       }
       var MetaProperty$0 = $S(New, Dot, Target);
-      var MetaProperty$1 = $TV($EXPECT($L14, fail, 'MetaProperty "import.meta"'), function($skip, $loc, $0, $1) {
+      var MetaProperty$1 = $TV($EXPECT($L15, fail, 'MetaProperty "import.meta"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function MetaProperty(state) {
@@ -1671,7 +1802,11 @@ var Civet = (() => {
       }
       var Parameters$0 = NonEmptyParameters;
       var Parameters$1 = $TV($EXPECT($L0, fail, 'Parameters ""'), function($skip, $loc, $0, $1) {
-        return { $loc, token: "()" };
+        return {
+          type: "Parameters",
+          children: [{ $loc, token: "()" }],
+          names: []
+        };
       });
       function Parameters(state) {
         if (state.tokenize) {
@@ -1680,7 +1815,13 @@ var Civet = (() => {
           return Parameters$0(state) || Parameters$1(state);
         }
       }
-      var NonEmptyParameters$0 = $S($E(TypeParameters), OpenParen, $Q(ParameterElement), $E(FunctionRestParameter), __, CloseParen);
+      var NonEmptyParameters$0 = $TS($S($E(TypeParameters), OpenParen, $Q(ParameterElement), $E(FunctionRestParameter), __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+        return {
+          type: "Parameters",
+          children: $0,
+          names: $3.flatMap((p) => p.names)
+        };
+      });
       function NonEmptyParameters(state) {
         if (state.verbose)
           console.log("ENTER:", "NonEmptyParameters");
@@ -1700,7 +1841,13 @@ var Civet = (() => {
           return FunctionRestParameter$0(state);
         }
       }
-      var ParameterElement$0 = $S(__, $C(BindingIdentifier, BindingPattern), $E(TypeSuffix), $E(Initializer), ParameterElementDelimiter);
+      var ParameterElement$0 = $TS($S($C(BindingIdentifier, BindingPattern), $E(TypeSuffix), $E(Initializer), ParameterElementDelimiter), function($skip, $loc, $0, $1, $2, $3, $4) {
+        return {
+          type: "Parameter",
+          children: $0,
+          names: $1.names
+        };
+      });
       function ParameterElement(state) {
         if (state.verbose)
           console.log("ENTER:", "ParameterElement");
@@ -1711,7 +1858,7 @@ var Civet = (() => {
         }
       }
       var ParameterElementDelimiter$0 = $S($Q(_), Comma);
-      var ParameterElementDelimiter$1 = $Y($S(__, $EXPECT($L15, fail, 'ParameterElementDelimiter ")"')));
+      var ParameterElementDelimiter$1 = $Y($S(__, $EXPECT($L16, fail, 'ParameterElementDelimiter ")"')));
       var ParameterElementDelimiter$2 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
         return { $loc, token: "," };
       });
@@ -1722,7 +1869,10 @@ var Civet = (() => {
           return ParameterElementDelimiter$0(state) || ParameterElementDelimiter$1(state) || ParameterElementDelimiter$2(state);
         }
       }
-      var BindingIdentifier$0 = $S(__, Identifier);
+      var BindingIdentifier$0 = $TS($S(__, Identifier), function($skip, $loc, $0, $1, $2) {
+        $2.children.unshift($1);
+        return $2;
+      });
       function BindingIdentifier(state) {
         if (state.verbose)
           console.log("ENTER:", "BindingIdentifier");
@@ -1732,8 +1882,16 @@ var Civet = (() => {
           return BindingIdentifier$0(state);
         }
       }
-      var BindingPattern$0 = $S(__, ObjectBindingPattern);
-      var BindingPattern$1 = $S(__, ArrayBindingPattern);
+      var BindingPattern$0 = $TS($S(__, ObjectBindingPattern), function($skip, $loc, $0, $1, $2) {
+        var p = $2;
+        p.children.unshift($1);
+        return p;
+      });
+      var BindingPattern$1 = $TS($S(__, ArrayBindingPattern), function($skip, $loc, $0, $1, $2) {
+        var p = $2;
+        p.children.unshift($1);
+        return p;
+      });
       function BindingPattern(state) {
         if (state.tokenize) {
           return $TOKEN("BindingPattern", state, BindingPattern$0(state) || BindingPattern$1(state));
@@ -1741,32 +1899,111 @@ var Civet = (() => {
           return BindingPattern$0(state) || BindingPattern$1(state);
         }
       }
-      var ObjectBindingPattern$0 = $S(OpenBrace, $Y(EOS), NestedBindingProperties, __, CloseBrace);
-      var ObjectBindingPattern$1 = $S(OpenBrace, $Q(BindingProperty), $E($S(__, BindingRestProperty)), __, CloseBrace);
+      var ObjectBindingPattern$0 = $TS($S(OpenBrace, ObjectBindingPatternContent, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
+        var c = $2;
+        c.children.unshift($1);
+        c.children.push($3, $4);
+        return c;
+      });
       function ObjectBindingPattern(state) {
+        if (state.verbose)
+          console.log("ENTER:", "ObjectBindingPattern");
+        if (state.tokenize) {
+          return $TOKEN("ObjectBindingPattern", state, ObjectBindingPattern$0(state));
+        } else {
+          return ObjectBindingPattern$0(state);
+        }
+      }
+      var ObjectBindingPatternContent$0 = $T($S($Y(EOS), NestedBindingProperties), function(value) {
+        return value[1];
+      });
+      var ObjectBindingPatternContent$1 = $TS($S($Q(BindingProperty), $E($S(__, BindingRestProperty))), function($skip, $loc, $0, $1, $2) {
+        var props = $1;
+        var rest = $2;
+        const names = props.flatMap((p) => p.names);
+        if (rest) {
+          props.push(...rest);
+          names.push(...rest[1].names);
+        }
+        return {
+          type: "BindingPattern",
+          names,
+          children: props
+        };
+      });
+      function ObjectBindingPatternContent(state) {
         if (state.tokenize) {
-          return $TOKEN("ObjectBindingPattern", state, ObjectBindingPattern$0(state) || ObjectBindingPattern$1(state));
+          return $TOKEN("ObjectBindingPatternContent", state, ObjectBindingPatternContent$0(state) || ObjectBindingPatternContent$1(state));
         } else {
-          return ObjectBindingPattern$0(state) || ObjectBindingPattern$1(state);
+          return ObjectBindingPatternContent$0(state) || ObjectBindingPatternContent$1(state);
         }
       }
-      var ArrayBindingPattern$0 = $S(OpenBracket, $Y(EOS), NestedBindingElements, __, CloseBracket);
-      var ArrayBindingPattern$1 = $S(OpenBracket, $Q($C(BindingElement, Elision)), $E($S(__, BindingRestElement)), __, CloseBracket);
+      var ArrayBindingPattern$0 = $TS($S(OpenBracket, ArrayBindingPatternContent, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
+        var c = $2;
+        return {
+          type: "BindingPattern",
+          names: c.names,
+          children: $0
+        };
+      });
       function ArrayBindingPattern(state) {
+        if (state.verbose)
+          console.log("ENTER:", "ArrayBindingPattern");
+        if (state.tokenize) {
+          return $TOKEN("ArrayBindingPattern", state, ArrayBindingPattern$0(state));
+        } else {
+          return ArrayBindingPattern$0(state);
+        }
+      }
+      var ArrayBindingPatternContent$0 = $T($S($Y(EOS), NestedBindingElements), function(value) {
+        return value[1];
+      });
+      var ArrayBindingPatternContent$1 = $TS($S($Q($C(BindingElement, Elision)), $E($S(__, BindingRestElement))), function($skip, $loc, $0, $1, $2) {
+        var props = $1;
+        var rest = $2;
+        const names = props.flatMap((p) => p.names || []);
+        if (rest) {
+          props.push(...rest);
+          names.push(...rest[1].names);
+        }
+        return {
+          type: "BindingPattern",
+          names,
+          children: props
+        };
+      });
+      function ArrayBindingPatternContent(state) {
+        if (state.tokenize) {
+          return $TOKEN("ArrayBindingPatternContent", state, ArrayBindingPatternContent$0(state) || ArrayBindingPatternContent$1(state));
+        } else {
+          return ArrayBindingPatternContent$0(state) || ArrayBindingPatternContent$1(state);
+        }
+      }
+      var Elision$0 = $S(__, Comma);
+      function Elision(state) {
+        if (state.verbose)
+          console.log("ENTER:", "Elision");
         if (state.tokenize) {
-          return $TOKEN("ArrayBindingPattern", state, ArrayBindingPattern$0(state) || ArrayBindingPattern$1(state));
+          return $TOKEN("Elision", state, Elision$0(state));
         } else {
-          return ArrayBindingPattern$0(state) || ArrayBindingPattern$1(state);
+          return Elision$0(state);
         }
       }
-      var NestedBindingProperties$0 = $TS($S(PushIndent, $Q(NestedBindingProperty), $E($S(Nested, BindingRestProperty)), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var NestedBindingProperties$0 = $TS($S(PushIndent, $Q(NestedBindingProperty), $E(NestedBindingRestProperty), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4) {
         var props = $2;
         var rest = $3;
-        if (!props.length)
+        if (!(props.length || rest))
           return $skip;
-        if (rest)
+        const names = props.flatMap((p) => p.names);
+        if (rest) {
           props.push(rest);
-        return props;
+          names.push(...rest.names);
+        }
+        return {
+          type: "BindingPattern",
+          children: props,
+          names
+        };
       });
       function NestedBindingProperties(state) {
         if (state.verbose)
@@ -1777,7 +2014,10 @@ var Civet = (() => {
           return NestedBindingProperties$0(state);
         }
       }
-      var NestedBindingProperty$0 = $S(Nested, BindingProperty);
+      var NestedBindingProperty$0 = $TS($S(Nested, BindingProperty), function($skip, $loc, $0, $1, $2) {
+        $2.children.unshift($1);
+        return $2;
+      });
       function NestedBindingProperty(state) {
         if (state.verbose)
           console.log("ENTER:", "NestedBindingProperty");
@@ -1787,8 +2027,22 @@ var Civet = (() => {
           return NestedBindingProperty$0(state);
         }
       }
-      var BindingProperty$0 = $S(__, PropertyName, __, Colon, $C(BindingIdentifier, BindingPattern), $E(Initializer), ObjectPropertyDelimiter);
-      var BindingProperty$1 = $S(BindingIdentifier, $E(Initializer), ObjectPropertyDelimiter);
+      var BindingProperty$0 = $TS($S(__, PropertyName, __, Colon, $C(BindingIdentifier, BindingPattern), $E(Initializer), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+        var b = $5;
+        return {
+          type: "BindingPattern",
+          names: b.names,
+          children: $0
+        };
+      });
+      var BindingProperty$1 = $TS($S(BindingIdentifier, $E(Initializer), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
+        var b = $1;
+        return {
+          type: "BindingPattern",
+          names: b.names,
+          children: $0
+        };
+      });
       function BindingProperty(state) {
         if (state.tokenize) {
           return $TOKEN("BindingProperty", state, BindingProperty$0(state) || BindingProperty$1(state));
@@ -1796,7 +2050,23 @@ var Civet = (() => {
           return BindingProperty$0(state) || BindingProperty$1(state);
         }
       }
-      var BindingRestProperty$0 = $S(DotDotDot, BindingIdentifier);
+      var NestedBindingRestProperty$0 = $TS($S(Nested, BindingRestProperty), function($skip, $loc, $0, $1, $2) {
+        $2.children.unshift($1);
+        return $2;
+      });
+      function NestedBindingRestProperty(state) {
+        if (state.verbose)
+          console.log("ENTER:", "NestedBindingRestProperty");
+        if (state.tokenize) {
+          return $TOKEN("NestedBindingRestProperty", state, NestedBindingRestProperty$0(state));
+        } else {
+          return NestedBindingRestProperty$0(state);
+        }
+      }
+      var BindingRestProperty$0 = $TS($S(DotDotDot, BindingIdentifier), function($skip, $loc, $0, $1, $2) {
+        $2.children.unshift($1);
+        return $2;
+      });
       function BindingRestProperty(state) {
         if (state.verbose)
           console.log("ENTER:", "BindingRestProperty");
@@ -1809,11 +2079,18 @@ var Civet = (() => {
       var NestedBindingElements$0 = $TS($S(PushIndent, $Q(NestedBindingElement), $E($S(Nested, BindingRestElement)), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4) {
         var props = $2;
         var rest = $3;
-        if (!props.length)
+        if (!(props.length || rest))
           return $skip;
-        if (rest)
-          props.push(rest);
-        return props;
+        const names = props.flatMap((p) => p.names);
+        if (rest) {
+          props.push(...rest);
+          names.push(...rest[1].names);
+        }
+        return {
+          type: "BindingPattern",
+          children: props,
+          names
+        };
       });
       function NestedBindingElements(state) {
         if (state.verbose)
@@ -1824,7 +2101,10 @@ var Civet = (() => {
           return NestedBindingElements$0(state);
         }
       }
-      var NestedBindingElement$0 = $S(Nested, BindingElement);
+      var NestedBindingElement$0 = $TS($S(Nested, BindingElement), function($skip, $loc, $0, $1, $2) {
+        $2.children.unshift($1);
+        return $2;
+      });
       function NestedBindingElement(state) {
         if (state.verbose)
           console.log("ENTER:", "NestedBindingElement");
@@ -1834,7 +2114,14 @@ var Civet = (() => {
           return NestedBindingElement$0(state);
         }
       }
-      var BindingElement$0 = $S(__, $C(BindingIdentifier, BindingPattern), $E(Initializer), ArrayElementDelimiter);
+      var BindingElement$0 = $TS($S($C(BindingIdentifier, BindingPattern), $E(Initializer), ArrayElementDelimiter), function($skip, $loc, $0, $1, $2, $3) {
+        var binding = $1;
+        return {
+          type: "BindingPattern",
+          names: binding.names,
+          children: $0
+        };
+      });
       function BindingElement(state) {
         if (state.verbose)
           console.log("ENTER:", "BindingElement");
@@ -1844,7 +2131,11 @@ var Civet = (() => {
           return BindingElement$0(state);
         }
       }
-      var BindingRestElement$0 = $S(DotDotDot, __, $C(BindingIdentifier, BindingPattern));
+      var BindingRestElement$0 = $TS($S(DotDotDot, $C(BindingIdentifier, BindingPattern)), function($skip, $loc, $0, $1, $2) {
+        var binding = $2;
+        binding.children.unshift($1);
+        return binding;
+      });
       function BindingRestElement(state) {
         if (state.verbose)
           console.log("ENTER:", "BindingRestElement");
@@ -1864,7 +2155,21 @@ var Civet = (() => {
           return FunctionDeclaration$0(state);
         }
       }
-      var FunctionSignature$0 = $S($E($S(Async, __)), Function, $E($S(Star, __)), $E(BindingIdentifier), __, Parameters, $E(ReturnTypeSuffix));
+      var FunctionSignature$0 = $TS($S($E($S(Async, __)), Function, $E(Star), $E(BindingIdentifier), __, Parameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+        var id = $4;
+        var parameters = $6;
+        id = id || [];
+        $0[3] = id;
+        return {
+          type: "FunctionSignature",
+          id,
+          parameters,
+          returnType: $7,
+          ts: false,
+          block: null,
+          children: $0
+        };
+      });
       function FunctionSignature(state) {
         if (state.verbose)
           console.log("ENTER:", "FunctionSignature");
@@ -1874,25 +2179,28 @@ var Civet = (() => {
           return FunctionSignature$0(state);
         }
       }
-      var FunctionExpression$0 = ThinArrowFunction;
-      var FunctionExpression$1 = $TS($S(FunctionSignature, $E(BracedBlock)), function($skip, $loc, $0, $1, $2) {
+      var FunctionExpression$0 = $TS($S(FunctionSignature, $E(BracedBlock)), function($skip, $loc, $0, $1, $2) {
+        var signature = $1;
         var block = $2;
         if (!block) {
-          return {
-            type: "FunctionDeclaration",
-            ts: true,
-            children: $1
-          };
+          signature.ts = true;
+          return signature;
         }
-        const suffix = $1[$1.length - 1];
+        const suffix = signature.returnType;
         const isVoid = suffix?.children?.[1]?.[0]?.[1]?.token === "void";
         if (module.config.implicitReturns && !isVoid) {
           module.addImplicitReturns(block);
         }
-        $1.push(block);
+        $1.block = block;
+        $1.children.push(block);
+        $1.type = "FunctionExpression";
+        return $1;
+      });
+      var FunctionExpression$1 = $TS($S(Ampersand, $P(MemberExpressionRest)), function($skip, $loc, $0, $1, $2) {
+        $1.token = "$ => $";
         return {
           type: "FunctionExpression",
-          children: $1
+          children: [$1, $2]
         };
       });
       function FunctionExpression(state) {
@@ -1903,7 +2211,7 @@ var Civet = (() => {
         }
       }
       var ThinArrowFunction$0 = $TS($S(Parameters, $E(ReturnTypeSuffix), $Q(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-        var params = $1;
+        var parameters = $1;
         var suffix = $2;
         var arrow = $4;
         var block = $5;
@@ -1911,11 +2219,18 @@ var Civet = (() => {
         if (module.config.implicitReturns && !isVoid) {
           block = module.addImplicitReturns(block);
         }
+        const id = [];
         return {
           type: "FunctionExpression",
+          id,
+          parameters,
+          returnType: suffix,
+          ts: false,
+          block,
           children: [
             { $loc: arrow.$loc, token: "function" },
-            params,
+            id,
+            parameters,
             suffix,
             block
           ]
@@ -1930,7 +2245,7 @@ var Civet = (() => {
           return ThinArrowFunction$0(state);
         }
       }
-      var Arrow$0 = $TV($EXPECT($L16, fail, 'Arrow "->"'), function($skip, $loc, $0, $1) {
+      var Arrow$0 = $TV($EXPECT($L17, fail, 'Arrow "->"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Arrow(state) {
@@ -1942,16 +2257,20 @@ var Civet = (() => {
           return Arrow$0(state);
         }
       }
-      var Block$0 = $T($S(__, OpenBrace, EOS, NestedBlockExpressions, __, CloseBrace), function(value) {
+      var Block$0 = $T($S(__, OpenBrace, EOS, NestedBlockStatements, __, CloseBrace), function(value) {
         var exps = value[3];
         return { "type": "BlockStatement", "expressions": exps, "children": value };
       });
-      var Block$1 = $T($S(InsertOpenBrace, EOS, NestedBlockExpressions, InsertNewline, InsertIndent, InsertCloseBrace), function(value) {
+      var Block$1 = $T($S(InsertOpenBrace, EOS, NestedBlockStatements, InsertNewline, InsertIndent, InsertCloseBrace), function(value) {
         var exps = value[2];
         return { "type": "BlockStatement", "expressions": exps, "children": value };
       });
-      var Block$2 = Statement;
-      var Block$3 = $S(__, Statement);
+      var Block$2 = $T($S($E(Then), Statement), function(value) {
+        return value[1];
+      });
+      var Block$3 = $T($S($E(Then), __, Statement), function(value) {
+        return [value[1], value[2]];
+      });
       function Block(state) {
         if (state.tokenize) {
           return $TOKEN("Block", state, Block$0(state) || Block$1(state) || Block$2(state) || Block$3(state));
@@ -1980,11 +2299,11 @@ var Civet = (() => {
           return EmptyBlock$0(state);
         }
       }
-      var BracedBlock$0 = $T($S(__, OpenBrace, EOS, NestedBlockExpressions, __, CloseBrace), function(value) {
-        var exps = value[3];
+      var BracedBlock$0 = $T($S($Q(TrailingComment), OpenBrace, BracedContent, __, CloseBrace), function(value) {
+        var exps = value[2];
         return { "type": "BlockStatement", "expressions": exps, "children": value };
       });
-      var BracedBlock$1 = $T($S(InsertOpenBrace, EOS, NestedBlockExpressions, InsertNewline, InsertIndent, InsertCloseBrace), function(value) {
+      var BracedBlock$1 = $T($S(InsertOpenBrace, EOS, NestedBlockStatements, InsertNewline, InsertIndent, InsertCloseBrace), function(value) {
         var exps = value[2];
         return { "type": "BlockStatement", "expressions": exps, "children": value };
       });
@@ -2003,58 +2322,69 @@ var Civet = (() => {
           return BracedBlock$0(state) || BracedBlock$1(state) || BracedBlock$2(state);
         }
       }
-      var SingleNestedExpression$0 = $TS($S(PushIndent, $E($S(Nested, Expression, StatementDelimiter)), $C($S($N($S(Nested, Expression)), PopIndent), PopIndent)), function($skip, $loc, $0, $1, $2, $3) {
-        var exp = $2;
-        if (exp)
-          return exp;
-        return $skip;
+      var BracedContent$0 = $T($S($Y(EOS), NestedBlockStatements), function(value) {
+        return value[1];
       });
-      function SingleNestedExpression(state) {
-        if (state.verbose)
-          console.log("ENTER:", "SingleNestedExpression");
+      var BracedContent$1 = $S($Q(TrailingComment), Statement);
+      function BracedContent(state) {
         if (state.tokenize) {
-          return $TOKEN("SingleNestedExpression", state, SingleNestedExpression$0(state));
+          return $TOKEN("BracedContent", state, BracedContent$0(state) || BracedContent$1(state));
         } else {
-          return SingleNestedExpression$0(state);
+          return BracedContent$0(state) || BracedContent$1(state);
         }
       }
-      var NestedBlockExpressions$0 = $TS($S(PushIndent, $Q(BlockExpression), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-        var exps = $2;
-        if (!exps.length)
+      var NestedBlockStatements$0 = $TS($S(PushIndent, $Q(NestedBlockStatement), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+        var statements = $2;
+        if (!statements.length)
           return $skip;
-        return exps;
+        return statements;
       });
-      function NestedBlockExpressions(state) {
+      function NestedBlockStatements(state) {
         if (state.verbose)
-          console.log("ENTER:", "NestedBlockExpressions");
+          console.log("ENTER:", "NestedBlockStatements");
         if (state.tokenize) {
-          return $TOKEN("NestedBlockExpressions", state, NestedBlockExpressions$0(state));
+          return $TOKEN("NestedBlockStatements", state, NestedBlockStatements$0(state));
         } else {
-          return NestedBlockExpressions$0(state);
+          return NestedBlockStatements$0(state);
         }
       }
-      var BlockExpression$0 = $S(Nested, StatementListItem, StatementDelimiter);
-      function BlockExpression(state) {
+      var NestedBlockStatement$0 = $S(Nested, StatementListItem, StatementDelimiter);
+      function NestedBlockStatement(state) {
         if (state.verbose)
-          console.log("ENTER:", "BlockExpression");
+          console.log("ENTER:", "NestedBlockStatement");
         if (state.tokenize) {
-          return $TOKEN("BlockExpression", state, BlockExpression$0(state));
+          return $TOKEN("NestedBlockStatement", state, NestedBlockStatement$0(state));
         } else {
-          return BlockExpression$0(state);
+          return NestedBlockStatement$0(state);
         }
       }
-      var Literal$0 = NullLiteral;
-      var Literal$1 = BooleanLiteral;
-      var Literal$2 = NumericLiteral;
-      var Literal$3 = StringLiteral;
+      var Literal$0 = $TS($S(LiteralContent), function($skip, $loc, $0, $1) {
+        return {
+          type: "Literal",
+          children: $0
+        };
+      });
       function Literal(state) {
+        if (state.verbose)
+          console.log("ENTER:", "Literal");
+        if (state.tokenize) {
+          return $TOKEN("Literal", state, Literal$0(state));
+        } else {
+          return Literal$0(state);
+        }
+      }
+      var LiteralContent$0 = NullLiteral;
+      var LiteralContent$1 = BooleanLiteral;
+      var LiteralContent$2 = NumericLiteral;
+      var LiteralContent$3 = StringLiteral;
+      function LiteralContent(state) {
         if (state.tokenize) {
-          return $TOKEN("Literal", state, Literal$0(state) || Literal$1(state) || Literal$2(state) || Literal$3(state));
+          return $TOKEN("LiteralContent", state, LiteralContent$0(state) || LiteralContent$1(state) || LiteralContent$2(state) || LiteralContent$3(state));
         } else {
-          return Literal$0(state) || Literal$1(state) || Literal$2(state) || Literal$3(state);
+          return LiteralContent$0(state) || LiteralContent$1(state) || LiteralContent$2(state) || LiteralContent$3(state);
         }
       }
-      var NullLiteral$0 = $TV($EXPECT($L17, fail, 'NullLiteral "null"'), function($skip, $loc, $0, $1) {
+      var NullLiteral$0 = $TV($EXPECT($L18, fail, 'NullLiteral "null"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function NullLiteral(state) {
@@ -2067,7 +2397,7 @@ var Civet = (() => {
         }
       }
       var BooleanLiteral$0 = CoffeeScriptBooleanLiteral;
-      var BooleanLiteral$1 = $TV($C($EXPECT($L18, fail, 'BooleanLiteral "true"'), $EXPECT($L19, fail, 'BooleanLiteral "false"')), function($skip, $loc, $0, $1) {
+      var BooleanLiteral$1 = $TV($C($EXPECT($L19, fail, 'BooleanLiteral "true"'), $EXPECT($L20, fail, 'BooleanLiteral "false"')), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function BooleanLiteral(state) {
@@ -2077,10 +2407,10 @@ var Civet = (() => {
           return BooleanLiteral$0(state) || BooleanLiteral$1(state);
         }
       }
-      var CoffeeScriptBooleanLiteral$0 = $TV($C($EXPECT($L20, fail, 'CoffeeScriptBooleanLiteral "yes"'), $EXPECT($L21, fail, 'CoffeeScriptBooleanLiteral "on"')), function($skip, $loc, $0, $1) {
+      var CoffeeScriptBooleanLiteral$0 = $TV($C($EXPECT($L21, fail, 'CoffeeScriptBooleanLiteral "yes"'), $EXPECT($L22, fail, 'CoffeeScriptBooleanLiteral "on"')), function($skip, $loc, $0, $1) {
         return { $loc, token: "true" };
       });
-      var CoffeeScriptBooleanLiteral$1 = $TV($C($EXPECT($L22, fail, 'CoffeeScriptBooleanLiteral "no"'), $EXPECT($L23, fail, 'CoffeeScriptBooleanLiteral "off"')), function($skip, $loc, $0, $1) {
+      var CoffeeScriptBooleanLiteral$1 = $TV($C($EXPECT($L23, fail, 'CoffeeScriptBooleanLiteral "no"'), $EXPECT($L24, fail, 'CoffeeScriptBooleanLiteral "off"')), function($skip, $loc, $0, $1) {
         return { $loc, token: "false" };
       });
       function CoffeeScriptBooleanLiteral(state) {
@@ -2090,7 +2420,7 @@ var Civet = (() => {
           return CoffeeScriptBooleanLiteral$0(state) || CoffeeScriptBooleanLiteral$1(state);
         }
       }
-      var Comma$0 = $TV($EXPECT($L24, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
+      var Comma$0 = $TV($EXPECT($L25, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Comma(state) {
@@ -2117,8 +2447,12 @@ var Civet = (() => {
       var IdentifierName$0 = $TR($EXPECT($R1, fail, "IdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$])*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return {
           type: "Identifier",
-          $loc,
-          token: $0
+          name: $0,
+          names: [$0],
+          children: [{
+            $loc,
+            token: $0
+          }]
         };
       });
       function IdentifierName(state) {
@@ -2140,19 +2474,44 @@ var Civet = (() => {
           return IdentifierReference$0(state);
         }
       }
-      var ArrayLiteral$0 = $S(OpenBracket, NestedElementList, __, CloseBracket);
-      var ArrayLiteral$1 = $S(OpenBracket, ElementList, __, CloseBracket);
+      var ArrayLiteral$0 = $TS($S(OpenBracket, ArrayLiteralContent, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
+        let children;
+        if (Array.isArray($2)) {
+          children = [$1, ...$2, ...$3, $4];
+        } else {
+          children = [$1, $2, ...$3, $4];
+        }
+        const names = children.flatMap((c) => {
+          return c.names || [];
+        });
+        return {
+          type: "ArrayExpression",
+          children,
+          names
+        };
+      });
       function ArrayLiteral(state) {
+        if (state.verbose)
+          console.log("ENTER:", "ArrayLiteral");
         if (state.tokenize) {
-          return $TOKEN("ArrayLiteral", state, ArrayLiteral$0(state) || ArrayLiteral$1(state));
+          return $TOKEN("ArrayLiteral", state, ArrayLiteral$0(state));
         } else {
-          return ArrayLiteral$0(state) || ArrayLiteral$1(state);
+          return ArrayLiteral$0(state);
+        }
+      }
+      var ArrayLiteralContent$0 = NestedElementList;
+      var ArrayLiteralContent$1 = ElementList;
+      function ArrayLiteralContent(state) {
+        if (state.tokenize) {
+          return $TOKEN("ArrayLiteralContent", state, ArrayLiteralContent$0(state) || ArrayLiteralContent$1(state));
+        } else {
+          return ArrayLiteralContent$0(state) || ArrayLiteralContent$1(state);
         }
       }
       var NestedElementList$0 = $TS($S(PushIndent, $Q(NestedElement), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
         var elements = $2;
         if (elements.length)
-          return elements;
+          return elements.flat();
         return $skip;
       });
       function NestedElementList(state) {
@@ -2164,7 +2523,13 @@ var Civet = (() => {
           return NestedElementList$0(state);
         }
       }
-      var NestedElement$0 = $S(Nested, InlineElementList, ArrayElementDelimiter);
+      var NestedElement$0 = $TS($S(Nested, ElementList, ArrayElementDelimiter), function($skip, $loc, $0, $1, $2, $3) {
+        const result = [...$1, ...$2];
+        if ($3) {
+          result.push($3);
+        }
+        return result;
+      });
       function NestedElement(state) {
         if (state.verbose)
           console.log("ENTER:", "NestedElement");
@@ -2175,7 +2540,7 @@ var Civet = (() => {
         }
       }
       var ArrayElementDelimiter$0 = $S($Q(_), Comma);
-      var ArrayElementDelimiter$1 = $Y($S(__, $EXPECT($L25, fail, 'ArrayElementDelimiter "]"')));
+      var ArrayElementDelimiter$1 = $Y($S(__, $EXPECT($L26, fail, 'ArrayElementDelimiter "]"')));
       var ArrayElementDelimiter$2 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
         return { $loc, token: "," };
       });
@@ -2186,7 +2551,15 @@ var Civet = (() => {
           return ArrayElementDelimiter$0(state) || ArrayElementDelimiter$1(state) || ArrayElementDelimiter$2(state);
         }
       }
-      var ElementList$0 = $S(ArrayElementExpression, $Q($S(__, Comma, __, ArrayElementExpression)));
+      var ElementList$0 = $TS($S(ArrayElementExpression, $Q(ElementListRest)), function($skip, $loc, $0, $1, $2) {
+        if ($2.length) {
+          return [].concat($1 || [], ...$2);
+        }
+        if ($1) {
+          return [].concat($1);
+        }
+        return [];
+      });
       function ElementList(state) {
         if (state.verbose)
           console.log("ENTER:", "ElementList");
@@ -2196,17 +2569,28 @@ var Civet = (() => {
           return ElementList$0(state);
         }
       }
-      var InlineElementList$0 = $S(ArrayElementExpression, $Q($S($Q(_), Comma, $Q(_), ArrayElementExpression)));
-      function InlineElementList(state) {
+      var ElementListRest$0 = $TS($S(__, Comma, __, ArrayElementExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
+        const result = [...$1, $2, ...$3];
+        if ($4) {
+          result.push($4);
+        }
+        return result;
+      });
+      function ElementListRest(state) {
         if (state.verbose)
-          console.log("ENTER:", "InlineElementList");
+          console.log("ENTER:", "ElementListRest");
         if (state.tokenize) {
-          return $TOKEN("InlineElementList", state, InlineElementList$0(state));
+          return $TOKEN("ElementListRest", state, ElementListRest$0(state));
         } else {
-          return InlineElementList$0(state);
+          return ElementListRest$0(state);
         }
       }
-      var ArrayElementExpression$0 = $E($S($E($S(DotDotDot, __)), AssignmentExpression));
+      var ArrayElementExpression$0 = $TV($E($S($E($S(DotDotDot, __)), ExtendedExpression)), function($skip, $loc, $0, $1) {
+        if ($1 && !$1[0]) {
+          return $1[1];
+        }
+        return $1;
+      });
       function ArrayElementExpression(state) {
         if (state.verbose)
           console.log("ENTER:", "ArrayElementExpression");
@@ -2216,28 +2600,69 @@ var Civet = (() => {
           return ArrayElementExpression$0(state);
         }
       }
-      var Elision$0 = $S(__, Comma);
-      function Elision(state) {
+      var ObjectLiteral$0 = BracedObjectLiteral;
+      var ObjectLiteral$1 = NestedObjectLiteral;
+      function ObjectLiteral(state) {
+        if (state.tokenize) {
+          return $TOKEN("ObjectLiteral", state, ObjectLiteral$0(state) || ObjectLiteral$1(state));
+        } else {
+          return ObjectLiteral$0(state) || ObjectLiteral$1(state);
+        }
+      }
+      var BracedObjectLiteral$0 = $TS($S(OpenBrace, $E(BracedObjectLiteralContent), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
+        if ($2) {
+          $2.unshift($1);
+          if ($3.length) {
+            $2.push(...$3);
+          }
+          $2.push($4);
+          return {
+            type: "ObjectExpression",
+            children: $2,
+            names: $2.flatMap((c) => {
+              return c.names || [];
+            })
+          };
+        }
+        return {
+          type: "ObjectExpression",
+          children: [$1, ...$3, $4],
+          names: []
+        };
+      });
+      function BracedObjectLiteral(state) {
         if (state.verbose)
-          console.log("ENTER:", "Elision");
+          console.log("ENTER:", "BracedObjectLiteral");
         if (state.tokenize) {
-          return $TOKEN("Elision", state, Elision$0(state));
+          return $TOKEN("BracedObjectLiteral", state, BracedObjectLiteral$0(state));
         } else {
-          return Elision$0(state);
+          return BracedObjectLiteral$0(state);
         }
       }
-      var ObjectLiteral$0 = $S(OpenBrace, $Y(EOS), NestedPropertyDefinitions, __, CloseBrace);
-      var ObjectLiteral$1 = $S(OpenBrace, __, PropertyDefinitionList, __, $E($S(Comma, __)), CloseBrace);
-      var ObjectLiteral$2 = $S(OpenBrace, __, CloseBrace);
-      var ObjectLiteral$3 = NestedObjectLiteral;
-      function ObjectLiteral(state) {
+      var BracedObjectLiteralContent$0 = $T($S($Y(EOS), NestedPropertyDefinitions), function(value) {
+        return value[1];
+      });
+      var BracedObjectLiteralContent$1 = $TS($S(__, PropertyDefinitionList, $E($S(__, Comma))), function($skip, $loc, $0, $1, $2, $3) {
+        if ($1.length) {
+          $2.splice(0, 0, ...$1);
+        }
+        if ($3) {
+          $2.push($3);
+        }
+        return $2;
+      });
+      function BracedObjectLiteralContent(state) {
         if (state.tokenize) {
-          return $TOKEN("ObjectLiteral", state, ObjectLiteral$0(state) || ObjectLiteral$1(state) || ObjectLiteral$2(state) || ObjectLiteral$3(state));
+          return $TOKEN("BracedObjectLiteralContent", state, BracedObjectLiteralContent$0(state) || BracedObjectLiteralContent$1(state));
         } else {
-          return ObjectLiteral$0(state) || ObjectLiteral$1(state) || ObjectLiteral$2(state) || ObjectLiteral$3(state);
+          return BracedObjectLiteralContent$0(state) || BracedObjectLiteralContent$1(state);
         }
       }
-      var NestedObjectLiteral$0 = $S(InsertOpenBrace, $Y(EOS), NestedPropertyDefinitions, InsertNewline, InsertIndent, InsertCloseBrace);
+      var NestedObjectLiteral$0 = $TS($S(InsertOpenBrace, $Y(EOS), NestedPropertyDefinitions, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+        $3.unshift($1);
+        $3.push($4, $5, $6);
+        return $3;
+      });
       function NestedObjectLiteral(state) {
         if (state.verbose)
           console.log("ENTER:", "NestedObjectLiteral");
@@ -2251,7 +2676,7 @@ var Civet = (() => {
         var defs = $2;
         if (!defs.length)
           return $skip;
-        return defs;
+        return defs.flat();
       });
       function NestedPropertyDefinitions(state) {
         if (state.verbose)
@@ -2262,7 +2687,13 @@ var Civet = (() => {
           return NestedPropertyDefinitions$0(state);
         }
       }
-      var NestedPropertyDefinition$0 = $S(Nested, PropertyDefinition, ObjectPropertyDelimiter);
+      var NestedPropertyDefinition$0 = $TS($S(Nested, PropertyDefinition, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
+        const result = [...$1, $2];
+        if ($3) {
+          result.push($3);
+        }
+        return result;
+      });
       function NestedPropertyDefinition(state) {
         if (state.verbose)
           console.log("ENTER:", "NestedPropertyDefinition");
@@ -2273,7 +2704,7 @@ var Civet = (() => {
         }
       }
       var ObjectPropertyDelimiter$0 = $S($Q(_), Comma);
-      var ObjectPropertyDelimiter$1 = $Y($S(__, $EXPECT($L26, fail, 'ObjectPropertyDelimiter "}"')));
+      var ObjectPropertyDelimiter$1 = $Y($S(__, $EXPECT($L27, fail, 'ObjectPropertyDelimiter "}"')));
       var ObjectPropertyDelimiter$2 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
         return { $loc, token: "," };
       });
@@ -2284,7 +2715,15 @@ var Civet = (() => {
           return ObjectPropertyDelimiter$0(state) || ObjectPropertyDelimiter$1(state) || ObjectPropertyDelimiter$2(state);
         }
       }
-      var PropertyDefinitionList$0 = $S(PropertyDefinition, $Q($S(__, Comma, __, PropertyDefinition)));
+      var PropertyDefinitionList$0 = $TS($S(PropertyDefinition, $Q($S(__, Comma, __, PropertyDefinition))), function($skip, $loc, $0, $1, $2) {
+        if ($2.length) {
+          return [].concat($1 || [], ...$2);
+        }
+        if ($1) {
+          return [].concat($1);
+        }
+        return [];
+      });
       function PropertyDefinitionList(state) {
         if (state.verbose)
           console.log("ENTER:", "PropertyDefinitionList");
@@ -2294,9 +2733,16 @@ var Civet = (() => {
           return PropertyDefinitionList$0(state);
         }
       }
-      var PropertyDefinition$0 = $S(PropertyName, __, Colon, AssignmentExpression);
+      var PropertyDefinition$0 = $TS($S(PropertyName, __, Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
+        var exp = $4;
+        return {
+          type: "Property",
+          children: $0,
+          names: exp.names || []
+        };
+      });
       var PropertyDefinition$1 = MethodDefinition;
-      var PropertyDefinition$2 = $S(DotDotDot, AssignmentExpression);
+      var PropertyDefinition$2 = $S(DotDotDot, ExtendedExpression);
       var PropertyDefinition$3 = IdentifierReference;
       function PropertyDefinition(state) {
         if (state.tokenize) {
@@ -2308,7 +2754,7 @@ var Civet = (() => {
       var PropertyName$0 = NumericLiteral;
       var PropertyName$1 = StringLiteral;
       var PropertyName$2 = IdentifierName;
-      var PropertyName$3 = $S(OpenBracket, AssignmentExpression, __, $EXPECT($L25, fail, 'PropertyName "]"'));
+      var PropertyName$3 = $S(OpenBracket, ExtendedExpression, __, CloseBracket);
       function PropertyName(state) {
         if (state.tokenize) {
           return $TOKEN("PropertyName", state, PropertyName$0(state) || PropertyName$1(state) || PropertyName$2(state) || PropertyName$3(state));
@@ -2358,7 +2804,11 @@ var Civet = (() => {
       var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $Q(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var name = $2;
         var suffix = $5;
-        name = name.token.match(/^(?:"|')/) ? name.token.slice(1, -1) : name.token;
+        if (name.name) {
+          name = name.name;
+        } else if (name.token) {
+          name = name.token.match(/^(?:"|')/) ? name.token.slice(1, -1) : name.token;
+        }
         return {
           type: "MethodSignature",
           children: $0,
@@ -2385,8 +2835,13 @@ var Civet = (() => {
       }
       var PrivateIdentifier$0 = $TV($TEXT($S($EXPECT($L7, fail, 'PrivateIdentifier "#"'), IdentifierName)), function($skip, $loc, $0, $1) {
         return {
-          $loc,
-          token: $1
+          type: "Identifier",
+          name: $0,
+          names: [$0],
+          children: [{
+            $loc,
+            token: $0
+          }]
         };
       });
       function PrivateIdentifier(state) {
@@ -2410,25 +2865,25 @@ var Civet = (() => {
           return AssignmentOp$0(state);
         }
       }
-      var AssignmentOpSymbol$0 = $EXPECT($L27, fail, 'AssignmentOpSymbol "**="');
-      var AssignmentOpSymbol$1 = $EXPECT($L28, fail, 'AssignmentOpSymbol "*="');
-      var AssignmentOpSymbol$2 = $EXPECT($L29, fail, 'AssignmentOpSymbol "/="');
-      var AssignmentOpSymbol$3 = $EXPECT($L30, fail, 'AssignmentOpSymbol "%="');
-      var AssignmentOpSymbol$4 = $EXPECT($L31, fail, 'AssignmentOpSymbol "+="');
-      var AssignmentOpSymbol$5 = $EXPECT($L32, fail, 'AssignmentOpSymbol "-="');
-      var AssignmentOpSymbol$6 = $EXPECT($L33, fail, 'AssignmentOpSymbol "<<="');
-      var AssignmentOpSymbol$7 = $EXPECT($L34, fail, 'AssignmentOpSymbol ">>>="');
-      var AssignmentOpSymbol$8 = $EXPECT($L35, fail, 'AssignmentOpSymbol ">>="');
-      var AssignmentOpSymbol$9 = $EXPECT($L36, fail, 'AssignmentOpSymbol "&&="');
-      var AssignmentOpSymbol$10 = $EXPECT($L37, fail, 'AssignmentOpSymbol "&="');
-      var AssignmentOpSymbol$11 = $EXPECT($L38, fail, 'AssignmentOpSymbol "^="');
-      var AssignmentOpSymbol$12 = $EXPECT($L39, fail, 'AssignmentOpSymbol "||="');
-      var AssignmentOpSymbol$13 = $EXPECT($L40, fail, 'AssignmentOpSymbol "|="');
-      var AssignmentOpSymbol$14 = $EXPECT($L41, fail, 'AssignmentOpSymbol "??="');
-      var AssignmentOpSymbol$15 = $T($EXPECT($L42, fail, 'AssignmentOpSymbol "?="'), function(value) {
+      var AssignmentOpSymbol$0 = $EXPECT($L28, fail, 'AssignmentOpSymbol "**="');
+      var AssignmentOpSymbol$1 = $EXPECT($L29, fail, 'AssignmentOpSymbol "*="');
+      var AssignmentOpSymbol$2 = $EXPECT($L30, fail, 'AssignmentOpSymbol "/="');
+      var AssignmentOpSymbol$3 = $EXPECT($L31, fail, 'AssignmentOpSymbol "%="');
+      var AssignmentOpSymbol$4 = $EXPECT($L32, fail, 'AssignmentOpSymbol "+="');
+      var AssignmentOpSymbol$5 = $EXPECT($L33, fail, 'AssignmentOpSymbol "-="');
+      var AssignmentOpSymbol$6 = $EXPECT($L34, fail, 'AssignmentOpSymbol "<<="');
+      var AssignmentOpSymbol$7 = $EXPECT($L35, fail, 'AssignmentOpSymbol ">>>="');
+      var AssignmentOpSymbol$8 = $EXPECT($L36, fail, 'AssignmentOpSymbol ">>="');
+      var AssignmentOpSymbol$9 = $EXPECT($L37, fail, 'AssignmentOpSymbol "&&="');
+      var AssignmentOpSymbol$10 = $EXPECT($L38, fail, 'AssignmentOpSymbol "&="');
+      var AssignmentOpSymbol$11 = $EXPECT($L39, fail, 'AssignmentOpSymbol "^="');
+      var AssignmentOpSymbol$12 = $EXPECT($L40, fail, 'AssignmentOpSymbol "||="');
+      var AssignmentOpSymbol$13 = $EXPECT($L41, fail, 'AssignmentOpSymbol "|="');
+      var AssignmentOpSymbol$14 = $EXPECT($L42, fail, 'AssignmentOpSymbol "??="');
+      var AssignmentOpSymbol$15 = $T($EXPECT($L43, fail, 'AssignmentOpSymbol "?="'), function(value) {
         return "??=";
       });
-      var AssignmentOpSymbol$16 = $EXPECT($L43, fail, 'AssignmentOpSymbol "="');
+      var AssignmentOpSymbol$16 = $EXPECT($L44, fail, 'AssignmentOpSymbol "="');
       function AssignmentOpSymbol(state) {
         if (state.tokenize) {
           return $TOKEN("AssignmentOpSymbol", state, AssignmentOpSymbol$0(state) || AssignmentOpSymbol$1(state) || AssignmentOpSymbol$2(state) || AssignmentOpSymbol$3(state) || AssignmentOpSymbol$4(state) || AssignmentOpSymbol$5(state) || AssignmentOpSymbol$6(state) || AssignmentOpSymbol$7(state) || AssignmentOpSymbol$8(state) || AssignmentOpSymbol$9(state) || AssignmentOpSymbol$10(state) || AssignmentOpSymbol$11(state) || AssignmentOpSymbol$12(state) || AssignmentOpSymbol$13(state) || AssignmentOpSymbol$14(state) || AssignmentOpSymbol$15(state) || AssignmentOpSymbol$16(state));
@@ -2437,7 +2892,9 @@ var Civet = (() => {
         }
       }
       var BinaryOp$0 = $TS($S(BinaryOpSymbol), function($skip, $loc, $0, $1) {
-        return { $loc, token: $1 };
+        if (typeof $1 === "string")
+          return { $loc, token: $1 };
+        return $1;
       });
       function BinaryOp(state) {
         if (state.verbose)
@@ -2448,68 +2905,80 @@ var Civet = (() => {
           return BinaryOp$0(state);
         }
       }
-      var BinaryOpSymbol$0 = $EXPECT($L44, fail, 'BinaryOpSymbol "**"');
-      var BinaryOpSymbol$1 = $EXPECT($L45, fail, 'BinaryOpSymbol "*"');
-      var BinaryOpSymbol$2 = $EXPECT($L46, fail, 'BinaryOpSymbol "/"');
-      var BinaryOpSymbol$3 = $EXPECT($L47, fail, 'BinaryOpSymbol "%"');
-      var BinaryOpSymbol$4 = $EXPECT($L48, fail, 'BinaryOpSymbol "+"');
-      var BinaryOpSymbol$5 = $EXPECT($L49, fail, 'BinaryOpSymbol "-"');
-      var BinaryOpSymbol$6 = $EXPECT($L50, fail, 'BinaryOpSymbol "<="');
-      var BinaryOpSymbol$7 = $EXPECT($L51, fail, 'BinaryOpSymbol ">="');
-      var BinaryOpSymbol$8 = $EXPECT($L52, fail, 'BinaryOpSymbol "<<"');
+      var BinaryOpSymbol$0 = $EXPECT($L45, fail, 'BinaryOpSymbol "**"');
+      var BinaryOpSymbol$1 = $EXPECT($L46, fail, 'BinaryOpSymbol "*"');
+      var BinaryOpSymbol$2 = $EXPECT($L47, fail, 'BinaryOpSymbol "/"');
+      var BinaryOpSymbol$3 = $EXPECT($L48, fail, 'BinaryOpSymbol "%"');
+      var BinaryOpSymbol$4 = $EXPECT($L49, fail, 'BinaryOpSymbol "+"');
+      var BinaryOpSymbol$5 = $EXPECT($L50, fail, 'BinaryOpSymbol "-"');
+      var BinaryOpSymbol$6 = $EXPECT($L51, fail, 'BinaryOpSymbol "<="');
+      var BinaryOpSymbol$7 = $EXPECT($L52, fail, 'BinaryOpSymbol ">="');
+      var BinaryOpSymbol$8 = $EXPECT($L53, fail, 'BinaryOpSymbol "<<"');
       var BinaryOpSymbol$9 = $EXPECT($L4, fail, 'BinaryOpSymbol "<"');
-      var BinaryOpSymbol$10 = $EXPECT($L53, fail, 'BinaryOpSymbol ">>>"');
-      var BinaryOpSymbol$11 = $EXPECT($L54, fail, 'BinaryOpSymbol ">>"');
-      var BinaryOpSymbol$12 = $EXPECT($L55, fail, 'BinaryOpSymbol ">"');
-      var BinaryOpSymbol$13 = $EXPECT($L56, fail, 'BinaryOpSymbol "!=="');
-      var BinaryOpSymbol$14 = $TV($EXPECT($L57, fail, 'BinaryOpSymbol "!="'), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$10 = $EXPECT($L54, fail, 'BinaryOpSymbol ">>>"');
+      var BinaryOpSymbol$11 = $EXPECT($L55, fail, 'BinaryOpSymbol ">>"');
+      var BinaryOpSymbol$12 = $EXPECT($L56, fail, 'BinaryOpSymbol ">"');
+      var BinaryOpSymbol$13 = $EXPECT($L57, fail, 'BinaryOpSymbol "!=="');
+      var BinaryOpSymbol$14 = $TV($EXPECT($L58, fail, 'BinaryOpSymbol "!="'), function($skip, $loc, $0, $1) {
         if (module.config.coffeeEq)
           return "!==";
         return $1;
       });
-      var BinaryOpSymbol$15 = $T($S($EXPECT($L58, fail, 'BinaryOpSymbol "is"'), NonIdContinue), function(value) {
+      var BinaryOpSymbol$15 = $TS($S($EXPECT($L59, fail, 'BinaryOpSymbol "isnt"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+        if (module.config.coffeeIsnt)
+          return "!==";
+        return $skip;
+      });
+      var BinaryOpSymbol$16 = $T($S($EXPECT($L60, fail, 'BinaryOpSymbol "is"'), NonIdContinue), function(value) {
         return "===";
       });
-      var BinaryOpSymbol$16 = $EXPECT($L59, fail, 'BinaryOpSymbol "==="');
-      var BinaryOpSymbol$17 = $TV($EXPECT($L60, fail, 'BinaryOpSymbol "=="'), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$17 = $EXPECT($L61, fail, 'BinaryOpSymbol "==="');
+      var BinaryOpSymbol$18 = $TV($EXPECT($L62, fail, 'BinaryOpSymbol "=="'), function($skip, $loc, $0, $1) {
         if (module.config.coffeeEq)
           return "===";
         return $1;
       });
-      var BinaryOpSymbol$18 = $T($S($EXPECT($L61, fail, 'BinaryOpSymbol "and"'), NonIdContinue), function(value) {
+      var BinaryOpSymbol$19 = $T($S($EXPECT($L63, fail, 'BinaryOpSymbol "and"'), NonIdContinue), function(value) {
         return "&&";
       });
-      var BinaryOpSymbol$19 = $EXPECT($L62, fail, 'BinaryOpSymbol "&&"');
-      var BinaryOpSymbol$20 = $T($S($EXPECT($L63, fail, 'BinaryOpSymbol "or"'), NonIdContinue), function(value) {
+      var BinaryOpSymbol$20 = $EXPECT($L64, fail, 'BinaryOpSymbol "&&"');
+      var BinaryOpSymbol$21 = $T($S(CoffeeOfEnabled, $EXPECT($L65, fail, 'BinaryOpSymbol "of"'), NonIdContinue), function(value) {
+        return "in";
+      });
+      var BinaryOpSymbol$22 = $T($S($EXPECT($L66, fail, 'BinaryOpSymbol "or"'), NonIdContinue), function(value) {
         return "||";
       });
-      var BinaryOpSymbol$21 = $EXPECT($L64, fail, 'BinaryOpSymbol "||"');
-      var BinaryOpSymbol$22 = $EXPECT($L65, fail, 'BinaryOpSymbol "??"');
-      var BinaryOpSymbol$23 = $TS($S($EXPECT($L66, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var BinaryOpSymbol$23 = $EXPECT($L67, fail, 'BinaryOpSymbol "||"');
+      var BinaryOpSymbol$24 = $EXPECT($L68, fail, 'BinaryOpSymbol "??"');
+      var BinaryOpSymbol$25 = $TS($S($EXPECT($L69, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return $1;
       });
-      var BinaryOpSymbol$24 = $TS($S($EXPECT($L67, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var BinaryOpSymbol$26 = $TS($S(CoffeeOfEnabled, $EXPECT($L70, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+        return module.getIndexOfRef();
+      });
+      var BinaryOpSymbol$27 = $TS($S($EXPECT($L70, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return $1;
       });
-      var BinaryOpSymbol$25 = $EXPECT($L68, fail, 'BinaryOpSymbol "&"');
-      var BinaryOpSymbol$26 = $EXPECT($L69, fail, 'BinaryOpSymbol "^"');
-      var BinaryOpSymbol$27 = $EXPECT($L70, fail, 'BinaryOpSymbol "|"');
+      var BinaryOpSymbol$28 = $EXPECT($L71, fail, 'BinaryOpSymbol "&"');
+      var BinaryOpSymbol$29 = $EXPECT($L72, fail, 'BinaryOpSymbol "^"');
+      var BinaryOpSymbol$30 = $EXPECT($L73, fail, 'BinaryOpSymbol "|"');
       function BinaryOpSymbol(state) {
         if (state.tokenize) {
-          return $TOKEN("BinaryOpSymbol", state, BinaryOpSymbol$0(state) || BinaryOpSymbol$1(state) || BinaryOpSymbol$2(state) || BinaryOpSymbol$3(state) || BinaryOpSymbol$4(state) || BinaryOpSymbol$5(state) || BinaryOpSymbol$6(state) || BinaryOpSymbol$7(state) || BinaryOpSymbol$8(state) || BinaryOpSymbol$9(state) || BinaryOpSymbol$10(state) || BinaryOpSymbol$11(state) || BinaryOpSymbol$12(state) || BinaryOpSymbol$13(state) || BinaryOpSymbol$14(state) || BinaryOpSymbol$15(state) || BinaryOpSymbol$16(state) || BinaryOpSymbol$17(state) || BinaryOpSymbol$18(state) || BinaryOpSymbol$19(state) || BinaryOpSymbol$20(state) || BinaryOpSymbol$21(state) || BinaryOpSymbol$22(state) || BinaryOpSymbol$23(state) || BinaryOpSymbol$24(state) || BinaryOpSymbol$25(state) || BinaryOpSymbol$26(state) || BinaryOpSymbol$27(state));
+          return $TOKEN("BinaryOpSymbol", state, BinaryOpSymbol$0(state) || BinaryOpSymbol$1(state) || BinaryOpSymbol$2(state) || BinaryOpSymbol$3(state) || BinaryOpSymbol$4(state) || BinaryOpSymbol$5(state) || BinaryOpSymbol$6(state) || BinaryOpSymbol$7(state) || BinaryOpSymbol$8(state) || BinaryOpSymbol$9(state) || BinaryOpSymbol$10(state) || BinaryOpSymbol$11(state) || BinaryOpSymbol$12(state) || BinaryOpSymbol$13(state) || BinaryOpSymbol$14(state) || BinaryOpSymbol$15(state) || BinaryOpSymbol$16(state) || BinaryOpSymbol$17(state) || BinaryOpSymbol$18(state) || BinaryOpSymbol$19(state) || BinaryOpSymbol$20(state) || BinaryOpSymbol$21(state) || BinaryOpSymbol$22(state) || BinaryOpSymbol$23(state) || BinaryOpSymbol$24(state) || BinaryOpSymbol$25(state) || BinaryOpSymbol$26(state) || BinaryOpSymbol$27(state) || BinaryOpSymbol$28(state) || BinaryOpSymbol$29(state) || BinaryOpSymbol$30(state));
         } else {
-          return BinaryOpSymbol$0(state) || BinaryOpSymbol$1(state) || BinaryOpSymbol$2(state) || BinaryOpSymbol$3(state) || BinaryOpSymbol$4(state) || BinaryOpSymbol$5(state) || BinaryOpSymbol$6(state) || BinaryOpSymbol$7(state) || BinaryOpSymbol$8(state) || BinaryOpSymbol$9(state) || BinaryOpSymbol$10(state) || BinaryOpSymbol$11(state) || BinaryOpSymbol$12(state) || BinaryOpSymbol$13(state) || BinaryOpSymbol$14(state) || BinaryOpSymbol$15(state) || BinaryOpSymbol$16(state) || BinaryOpSymbol$17(state) || BinaryOpSymbol$18(state) || BinaryOpSymbol$19(state) || BinaryOpSymbol$20(state) || BinaryOpSymbol$21(state) || BinaryOpSymbol$22(state) || BinaryOpSymbol$23(state) || BinaryOpSymbol$24(state) || BinaryOpSymbol$25(state) || BinaryOpSymbol$26(state) || BinaryOpSymbol$27(state);
+          return BinaryOpSymbol$0(state) || BinaryOpSymbol$1(state) || BinaryOpSymbol$2(state) || BinaryOpSymbol$3(state) || BinaryOpSymbol$4(state) || BinaryOpSymbol$5(state) || BinaryOpSymbol$6(state) || BinaryOpSymbol$7(state) || BinaryOpSymbol$8(state) || BinaryOpSymbol$9(state) || BinaryOpSymbol$10(state) || BinaryOpSymbol$11(state) || BinaryOpSymbol$12(state) || BinaryOpSymbol$13(state) || BinaryOpSymbol$14(state) || BinaryOpSymbol$15(state) || BinaryOpSymbol$16(state) || BinaryOpSymbol$17(state) || BinaryOpSymbol$18(state) || BinaryOpSymbol$19(state) || BinaryOpSymbol$20(state) || BinaryOpSymbol$21(state) || BinaryOpSymbol$22(state) || BinaryOpSymbol$23(state) || BinaryOpSymbol$24(state) || BinaryOpSymbol$25(state) || BinaryOpSymbol$26(state) || BinaryOpSymbol$27(state) || BinaryOpSymbol$28(state) || BinaryOpSymbol$29(state) || BinaryOpSymbol$30(state);
         }
       }
-      var UnaryOp$0 = $TR($EXPECT($R2, fail, "UnaryOp /[!~+-]/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var UnaryOp$0 = $TR($EXPECT($R2, fail, "UnaryOp /[!~+-](?!\\s)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
-      var UnaryOp$1 = $S($C(Delete, Void, Typeof), __);
+      var UnaryOp$1 = $S($C(Await, Delete, Void, Typeof), __);
+      var UnaryOp$2 = Not;
       function UnaryOp(state) {
         if (state.tokenize) {
-          return $TOKEN("UnaryOp", state, UnaryOp$0(state) || UnaryOp$1(state));
+          return $TOKEN("UnaryOp", state, UnaryOp$0(state) || UnaryOp$1(state) || UnaryOp$2(state));
         } else {
-          return UnaryOp$0(state) || UnaryOp$1(state);
+          return UnaryOp$0(state) || UnaryOp$1(state) || UnaryOp$2(state);
         }
       }
       var ModuleItem$0 = ImportDeclaration;
@@ -2528,7 +2997,18 @@ var Civet = (() => {
         var ws = $2;
         var post = $3;
         if (post) {
-          post.children.push(statement);
+          let block;
+          if (post.type === "ForStatement") {
+            if (post.blockPrefix?.length) {
+              block = [" {", ...post.blockPrefix, ...statement, " }"];
+            } else {
+              block = statement;
+            }
+          } else {
+            block = statement;
+          }
+          post.block = block;
+          post.children.push(block);
           if (!module.isWhitespaceOrEmpty(ws))
             post.children.push(ws);
           return post;
@@ -2570,7 +3050,7 @@ var Civet = (() => {
           return Statement$0(state) || Statement$1(state) || Statement$2(state) || Statement$3(state) || Statement$4(state) || Statement$5(state) || Statement$6(state) || Statement$7(state) || Statement$8(state);
         }
       }
-      var EmptyStatement$0 = $T($S($Q(TrailingComment), $Y($EXPECT($L71, fail, 'EmptyStatement ";"'))), function(value) {
+      var EmptyStatement$0 = $T($S($Q(TrailingComment), $Y($EXPECT($L74, fail, 'EmptyStatement ";"'))), function(value) {
         return { "type": "EmptyStatement", "children": value[0] };
       });
       function EmptyStatement(state) {
@@ -2582,7 +3062,7 @@ var Civet = (() => {
           return EmptyStatement$0(state);
         }
       }
-      var BlockStatement$0 = $T($S(__, OpenBrace, EOS, NestedBlockExpressions, __, CloseBrace), function(value) {
+      var BlockStatement$0 = $T($S(__, OpenBrace, EOS, NestedBlockStatements, __, CloseBrace, $N($S(__, $EXPECT($L44, fail, 'BlockStatement "="')))), function(value) {
         var exps = value[3];
         return { "type": "BlockStatement", "children": value, "expressions": exps };
       });
@@ -2595,7 +3075,7 @@ var Civet = (() => {
           return BlockStatement$0(state);
         }
       }
-      var IfStatement$0 = $TS($S(IfClause, Block, $E($S(__, Else, Block))), function($skip, $loc, $0, $1, $2, $3) {
+      var IfStatement$0 = $TS($S($C(IfClause, UnlessClause), Block, $E($S(__, Else, Block))), function($skip, $loc, $0, $1, $2, $3) {
         var clause = $1;
         var block = $2;
         var e = $3;
@@ -2604,17 +3084,13 @@ var Civet = (() => {
           clause.children.push(e);
         return clause;
       });
-      var IfStatement$1 = $TS($S(UnlessClause, Block), function($skip, $loc, $0, $1, $2) {
-        var clause = $1;
-        var block = $2;
-        clause.children.push(block);
-        return clause;
-      });
       function IfStatement(state) {
+        if (state.verbose)
+          console.log("ENTER:", "IfStatement");
         if (state.tokenize) {
-          return $TOKEN("IfStatement", state, IfStatement$0(state) || IfStatement$1(state));
+          return $TOKEN("IfStatement", state, IfStatement$0(state));
         } else {
-          return IfStatement$0(state) || IfStatement$1(state);
+          return IfStatement$0(state);
         }
       }
       var IfClause$0 = $T($S(If, Condition), function(value) {
@@ -2655,6 +3131,72 @@ var Civet = (() => {
           return UnlessClause$0(state);
         }
       }
+      var IfExpression$0 = $TS($S(IfClause, ExpressionBlock, $E($S(__, Else, ExpressionBlock))), function($skip, $loc, $0, $1, $2, $3) {
+        var clause = $1;
+        var b = $2;
+        var e = $3;
+        clause.children.shift();
+        clause.children.push("?", b, ":");
+        if (e) {
+          e.splice(1, 1);
+          clause.children.push(e);
+        } else {
+          clause.children.push("void 0");
+        }
+        clause.type = "IfExpression";
+        return clause;
+      });
+      function IfExpression(state) {
+        if (state.verbose)
+          console.log("ENTER:", "IfExpression");
+        if (state.tokenize) {
+          return $TOKEN("IfExpression", state, IfExpression$0(state));
+        } else {
+          return IfExpression$0(state);
+        }
+      }
+      var ExpressionBlock$0 = $TS($S(InsertOpenParen, EOS, NestedBlockExpressions, InsertNewline, InsertIndent, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+        var exps = $3;
+        exps[exps.length - 1].pop();
+        return {
+          type: "BlockExpressions",
+          expressions: exps,
+          children: $0
+        };
+      });
+      var ExpressionBlock$1 = $S($E(Then), ExtendedExpression);
+      function ExpressionBlock(state) {
+        if (state.tokenize) {
+          return $TOKEN("ExpressionBlock", state, ExpressionBlock$0(state) || ExpressionBlock$1(state));
+        } else {
+          return ExpressionBlock$0(state) || ExpressionBlock$1(state);
+        }
+      }
+      var NestedBlockExpressions$0 = $TS($S(PushIndent, $Q(NestedBlockExpression), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+        var exps = $2;
+        if (!exps.length)
+          return $skip;
+        return exps;
+      });
+      function NestedBlockExpressions(state) {
+        if (state.verbose)
+          console.log("ENTER:", "NestedBlockExpressions");
+        if (state.tokenize) {
+          return $TOKEN("NestedBlockExpressions", state, NestedBlockExpressions$0(state));
+        } else {
+          return NestedBlockExpressions$0(state);
+        }
+      }
+      var NestedBlockExpression$0 = $S(Nested, ExtendedExpression, ExpressionDelimiter);
+      function NestedBlockExpression(state) {
+        if (state.verbose)
+          console.log("ENTER:", "NestedBlockExpression");
+        if (state.tokenize) {
+          return $TOKEN("NestedBlockExpression", state, NestedBlockExpression$0(state));
+        } else {
+          return NestedBlockExpression$0(state);
+        }
+      }
       var IterationStatement$0 = LoopStatement;
       var IterationStatement$1 = DoWhileStatement;
       var IterationStatement$2 = WhileStatement;
@@ -2729,61 +3271,219 @@ var Civet = (() => {
           kind.token = "while";
           $0 = [kind, cond];
         }
-        return {
-          type: "IterationStatement",
-          children: $0
-        };
+        return {
+          type: "IterationStatement",
+          children: $0
+        };
+      });
+      function WhileClause(state) {
+        if (state.verbose)
+          console.log("ENTER:", "WhileClause");
+        if (state.tokenize) {
+          return $TOKEN("WhileClause", state, WhileClause$0(state));
+        } else {
+          return WhileClause$0(state);
+        }
+      }
+      var ForStatement$0 = $TS($S(ForClause, Block), function($skip, $loc, $0, $1, $2) {
+        var clause = $1;
+        var block = $2;
+        clause.children.push(block);
+        clause.block = block;
+        if (clause.blockPrefix) {
+          block.expressions.splice(0, 0, ...clause.blockPrefix);
+        }
+        return clause;
+      });
+      function ForStatement(state) {
+        if (state.verbose)
+          console.log("ENTER:", "ForStatement");
+        if (state.tokenize) {
+          return $TOKEN("ForStatement", state, ForStatement$0(state));
+        } else {
+          return ForStatement$0(state);
+        }
+      }
+      var ForClause$0 = $TS($S(For, __, ForStatementControl), function($skip, $loc, $0, $1, $2, $3) {
+        var c = $3;
+        const { children, declaration } = c;
+        children.splice(0, 0, $1, ...$2);
+        return {
+          type: "ForStatement",
+          children,
+          declaration,
+          block: null,
+          blockPrefix: c.blockPrefix
+        };
+      });
+      function ForClause(state) {
+        if (state.verbose)
+          console.log("ENTER:", "ForClause");
+        if (state.tokenize) {
+          return $TOKEN("ForClause", state, ForClause$0(state));
+        } else {
+          return ForClause$0(state);
+        }
+      }
+      var ForStatementControl$0 = $T($S($N(CoffeeForLoopsEnabled), ForStatementParameters), function(value) {
+        return value[1];
+      });
+      var ForStatementControl$1 = $TS($S(CoffeeForLoopsEnabled, CoffeeForStatementParameters, $E(WhenCondition)), function($skip, $loc, $0, $1, $2, $3) {
+        if ($3) {
+          const indent = "".padStart((module.currentIndent + 1) * 2);
+          module.insertTrimmingSpace($3, "");
+          $2.blockPrefix.push({
+            type: "IfStatement",
+            children: [indent, "if (!(", $3, ")) continue\n"]
+          });
+        }
+        return $2;
       });
-      function WhileClause(state) {
+      function ForStatementControl(state) {
+        if (state.tokenize) {
+          return $TOKEN("ForStatementControl", state, ForStatementControl$0(state) || ForStatementControl$1(state));
+        } else {
+          return ForStatementControl$0(state) || ForStatementControl$1(state);
+        }
+      }
+      var WhenCondition$0 = $T($S(__, When, ExtendedExpression), function(value) {
+        var exp = value[2];
+        return exp;
+      });
+      function WhenCondition(state) {
         if (state.verbose)
-          console.log("ENTER:", "WhileClause");
+          console.log("ENTER:", "WhenCondition");
         if (state.tokenize) {
-          return $TOKEN("WhileClause", state, WhileClause$0(state));
+          return $TOKEN("WhenCondition", state, WhenCondition$0(state));
         } else {
-          return WhileClause$0(state);
+          return WhenCondition$0(state);
         }
       }
-      var ForStatement$0 = $TS($S(ForClause, Block), function($skip, $loc, $0, $1, $2) {
-        var clause = $1;
-        var block = $2;
-        clause.children.push(block);
-        return clause;
+      var CoffeeForStatementParameters$0 = $TS($S($E($S(Await, __)), InsertOpenParen, CoffeeForDeclaration, __, $C(In, Of, From), ExtendedExpression, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+        var declaration = $3;
+        var kind = $5;
+        var exp = $6;
+        let blockPrefix = [];
+        if (kind.token === "from") {
+          kind.token = "of";
+        } else if (kind.token === "of") {
+          module.insertTrimmingSpace(declaration, "");
+          module.insertTrimmingSpace(exp, "");
+          if (declaration.own) {
+            const indent = "".padStart((module.currentIndent + 1) * 2);
+            const hasPropRef = module.getHasPropRef();
+            blockPrefix.push([indent, "if (!", hasPropRef, ".call(", exp, ", ", declaration, ")) continue\n"]);
+          }
+          kind.token = "in ";
+        } else if (kind.token === "in") {
+          const counterRef = {
+            type: "Ref",
+            base: "i"
+          };
+          const lenRef = {
+            type: "Ref",
+            base: "len"
+          };
+          const expRef = exp.type === "Identifier" ? exp : {
+            type: "Ref",
+            base: "ref"
+          };
+          const varRef = declaration;
+          module.insertTrimmingSpace(exp, "");
+          const expRefDec = expRef !== exp ? [expRef, " = ", exp, ", "] : [];
+          declaration = {
+            type: "Declaration",
+            children: ["let ", ...expRefDec, counterRef, " = 0, ", lenRef, " = ", expRef, ".length"],
+            names: []
+          };
+          const indent = "".padStart((module.currentIndent + 1) * 2);
+          blockPrefix.push([{
+            type: "AssignmentExpression",
+            children: [indent, varRef, " = ", expRef, "[", counterRef, "]\n"],
+            names: varRef.names
+          }]);
+          return {
+            declaration,
+            children: [$1, $2, declaration, "; ", counterRef, " < ", lenRef, "; ", counterRef, "++", $7],
+            blockPrefix
+          };
+        }
+        return {
+          declaration,
+          children: $0,
+          blockPrefix
+        };
       });
-      function ForStatement(state) {
+      function CoffeeForStatementParameters(state) {
         if (state.verbose)
-          console.log("ENTER:", "ForStatement");
+          console.log("ENTER:", "CoffeeForStatementParameters");
         if (state.tokenize) {
-          return $TOKEN("ForStatement", state, ForStatement$0(state));
+          return $TOKEN("CoffeeForStatementParameters", state, CoffeeForStatementParameters$0(state));
         } else {
-          return ForStatement$0(state);
+          return CoffeeForStatementParameters$0(state);
         }
       }
-      var ForClause$0 = $T($S(For, __, ForStatementControl), function(value) {
-        return { "type": "IterationStatement", "children": value };
+      var CoffeeForDeclaration$0 = $TS($S($E($S(__, $EXPECT($L75, fail, 'CoffeeForDeclaration "own"'))), ForBinding), function($skip, $loc, $0, $1, $2) {
+        var own = $1;
+        var binding = $2;
+        if (own) {
+          binding.own = true;
+        }
+        binding.type = "AssignmentExpression";
+        return binding;
       });
-      function ForClause(state) {
+      function CoffeeForDeclaration(state) {
         if (state.verbose)
-          console.log("ENTER:", "ForClause");
+          console.log("ENTER:", "CoffeeForDeclaration");
         if (state.tokenize) {
-          return $TOKEN("ForClause", state, ForClause$0(state));
+          return $TOKEN("CoffeeForDeclaration", state, CoffeeForDeclaration$0(state));
         } else {
-          return ForClause$0(state);
+          return CoffeeForDeclaration$0(state);
         }
       }
-      var ForStatementControl$0 = $S(OpenParen, __, $C(LexicalDeclaration, VariableStatement, $E(Expression)), __, Semicolon, $E(Expression), Semicolon, $E(Expression), __, CloseParen);
-      var ForStatementControl$1 = $S(InsertOpenParen, __, $C(LexicalDeclaration, VariableStatement, $E(Expression)), __, Semicolon, $E(Expression), Semicolon, $E($S($N(EOS), Expression)), InsertCloseParen);
-      var ForStatementControl$2 = $S(OpenParen, __, ForInOfDeclaration, __, In, Expression, __, CloseParen);
-      var ForStatementControl$3 = $S(InsertOpenParen, ForInOfDeclaration, __, In, Expression, InsertCloseParen);
-      var ForStatementControl$4 = $S($E($S(Await, __)), OpenParen, __, ForInOfDeclaration, __, Of, AssignmentExpression, __, CloseParen);
-      var ForStatementControl$5 = $S($E($S(Await, __)), InsertOpenParen, ForInOfDeclaration, __, Of, AssignmentExpression, InsertCloseParen);
-      function ForStatementControl(state) {
+      var ForStatementParameters$0 = $TS($S(OpenParen, __, $C(LexicalDeclaration, VariableStatement, $E(Expression)), __, Semicolon, $E(Expression), Semicolon, $E(Expression), __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10) {
+        var declaration = $3;
+        return {
+          declaration,
+          children: $0
+        };
+      });
+      var ForStatementParameters$1 = $TS($S(InsertOpenParen, __, $C(LexicalDeclaration, VariableStatement, $E(Expression)), __, Semicolon, $E(Expression), Semicolon, $E($S($N(EOS), Expression)), InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+        var declaration = $3;
+        return {
+          declaration,
+          children: $0
+        };
+      });
+      var ForStatementParameters$2 = $TS($S($E($S(Await, __)), OpenParen, __, ForInOfDeclaration, __, $C(In, Of), ExtendedExpression, __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+        var declaration = $4;
+        return {
+          declaration,
+          children: $0
+        };
+      });
+      var ForStatementParameters$3 = $TS($S($E($S(Await, __)), InsertOpenParen, ForInOfDeclaration, __, $C(In, Of), ExtendedExpression, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+        var declaration = $3;
+        return {
+          declaration,
+          children: $0
+        };
+      });
+      function ForStatementParameters(state) {
         if (state.tokenize) {
-          return $TOKEN("ForStatementControl", state, ForStatementControl$0(state) || ForStatementControl$1(state) || ForStatementControl$2(state) || ForStatementControl$3(state) || ForStatementControl$4(state) || ForStatementControl$5(state));
+          return $TOKEN("ForStatementParameters", state, ForStatementParameters$0(state) || ForStatementParameters$1(state) || ForStatementParameters$2(state) || ForStatementParameters$3(state));
         } else {
-          return ForStatementControl$0(state) || ForStatementControl$1(state) || ForStatementControl$2(state) || ForStatementControl$3(state) || ForStatementControl$4(state) || ForStatementControl$5(state);
+          return ForStatementParameters$0(state) || ForStatementParameters$1(state) || ForStatementParameters$2(state) || ForStatementParameters$3(state);
         }
       }
-      var ForInOfDeclaration$0 = $S(Var, ForBinding);
+      var ForInOfDeclaration$0 = $TS($S(Var, ForBinding), function($skip, $loc, $0, $1, $2) {
+        var binding = $2;
+        return {
+          type: "ForDeclaration",
+          children: $0,
+          names: binding.names
+        };
+      });
       var ForInOfDeclaration$1 = ForDeclaration;
       var ForInOfDeclaration$2 = LeftHandSideExpression;
       function ForInOfDeclaration(state) {
@@ -2793,8 +3493,24 @@ var Civet = (() => {
           return ForInOfDeclaration$0(state) || ForInOfDeclaration$1(state) || ForInOfDeclaration$2(state);
         }
       }
-      var ForDeclaration$0 = $S(LetOrConst, NonIdContinue, ForBinding);
-      var ForDeclaration$1 = $S(InsertConst, ForBinding, $R$0($EXPECT($R3, fail, "ForDeclaration /(?=[\\s\\)])/")));
+      var ForDeclaration$0 = $TS($S(LetOrConst, NonIdContinue, ForBinding), function($skip, $loc, $0, $1, $2, $3) {
+        var c = $1;
+        var binding = $3;
+        return {
+          type: "ForDeclaration",
+          children: [c, binding],
+          names: binding.names
+        };
+      });
+      var ForDeclaration$1 = $TS($S(InsertConst, ForBinding, $EXPECT($R3, fail, "ForDeclaration /(?=[\\s\\)])/")), function($skip, $loc, $0, $1, $2, $3) {
+        var c = $1;
+        var binding = $2;
+        return {
+          type: "ForDeclaration",
+          children: [c, binding],
+          names: binding.names
+        };
+      });
       function ForDeclaration(state) {
         if (state.tokenize) {
           return $TOKEN("ForDeclaration", state, ForDeclaration$0(state) || ForDeclaration$1(state));
@@ -2823,6 +3539,22 @@ var Civet = (() => {
           return SwitchStatement$0(state);
         }
       }
+      var SwitchExpression$0 = $TV(SwitchStatement, function($skip, $loc, $0, $1) {
+        var e = $0;
+        module.addImplicitReturns(e.children[2]);
+        e.type = "SwitchExpression";
+        e.children = ["($=>{", e.children, "})()"];
+        return e;
+      });
+      function SwitchExpression(state) {
+        if (state.verbose)
+          console.log("ENTER:", "SwitchExpression");
+        if (state.tokenize) {
+          return $TOKEN("SwitchExpression", state, SwitchExpression$0(state));
+        } else {
+          return SwitchExpression$0(state);
+        }
+      }
       var CaseBlock$0 = $TS($S(__, OpenBrace, $Y(EOS), NestedCaseClauses, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         var clauses = $4;
         $0.splice(2, 1);
@@ -2876,19 +3608,19 @@ var Civet = (() => {
           return NestedCaseClause$0(state);
         }
       }
-      var CaseClause$0 = $T($S(Case, CaseExpressionList, $C(NestedBlockExpressions, NoExpressions)), function(value) {
+      var CaseClause$0 = $T($S(Case, CaseExpressionList, $C(NestedBlockStatements, NoExpressions)), function(value) {
         var exps = value[2];
         return { "type": "CaseClause", "expressions": exps, "children": value };
       });
-      var CaseClause$1 = $T($S(When, CaseExpressionList, NestedBlockExpressions, InsertBreak), function(value) {
+      var CaseClause$1 = $T($S(When, CaseExpressionList, NestedBlockStatements, InsertBreak), function(value) {
         var exps = value[2];
         return { "type": "WhenClause", "expressions": exps, "children": value };
       });
-      var CaseClause$2 = $T($S(Default, ImpliedColon, $C(NestedBlockExpressions, NoExpressions)), function(value) {
+      var CaseClause$2 = $T($S(Default, ImpliedColon, $C(NestedBlockStatements, NoExpressions)), function(value) {
         var exps = value[2];
         return { "type": "DefaultClause", "expressions": exps, "children": value };
       });
-      var CaseClause$3 = $TS($S(Else, ImpliedColon, NestedBlockExpressions), function($skip, $loc, $0, $1, $2, $3) {
+      var CaseClause$3 = $TS($S(Else, ImpliedColon, NestedBlockStatements), function($skip, $loc, $0, $1, $2, $3) {
         var exps = $3;
         $1.token = "default";
         return {
@@ -2990,7 +3722,7 @@ var Civet = (() => {
           return CatchBind$0(state) || CatchBind$1(state);
         }
       }
-      var Finally$0 = $S(__, $EXPECT($L72, fail, 'Finally "finally"'), BracedBlock);
+      var Finally$0 = $S(__, $EXPECT($L76, fail, 'Finally "finally"'), BracedBlock);
       function Finally(state) {
         if (state.verbose)
           console.log("ENTER:", "Finally");
@@ -3009,7 +3741,7 @@ var Civet = (() => {
           return CatchParameter$0(state) || CatchParameter$1(state);
         }
       }
-      var Condition$0 = $S(__, OpenParen, Expression, __, CloseParen);
+      var Condition$0 = $S(__, OpenParen, ExtendedExpression, __, CloseParen);
       var Condition$1 = $TS($S($N(EOS), __, InsertOpenParen, ExpressionWithIndentedApplicationSuppressed, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         $0.shift();
         return $0;
@@ -3021,7 +3753,7 @@ var Civet = (() => {
           return Condition$0(state) || Condition$1(state);
         }
       }
-      var ExpressionWithIndentedApplicationSuppressed$0 = $TS($S(SuppressIndentedApplication, $E(AssignmentExpression)), function($skip, $loc, $0, $1, $2) {
+      var ExpressionWithIndentedApplicationSuppressed$0 = $TS($S(SuppressIndentedApplication, $E(ExtendedExpression)), function($skip, $loc, $0, $1, $2) {
         var exp = $2;
         module.suppressIndentedApplication = false;
         if (exp)
@@ -3059,19 +3791,19 @@ var Civet = (() => {
           return ExpressionStatement$0(state);
         }
       }
-      var KeywordStatement$0 = $T($S($EXPECT($L73, fail, 'KeywordStatement "break"'), NonIdContinue), function(value) {
+      var KeywordStatement$0 = $T($S($EXPECT($L77, fail, 'KeywordStatement "break"'), NonIdContinue), function(value) {
         return { "type": "BreakStatement", "children": value };
       });
-      var KeywordStatement$1 = $T($S($EXPECT($L74, fail, 'KeywordStatement "continue"'), NonIdContinue), function(value) {
+      var KeywordStatement$1 = $T($S($EXPECT($L78, fail, 'KeywordStatement "continue"'), NonIdContinue), function(value) {
         return { "type": "ContinueStatement", "children": value };
       });
-      var KeywordStatement$2 = $T($S($EXPECT($L75, fail, 'KeywordStatement "debugger"'), NonIdContinue), function(value) {
+      var KeywordStatement$2 = $T($S($EXPECT($L79, fail, 'KeywordStatement "debugger"'), NonIdContinue), function(value) {
         return { "type": "DebuggerStatement", "children": value };
       });
       var KeywordStatement$3 = $T($S(Return, $E(MaybeNestedExpression)), function(value) {
         return { "type": "ReturnStatement", "children": value };
       });
-      var KeywordStatement$4 = $T($S(Throw, Expression), function(value) {
+      var KeywordStatement$4 = $T($S(Throw, ExtendedExpression), function(value) {
         return { "type": "ThrowStatement", "children": value };
       });
       function KeywordStatement(state) {
@@ -3081,8 +3813,42 @@ var Civet = (() => {
           return KeywordStatement$0(state) || KeywordStatement$1(state) || KeywordStatement$2(state) || KeywordStatement$3(state) || KeywordStatement$4(state);
         }
       }
-      var MaybeNestedExpression$0 = $S($N(EOS), $Q(TrailingComment), Expression);
-      var MaybeNestedExpression$1 = $S($Y(EOS), ObjectLiteral);
+      var DebuggerExpression$0 = $TS($S($EXPECT($L79, fail, 'DebuggerExpression "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+        return {
+          type: "DebuggerExpression",
+          children: ["($=>{", $1, "})()"]
+        };
+      });
+      function DebuggerExpression(state) {
+        if (state.verbose)
+          console.log("ENTER:", "DebuggerExpression");
+        if (state.tokenize) {
+          return $TOKEN("DebuggerExpression", state, DebuggerExpression$0(state));
+        } else {
+          return DebuggerExpression$0(state);
+        }
+      }
+      var ThrowExpression$0 = $TS($S(Throw, ExtendedExpression), function($skip, $loc, $0, $1, $2) {
+        return {
+          type: "ThrowExpression",
+          children: ["($=>{", ...$0, "})()"]
+        };
+      });
+      function ThrowExpression(state) {
+        if (state.verbose)
+          console.log("ENTER:", "ThrowExpression");
+        if (state.tokenize) {
+          return $TOKEN("ThrowExpression", state, ThrowExpression$0(state));
+        } else {
+          return ThrowExpression$0(state);
+        }
+      }
+      var MaybeNestedExpression$0 = $TS($S($N(EOS), $Q(TrailingComment), AssignmentExpression), function($skip, $loc, $0, $1, $2, $3) {
+        return [...$2, $3];
+      });
+      var MaybeNestedExpression$1 = $T($S($Y(EOS), ObjectLiteral), function(value) {
+        return value[1];
+      });
       function MaybeNestedExpression(state) {
         if (state.tokenize) {
           return $TOKEN("MaybeNestedExpression", state, MaybeNestedExpression$0(state) || MaybeNestedExpression$1(state));
@@ -3090,7 +3856,7 @@ var Civet = (() => {
           return MaybeNestedExpression$0(state) || MaybeNestedExpression$1(state);
         }
       }
-      var ImportDeclaration$0 = $T($S($EXPECT($L76, fail, 'ImportDeclaration "import type"'), NonIdContinue, __, ImportClause, __, FromClause), function(value) {
+      var ImportDeclaration$0 = $T($S($EXPECT($L80, fail, 'ImportDeclaration "import type"'), NonIdContinue, __, ImportClause, __, FromClause), function(value) {
         return { "ts": true, "children": value };
       });
       var ImportDeclaration$1 = $S(Import, __, ImportClause, __, FromClause);
@@ -3125,7 +3891,19 @@ var Civet = (() => {
           return ImpliedImport$0(state);
         }
       }
-      var ImportClause$0 = $S(ImportedBinding, $E($S(__, Comma, __, $C(NameSpaceImport, NamedImports))));
+      var ImportClause$0 = $TS($S(ImportedBinding, $E($S(__, Comma, __, $C(NameSpaceImport, NamedImports)))), function($skip, $loc, $0, $1, $2) {
+        var binding = $1;
+        var rest = $2;
+        if (rest) {
+          return {
+            type: "Declaration",
+            children: $0,
+            names: [...binding.names, ...rest[3].names]
+          };
+        }
+        $1.type = "Declaration";
+        return $1;
+      });
       var ImportClause$1 = NameSpaceImport;
       var ImportClause$2 = NamedImports;
       function ImportClause(state) {
@@ -3135,7 +3913,14 @@ var Civet = (() => {
           return ImportClause$0(state) || ImportClause$1(state) || ImportClause$2(state);
         }
       }
-      var NameSpaceImport$0 = $S(Star, __, As, NonIdContinue, __, ImportedBinding);
+      var NameSpaceImport$0 = $TS($S(Star, __, As, __, ImportedBinding), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        var binding = $5;
+        return {
+          type: "Declaration",
+          children: $0,
+          names: binding.names
+        };
+      });
       function NameSpaceImport(state) {
         if (state.verbose)
           console.log("ENTER:", "NameSpaceImport");
@@ -3145,7 +3930,17 @@ var Civet = (() => {
           return NameSpaceImport$0(state);
         }
       }
-      var NamedImports$0 = $S(OpenBrace, $Q(ImportSpecifier), $E($S(__, Comma)), __, CloseBrace);
+      var NamedImports$0 = $TS($S(OpenBrace, $Q(ImportSpecifier), $E($S(__, Comma)), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        var specifiers = $2;
+        const names = specifiers.flatMap(({ binding }) => {
+          return binding.names;
+        });
+        return {
+          type: "Declaration",
+          children: $0,
+          names
+        };
+      });
       function NamedImports(state) {
         if (state.verbose)
           console.log("ENTER:", "NamedImports");
@@ -3165,8 +3960,20 @@ var Civet = (() => {
           return FromClause$0(state);
         }
       }
-      var ImportSpecifier$0 = $S(__, ModuleExportName, __, As, NonIdContinue, __, ImportedBinding, ObjectPropertyDelimiter);
-      var ImportSpecifier$1 = $S(__, ImportedBinding, ObjectPropertyDelimiter);
+      var ImportSpecifier$0 = $TS($S(__, ModuleExportName, __, As, __, ImportedBinding, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+        var binding = $6;
+        return {
+          binding,
+          children: $0
+        };
+      });
+      var ImportSpecifier$1 = $TS($S(__, ImportedBinding, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
+        var binding = $2;
+        return {
+          binding,
+          children: $0
+        };
+      });
       function ImportSpecifier(state) {
         if (state.tokenize) {
           return $TOKEN("ImportSpecifier", state, ImportSpecifier$0(state) || ImportSpecifier$1(state));
@@ -3228,7 +4035,7 @@ var Civet = (() => {
           return ImportedBinding$0(state);
         }
       }
-      var ExportDeclaration$0 = $S(Export, __, $EXPECT($L77, fail, 'ExportDeclaration "default"'), NonIdContinue, __, $C(HoistableDeclaration, ClassDeclaration, AssignmentExpression));
+      var ExportDeclaration$0 = $S(Export, __, $EXPECT($L81, fail, 'ExportDeclaration "default"'), NonIdContinue, __, $C(HoistableDeclaration, ClassDeclaration, ExtendedExpression));
       var ExportDeclaration$1 = $S(Export, __, ExportFromClause, __, FromClause);
       var ExportDeclaration$2 = $S(Export, __, $C(NamedExports, VariableStatement, Declaration));
       function ExportDeclaration(state) {
@@ -3238,7 +4045,7 @@ var Civet = (() => {
           return ExportDeclaration$0(state) || ExportDeclaration$1(state) || ExportDeclaration$2(state);
         }
       }
-      var ExportFromClause$0 = $S(Star, $E($S(__, As, NonIdContinue, __, ModuleExportName)));
+      var ExportFromClause$0 = $S(Star, $E($S(__, As, __, ModuleExportName)));
       var ExportFromClause$1 = NamedExports;
       function ExportFromClause(state) {
         if (state.tokenize) {
@@ -3288,18 +4095,43 @@ var Civet = (() => {
           return HoistableDeclaration$0(state);
         }
       }
-      var LexicalDeclaration$0 = $T($S(LetOrConst, __, LexicalBinding, $Q($S(__, Comma, __, LexicalBinding))), function(value) {
-        return { "type": "VariableDeclaration", "children": value };
+      var LexicalDeclaration$0 = $TS($S(LetOrConst, LexicalBinding, $Q($S(__, Comma, LexicalBinding))), function($skip, $loc, $0, $1, $2, $3) {
+        var binding = $2;
+        var tail = $3;
+        return {
+          type: "Declaration",
+          children: $0,
+          names: [...binding.names].concat(tail.flatMap(([, , b]) => b.names))
+        };
       });
-      var LexicalDeclaration$1 = $TS($S(InsertConst, $C(BindingPattern, BindingIdentifier), $E(TypeSuffix), __, ConstAssignment, AssignmentExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var LexicalDeclaration$1 = $TS($S(InsertConst, $C(BindingPattern, BindingIdentifier), $E(TypeSuffix), __, ConstAssignment, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         var c = $1;
+        var id = $2;
         var ca = $5;
+        var e = $6;
         c.$loc = {
           pos: ca.$loc.pos - 1,
           length: ca.$loc.length + 1
         };
+        let exp;
+        if (e.type === "FunctionExpression") {
+          exp = e;
+        } else {
+          exp = e[1];
+        }
+        if (exp?.children?.[0]?.token?.match(/^\s+$/))
+          exp.children.shift();
+        if (id.type === "Identifier" && exp?.type === "FunctionExpression") {
+          if (exp.id.length === 0) {
+            exp.id.push(" ", id, $3, $4);
+          }
+          exp.type = "Declaration";
+          exp.names = id.names;
+          return exp;
+        }
         return {
-          type: "VariableDeclaration",
+          type: "Declaration",
+          names: id.names,
           children: $0
         };
       });
@@ -3310,7 +4142,7 @@ var Civet = (() => {
           return LexicalDeclaration$0(state) || LexicalDeclaration$1(state);
         }
       }
-      var ConstAssignment$0 = $TV($EXPECT($L78, fail, 'ConstAssignment ":="'), function($skip, $loc, $0, $1) {
+      var ConstAssignment$0 = $TV($EXPECT($L82, fail, 'ConstAssignment ":="'), function($skip, $loc, $0, $1) {
         return { $loc, token: "=" };
       });
       function ConstAssignment(state) {
@@ -3322,8 +4154,19 @@ var Civet = (() => {
           return ConstAssignment$0(state);
         }
       }
-      var LexicalBinding$0 = $S(BindingPattern, $E(TypeSuffix), Initializer);
-      var LexicalBinding$1 = $S(BindingIdentifier, $E(TypeSuffix), $E(Initializer));
+      var LexicalBinding$0 = $TS($S(BindingPattern, $E(TypeSuffix), Initializer), function($skip, $loc, $0, $1, $2, $3) {
+        if ($2)
+          $1.children.push($2);
+        $1.children.push($3);
+        return $1;
+      });
+      var LexicalBinding$1 = $TS($S(BindingIdentifier, $E(TypeSuffix), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3) {
+        if ($2)
+          $1.children.push($2);
+        if ($3)
+          $1.children.push($3);
+        return $1;
+      });
       function LexicalBinding(state) {
         if (state.tokenize) {
           return $TOKEN("LexicalBinding", state, LexicalBinding$0(state) || LexicalBinding$1(state));
@@ -3331,7 +4174,7 @@ var Civet = (() => {
           return LexicalBinding$0(state) || LexicalBinding$1(state);
         }
       }
-      var Initializer$0 = $S(__, Equals, AssignmentExpression);
+      var Initializer$0 = $S(__, Equals, ExtendedExpression);
       function Initializer(state) {
         if (state.verbose)
           console.log("ENTER:", "Initializer");
@@ -3341,8 +4184,9 @@ var Civet = (() => {
           return Initializer$0(state);
         }
       }
-      var VariableStatement$0 = $T($S(Var, __, VariableDeclarationList), function(value) {
-        return { "type": "VariableDeclaration", "children": value };
+      var VariableStatement$0 = $TS($S(Var, __, VariableDeclarationList), function($skip, $loc, $0, $1, $2, $3) {
+        $3.children.splice(0, 0, $1, ...$2);
+        return $3;
       });
       function VariableStatement(state) {
         if (state.verbose)
@@ -3353,7 +4197,20 @@ var Civet = (() => {
           return VariableStatement$0(state);
         }
       }
-      var VariableDeclarationList$0 = $S(VariableDeclaration, $Q($S(__, Comma, __, VariableDeclaration)));
+      var VariableDeclarationList$0 = $TS($S(VariableDeclaration, $Q($S(__, Comma, __, VariableDeclaration))), function($skip, $loc, $0, $1, $2) {
+        let children;
+        if ($2.length) {
+          children = [$1, ...$2];
+        } else {
+          children = [$1];
+        }
+        const names = children.flatMap((c) => c.names || []);
+        return {
+          type: "Declaration",
+          children,
+          names
+        };
+      });
       function VariableDeclarationList(state) {
         if (state.verbose)
           console.log("ENTER:", "VariableDeclarationList");
@@ -3363,8 +4220,19 @@ var Civet = (() => {
           return VariableDeclarationList$0(state);
         }
       }
-      var VariableDeclaration$0 = $S(BindingPattern, $E(TypeSuffix), Initializer);
-      var VariableDeclaration$1 = $S(BindingIdentifier, $E(TypeSuffix), $E(Initializer));
+      var VariableDeclaration$0 = $TS($S(BindingPattern, $E(TypeSuffix), Initializer), function($skip, $loc, $0, $1, $2, $3) {
+        if ($2)
+          $1.children.push($2);
+        $1.children.push($3);
+        return $1;
+      });
+      var VariableDeclaration$1 = $TS($S(BindingIdentifier, $E(TypeSuffix), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3) {
+        if ($2)
+          $1.children.push($2);
+        if ($3)
+          $1.children.push($3);
+        return $1;
+      });
       function VariableDeclaration(state) {
         if (state.tokenize) {
           return $TOKEN("VariableDeclaration", state, VariableDeclaration$0(state) || VariableDeclaration$1(state));
@@ -3545,7 +4413,7 @@ var Civet = (() => {
           return TripleSingleStringCharacters$0(state);
         }
       }
-      var CoffeeStringSubstitution$0 = $S(CoffeeSubstitutionStart, Expression, __, CloseBrace);
+      var CoffeeStringSubstitution$0 = $S(CoffeeSubstitutionStart, ExtendedExpression, __, CloseBrace);
       function CoffeeStringSubstitution(state) {
         if (state.verbose)
           console.log("ENTER:", "CoffeeStringSubstitution");
@@ -3596,7 +4464,7 @@ var Civet = (() => {
           return CoffeeDoubleQuotedStringCharacters$0(state);
         }
       }
-      var RegularExpressionLiteral$0 = $TV($TEXT($S($EXPECT($L46, fail, 'RegularExpressionLiteral "/"'), RegularExpressionBody, $EXPECT($L46, fail, 'RegularExpressionLiteral "/"'), RegularExpressionFlags)), function($skip, $loc, $0, $1) {
+      var RegularExpressionLiteral$0 = $TV($TEXT($S($EXPECT($L47, fail, 'RegularExpressionLiteral "/"'), RegularExpressionBody, $EXPECT($L47, fail, 'RegularExpressionLiteral "/"'), RegularExpressionFlags)), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function RegularExpressionLiteral(state) {
@@ -3649,7 +4517,7 @@ var Civet = (() => {
           return TemplateLiteral$0(state) || TemplateLiteral$1(state);
         }
       }
-      var TemplateSubstitution$0 = $S(SubstitutionStart, Expression, __, CloseBrace);
+      var TemplateSubstitution$0 = $S(SubstitutionStart, ExtendedExpression, __, CloseBrace);
       function TemplateSubstitution(state) {
         if (state.verbose)
           console.log("ENTER:", "TemplateSubstitution");
@@ -3684,12 +4552,13 @@ var Civet = (() => {
         }
       }
       var ReservedWord$0 = $S(CoffeeBooleansEnabled, $R$0($EXPECT($R23, fail, "ReservedWord /(?:on|off|yes|no)(?!\\p{ID_Continue})/")));
-      var ReservedWord$1 = $R$0($EXPECT($R24, fail, "ReservedWord /(?:and|as|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|loop|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
+      var ReservedWord$1 = $S(CoffeeIsntEnabled, $R$0($EXPECT($R24, fail, "ReservedWord /(?:isnt)(?!\\p{ID_Continue})/")));
+      var ReservedWord$2 = $R$0($EXPECT($R25, fail, "ReservedWord /(?:and|as|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|loop|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
       function ReservedWord(state) {
         if (state.tokenize) {
-          return $TOKEN("ReservedWord", state, ReservedWord$0(state) || ReservedWord$1(state));
+          return $TOKEN("ReservedWord", state, ReservedWord$0(state) || ReservedWord$1(state) || ReservedWord$2(state));
         } else {
-          return ReservedWord$0(state) || ReservedWord$1(state);
+          return ReservedWord$0(state) || ReservedWord$1(state) || ReservedWord$2(state);
         }
       }
       var Comment$0 = MultiLineComment;
@@ -3701,7 +4570,7 @@ var Civet = (() => {
           return Comment$0(state) || Comment$1(state);
         }
       }
-      var SingleLineComment$0 = $TR($EXPECT($R25, fail, "SingleLineComment /\\/\\/[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var SingleLineComment$0 = $TR($EXPECT($R26, fail, "SingleLineComment /\\/\\/[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       var SingleLineComment$1 = $S(CoffeeCommentEnabled, CoffeeSingleLineComment);
@@ -3721,7 +4590,7 @@ var Civet = (() => {
           return MultiLineComment$0(state) || MultiLineComment$1(state);
         }
       }
-      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L79, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L80, fail, 'JSMultiLineComment "*/"')), $EXPECT($R26, fail, "JSMultiLineComment /./"))), $EXPECT($L80, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L83, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L84, fail, 'JSMultiLineComment "*/"')), $EXPECT($R27, fail, "JSMultiLineComment /./"))), $EXPECT($L84, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function JSMultiLineComment(state) {
@@ -3733,7 +4602,7 @@ var Civet = (() => {
           return JSMultiLineComment$0(state);
         }
       }
-      var CoffeeSingleLineComment$0 = $TR($EXPECT($R27, fail, "CoffeeSingleLineComment /#([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var CoffeeSingleLineComment$0 = $TR($EXPECT($R28, fail, "CoffeeSingleLineComment /#([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: `//${$1}` };
       });
       function CoffeeSingleLineComment(state) {
@@ -3745,7 +4614,7 @@ var Civet = (() => {
           return CoffeeSingleLineComment$0(state);
         }
       }
-      var CoffeeMultiLineComment$0 = $TS($S($EXPECT($L81, fail, 'CoffeeMultiLineComment "###"'), $TEXT($Q($S($N($C($EXPECT($L81, fail, 'CoffeeMultiLineComment "###"'), $EXPECT($L80, fail, 'CoffeeMultiLineComment "*/"'))), $EXPECT($R26, fail, "CoffeeMultiLineComment /./")))), $EXPECT($L81, fail, 'CoffeeMultiLineComment "###"')), function($skip, $loc, $0, $1, $2, $3) {
+      var CoffeeMultiLineComment$0 = $TS($S($EXPECT($L85, fail, 'CoffeeMultiLineComment "###"'), $TEXT($Q($S($N($C($EXPECT($L85, fail, 'CoffeeMultiLineComment "###"'), $EXPECT($L84, fail, 'CoffeeMultiLineComment "*/"'))), $EXPECT($R27, fail, "CoffeeMultiLineComment /./")))), $EXPECT($L85, fail, 'CoffeeMultiLineComment "###"')), function($skip, $loc, $0, $1, $2, $3) {
         return { $loc, token: `/*${$2}*/` };
       });
       function CoffeeMultiLineComment(state) {
@@ -3757,7 +4626,7 @@ var Civet = (() => {
           return CoffeeMultiLineComment$0(state);
         }
       }
-      var InlineComment$0 = $TV($TEXT($S($EXPECT($L79, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L80, fail, 'InlineComment "*/"')), $EXPECT($R28, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L80, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
+      var InlineComment$0 = $TV($TEXT($S($EXPECT($L83, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L84, fail, 'InlineComment "*/"')), $EXPECT($R29, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L84, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function InlineComment(state) {
@@ -3799,7 +4668,7 @@ var Civet = (() => {
           return _$0(state);
         }
       }
-      var NonNewlineWhitespace$0 = $TR($EXPECT($R29, fail, "NonNewlineWhitespace /[ \\t]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var NonNewlineWhitespace$0 = $TR($EXPECT($R30, fail, "NonNewlineWhitespace /[ \\t]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function NonNewlineWhitespace(state) {
@@ -3821,7 +4690,7 @@ var Civet = (() => {
           return __$0(state);
         }
       }
-      var Whitespace$0 = $TR($EXPECT($R30, fail, "Whitespace /[\\s]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var Whitespace$0 = $TR($EXPECT($R31, fail, "Whitespace /[\\s]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function Whitespace(state) {
@@ -3833,6 +4702,20 @@ var Civet = (() => {
           return Whitespace$0(state);
         }
       }
+      var ExpressionDelimiter$0 = $TS($S($Q(TrailingComment), Semicolon, $Q(TrailingComment)), function($skip, $loc, $0, $1, $2, $3) {
+        $2.token = ",";
+        return $0;
+      });
+      var ExpressionDelimiter$1 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
+        return { $loc, token: "," };
+      });
+      function ExpressionDelimiter(state) {
+        if (state.tokenize) {
+          return $TOKEN("ExpressionDelimiter", state, ExpressionDelimiter$0(state) || ExpressionDelimiter$1(state));
+        } else {
+          return ExpressionDelimiter$0(state) || ExpressionDelimiter$1(state);
+        }
+      }
       var StatementDelimiter$0 = $S($Q(TrailingComment), Semicolon, $Q(TrailingComment));
       var StatementDelimiter$1 = $Y(EOS);
       function StatementDelimiter(state) {
@@ -3842,7 +4725,7 @@ var Civet = (() => {
           return StatementDelimiter$0(state) || StatementDelimiter$1(state);
         }
       }
-      var NonIdContinue$0 = $R$0($EXPECT($R31, fail, "NonIdContinue /(?!\\p{ID_Continue})/"));
+      var NonIdContinue$0 = $R$0($EXPECT($R32, fail, "NonIdContinue /(?!\\p{ID_Continue})/"));
       function NonIdContinue(state) {
         if (state.verbose)
           console.log("ENTER:", "NonIdContinue");
@@ -3864,7 +4747,19 @@ var Civet = (() => {
           return Loc$0(state);
         }
       }
-      var As$0 = $TS($S($EXPECT($L82, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Ampersand$0 = $TV($EXPECT($L71, fail, 'Ampersand "&"'), function($skip, $loc, $0, $1) {
+        return { $loc, token: $1 };
+      });
+      function Ampersand(state) {
+        if (state.verbose)
+          console.log("ENTER:", "Ampersand");
+        if (state.tokenize) {
+          return $TOKEN("Ampersand", state, Ampersand$0(state));
+        } else {
+          return Ampersand$0(state);
+        }
+      }
+      var As$0 = $TS($S($EXPECT($L86, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function As(state) {
@@ -3876,7 +4771,7 @@ var Civet = (() => {
           return As$0(state);
         }
       }
-      var Async$0 = $TV($EXPECT($L83, fail, 'Async "async"'), function($skip, $loc, $0, $1) {
+      var Async$0 = $TV($EXPECT($L87, fail, 'Async "async"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Async(state) {
@@ -3888,7 +4783,7 @@ var Civet = (() => {
           return Async$0(state);
         }
       }
-      var Await$0 = $TS($S($EXPECT($L84, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Await$0 = $TS($S($EXPECT($L88, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Await(state) {
@@ -3900,7 +4795,7 @@ var Civet = (() => {
           return Await$0(state);
         }
       }
-      var Backtick$0 = $TV($EXPECT($L85, fail, 'Backtick "`"'), function($skip, $loc, $0, $1) {
+      var Backtick$0 = $TV($EXPECT($L89, fail, 'Backtick "`"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Backtick(state) {
@@ -3912,7 +4807,7 @@ var Civet = (() => {
           return Backtick$0(state);
         }
       }
-      var Case$0 = $TS($S($EXPECT($L86, fail, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Case$0 = $TS($S($EXPECT($L90, fail, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Case(state) {
@@ -3924,7 +4819,7 @@ var Civet = (() => {
           return Case$0(state);
         }
       }
-      var Catch$0 = $TV($EXPECT($L87, fail, 'Catch "catch"'), function($skip, $loc, $0, $1) {
+      var Catch$0 = $TV($EXPECT($L91, fail, 'Catch "catch"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Catch(state) {
@@ -3936,7 +4831,7 @@ var Civet = (() => {
           return Catch$0(state);
         }
       }
-      var Class$0 = $TV($EXPECT($L88, fail, 'Class "class"'), function($skip, $loc, $0, $1) {
+      var Class$0 = $TV($EXPECT($L92, fail, 'Class "class"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Class(state) {
@@ -3948,7 +4843,7 @@ var Civet = (() => {
           return Class$0(state);
         }
       }
-      var CloseBrace$0 = $TV($EXPECT($L26, fail, 'CloseBrace "}"'), function($skip, $loc, $0, $1) {
+      var CloseBrace$0 = $TV($EXPECT($L27, fail, 'CloseBrace "}"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function CloseBrace(state) {
@@ -3960,7 +4855,7 @@ var Civet = (() => {
           return CloseBrace$0(state);
         }
       }
-      var CloseBracket$0 = $TV($EXPECT($L25, fail, 'CloseBracket "]"'), function($skip, $loc, $0, $1) {
+      var CloseBracket$0 = $TV($EXPECT($L26, fail, 'CloseBracket "]"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function CloseBracket(state) {
@@ -3972,7 +4867,7 @@ var Civet = (() => {
           return CloseBracket$0(state);
         }
       }
-      var CloseParen$0 = $TV($EXPECT($L15, fail, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
+      var CloseParen$0 = $TV($EXPECT($L16, fail, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function CloseParen(state) {
@@ -3984,7 +4879,7 @@ var Civet = (() => {
           return CloseParen$0(state);
         }
       }
-      var CoffeeSubstitutionStart$0 = $TV($EXPECT($L89, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
+      var CoffeeSubstitutionStart$0 = $TV($EXPECT($L93, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "${" };
       });
       function CoffeeSubstitutionStart(state) {
@@ -3996,7 +4891,7 @@ var Civet = (() => {
           return CoffeeSubstitutionStart$0(state);
         }
       }
-      var Colon$0 = $TV($EXPECT($L90, fail, 'Colon ":"'), function($skip, $loc, $0, $1) {
+      var Colon$0 = $TV($EXPECT($L94, fail, 'Colon ":"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Colon(state) {
@@ -4020,7 +4915,7 @@ var Civet = (() => {
           return ConstructorShorthand$0(state);
         }
       }
-      var Default$0 = $TS($S($EXPECT($L77, fail, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Default$0 = $TS($S($EXPECT($L81, fail, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Default(state) {
@@ -4032,7 +4927,7 @@ var Civet = (() => {
           return Default$0(state);
         }
       }
-      var Delete$0 = $TS($S($EXPECT($L91, fail, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Delete$0 = $TS($S($EXPECT($L95, fail, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Delete(state) {
@@ -4044,7 +4939,7 @@ var Civet = (() => {
           return Delete$0(state);
         }
       }
-      var Do$0 = $TS($S($EXPECT($L92, fail, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Do$0 = $TS($S($EXPECT($L96, fail, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Do(state) {
@@ -4056,7 +4951,7 @@ var Civet = (() => {
           return Do$0(state);
         }
       }
-      var Dot$0 = $TV($EXPECT($L93, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
+      var Dot$0 = $TV($EXPECT($L9, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Dot(state) {
@@ -4068,7 +4963,7 @@ var Civet = (() => {
           return Dot$0(state);
         }
       }
-      var DotDot$0 = $TV($EXPECT($L94, fail, 'DotDot ".."'), function($skip, $loc, $0, $1) {
+      var DotDot$0 = $TV($EXPECT($L97, fail, 'DotDot ".."'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function DotDot(state) {
@@ -4080,7 +4975,7 @@ var Civet = (() => {
           return DotDot$0(state);
         }
       }
-      var DotDotDot$0 = $TV($EXPECT($L95, fail, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
+      var DotDotDot$0 = $TV($EXPECT($L98, fail, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function DotDotDot(state) {
@@ -4092,7 +4987,7 @@ var Civet = (() => {
           return DotDotDot$0(state);
         }
       }
-      var DoubleQuote$0 = $TV($EXPECT($L96, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
+      var DoubleQuote$0 = $TV($EXPECT($L99, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function DoubleQuote(state) {
@@ -4104,7 +4999,7 @@ var Civet = (() => {
           return DoubleQuote$0(state);
         }
       }
-      var Else$0 = $TV($EXPECT($L97, fail, 'Else "else"'), function($skip, $loc, $0, $1) {
+      var Else$0 = $TV($EXPECT($L100, fail, 'Else "else"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Else(state) {
@@ -4116,7 +5011,7 @@ var Civet = (() => {
           return Else$0(state);
         }
       }
-      var Equals$0 = $TV($EXPECT($L43, fail, 'Equals "="'), function($skip, $loc, $0, $1) {
+      var Equals$0 = $TV($EXPECT($L44, fail, 'Equals "="'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Equals(state) {
@@ -4128,7 +5023,7 @@ var Civet = (() => {
           return Equals$0(state);
         }
       }
-      var Export$0 = $TS($S($EXPECT($L98, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Export$0 = $TS($S($EXPECT($L101, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Export(state) {
@@ -4140,7 +5035,7 @@ var Civet = (() => {
           return Export$0(state);
         }
       }
-      var For$0 = $TS($S($EXPECT($L99, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var For$0 = $TS($S($EXPECT($L102, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function For(state) {
@@ -4152,7 +5047,7 @@ var Civet = (() => {
           return For$0(state);
         }
       }
-      var From$0 = $TS($S($EXPECT($L100, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var From$0 = $TS($S($EXPECT($L103, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function From(state) {
@@ -4164,7 +5059,7 @@ var Civet = (() => {
           return From$0(state);
         }
       }
-      var Function$0 = $TV($EXPECT($L101, fail, 'Function "function"'), function($skip, $loc, $0, $1) {
+      var Function$0 = $TV($EXPECT($L104, fail, 'Function "function"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Function(state) {
@@ -4176,7 +5071,7 @@ var Civet = (() => {
           return Function$0(state);
         }
       }
-      var GetOrSet$0 = $TS($S($C($EXPECT($L102, fail, 'GetOrSet "get"'), $EXPECT($L103, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var GetOrSet$0 = $TS($S($C($EXPECT($L105, fail, 'GetOrSet "get"'), $EXPECT($L106, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function GetOrSet(state) {
@@ -4188,7 +5083,7 @@ var Civet = (() => {
           return GetOrSet$0(state);
         }
       }
-      var If$0 = $TV($EXPECT($L104, fail, 'If "if"'), function($skip, $loc, $0, $1) {
+      var If$0 = $TV($TEXT($S($EXPECT($L107, fail, 'If "if"'), $E($EXPECT($L108, fail, 'If " "')))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function If(state) {
@@ -4200,7 +5095,7 @@ var Civet = (() => {
           return If$0(state);
         }
       }
-      var Import$0 = $TS($S($EXPECT($L10, fail, 'Import "import"'), $Y($EXPECT($R32, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
+      var Import$0 = $TS($S($EXPECT($L11, fail, 'Import "import"'), $Y($EXPECT($R33, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Import(state) {
@@ -4212,7 +5107,7 @@ var Civet = (() => {
           return Import$0(state);
         }
       }
-      var In$0 = $TV($EXPECT($L67, fail, 'In "in"'), function($skip, $loc, $0, $1) {
+      var In$0 = $TV($EXPECT($L70, fail, 'In "in"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function In(state) {
@@ -4224,7 +5119,7 @@ var Civet = (() => {
           return In$0(state);
         }
       }
-      var LetOrConst$0 = $TV($C($EXPECT($L105, fail, 'LetOrConst "let"'), $EXPECT($L106, fail, 'LetOrConst "const"')), function($skip, $loc, $0, $1) {
+      var LetOrConst$0 = $TV($C($EXPECT($L109, fail, 'LetOrConst "let"'), $EXPECT($L110, fail, 'LetOrConst "const"')), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function LetOrConst(state) {
@@ -4236,7 +5131,7 @@ var Civet = (() => {
           return LetOrConst$0(state);
         }
       }
-      var Loop$0 = $TS($S($EXPECT($L107, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Loop$0 = $TS($S($EXPECT($L111, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "while(true)" };
       });
       function Loop(state) {
@@ -4248,7 +5143,7 @@ var Civet = (() => {
           return Loop$0(state);
         }
       }
-      var New$0 = $TV($EXPECT($L108, fail, 'New "new"'), function($skip, $loc, $0, $1) {
+      var New$0 = $TV($EXPECT($L112, fail, 'New "new"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function New(state) {
@@ -4260,7 +5155,19 @@ var Civet = (() => {
           return New$0(state);
         }
       }
-      var Of$0 = $TV($EXPECT($L109, fail, 'Of "of"'), function($skip, $loc, $0, $1) {
+      var Not$0 = $TS($S(CoffeeNotEnabled, $EXPECT($L113, fail, 'Not "not"'), NonIdContinue, $E($EXPECT($L108, fail, 'Not " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+        return { $loc, token: "!" };
+      });
+      function Not(state) {
+        if (state.verbose)
+          console.log("ENTER:", "Not");
+        if (state.tokenize) {
+          return $TOKEN("Not", state, Not$0(state));
+        } else {
+          return Not$0(state);
+        }
+      }
+      var Of$0 = $TV($EXPECT($L65, fail, 'Of "of"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Of(state) {
@@ -4272,7 +5179,7 @@ var Civet = (() => {
           return Of$0(state);
         }
       }
-      var OpenBrace$0 = $TV($EXPECT($L110, fail, 'OpenBrace "{"'), function($skip, $loc, $0, $1) {
+      var OpenBrace$0 = $TV($EXPECT($L114, fail, 'OpenBrace "{"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenBrace(state) {
@@ -4284,7 +5191,7 @@ var Civet = (() => {
           return OpenBrace$0(state);
         }
       }
-      var OpenBracket$0 = $TV($EXPECT($L111, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
+      var OpenBracket$0 = $TV($EXPECT($L115, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenBracket(state) {
@@ -4296,7 +5203,7 @@ var Civet = (() => {
           return OpenBracket$0(state);
         }
       }
-      var OpenParen$0 = $TV($EXPECT($L112, fail, 'OpenParen "("'), function($skip, $loc, $0, $1) {
+      var OpenParen$0 = $TV($EXPECT($L116, fail, 'OpenParen "("'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenParen(state) {
@@ -4308,7 +5215,7 @@ var Civet = (() => {
           return OpenParen$0(state);
         }
       }
-      var QuestionMark$0 = $TV($EXPECT($L113, fail, 'QuestionMark "?"'), function($skip, $loc, $0, $1) {
+      var QuestionMark$0 = $TV($EXPECT($L117, fail, 'QuestionMark "?"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function QuestionMark(state) {
@@ -4320,7 +5227,7 @@ var Civet = (() => {
           return QuestionMark$0(state);
         }
       }
-      var Return$0 = $TS($S($EXPECT($L114, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Return$0 = $TS($S($EXPECT($L118, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Return(state) {
@@ -4332,7 +5239,7 @@ var Civet = (() => {
           return Return$0(state);
         }
       }
-      var Semicolon$0 = $TV($EXPECT($L71, fail, 'Semicolon ";"'), function($skip, $loc, $0, $1) {
+      var Semicolon$0 = $TV($EXPECT($L74, fail, 'Semicolon ";"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Semicolon(state) {
@@ -4344,7 +5251,7 @@ var Civet = (() => {
           return Semicolon$0(state);
         }
       }
-      var SingleQuote$0 = $TV($EXPECT($L115, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
+      var SingleQuote$0 = $TV($EXPECT($L119, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function SingleQuote(state) {
@@ -4356,7 +5263,7 @@ var Civet = (() => {
           return SingleQuote$0(state);
         }
       }
-      var Star$0 = $TV($EXPECT($L45, fail, 'Star "*"'), function($skip, $loc, $0, $1) {
+      var Star$0 = $TV($EXPECT($L46, fail, 'Star "*"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Star(state) {
@@ -4368,10 +5275,10 @@ var Civet = (() => {
           return Star$0(state);
         }
       }
-      var Static$0 = $TV($EXPECT($L116, fail, 'Static "static"'), function($skip, $loc, $0, $1) {
+      var Static$0 = $TV($EXPECT($L120, fail, 'Static "static"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
-      var Static$1 = $TS($S($EXPECT($L8, fail, 'Static "@"'), $N($EXPECT($L112, fail, 'Static "("'))), function($skip, $loc, $0, $1, $2) {
+      var Static$1 = $TS($S($EXPECT($L8, fail, 'Static "@"'), $N($EXPECT($L116, fail, 'Static "("'))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "static " };
       });
       function Static(state) {
@@ -4381,7 +5288,7 @@ var Civet = (() => {
           return Static$0(state) || Static$1(state);
         }
       }
-      var SubstitutionStart$0 = $TV($EXPECT($L117, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
+      var SubstitutionStart$0 = $TV($EXPECT($L121, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function SubstitutionStart(state) {
@@ -4393,7 +5300,7 @@ var Civet = (() => {
           return SubstitutionStart$0(state);
         }
       }
-      var Switch$0 = $TS($S($EXPECT($L118, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Switch$0 = $TS($S($EXPECT($L122, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Switch(state) {
@@ -4405,7 +5312,7 @@ var Civet = (() => {
           return Switch$0(state);
         }
       }
-      var Target$0 = $TV($EXPECT($L119, fail, 'Target "target"'), function($skip, $loc, $0, $1) {
+      var Target$0 = $TV($EXPECT($L123, fail, 'Target "target"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Target(state) {
@@ -4417,7 +5324,19 @@ var Civet = (() => {
           return Target$0(state);
         }
       }
-      var Throw$0 = $TS($S($EXPECT($L120, fail, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Then$0 = $TS($S(__, $EXPECT($L124, fail, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+        return { $loc, token: "" };
+      });
+      function Then(state) {
+        if (state.verbose)
+          console.log("ENTER:", "Then");
+        if (state.tokenize) {
+          return $TOKEN("Then", state, Then$0(state));
+        } else {
+          return Then$0(state);
+        }
+      }
+      var Throw$0 = $TS($S($EXPECT($L125, fail, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Throw(state) {
@@ -4429,7 +5348,7 @@ var Civet = (() => {
           return Throw$0(state);
         }
       }
-      var TripleDoubleQuote$0 = $TV($EXPECT($L121, fail, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
+      var TripleDoubleQuote$0 = $TV($EXPECT($L126, fail, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleDoubleQuote(state) {
@@ -4441,7 +5360,7 @@ var Civet = (() => {
           return TripleDoubleQuote$0(state);
         }
       }
-      var TripleSingleQuote$0 = $TV($EXPECT($L122, fail, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
+      var TripleSingleQuote$0 = $TV($EXPECT($L127, fail, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleSingleQuote(state) {
@@ -4453,7 +5372,7 @@ var Civet = (() => {
           return TripleSingleQuote$0(state);
         }
       }
-      var TripleTick$0 = $TV($EXPECT($L123, fail, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
+      var TripleTick$0 = $TV($EXPECT($L128, fail, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleTick(state) {
@@ -4465,7 +5384,7 @@ var Civet = (() => {
           return TripleTick$0(state);
         }
       }
-      var Try$0 = $TV($EXPECT($L124, fail, 'Try "try"'), function($skip, $loc, $0, $1) {
+      var Try$0 = $TV($EXPECT($L129, fail, 'Try "try"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Try(state) {
@@ -4477,7 +5396,7 @@ var Civet = (() => {
           return Try$0(state);
         }
       }
-      var Typeof$0 = $TS($S($EXPECT($L125, fail, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Typeof$0 = $TS($S($EXPECT($L130, fail, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Typeof(state) {
@@ -4489,7 +5408,7 @@ var Civet = (() => {
           return Typeof$0(state);
         }
       }
-      var Unless$0 = $TV($EXPECT($L126, fail, 'Unless "unless"'), function($skip, $loc, $0, $1) {
+      var Unless$0 = $TV($EXPECT($L131, fail, 'Unless "unless"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Unless(state) {
@@ -4501,7 +5420,7 @@ var Civet = (() => {
           return Unless$0(state);
         }
       }
-      var Until$0 = $TS($S($EXPECT($L127, fail, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Until$0 = $TS($S($EXPECT($L132, fail, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Until(state) {
@@ -4513,7 +5432,7 @@ var Civet = (() => {
           return Until$0(state);
         }
       }
-      var Var$0 = $TV($EXPECT($L128, fail, 'Var "var"'), function($skip, $loc, $0, $1) {
+      var Var$0 = $TV($EXPECT($L133, fail, 'Var "var"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Var(state) {
@@ -4525,7 +5444,7 @@ var Civet = (() => {
           return Var$0(state);
         }
       }
-      var Void$0 = $TS($S($EXPECT($L129, fail, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Void$0 = $TS($S($EXPECT($L134, fail, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Void(state) {
@@ -4537,7 +5456,7 @@ var Civet = (() => {
           return Void$0(state);
         }
       }
-      var When$0 = $TS($S($EXPECT($L130, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var When$0 = $TS($S($EXPECT($L135, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "case" };
       });
       function When(state) {
@@ -4549,7 +5468,7 @@ var Civet = (() => {
           return When$0(state);
         }
       }
-      var While$0 = $TS($S($EXPECT($L131, fail, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var While$0 = $TS($S($EXPECT($L136, fail, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function While(state) {
@@ -4561,7 +5480,7 @@ var Civet = (() => {
           return While$0(state);
         }
       }
-      var Yield$0 = $TS($S($EXPECT($L132, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Yield$0 = $TS($S($EXPECT($L137, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Yield(state) {
@@ -4587,7 +5506,7 @@ var Civet = (() => {
           return JSXElement$0(state) || JSXElement$1(state);
         }
       }
-      var JSXSelfClosingElement$0 = $S($EXPECT($L4, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L133, fail, 'JSXSelfClosingElement "/>"'));
+      var JSXSelfClosingElement$0 = $S($EXPECT($L4, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L138, fail, 'JSXSelfClosingElement "/>"'));
       function JSXSelfClosingElement(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXSelfClosingElement");
@@ -4597,7 +5516,7 @@ var Civet = (() => {
           return JSXSelfClosingElement$0(state);
         }
       }
-      var JSXOpeningElement$0 = $S($EXPECT($L4, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L55, fail, 'JSXOpeningElement ">"'));
+      var JSXOpeningElement$0 = $S($EXPECT($L4, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L56, fail, 'JSXOpeningElement ">"'));
       function JSXOpeningElement(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXOpeningElement");
@@ -4607,7 +5526,7 @@ var Civet = (() => {
           return JSXOpeningElement$0(state);
         }
       }
-      var JSXClosingElement$0 = $S($EXPECT($L134, fail, 'JSXClosingElement "</"'), __, $TEXT(JSXElementName), __, $EXPECT($L55, fail, 'JSXClosingElement ">"'));
+      var JSXClosingElement$0 = $S($EXPECT($L139, fail, 'JSXClosingElement "</"'), __, $TEXT(JSXElementName), __, $EXPECT($L56, fail, 'JSXClosingElement ">"'));
       function JSXClosingElement(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXClosingElement");
@@ -4617,7 +5536,7 @@ var Civet = (() => {
           return JSXClosingElement$0(state);
         }
       }
-      var JSXFragment$0 = $S($EXPECT($L135, fail, 'JSXFragment "<>"'), $E(JSXChildren), $EXPECT($L136, fail, 'JSXFragment "</>"'));
+      var JSXFragment$0 = $S($EXPECT($L140, fail, 'JSXFragment "<>"'), $E(JSXChildren), $EXPECT($L141, fail, 'JSXFragment "</>"'));
       function JSXFragment(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXFragment");
@@ -4637,7 +5556,7 @@ var Civet = (() => {
           return JSXElementName$0(state);
         }
       }
-      var JSXIdentifierName$0 = $R$0($EXPECT($R33, fail, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
+      var JSXIdentifierName$0 = $R$0($EXPECT($R34, fail, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
       function JSXIdentifierName(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXIdentifierName");
@@ -4657,7 +5576,7 @@ var Civet = (() => {
           return JSXAttributes$0(state);
         }
       }
-      var JSXAttribute$0 = $S(OpenBrace, __, DotDotDot, __, AssignmentExpression, __, CloseBrace);
+      var JSXAttribute$0 = $S(OpenBrace, __, DotDotDot, ExtendedExpression, __, CloseBrace);
       var JSXAttribute$1 = $S(JSXAttributeName, $E(JSXAttributeInitializer));
       function JSXAttribute(state) {
         if (state.tokenize) {
@@ -4686,9 +5605,9 @@ var Civet = (() => {
           return JSXAttributeInitializer$0(state);
         }
       }
-      var JSXAttributeValue$0 = $R$0($EXPECT($R34, fail, 'JSXAttributeValue /"[^"]*"/'));
-      var JSXAttributeValue$1 = $R$0($EXPECT($R35, fail, "JSXAttributeValue /'[^']*'/"));
-      var JSXAttributeValue$2 = $S(OpenBrace, __, AssignmentExpression, __, CloseBrace);
+      var JSXAttributeValue$0 = $R$0($EXPECT($R35, fail, 'JSXAttributeValue /"[^"]*"/'));
+      var JSXAttributeValue$1 = $R$0($EXPECT($R36, fail, "JSXAttributeValue /'[^']*'/"));
+      var JSXAttributeValue$2 = $S(OpenBrace, ExtendedExpression, __, CloseBrace);
       var JSXAttributeValue$3 = JSXElement;
       var JSXAttributeValue$4 = JSXFragment;
       function JSXAttributeValue(state) {
@@ -4719,7 +5638,7 @@ var Civet = (() => {
           return JSXChild$0(state) || JSXChild$1(state) || JSXChild$2(state) || JSXChild$3(state);
         }
       }
-      var JSXText$0 = $R$0($EXPECT($R36, fail, "JSXText /[^{}<>]+/"));
+      var JSXText$0 = $R$0($EXPECT($R37, fail, "JSXText /[^{}<>]+/"));
       function JSXText(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXText");
@@ -4729,7 +5648,7 @@ var Civet = (() => {
           return JSXText$0(state);
         }
       }
-      var JSXChildExpression$0 = $S(__, $E($S(DotDotDot, __)), AssignmentExpression);
+      var JSXChildExpression$0 = $S(__, $E($S(DotDotDot, __)), ExtendedExpression);
       function JSXChildExpression(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXChildExpression");
@@ -4751,7 +5670,7 @@ var Civet = (() => {
           return TypeDeclaration$0(state);
         }
       }
-      var TypeDeclarationModifier$0 = $S($EXPECT($L137, fail, 'TypeDeclarationModifier "declare"'), NonIdContinue);
+      var TypeDeclarationModifier$0 = $S($EXPECT($L142, fail, 'TypeDeclarationModifier "declare"'), NonIdContinue);
       var TypeDeclarationModifier$1 = Export;
       function TypeDeclarationModifier(state) {
         if (state.tokenize) {
@@ -4771,7 +5690,7 @@ var Civet = (() => {
           return TypeDeclarationRest$0(state) || TypeDeclarationRest$1(state) || TypeDeclarationRest$2(state) || TypeDeclarationRest$3(state);
         }
       }
-      var TypeKeyword$0 = $S($EXPECT($L138, fail, 'TypeKeyword "type"'), NonIdContinue);
+      var TypeKeyword$0 = $S($EXPECT($L143, fail, 'TypeKeyword "type"'), NonIdContinue);
       function TypeKeyword(state) {
         if (state.verbose)
           console.log("ENTER:", "TypeKeyword");
@@ -4781,7 +5700,7 @@ var Civet = (() => {
           return TypeKeyword$0(state);
         }
       }
-      var Interface$0 = $S($EXPECT($L139, fail, 'Interface "interface"'), NonIdContinue);
+      var Interface$0 = $S($EXPECT($L144, fail, 'Interface "interface"'), NonIdContinue);
       function Interface(state) {
         if (state.verbose)
           console.log("ENTER:", "Interface");
@@ -4791,7 +5710,7 @@ var Civet = (() => {
           return Interface$0(state);
         }
       }
-      var Namespace$0 = $S($EXPECT($L140, fail, 'Namespace "namespace"'), NonIdContinue);
+      var Namespace$0 = $S($EXPECT($L145, fail, 'Namespace "namespace"'), NonIdContinue);
       function Namespace(state) {
         if (state.verbose)
           console.log("ENTER:", "Namespace");
@@ -4891,7 +5810,7 @@ var Civet = (() => {
           return NestedTypeDeclaration$0(state);
         }
       }
-      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R37, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L141, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R38, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
+      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R38, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L146, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R39, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
       function TypeIndexSignature(state) {
         if (state.verbose)
           console.log("ENTER:", "TypeIndexSignature");
@@ -4922,7 +5841,7 @@ var Civet = (() => {
           return TypeSuffix$0(state);
         }
       }
-      var ReturnTypeSuffix$0 = $TS($S(__, Colon, $E($S(__, $EXPECT($L142, fail, 'ReturnTypeSuffix "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var ReturnTypeSuffix$0 = $TS($S(__, Colon, $E($S(__, $EXPECT($L147, fail, 'ReturnTypeSuffix "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2, $3, $4) {
         if (!$3)
           $0.splice(2, 1);
         if ($1.length === 0)
@@ -4942,7 +5861,7 @@ var Civet = (() => {
           return ReturnTypeSuffix$0(state);
         }
       }
-      var TypePredicate$0 = $TS($S(Type, $E($S(__, $EXPECT($L58, fail, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
+      var TypePredicate$0 = $TS($S(Type, $E($S(__, $EXPECT($L60, fail, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
         if (!$2)
           return $1;
         return $0;
@@ -5005,9 +5924,9 @@ var Civet = (() => {
           return TypeUnarySuffix$0(state) || TypeUnarySuffix$1(state);
         }
       }
-      var TypeUnaryOp$0 = $EXPECT($L143, fail, 'TypeUnaryOp "keyof"');
-      var TypeUnaryOp$1 = $EXPECT($L125, fail, 'TypeUnaryOp "typeof"');
-      var TypeUnaryOp$2 = $EXPECT($L144, fail, 'TypeUnaryOp "infer"');
+      var TypeUnaryOp$0 = $EXPECT($L148, fail, 'TypeUnaryOp "keyof"');
+      var TypeUnaryOp$1 = $EXPECT($L130, fail, 'TypeUnaryOp "typeof"');
+      var TypeUnaryOp$2 = $EXPECT($L149, fail, 'TypeUnaryOp "infer"');
       function TypeUnaryOp(state) {
         if (state.tokenize) {
           return $TOKEN("TypeUnaryOp", state, TypeUnaryOp$0(state) || TypeUnaryOp$1(state) || TypeUnaryOp$2(state));
@@ -5097,10 +6016,10 @@ var Civet = (() => {
         }
       }
       var TypeLiteral$0 = Literal;
-      var TypeLiteral$1 = $TV($EXPECT($L129, fail, 'TypeLiteral "void"'), function($skip, $loc, $0, $1) {
+      var TypeLiteral$1 = $TV($EXPECT($L134, fail, 'TypeLiteral "void"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "void" };
       });
-      var TypeLiteral$2 = $TV($EXPECT($L145, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+      var TypeLiteral$2 = $TV($EXPECT($L150, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "[]" };
       });
       function TypeLiteral(state) {
@@ -5110,10 +6029,10 @@ var Civet = (() => {
           return TypeLiteral$0(state) || TypeLiteral$1(state) || TypeLiteral$2(state);
         }
       }
-      var TypeBinaryOp$0 = $TV($EXPECT($L70, fail, 'TypeBinaryOp "|"'), function($skip, $loc, $0, $1) {
+      var TypeBinaryOp$0 = $TV($EXPECT($L73, fail, 'TypeBinaryOp "|"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "|" };
       });
-      var TypeBinaryOp$1 = $TV($EXPECT($L68, fail, 'TypeBinaryOp "&"'), function($skip, $loc, $0, $1) {
+      var TypeBinaryOp$1 = $TV($EXPECT($L71, fail, 'TypeBinaryOp "&"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "&" };
       });
       function TypeBinaryOp(state) {
@@ -5133,7 +6052,7 @@ var Civet = (() => {
           return FunctionType$0(state);
         }
       }
-      var TypeArguments$0 = $S(__, $EXPECT($L4, fail, 'TypeArguments "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L55, fail, 'TypeArguments ">"'));
+      var TypeArguments$0 = $S(__, $EXPECT($L4, fail, 'TypeArguments "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L56, fail, 'TypeArguments ">"'));
       function TypeArguments(state) {
         if (state.verbose)
           console.log("ENTER:", "TypeArguments");
@@ -5143,7 +6062,7 @@ var Civet = (() => {
           return TypeArguments$0(state);
         }
       }
-      var TypeParameters$0 = $TS($S(__, $EXPECT($L4, fail, 'TypeParameters "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L55, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+      var TypeParameters$0 = $TS($S(__, $EXPECT($L4, fail, 'TypeParameters "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L56, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
         return { ts: true, children: $0 };
       });
       function TypeParameters(state) {
@@ -5176,8 +6095,8 @@ var Civet = (() => {
         }
       }
       var TypeParameterDelimiter$0 = $S($Q(_), Comma);
-      var TypeParameterDelimiter$1 = $Y($S($Q(_), $EXPECT($L55, fail, 'TypeParameterDelimiter ">"')));
-      var TypeParameterDelimiter$2 = $TV($Y($S(__, $EXPECT($L55, fail, 'TypeParameterDelimiter ">"'))), function($skip, $loc, $0, $1) {
+      var TypeParameterDelimiter$1 = $Y($S($Q(_), $EXPECT($L56, fail, 'TypeParameterDelimiter ">"')));
+      var TypeParameterDelimiter$2 = $TV($Y($S(__, $EXPECT($L56, fail, 'TypeParameterDelimiter ">"'))), function($skip, $loc, $0, $1) {
         return { $loc, token: "," };
       });
       var TypeParameterDelimiter$3 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
@@ -5190,7 +6109,7 @@ var Civet = (() => {
           return TypeParameterDelimiter$0(state) || TypeParameterDelimiter$1(state) || TypeParameterDelimiter$2(state) || TypeParameterDelimiter$3(state);
         }
       }
-      var Shebang$0 = $S($R$0($EXPECT($R39, fail, "Shebang /#![^\\r\\n]*/")), EOL);
+      var Shebang$0 = $S($R$0($EXPECT($R40, fail, "Shebang /#![^\\r\\n]*/")), EOL);
       function Shebang(state) {
         if (state.verbose)
           console.log("ENTER:", "Shebang");
@@ -5200,11 +6119,11 @@ var Civet = (() => {
           return Shebang$0(state);
         }
       }
-      var CivetPrologue$0 = $T($S($EXPECT($R40, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
+      var CivetPrologue$0 = $T($S($EXPECT($R41, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
         var content = value[2];
         return content;
       });
-      var CivetPrologue$1 = $T($S($EXPECT($R40, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
+      var CivetPrologue$1 = $T($S($EXPECT($R41, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
         var content = value[2];
         return content;
       });
@@ -5215,7 +6134,7 @@ var Civet = (() => {
           return CivetPrologue$0(state) || CivetPrologue$1(state);
         }
       }
-      var CivetPrologueContent$0 = $TS($S($EXPECT($L146, fail, 'CivetPrologueContent "civet"'), $Q(CivetOption), $EXPECT($R41, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3) {
+      var CivetPrologueContent$0 = $TS($S($EXPECT($L151, fail, 'CivetPrologueContent "civet"'), $Q(CivetOption), $EXPECT($R42, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3) {
         var options = $2;
         return {
           type: "CivetPrologue",
@@ -5232,7 +6151,7 @@ var Civet = (() => {
           return CivetPrologueContent$0(state);
         }
       }
-      var CivetOption$0 = $TR($EXPECT($R42, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var CivetOption$0 = $TR($EXPECT($R43, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         const optionName = $2.replace(/-+([a-z]?)/g, (_2, l) => {
           if (l)
             return l.toUpperCase();
@@ -5250,7 +6169,7 @@ var Civet = (() => {
           return CivetOption$0(state);
         }
       }
-      var UnknownPrologue$0 = $S($R$0($EXPECT($R40, fail, "UnknownPrologue /[\\t ]*/")), BasicStringLiteral, $TEXT(StatementDelimiter), EOS);
+      var UnknownPrologue$0 = $S($R$0($EXPECT($R41, fail, "UnknownPrologue /[\\t ]*/")), BasicStringLiteral, $TEXT(StatementDelimiter), EOS);
       function UnknownPrologue(state) {
         if (state.verbose)
           console.log("ENTER:", "UnknownPrologue");
@@ -5279,7 +6198,7 @@ var Civet = (() => {
           return EOS$0(state);
         }
       }
-      var EOL$0 = $TR($EXPECT($R43, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var EOL$0 = $TR($EXPECT($R44, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function EOL(state) {
@@ -5463,6 +6382,20 @@ var Civet = (() => {
           return CoffeeBooleansEnabled$0(state);
         }
       }
+      var CoffeeForLoopsEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeForLoopsEnabled ""'), function($skip, $loc, $0, $1) {
+        if (module.config.coffeeForLoops)
+          return;
+        return $skip;
+      });
+      function CoffeeForLoopsEnabled(state) {
+        if (state.verbose)
+          console.log("ENTER:", "CoffeeForLoopsEnabled");
+        if (state.tokenize) {
+          return $TOKEN("CoffeeForLoopsEnabled", state, CoffeeForLoopsEnabled$0(state));
+        } else {
+          return CoffeeForLoopsEnabled$0(state);
+        }
+      }
       var CoffeeInterpolationEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeInterpolationEnabled ""'), function($skip, $loc, $0, $1) {
         if (module.config.coffeeInterpolation)
           return;
@@ -5477,6 +6410,48 @@ var Civet = (() => {
           return CoffeeInterpolationEnabled$0(state);
         }
       }
+      var CoffeeIsntEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeIsntEnabled ""'), function($skip, $loc, $0, $1) {
+        if (module.config.coffeeIsnt)
+          return;
+        return $skip;
+      });
+      function CoffeeIsntEnabled(state) {
+        if (state.verbose)
+          console.log("ENTER:", "CoffeeIsntEnabled");
+        if (state.tokenize) {
+          return $TOKEN("CoffeeIsntEnabled", state, CoffeeIsntEnabled$0(state));
+        } else {
+          return CoffeeIsntEnabled$0(state);
+        }
+      }
+      var CoffeeNotEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeNotEnabled ""'), function($skip, $loc, $0, $1) {
+        if (module.config.coffeeNot)
+          return;
+        return $skip;
+      });
+      function CoffeeNotEnabled(state) {
+        if (state.verbose)
+          console.log("ENTER:", "CoffeeNotEnabled");
+        if (state.tokenize) {
+          return $TOKEN("CoffeeNotEnabled", state, CoffeeNotEnabled$0(state));
+        } else {
+          return CoffeeNotEnabled$0(state);
+        }
+      }
+      var CoffeeOfEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeOfEnabled ""'), function($skip, $loc, $0, $1) {
+        if (module.config.coffeeOf)
+          return;
+        return $skip;
+      });
+      function CoffeeOfEnabled(state) {
+        if (state.verbose)
+          console.log("ENTER:", "CoffeeOfEnabled");
+        if (state.tokenize) {
+          return $TOKEN("CoffeeOfEnabled", state, CoffeeOfEnabled$0(state));
+        } else {
+          return CoffeeOfEnabled$0(state);
+        }
+      }
       var Reset$0 = $TV($EXPECT($L0, fail, 'Reset ""'), function($skip, $loc, $0, $1) {
         module.currentIndent = 0;
         module.indentLevels = [0];
@@ -5486,9 +6461,51 @@ var Civet = (() => {
           coffeeBooleans: false,
           coffeeComment: false,
           coffeeEq: false,
+          coffeeForLoops: false,
           coffeeInterpolation: false,
+          coffeeIsnt: false,
+          coffeeNot: false,
+          coffeeOf: false,
           implicitReturns: true
         };
+        let indexOfRef, hasPropRef;
+        module.prelude = [];
+        module.getIndexOfRef = function() {
+          if (indexOfRef)
+            return indexOfRef;
+          indexOfRef = {
+            type: "Ref",
+            base: "indexOf"
+          };
+          const typeSuffix = {
+            ts: true,
+            children: [": <T>(this: T[], searchElement: T) => boolean"]
+          };
+          const asAny = {
+            ts: true,
+            children: [" as any"]
+          };
+          module.prelude.push(["", "const ", indexOfRef, typeSuffix, " = [].indexOf", asAny, "\n"]);
+          return indexOfRef;
+        };
+        module.getHasPropRef = function() {
+          if (hasPropRef)
+            return hasPropRef;
+          hasPropRef = {
+            type: "Ref",
+            base: "hasProp"
+          };
+          const typeSuffix = {
+            ts: true,
+            children: [": <T>(this: T, prop: keyof T) => boolean"]
+          };
+          const asAny = {
+            ts: true,
+            children: [" as any"]
+          };
+          module.prelude.push(["", "const ", hasPropRef, typeSuffix, " = {}.hasOwnProperty", asAny, "\n"]);
+          return hasPropRef;
+        };
         Object.defineProperty(module.config, "coffeeCompat", {
           set(b) {
             if (b) {
@@ -5496,15 +6513,21 @@ var Civet = (() => {
               this.coffeeBooleans = true;
               this.coffeeComment = true;
               this.coffeeEq = true;
+              this.coffeeForLoops = true;
               this.coffeeInterpolation = true;
-              this.implicitReturns = true;
+              this.coffeeIsnt = true;
+              this.coffeeNot = true;
+              this.coffeeOf = true;
             } else {
               this.autoVar = false;
               this.coffeeBooleans = false;
               this.coffeeComment = false;
               this.coffeeEq = false;
+              this.coffeeForLoops = false;
               this.coffeeInterpolation = false;
-              this.implicitReturns = false;
+              this.coffeeIsnt = false;
+              this.coffeeNot = false;
+              this.coffeeOf = false;
             }
           }
         });
@@ -5536,7 +6559,7 @@ var Civet = (() => {
               node.children.unshift("return ");
               return;
             case "Identifier":
-              node.token = "return " + node.token;
+              node.children.unshift("return ");
               return;
             case "BlockStatement":
               insertReturn(node.expressions[node.expressions.length - 1]);
@@ -5569,10 +6592,11 @@ var Civet = (() => {
             case "ContinueStatement":
             case "DebuggerStatement":
             case "EmptyStatement":
+            case "ForStatement":
             case "IterationStatement":
             case "ReturnStatement":
             case "ThrowStatement":
-            case "VariableDeclaration":
+            case "Declaration":
               return;
             case "BlockStatement":
               insertReturn(exp.expressions[exp.expressions.length - 1]);
@@ -5618,7 +6642,7 @@ var Civet = (() => {
           let chains = [];
           while (i < l) {
             const [, op] = binops[i];
-            if (relationalOps.includes(op.token)) {
+            if (relationalOps.includes(op.token) || op.type === "Ref") {
               chains.push(i);
             } else if (lowerPrecedenceOps.includes(op.token)) {
               processChains();
@@ -5632,7 +6656,7 @@ var Civet = (() => {
             if (chains.length > 1) {
               chains.forEach((index, k) => {
                 if (k > 0) {
-                  results.push(" && ");
+                  results.push(" ", "&&", " ");
                 }
                 const [pre, op, post, exp] = binops[index];
                 let endIndex;
@@ -5680,9 +6704,12 @@ var Civet = (() => {
         };
         module.insertTrimmingSpace = function(spacing, c) {
           let target = spacing;
-          while (Array.isArray(target)) {
-            target = target[0];
-          }
+          if (!target)
+            return;
+          if (Array.isArray(target))
+            return module.insertTrimmingSpace(target[0], c);
+          if (target.children)
+            return module.insertTrimmingSpace(target.children[0], c);
           if (target.token) {
             target.token = target.token.replace(/^ ?/, c);
           }
@@ -5738,6 +6765,137 @@ var Civet = (() => {
             token: str
           };
         };
+        function gatherNodes(node, predicate) {
+          if (node == null)
+            return [];
+          if (Array.isArray(node)) {
+            return node.flatMap((n) => gatherNodes(n, predicate));
+          }
+          if (predicate(node)) {
+            return [node];
+          }
+          switch (node.type) {
+            case "BlockStatement":
+              return [];
+            case "ForStatement":
+              const isDec = node.declaration?.type === "Declaration";
+              return node.children.flatMap((n) => {
+                if (isDec && n === node.declaration)
+                  return [];
+                return gatherNodes(n, predicate);
+              });
+            default:
+              return gatherNodes(node.children, predicate);
+          }
+          return [];
+        }
+        function gatherRecursive(node, predicate) {
+          if (node == null)
+            return [];
+          if (Array.isArray(node)) {
+            return node.flatMap((n) => gatherNodes(n, predicate));
+          }
+          if (predicate(node)) {
+            return [node];
+          }
+          return gatherNodes(node.children, predicate);
+        }
+        module.processProgram = function(statements) {
+          statements.unshift(...module.prelude);
+          if (module.config.autoVar) {
+            createVarDecs(statements, []);
+          }
+          populateRefs(statements);
+        };
+        function findDecs(statements) {
+          const declarationNames = gatherNodes(statements, (node) => {
+            if (node.type === "Declaration") {
+              return true;
+            }
+          }).flatMap((d) => d.names);
+          return new Set(declarationNames);
+        }
+        function populateRefs(statements) {
+          const refNodes = gatherNodes(statements, ({ type }) => type === "Ref");
+          const blockNodes = new Set(gatherNodes(statements, ({ type }) => type === "BlockStatement"));
+          const forNodes = gatherNodes(statements, ({ type }) => type === "ForStatement");
+          forNodes.forEach(({ declaration, block }) => {
+            if (block.type === "BlockStatement") {
+              populateRefs([declaration, ...block.children]);
+            } else {
+              populateRefs([declaration, ...block]);
+            }
+            blockNodes.delete(block);
+          });
+          blockNodes.forEach(({ expressions }) => populateRefs(expressions));
+          if (refNodes.length) {
+            const ids = gatherRecursive(statements, (s) => s.type === "Identifier");
+            const names = new Set(ids.flatMap(({ names: names2 }) => names2 || []));
+            refNodes.forEach((ref) => {
+              const { type, base } = ref;
+              if (type !== "Ref")
+                return;
+              ref.type = "Identifier";
+              let n = 0;
+              let name = base;
+              while (names.has(name)) {
+                n++;
+                name = `${base}${n}`;
+              }
+              names.add(name);
+              ref.children = ref.names = [name];
+            });
+          }
+        }
+        function createVarDecs(statements, scopes, pushVar) {
+          function hasDec(name) {
+            return scopes.some((s) => s.has(name));
+          }
+          function findAssignments(statements2, decs2) {
+            const assignmentStatements = gatherNodes(statements2, (node) => {
+              return node.type === "AssignmentExpression";
+            });
+            const undeclaredIdentifiers = assignmentStatements.flatMap((a) => {
+              return a.names;
+            });
+            return undeclaredIdentifiers.filter((x, i, a) => {
+              if (!hasDec(x))
+                return a.indexOf(x) === i;
+            });
+          }
+          if (!pushVar) {
+            pushVar = function(name) {
+              varIds.push(name);
+              decs.add(name);
+            };
+          }
+          const decs = findDecs(statements);
+          scopes.push(decs);
+          const varIds = [];
+          findAssignments(statements, scopes).forEach(pushVar);
+          const fnNodes = gatherNodes(statements, (s) => s.type === "FunctionExpression");
+          const forNodes = gatherNodes(statements, (s) => s.type === "ForStatement");
+          const blockNodes = new Set(gatherNodes(statements, (s) => s.type === "BlockStatement"));
+          fnNodes.forEach(({ block }) => blockNodes.delete(block));
+          forNodes.forEach(({ block }) => blockNodes.delete(block));
+          blockNodes.forEach((block) => {
+            createVarDecs(block.expressions, scopes, pushVar);
+          });
+          forNodes.forEach(({ block, declaration }) => {
+            scopes.push(new Set(declaration.names));
+            createVarDecs(block.expressions, scopes, pushVar);
+            scopes.pop();
+          });
+          fnNodes.forEach(({ block, parameters }) => {
+            scopes.push(new Set(parameters.names));
+            createVarDecs(block.expressions, scopes);
+            scopes.pop();
+          });
+          if (varIds.length) {
+            const indent = statements[0][0];
+            statements.unshift([indent, "var ", varIds.join(", "), "\n"]);
+          }
+        }
         return $0;
       });
       function Init(state) {
@@ -5749,7 +6907,7 @@ var Civet = (() => {
           return Init$0(state);
         }
       }
-      var Indent$0 = $TV($Q($C($EXPECT($L147, fail, 'Indent "  "'), $EXPECT($L148, fail, 'Indent "\\\\t"'))), function($skip, $loc, $0, $1) {
+      var Indent$0 = $TV($Q($C($EXPECT($L152, fail, 'Indent "  "'), $EXPECT($L153, fail, 'Indent "\\\\t"'))), function($skip, $loc, $0, $1) {
         const level = $1.length;
         return {
           $loc,