@danielx/civet 0.4.3 → 0.4.5

package/dist/browser.js

@@ -505,7 +505,6 @@ var Civet = (() => {
         PropertyName,
         MethodDefinition,
         MethodModifier,
-        ConstructorShorthand,
         MethodSignature,
         ClassElementName,
         PrivateIdentifier,
@@ -535,6 +534,7 @@ var Civet = (() => {
         NestedCaseClauses,
         NestedCaseClause,
         CaseClause,
+        CaseExpressionList,
         ImpliedColon,
         TryStatement,
         CatchClause,
@@ -580,12 +580,12 @@ var Civet = (() => {
         OctalIntegerLiteral,
         HexLiteral,
         StringLiteral,
-        DoubleStringCharacter,
-        SingleStringCharacter,
+        BasicStringLiteral,
+        DoubleStringCharacters,
+        SingleStringCharacters,
         TripleDoubleStringCharacters,
         TripleSingleStringCharacters,
         CoffeeStringSubstitution,
-        CoffeeSubstitutionStart,
         RegularExpressionLiteral,
         RegularExpressionBody,
         RegExpCharacter,
@@ -593,6 +593,7 @@ var Civet = (() => {
         TemplateLiteral,
         TemplateSubstitution,
         TemplateCharacters,
+        TemplateBlockCharacters,
         ReservedWord,
         Comment,
         SingleLineComment,
@@ -613,13 +614,18 @@ var Civet = (() => {
         As,
         Async,
         Await,
+        Case,
         Catch,
         Class,
         CloseBrace,
         CloseBracket,
         CloseParen,
+        CoffeeSubstitutionStart,
         Colon,
+        ConstructorShorthand,
+        Default,
         Dot,
+        DoubleQuote,
         Else,
         Equals,
         Export,
@@ -640,7 +646,10 @@ var Civet = (() => {
         QuestionMark,
         Return,
         Semicolon,
+        SingleQuote,
+        Star,
         Static,
+        SubstitutionStart,
         Switch,
         Target,
         TripleDoubleQuote,
@@ -650,6 +659,7 @@ var Civet = (() => {
         Unless,
         Var,
         When,
+        Yield,
         JSXElement,
         JSXSelfClosingElement,
         JSXOpeningElement,
@@ -731,130 +741,130 @@ var Civet = (() => {
       var $L1 = $L("");
       var $L2 = $L("++");
       var $L3 = $L("--");
-      var $L4 = $L("yield");
-      var $L5 = $L("*");
-      var $L6 = $L("=>");
-      var $L7 = $L("<");
-      var $L8 = $L("extends");
-      var $L9 = $L("this");
-      var $L10 = $L("#");
-      var $L11 = $L("@");
-      var $L12 = $L("super");
-      var $L13 = $L("import");
-      var $L14 = $L("!");
-      var $L15 = $L("::");
-      var $L16 = $L("super[");
-      var $L17 = $L("import.meta");
-      var $L18 = $L(")");
-      var $L19 = $L("...");
-      var $L20 = $L("->");
-      var $L21 = $L("null");
-      var $L22 = $L("true");
-      var $L23 = $L("false");
-      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("is");
-      var $L58 = $L("===");
-      var $L59 = $L("==");
-      var $L60 = $L("and");
-      var $L61 = $L("&&");
-      var $L62 = $L("or");
-      var $L63 = $L("||");
-      var $L64 = $L("??");
-      var $L65 = $L("instanceof");
-      var $L66 = $L("in");
-      var $L67 = $L("&");
-      var $L68 = $L("^");
-      var $L69 = $L("|");
-      var $L70 = $L("delete");
-      var $L71 = $L("void");
-      var $L72 = $L("typeof");
-      var $L73 = $L(";");
-      var $L74 = $L("do");
-      var $L75 = $L("while");
-      var $L76 = $L("until");
-      var $L77 = $L("case");
-      var $L78 = $L("default");
-      var $L79 = $L("finally");
-      var $L80 = $L("break");
-      var $L81 = $L("continue");
-      var $L82 = $L("debugger");
-      var $L83 = $L("throw");
-      var $L84 = $L("import type");
-      var $L85 = $L(":=");
-      var $L86 = $L('"');
-      var $L87 = $L("'");
-      var $L88 = $L("#{");
-      var $L89 = $L("${");
-      var $L90 = $L("/*");
-      var $L91 = $L("*/");
-      var $L92 = $L("###");
-      var $L93 = $L("as");
-      var $L94 = $L("async");
-      var $L95 = $L("await");
-      var $L96 = $L("catch");
-      var $L97 = $L("class");
-      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("let");
-      var $L109 = $L("const");
-      var $L110 = $L("loop");
-      var $L111 = $L("new");
-      var $L112 = $L("of");
-      var $L113 = $L("{");
-      var $L114 = $L("[");
-      var $L115 = $L("(");
-      var $L116 = $L("?");
-      var $L117 = $L("return");
-      var $L118 = $L("static");
-      var $L119 = $L("switch");
-      var $L120 = $L("target");
-      var $L121 = $L('"""');
-      var $L122 = $L("'''");
-      var $L123 = $L("```");
-      var $L124 = $L("try");
-      var $L125 = $L("unless");
-      var $L126 = $L("var");
-      var $L127 = $L("when");
+      var $L4 = $L("=>");
+      var $L5 = $L("<");
+      var $L6 = $L("extends");
+      var $L7 = $L("this");
+      var $L8 = $L("#");
+      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("->");
+      var $L19 = $L("null");
+      var $L20 = $L("true");
+      var $L21 = $L("false");
+      var $L22 = $L(",");
+      var $L23 = $L("]");
+      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("is");
+      var $L57 = $L("===");
+      var $L58 = $L("==");
+      var $L59 = $L("and");
+      var $L60 = $L("&&");
+      var $L61 = $L("or");
+      var $L62 = $L("||");
+      var $L63 = $L("??");
+      var $L64 = $L("instanceof");
+      var $L65 = $L("in");
+      var $L66 = $L("&");
+      var $L67 = $L("^");
+      var $L68 = $L("|");
+      var $L69 = $L("delete");
+      var $L70 = $L("void");
+      var $L71 = $L("typeof");
+      var $L72 = $L(";");
+      var $L73 = $L("do");
+      var $L74 = $L("while");
+      var $L75 = $L("until");
+      var $L76 = $L("finally");
+      var $L77 = $L("break");
+      var $L78 = $L("continue");
+      var $L79 = $L("debugger");
+      var $L80 = $L("throw");
+      var $L81 = $L("import type");
+      var $L82 = $L("default");
+      var $L83 = $L(":=");
+      var $L84 = $L("/*");
+      var $L85 = $L("*/");
+      var $L86 = $L("###");
+      var $L87 = $L("as");
+      var $L88 = $L("async");
+      var $L89 = $L("await");
+      var $L90 = $L("case");
+      var $L91 = $L("catch");
+      var $L92 = $L("class");
+      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('"""');
+      var $L121 = $L("'''");
+      var $L122 = $L("```");
+      var $L123 = $L("try");
+      var $L124 = $L("unless");
+      var $L125 = $L("var");
+      var $L126 = $L("when");
+      var $L127 = $L("yield");
       var $L128 = $L("/>");
       var $L129 = $L("</");
       var $L130 = $L("<>");
@@ -879,21 +889,21 @@ var Civet = (() => {
       var $R6 = $R(new RegExp("0[bB][01](?:[01]|_[01])*", "suy"));
       var $R7 = $R(new RegExp("0[oO][0-7](?:[0-7]|_[0-7])*", "suy"));
       var $R8 = $R(new RegExp("0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_[0-9a-fA-F])*", "suy"));
-      var $R9 = $R(new RegExp('(?:\\\\.|[^"])+', "suy"));
-      var $R10 = $R(new RegExp("(?:\\\\.|[^'])+", "suy"));
+      var $R9 = $R(new RegExp('(?:\\\\.|[^"])*', "suy"));
+      var $R10 = $R(new RegExp("(?:\\\\.|[^'])*", "suy"));
       var $R11 = $R(new RegExp('(?:"(?!"")|#(?!\\{)|\\\\.|[^#"])+', "suy"));
       var $R12 = $R(new RegExp("(?:'(?!'')|\\\\.|[^'])*", "suy"));
       var $R13 = $R(new RegExp("[*\\/\\r\\n]", "suy"));
       var $R14 = $R(new RegExp("(?:\\\\.|[^\\/\\r\\n])+", "suy"));
       var $R15 = $R(new RegExp("(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
       var $R16 = $R(new RegExp("(?:\\$(?!\\{)|\\\\.|[^$`])+", "suy"));
-      var $R17 = $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|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
-      var $R18 = $R(new RegExp("\\/\\/[^\\r\\n]*", "suy"));
-      var $R19 = $R(new RegExp(".", "suy"));
-      var $R20 = $R(new RegExp("#([^\\r\\n]*)", "suy"));
-      var $R21 = $R(new RegExp("[^\\r\\n]", "suy"));
-      var $R22 = $R(new RegExp("[ \\t]+", "suy"));
-      var $R23 = $R(new RegExp("[\\t ]+", "suy"));
+      var $R17 = $R(new RegExp("(?:\\$(?!\\{)|`(?!``)|\\\\.|[^$`])+", "suy"));
+      var $R18 = $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|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
+      var $R19 = $R(new RegExp("\\/\\/[^\\r\\n]*", "suy"));
+      var $R20 = $R(new RegExp(".", "suy"));
+      var $R21 = $R(new RegExp("#([^\\r\\n]*)", "suy"));
+      var $R22 = $R(new RegExp("[^\\r\\n]", "suy"));
+      var $R23 = $R(new RegExp("[ \\t]+", "suy"));
       var $R24 = $R(new RegExp("[\\s]+", "suy"));
       var $R25 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
       var $R26 = $R(new RegExp("\\s", "suy"));
@@ -1006,8 +1016,7 @@ var Civet = (() => {
       }
       var ApplicationStart$0 = $TS($S($N(EOS), _, $N(AdditionalReservedWords)), function($skip, $loc, $0, $1, $2, $3) {
         var spacing = $2;
-        spacing[0].token = spacing[0].token.replace(/^ ?/, "(");
-        return spacing;
+        return module.insertTrimmingSpace(spacing, "(");
       });
       var ApplicationStart$1 = $S(IndentedApplicationAllowed, $Y(NestedObjectLiteral), InsertOpenParen);
       function ApplicationStart(state) {
@@ -1132,7 +1141,7 @@ var Civet = (() => {
           return AwaitExpression$0(state);
         }
       }
-      var YieldExpression$0 = $S($EXPECT($L4, fail, 'YieldExpression "yield"'), NonIdContinue, $E($S($Q(TrailingComment), $EXPECT($L5, fail, 'YieldExpression "*"'))), AssignmentExpression);
+      var YieldExpression$0 = $S(Yield, $E($S($Q(TrailingComment), Star)), AssignmentExpression);
       function YieldExpression(state) {
         if (state.verbose)
           console.log("ENTER:", "YieldExpression");
@@ -1151,7 +1160,7 @@ var Civet = (() => {
           return ArrowFunction$0(state) || ArrowFunction$1(state);
         }
       }
-      var FatArrow$0 = $TS($S(__, $EXPECT($L6, fail, 'FatArrow "=>"')), function($skip, $loc, $0, $1, $2) {
+      var FatArrow$0 = $TS($S(__, $EXPECT($L4, fail, 'FatArrow "=>"')), function($skip, $loc, $0, $1, $2) {
         var ws = $1;
         if (!ws.length)
           return " =>";
@@ -1247,10 +1256,10 @@ var Civet = (() => {
           return ClassHeritage$0(state);
         }
       }
-      var ExtendsToken$0 = $TV($EXPECT($L7, fail, 'ExtendsToken "<"'), function($skip, $loc, $0, $1) {
+      var ExtendsToken$0 = $TV($EXPECT($L5, fail, 'ExtendsToken "<"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "extends" };
       });
-      var ExtendsToken$1 = $TV($EXPECT($L8, fail, 'ExtendsToken "extends"'), function($skip, $loc, $0, $1) {
+      var ExtendsToken$1 = $TV($EXPECT($L6, fail, 'ExtendsToken "extends"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function ExtendsToken(state) {
@@ -1320,11 +1329,11 @@ var Civet = (() => {
           return FieldDefinition$0(state) || FieldDefinition$1(state);
         }
       }
-      var This$0 = $TV($EXPECT($L9, fail, 'This "this"'), function($skip, $loc, $0, $1) {
+      var This$0 = $TV($EXPECT($L7, fail, 'This "this"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
-      var This$1 = $S(AtAccessor, $S($E($EXPECT($L10, fail, 'This "#"')), IdentifierName));
-      var This$2 = $TV($EXPECT($L11, fail, 'This "@"'), function($skip, $loc, $0, $1) {
+      var This$1 = $S(AtAccessor, $S($E($EXPECT($L8, fail, 'This "#"')), IdentifierName));
+      var This$2 = $TV($EXPECT($L9, fail, 'This "@"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "this" };
       });
       function This(state) {
@@ -1334,7 +1343,7 @@ var Civet = (() => {
           return This$0(state) || This$1(state) || This$2(state);
         }
       }
-      var AtAccessor$0 = $TV($EXPECT($L11, fail, 'AtAccessor "@"'), function($skip, $loc, $0, $1) {
+      var AtAccessor$0 = $TV($EXPECT($L9, fail, 'AtAccessor "@"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "this." };
       });
       function AtAccessor(state) {
@@ -1365,8 +1374,8 @@ var Civet = (() => {
           return NewExpression$0(state);
         }
       }
-      var CallExpression$0 = $S($EXPECT($L12, fail, 'CallExpression "super"'), ArgumentsWithTrailingCallExpressions);
-      var CallExpression$1 = $S($EXPECT($L13, 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, AssignmentExpression, __, CloseParen);
       var CallExpression$2 = $S(MemberExpression, $Q(CallExpressionRest));
       function CallExpression(state) {
         if (state.tokenize) {
@@ -1395,7 +1404,7 @@ var Civet = (() => {
           return OptionalShorthand$0(state);
         }
       }
-      var NonNullAssertion$0 = $T($EXPECT($L14, fail, 'NonNullAssertion "!"'), function(value) {
+      var NonNullAssertion$0 = $T($EXPECT($L12, fail, 'NonNullAssertion "!"'), function(value) {
         return { "ts": true, "children": value };
       });
       function NonNullAssertion(state) {
@@ -1429,7 +1438,7 @@ var Civet = (() => {
       }
       var MemberExpressionRest$0 = $S($E($C(OptionalShorthand, NonNullAssertion)), OpenBracket, Expression, __, CloseBracket);
       var MemberExpressionRest$1 = $S($E($S($Y(EOS), IndentedFurther)), PropertyAccess);
-      var MemberExpressionRest$2 = $TS($S($E($S($Y(EOS), IndentedFurther)), $EXPECT($L15, 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];
@@ -1453,7 +1462,7 @@ var Civet = (() => {
           return PropertyAccess$0(state);
         }
       }
-      var SuperProperty$0 = $S($EXPECT($L16, fail, 'SuperProperty "super["'), Expression, __, CloseBracket);
+      var SuperProperty$0 = $S($EXPECT($L14, fail, 'SuperProperty "super["'), Expression, __, CloseBracket);
       function SuperProperty(state) {
         if (state.verbose)
           console.log("ENTER:", "SuperProperty");
@@ -1464,7 +1473,7 @@ var Civet = (() => {
         }
       }
       var MetaProperty$0 = $S(New, Dot, Target);
-      var MetaProperty$1 = $TV($EXPECT($L17, 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) {
@@ -1496,8 +1505,8 @@ var Civet = (() => {
         }
       }
       var ParameterElementDelimiter$0 = $S($Q(_), Comma);
-      var ParameterElementDelimiter$1 = $Y($S($Q(_), $EXPECT($L18, fail, 'ParameterElementDelimiter ")"')));
-      var ParameterElementDelimiter$2 = $TV($Y($S(__, $EXPECT($L18, fail, 'ParameterElementDelimiter ")"'))), function($skip, $loc, $0, $1) {
+      var ParameterElementDelimiter$1 = $Y($S($Q(_), $EXPECT($L16, fail, 'ParameterElementDelimiter ")"')));
+      var ParameterElementDelimiter$2 = $TV($Y($S(__, $EXPECT($L16, fail, 'ParameterElementDelimiter ")"'))), function($skip, $loc, $0, $1) {
         return { $loc, token: "," };
       });
       var ParameterElementDelimiter$3 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
@@ -1584,7 +1593,7 @@ var Civet = (() => {
           return BindingProperty$0(state) || BindingProperty$1(state);
         }
       }
-      var BindingRestProperty$0 = $S($EXPECT($L19, fail, 'BindingRestProperty "..."'), BindingIdentifier);
+      var BindingRestProperty$0 = $S($EXPECT($L17, fail, 'BindingRestProperty "..."'), BindingIdentifier);
       function BindingRestProperty(state) {
         if (state.verbose)
           console.log("ENTER:", "BindingRestProperty");
@@ -1632,7 +1641,7 @@ var Civet = (() => {
           return BindingElement$0(state);
         }
       }
-      var BindingRestElement$0 = $S($EXPECT($L19, fail, 'BindingRestElement "..."'), __, $C(BindingIdentifier, BindingPattern));
+      var BindingRestElement$0 = $S($EXPECT($L17, fail, 'BindingRestElement "..."'), __, $C(BindingIdentifier, BindingPattern));
       function BindingRestElement(state) {
         if (state.verbose)
           console.log("ENTER:", "BindingRestElement");
@@ -1653,7 +1662,7 @@ var Civet = (() => {
         }
       }
       var FunctionExpression$0 = ThinArrowFunction;
-      var FunctionExpression$1 = $S($E($S(Async, __)), Function, $E($S($EXPECT($L5, fail, 'FunctionExpression "*"'), __)), $E(BindingIdentifier), __, Parameters, $E(ReturnTypeSuffix), BracedBlock);
+      var FunctionExpression$1 = $S($E($S(Async, __)), Function, $E($S(Star, __)), $E(BindingIdentifier), __, Parameters, $E(ReturnTypeSuffix), BracedBlock);
       function FunctionExpression(state) {
         if (state.tokenize) {
           return $TOKEN("FunctionExpression", state, FunctionExpression$0(state) || FunctionExpression$1(state));
@@ -1682,7 +1691,7 @@ var Civet = (() => {
           return ThinArrowFunction$0(state);
         }
       }
-      var Arrow$0 = $TV($EXPECT($L20, fail, 'Arrow "->"'), function($skip, $loc, $0, $1) {
+      var Arrow$0 = $TV($EXPECT($L18, fail, 'Arrow "->"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Arrow(state) {
@@ -1775,7 +1784,7 @@ var Civet = (() => {
           return Literal$0(state) || Literal$1(state) || Literal$2(state) || Literal$3(state);
         }
       }
-      var NullLiteral$0 = $TV($EXPECT($L21, fail, 'NullLiteral "null"'), function($skip, $loc, $0, $1) {
+      var NullLiteral$0 = $TV($EXPECT($L19, fail, 'NullLiteral "null"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function NullLiteral(state) {
@@ -1787,7 +1796,7 @@ var Civet = (() => {
           return NullLiteral$0(state);
         }
       }
-      var BooleanLiteral$0 = $TV($C($EXPECT($L22, fail, 'BooleanLiteral "true"'), $EXPECT($L23, fail, 'BooleanLiteral "false"')), function($skip, $loc, $0, $1) {
+      var BooleanLiteral$0 = $TV($C($EXPECT($L20, fail, 'BooleanLiteral "true"'), $EXPECT($L21, fail, 'BooleanLiteral "false"')), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function BooleanLiteral(state) {
@@ -1799,7 +1808,7 @@ var Civet = (() => {
           return BooleanLiteral$0(state);
         }
       }
-      var Comma$0 = $TV($EXPECT($L24, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
+      var Comma$0 = $TV($EXPECT($L22, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Comma(state) {
@@ -1881,7 +1890,7 @@ var Civet = (() => {
         }
       }
       var ArrayElementDelimiter$0 = $S($Q(_), Comma);
-      var ArrayElementDelimiter$1 = $Y($S(__, $EXPECT($L25, fail, 'ArrayElementDelimiter "]"')));
+      var ArrayElementDelimiter$1 = $Y($S(__, $EXPECT($L23, fail, 'ArrayElementDelimiter "]"')));
       var ArrayElementDelimiter$2 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
         return { $loc, token: "," };
       });
@@ -1912,7 +1921,7 @@ var Civet = (() => {
           return InlineElementList$0(state);
         }
       }
-      var ArrayElementExpression$0 = $E($S($E($S($EXPECT($L19, fail, 'ArrayElementExpression "..."'), __)), AssignmentExpression));
+      var ArrayElementExpression$0 = $E($S($E($S($EXPECT($L17, fail, 'ArrayElementExpression "..."'), __)), AssignmentExpression));
       function ArrayElementExpression(state) {
         if (state.verbose)
           console.log("ENTER:", "ArrayElementExpression");
@@ -1979,7 +1988,7 @@ var Civet = (() => {
         }
       }
       var ObjectPropertyDelimiter$0 = $S($Q(_), Comma);
-      var ObjectPropertyDelimiter$1 = $Y($S(__, $EXPECT($L26, fail, 'ObjectPropertyDelimiter "}"')));
+      var ObjectPropertyDelimiter$1 = $Y($S(__, $EXPECT($L24, fail, 'ObjectPropertyDelimiter "}"')));
       var ObjectPropertyDelimiter$2 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
         return { $loc, token: "," };
       });
@@ -2002,7 +2011,7 @@ var Civet = (() => {
       }
       var PropertyDefinition$0 = $S(PropertyName, __, Colon, AssignmentExpression);
       var PropertyDefinition$1 = MethodDefinition;
-      var PropertyDefinition$2 = $S($EXPECT($L19, fail, 'PropertyDefinition "..."'), AssignmentExpression);
+      var PropertyDefinition$2 = $S($EXPECT($L17, fail, 'PropertyDefinition "..."'), AssignmentExpression);
       var PropertyDefinition$3 = IdentifierReference;
       function PropertyDefinition(state) {
         if (state.tokenize) {
@@ -2014,7 +2023,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, AssignmentExpression, __, $EXPECT($L23, fail, 'PropertyName "]"'));
       function PropertyName(state) {
         if (state.tokenize) {
           return $TOKEN("PropertyName", state, PropertyName$0(state) || PropertyName$1(state) || PropertyName$2(state) || PropertyName$3(state));
@@ -2033,8 +2042,8 @@ var Civet = (() => {
         }
       }
       var MethodModifier$0 = $S(GetOrSet, $Q(TrailingComment));
-      var MethodModifier$1 = $S($S(Async, __), $E($S($EXPECT($L5, fail, 'MethodModifier "*"'), __)));
-      var MethodModifier$2 = $S($EXPECT($L5, fail, 'MethodModifier "*"'), __);
+      var MethodModifier$1 = $S($S(Async, __), $E($S(Star, __)));
+      var MethodModifier$2 = $S(Star, __);
       var MethodModifier$3 = $S(Async, __);
       function MethodModifier(state) {
         if (state.tokenize) {
@@ -2043,18 +2052,6 @@ var Civet = (() => {
           return MethodModifier$0(state) || MethodModifier$1(state) || MethodModifier$2(state) || MethodModifier$3(state);
         }
       }
-      var ConstructorShorthand$0 = $TV($EXPECT($L11, fail, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
-        return { $loc, token: "constructor" };
-      });
-      function ConstructorShorthand(state) {
-        if (state.verbose)
-          console.log("ENTER:", "ConstructorShorthand");
-        if (state.tokenize) {
-          return $TOKEN("ConstructorShorthand", state, ConstructorShorthand$0(state));
-        } else {
-          return ConstructorShorthand$0(state);
-        }
-      }
       var MethodSignature$0 = $S(ConstructorShorthand, Parameters);
       var MethodSignature$1 = $S($E(MethodModifier), ClassElementName, $Q(_), Parameters);
       function MethodSignature(state) {
@@ -2073,7 +2070,7 @@ var Civet = (() => {
           return ClassElementName$0(state) || ClassElementName$1(state);
         }
       }
-      var PrivateIdentifier$0 = $S($EXPECT($L10, fail, 'PrivateIdentifier "#"'), IdentifierName);
+      var PrivateIdentifier$0 = $S($EXPECT($L8, fail, 'PrivateIdentifier "#"'), IdentifierName);
       function PrivateIdentifier(state) {
         if (state.verbose)
           console.log("ENTER:", "PrivateIdentifier");
@@ -2095,25 +2092,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($L25, fail, 'AssignmentOpSymbol "**="');
+      var AssignmentOpSymbol$1 = $EXPECT($L26, fail, 'AssignmentOpSymbol "*="');
+      var AssignmentOpSymbol$2 = $EXPECT($L27, fail, 'AssignmentOpSymbol "/="');
+      var AssignmentOpSymbol$3 = $EXPECT($L28, fail, 'AssignmentOpSymbol "%="');
+      var AssignmentOpSymbol$4 = $EXPECT($L29, fail, 'AssignmentOpSymbol "+="');
+      var AssignmentOpSymbol$5 = $EXPECT($L30, fail, 'AssignmentOpSymbol "-="');
+      var AssignmentOpSymbol$6 = $EXPECT($L31, fail, 'AssignmentOpSymbol "<<="');
+      var AssignmentOpSymbol$7 = $EXPECT($L32, fail, 'AssignmentOpSymbol ">>>="');
+      var AssignmentOpSymbol$8 = $EXPECT($L33, fail, 'AssignmentOpSymbol ">>="');
+      var AssignmentOpSymbol$9 = $EXPECT($L34, fail, 'AssignmentOpSymbol "&&="');
+      var AssignmentOpSymbol$10 = $EXPECT($L35, fail, 'AssignmentOpSymbol "&="');
+      var AssignmentOpSymbol$11 = $EXPECT($L36, fail, 'AssignmentOpSymbol "^="');
+      var AssignmentOpSymbol$12 = $EXPECT($L37, fail, 'AssignmentOpSymbol "||="');
+      var AssignmentOpSymbol$13 = $EXPECT($L38, fail, 'AssignmentOpSymbol "|="');
+      var AssignmentOpSymbol$14 = $EXPECT($L39, fail, 'AssignmentOpSymbol "??="');
+      var AssignmentOpSymbol$15 = $T($EXPECT($L40, fail, 'AssignmentOpSymbol "?="'), function(value) {
         return "??=";
       });
-      var AssignmentOpSymbol$16 = $EXPECT($L43, fail, 'AssignmentOpSymbol "="');
+      var AssignmentOpSymbol$16 = $EXPECT($L41, 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));
@@ -2133,52 +2130,52 @@ var Civet = (() => {
           return BinaryOp$0(state);
         }
       }
-      var BinaryOpSymbol$0 = $EXPECT($L44, fail, 'BinaryOpSymbol "**"');
-      var BinaryOpSymbol$1 = $EXPECT($L5, fail, 'BinaryOpSymbol "*"');
-      var BinaryOpSymbol$2 = $EXPECT($L45, fail, 'BinaryOpSymbol "/"');
-      var BinaryOpSymbol$3 = $EXPECT($L46, fail, 'BinaryOpSymbol "%"');
-      var BinaryOpSymbol$4 = $EXPECT($L47, fail, 'BinaryOpSymbol "+"');
-      var BinaryOpSymbol$5 = $EXPECT($L48, fail, 'BinaryOpSymbol "-"');
-      var BinaryOpSymbol$6 = $EXPECT($L49, fail, 'BinaryOpSymbol "<="');
-      var BinaryOpSymbol$7 = $EXPECT($L50, fail, 'BinaryOpSymbol ">="');
-      var BinaryOpSymbol$8 = $EXPECT($L51, fail, 'BinaryOpSymbol "<<"');
-      var BinaryOpSymbol$9 = $EXPECT($L7, fail, 'BinaryOpSymbol "<"');
-      var BinaryOpSymbol$10 = $EXPECT($L52, fail, 'BinaryOpSymbol ">>>"');
-      var BinaryOpSymbol$11 = $EXPECT($L53, fail, 'BinaryOpSymbol ">>"');
-      var BinaryOpSymbol$12 = $EXPECT($L54, fail, 'BinaryOpSymbol ">"');
-      var BinaryOpSymbol$13 = $EXPECT($L55, fail, 'BinaryOpSymbol "!=="');
-      var BinaryOpSymbol$14 = $TV($EXPECT($L56, fail, 'BinaryOpSymbol "!="'), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$0 = $EXPECT($L42, fail, 'BinaryOpSymbol "**"');
+      var BinaryOpSymbol$1 = $EXPECT($L43, fail, 'BinaryOpSymbol "*"');
+      var BinaryOpSymbol$2 = $EXPECT($L44, fail, 'BinaryOpSymbol "/"');
+      var BinaryOpSymbol$3 = $EXPECT($L45, fail, 'BinaryOpSymbol "%"');
+      var BinaryOpSymbol$4 = $EXPECT($L46, fail, 'BinaryOpSymbol "+"');
+      var BinaryOpSymbol$5 = $EXPECT($L47, fail, 'BinaryOpSymbol "-"');
+      var BinaryOpSymbol$6 = $EXPECT($L48, fail, 'BinaryOpSymbol "<="');
+      var BinaryOpSymbol$7 = $EXPECT($L49, fail, 'BinaryOpSymbol ">="');
+      var BinaryOpSymbol$8 = $EXPECT($L50, fail, 'BinaryOpSymbol "<<"');
+      var BinaryOpSymbol$9 = $EXPECT($L5, fail, 'BinaryOpSymbol "<"');
+      var BinaryOpSymbol$10 = $EXPECT($L51, fail, 'BinaryOpSymbol ">>>"');
+      var BinaryOpSymbol$11 = $EXPECT($L52, fail, 'BinaryOpSymbol ">>"');
+      var BinaryOpSymbol$12 = $EXPECT($L53, fail, 'BinaryOpSymbol ">"');
+      var BinaryOpSymbol$13 = $EXPECT($L54, fail, 'BinaryOpSymbol "!=="');
+      var BinaryOpSymbol$14 = $TV($EXPECT($L55, fail, 'BinaryOpSymbol "!="'), function($skip, $loc, $0, $1) {
         if (module.coffeeCompat)
           return "!==";
         return $1;
       });
-      var BinaryOpSymbol$15 = $T($S($EXPECT($L57, fail, 'BinaryOpSymbol "is"'), NonIdContinue), function(value) {
+      var BinaryOpSymbol$15 = $T($S($EXPECT($L56, fail, 'BinaryOpSymbol "is"'), NonIdContinue), function(value) {
         return "===";
       });
-      var BinaryOpSymbol$16 = $EXPECT($L58, fail, 'BinaryOpSymbol "==="');
-      var BinaryOpSymbol$17 = $TV($EXPECT($L59, fail, 'BinaryOpSymbol "=="'), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$16 = $EXPECT($L57, fail, 'BinaryOpSymbol "==="');
+      var BinaryOpSymbol$17 = $TV($EXPECT($L58, fail, 'BinaryOpSymbol "=="'), function($skip, $loc, $0, $1) {
         if (module.coffeeCompat)
           return "===";
         return $1;
       });
-      var BinaryOpSymbol$18 = $T($S($EXPECT($L60, fail, 'BinaryOpSymbol "and"'), NonIdContinue), function(value) {
+      var BinaryOpSymbol$18 = $T($S($EXPECT($L59, fail, 'BinaryOpSymbol "and"'), NonIdContinue), function(value) {
         return "&&";
       });
-      var BinaryOpSymbol$19 = $EXPECT($L61, fail, 'BinaryOpSymbol "&&"');
-      var BinaryOpSymbol$20 = $T($S($EXPECT($L62, fail, 'BinaryOpSymbol "or"'), NonIdContinue), function(value) {
+      var BinaryOpSymbol$19 = $EXPECT($L60, fail, 'BinaryOpSymbol "&&"');
+      var BinaryOpSymbol$20 = $T($S($EXPECT($L61, fail, 'BinaryOpSymbol "or"'), NonIdContinue), function(value) {
         return "||";
       });
-      var BinaryOpSymbol$21 = $EXPECT($L63, fail, 'BinaryOpSymbol "||"');
-      var BinaryOpSymbol$22 = $EXPECT($L64, fail, 'BinaryOpSymbol "??"');
-      var BinaryOpSymbol$23 = $TS($S($EXPECT($L65, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var BinaryOpSymbol$21 = $EXPECT($L62, fail, 'BinaryOpSymbol "||"');
+      var BinaryOpSymbol$22 = $EXPECT($L63, fail, 'BinaryOpSymbol "??"');
+      var BinaryOpSymbol$23 = $TS($S($EXPECT($L64, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return $1;
       });
-      var BinaryOpSymbol$24 = $TS($S($EXPECT($L66, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var BinaryOpSymbol$24 = $TS($S($EXPECT($L65, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return $1;
       });
-      var BinaryOpSymbol$25 = $EXPECT($L67, fail, 'BinaryOpSymbol "&"');
-      var BinaryOpSymbol$26 = $EXPECT($L68, fail, 'BinaryOpSymbol "^"');
-      var BinaryOpSymbol$27 = $EXPECT($L69, fail, 'BinaryOpSymbol "|"');
+      var BinaryOpSymbol$25 = $EXPECT($L66, fail, 'BinaryOpSymbol "&"');
+      var BinaryOpSymbol$26 = $EXPECT($L67, fail, 'BinaryOpSymbol "^"');
+      var BinaryOpSymbol$27 = $EXPECT($L68, 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));
@@ -2187,7 +2184,7 @@ var Civet = (() => {
         }
       }
       var UnaryOp$0 = $R$0($EXPECT($R2, fail, "UnaryOp /[!~+-]/"));
-      var UnaryOp$1 = $S($C($EXPECT($L70, fail, 'UnaryOp "delete"'), $EXPECT($L71, fail, 'UnaryOp "void"'), $EXPECT($L72, fail, 'UnaryOp "typeof"')), NonIdContinue, __);
+      var UnaryOp$1 = $S($C($EXPECT($L69, fail, 'UnaryOp "delete"'), $EXPECT($L70, fail, 'UnaryOp "void"'), $EXPECT($L71, fail, 'UnaryOp "typeof"')), NonIdContinue, __);
       function UnaryOp(state) {
         if (state.tokenize) {
           return $TOKEN("UnaryOp", state, UnaryOp$0(state) || UnaryOp$1(state));
@@ -2267,7 +2264,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 = $S($Q(TrailingComment), $Y($EXPECT($L73, fail, 'EmptyStatement ";"')));
+      var EmptyStatement$0 = $S($Q(TrailingComment), $Y($EXPECT($L72, fail, 'EmptyStatement ";"')));
       function EmptyStatement(state) {
         if (state.verbose)
           console.log("ENTER:", "EmptyStatement");
@@ -2332,7 +2329,7 @@ var Civet = (() => {
           return LoopStatement$0(state);
         }
       }
-      var DoWhileStatement$0 = $S($EXPECT($L74, fail, 'DoWhileStatement "do"'), NonIdContinue, Block, __, WhileClause);
+      var DoWhileStatement$0 = $S($EXPECT($L73, fail, 'DoWhileStatement "do"'), NonIdContinue, Block, __, WhileClause);
       function DoWhileStatement(state) {
         if (state.verbose)
           console.log("ENTER:", "DoWhileStatement");
@@ -2352,7 +2349,7 @@ var Civet = (() => {
           return WhileStatement$0(state);
         }
       }
-      var WhileClause$0 = $TS($S($C($EXPECT($L75, fail, 'WhileClause "while"'), $EXPECT($L76, fail, 'WhileClause "until"')), NonIdContinue, Condition), function($skip, $loc, $0, $1, $2, $3) {
+      var WhileClause$0 = $TS($S($C($EXPECT($L74, fail, 'WhileClause "while"'), $EXPECT($L75, fail, 'WhileClause "until"')), NonIdContinue, Condition), function($skip, $loc, $0, $1, $2, $3) {
         var kind = $1;
         var cond = $3;
         if (kind === "until") {
@@ -2411,7 +2408,7 @@ var Civet = (() => {
           return ForBinding$0(state) || ForBinding$1(state);
         }
       }
-      var SwitchStatement$0 = $S(Switch, NonIdContinue, Condition, CaseBlock);
+      var SwitchStatement$0 = $S(Switch, Condition, CaseBlock);
       function SwitchStatement(state) {
         if (state.verbose)
           console.log("ENTER:", "SwitchStatement");
@@ -2455,9 +2452,9 @@ var Civet = (() => {
           return NestedCaseClause$0(state);
         }
       }
-      var CaseClause$0 = $S($EXPECT($L77, fail, 'CaseClause "case"'), NonIdContinue, $Q(_), ExpressionWithIndentedApplicationSuppressed, ImpliedColon, NestedBlockExpressions);
-      var CaseClause$1 = $S(When, $Q(_), ExpressionWithIndentedApplicationSuppressed, ImpliedColon, NestedBlockExpressions, InsertBreak);
-      var CaseClause$2 = $S($EXPECT($L78, fail, 'CaseClause "default"'), NonIdContinue, ImpliedColon, NestedBlockExpressions);
+      var CaseClause$0 = $S(Case, CaseExpressionList, NestedBlockExpressions);
+      var CaseClause$1 = $S(When, CaseExpressionList, NestedBlockExpressions, InsertBreak);
+      var CaseClause$2 = $S(Default, ImpliedColon, NestedBlockExpressions);
       function CaseClause(state) {
         if (state.tokenize) {
           return $TOKEN("CaseClause", state, CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state));
@@ -2465,6 +2462,25 @@ var Civet = (() => {
           return CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state);
         }
       }
+      var CaseExpressionList$0 = $TS($S($S($Q(_), ExpressionWithIndentedApplicationSuppressed, ImpliedColon), $Q($S(__, Comma, ExpressionWithIndentedApplicationSuppressed, ImpliedColon))), function($skip, $loc, $0, $1, $2) {
+        const result = $2.map(([ws, _comma, exp, col]) => {
+          module.insertTrimmingSpace(exp, "");
+          if (ws.length)
+            return [module.insertTrimmingSpace("case ", ws), exp, col];
+          return ["case ", exp, col];
+        });
+        result.unshift($1);
+        return result;
+      });
+      function CaseExpressionList(state) {
+        if (state.verbose)
+          console.log("ENTER:", "CaseExpressionList");
+        if (state.tokenize) {
+          return $TOKEN("CaseExpressionList", state, CaseExpressionList$0(state));
+        } else {
+          return CaseExpressionList$0(state);
+        }
+      }
       var ImpliedColon$0 = $S(__, Colon);
       var ImpliedColon$1 = $TV($EXPECT($L1, fail, 'ImpliedColon ""'), function($skip, $loc, $0, $1) {
         return { $loc, token: ":" };
@@ -2512,7 +2528,7 @@ var Civet = (() => {
           return CatchBind$0(state) || CatchBind$1(state);
         }
       }
-      var Finally$0 = $S(__, $EXPECT($L79, fail, 'Finally "finally"'), BracedBlock);
+      var Finally$0 = $S(__, $EXPECT($L76, fail, 'Finally "finally"'), BracedBlock);
       function Finally(state) {
         if (state.verbose)
           console.log("ENTER:", "Finally");
@@ -2540,7 +2556,7 @@ var Civet = (() => {
           return Condition$0(state) || Condition$1(state);
         }
       }
-      var ExpressionWithIndentedApplicationSuppressed$0 = $TS($S(SuppressIndentedApplication, $E(Expression)), function($skip, $loc, $0, $1, $2) {
+      var ExpressionWithIndentedApplicationSuppressed$0 = $TS($S(SuppressIndentedApplication, $E(AssignmentExpression)), function($skip, $loc, $0, $1, $2) {
         var exp = $2;
         module.suppressIndentedApplication = false;
         if (exp)
@@ -2578,11 +2594,11 @@ var Civet = (() => {
           return ExpressionStatement$0(state);
         }
       }
-      var KeywordStatement$0 = $S($EXPECT($L80, fail, 'KeywordStatement "break"'), NonIdContinue);
-      var KeywordStatement$1 = $S($EXPECT($L81, fail, 'KeywordStatement "continue"'), NonIdContinue);
-      var KeywordStatement$2 = $S($EXPECT($L82, fail, 'KeywordStatement "debugger"'), NonIdContinue);
+      var KeywordStatement$0 = $S($EXPECT($L77, fail, 'KeywordStatement "break"'), NonIdContinue);
+      var KeywordStatement$1 = $S($EXPECT($L78, fail, 'KeywordStatement "continue"'), NonIdContinue);
+      var KeywordStatement$2 = $S($EXPECT($L79, fail, 'KeywordStatement "debugger"'), NonIdContinue);
       var KeywordStatement$3 = $S(Return, $E(MaybeNestedExpression));
-      var KeywordStatement$4 = $S($EXPECT($L83, fail, 'KeywordStatement "throw"'), NonIdContinue, Expression);
+      var KeywordStatement$4 = $S($EXPECT($L80, fail, 'KeywordStatement "throw"'), NonIdContinue, Expression);
       function KeywordStatement(state) {
         if (state.tokenize) {
           return $TOKEN("KeywordStatement", state, KeywordStatement$0(state) || KeywordStatement$1(state) || KeywordStatement$2(state) || KeywordStatement$3(state) || KeywordStatement$4(state));
@@ -2599,7 +2615,7 @@ var Civet = (() => {
           return MaybeNestedExpression$0(state) || MaybeNestedExpression$1(state);
         }
       }
-      var ImportDeclaration$0 = $T($S($EXPECT($L84, fail, 'ImportDeclaration "import type"'), NonIdContinue, __, ImportClause, __, FromClause), function(value) {
+      var ImportDeclaration$0 = $T($S($EXPECT($L81, fail, 'ImportDeclaration "import type"'), NonIdContinue, __, ImportClause, __, FromClause), function(value) {
         return { "ts": true, "children": value };
       });
       var ImportDeclaration$1 = $S(Import, __, ImportClause, __, FromClause);
@@ -2644,7 +2660,7 @@ var Civet = (() => {
           return ImportClause$0(state) || ImportClause$1(state) || ImportClause$2(state);
         }
       }
-      var NameSpaceImport$0 = $S($EXPECT($L5, fail, 'NameSpaceImport "*"'), __, As, NonIdContinue, __, ImportedBinding);
+      var NameSpaceImport$0 = $S(Star, __, As, NonIdContinue, __, ImportedBinding);
       function NameSpaceImport(state) {
         if (state.verbose)
           console.log("ENTER:", "NameSpaceImport");
@@ -2705,7 +2721,7 @@ var Civet = (() => {
           return ModuleSpecifier$0(state);
         }
       }
-      var UnprocessedModuleSpecifier$0 = StringLiteral;
+      var UnprocessedModuleSpecifier$0 = BasicStringLiteral;
       var UnprocessedModuleSpecifier$1 = UnquotedSpecifier;
       function UnprocessedModuleSpecifier(state) {
         if (state.tokenize) {
@@ -2737,7 +2753,7 @@ var Civet = (() => {
           return ImportedBinding$0(state);
         }
       }
-      var ExportDeclaration$0 = $S(Export, __, $EXPECT($L78, fail, 'ExportDeclaration "default"'), NonIdContinue, __, $C(HoistableDeclaration, ClassDeclaration, AssignmentExpression));
+      var ExportDeclaration$0 = $S(Export, __, $EXPECT($L82, fail, 'ExportDeclaration "default"'), NonIdContinue, __, $C(HoistableDeclaration, ClassDeclaration, AssignmentExpression));
       var ExportDeclaration$1 = $S(Export, __, ExportFromClause, __, FromClause);
       var ExportDeclaration$2 = $S(Export, __, $C(NamedExports, VariableStatement, Declaration));
       function ExportDeclaration(state) {
@@ -2747,7 +2763,7 @@ var Civet = (() => {
           return ExportDeclaration$0(state) || ExportDeclaration$1(state) || ExportDeclaration$2(state);
         }
       }
-      var ExportFromClause$0 = $S($EXPECT($L5, fail, 'ExportFromClause "*"'), $E($S(__, As, NonIdContinue, __, ModuleExportName)));
+      var ExportFromClause$0 = $S(Star, $E($S(__, As, NonIdContinue, __, ModuleExportName)));
       var ExportFromClause$1 = NamedExports;
       function ExportFromClause(state) {
         if (state.tokenize) {
@@ -2814,7 +2830,7 @@ var Civet = (() => {
           return LexicalDeclaration$0(state) || LexicalDeclaration$1(state);
         }
       }
-      var ConstAssignment$0 = $TV($EXPECT($L85, fail, 'ConstAssignment ":="'), function($skip, $loc, $0, $1) {
+      var ConstAssignment$0 = $TV($EXPECT($L83, fail, 'ConstAssignment ":="'), function($skip, $loc, $0, $1) {
         return { $loc, token: "=" };
       });
       function ConstAssignment(state) {
@@ -2949,37 +2965,7 @@ var Civet = (() => {
         }
       }
       var StringLiteral$0 = $TS($S(TripleDoubleQuote, $Q($C(TripleDoubleStringCharacters, CoffeeStringSubstitution)), TripleDoubleQuote), function($skip, $loc, $0, $1, $2, $3) {
-        var s = $1;
-        var strWithSubstitutions = $2;
-        var e = $3;
-        if (strWithSubstitutions.length === 0) {
-          return $0;
-        }
-        let initialSpacing, i = 0, l = strWithSubstitutions.length, results = [s];
-        const { token } = strWithSubstitutions[0];
-        if (token) {
-          initialSpacing = token.match(/^(\r?\n|\n)\s+/);
-        } else {
-          initialSpacing = false;
-        }
-        while (i < l) {
-          let segment = strWithSubstitutions[i];
-          if (segment.token) {
-            segment = module.dedentBlockString(segment, initialSpacing, false);
-            if (i === 0) {
-              segment.token = segment.token.replace(/^(\r?\n|\n)/, "");
-            }
-            if (i === l - 1) {
-              segment.token = segment.token.replace(/(\r?\n|\n)[ \t]*$/, "");
-            }
-            results.push(segment);
-          } else {
-            results.push(segment);
-          }
-          i++;
-        }
-        results.push(e);
-        return results;
+        return module.dedentBlockSubstitutions($0);
       });
       var StringLiteral$1 = $TS($S(TripleSingleQuote, TripleSingleStringCharacters, TripleSingleQuote), function($skip, $loc, $0, $1, $2, $3) {
         var s = $1;
@@ -2987,37 +2973,57 @@ var Civet = (() => {
         var e = $3;
         return [s, module.dedentBlockString(str), e];
       });
-      var StringLiteral$2 = $TV($TEXT($S($EXPECT($L86, fail, 'StringLiteral "\\\\\\""'), $Q(DoubleStringCharacter), $EXPECT($L86, fail, 'StringLiteral "\\\\\\""'))), function($skip, $loc, $0, $1) {
-        return { $loc, token: $1 };
+      var StringLiteral$2 = BasicStringLiteral;
+      function StringLiteral(state) {
+        if (state.tokenize) {
+          return $TOKEN("StringLiteral", state, StringLiteral$0(state) || StringLiteral$1(state) || StringLiteral$2(state));
+        } else {
+          return StringLiteral$0(state) || StringLiteral$1(state) || StringLiteral$2(state);
+        }
+      }
+      var BasicStringLiteral$0 = $TS($S(DoubleQuote, DoubleStringCharacters, DoubleQuote), function($skip, $loc, $0, $1, $2, $3) {
+        var str = $2;
+        return {
+          token: `"${module.modifyString(str.token)}"`,
+          $loc
+        };
       });
-      var StringLiteral$3 = $TV($TEXT($S($EXPECT($L87, fail, `StringLiteral "'"`), $Q(SingleStringCharacter), $EXPECT($L87, fail, `StringLiteral "'"`))), function($skip, $loc, $0, $1) {
-        return { $loc, token: $1 };
+      var BasicStringLiteral$1 = $TS($S(SingleQuote, SingleStringCharacters, SingleQuote), function($skip, $loc, $0, $1, $2, $3) {
+        var str = $2;
+        return {
+          token: `'${module.modifyString(str.token)}'`,
+          $loc
+        };
       });
-      function StringLiteral(state) {
+      function BasicStringLiteral(state) {
         if (state.tokenize) {
-          return $TOKEN("StringLiteral", state, StringLiteral$0(state) || StringLiteral$1(state) || StringLiteral$2(state) || StringLiteral$3(state));
+          return $TOKEN("BasicStringLiteral", state, BasicStringLiteral$0(state) || BasicStringLiteral$1(state));
         } else {
-          return StringLiteral$0(state) || StringLiteral$1(state) || StringLiteral$2(state) || StringLiteral$3(state);
+          return BasicStringLiteral$0(state) || BasicStringLiteral$1(state);
         }
       }
-      var DoubleStringCharacter$0 = $R$0($EXPECT($R9, fail, 'DoubleStringCharacter /(?:\\\\.|[^"])+/'));
-      function DoubleStringCharacter(state) {
+      var DoubleStringCharacters$0 = $TR($EXPECT($R9, fail, 'DoubleStringCharacters /(?:\\\\.|[^"])*/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+        return { $loc, token: $0 };
+      });
+      function DoubleStringCharacters(state) {
         if (state.verbose)
-          console.log("ENTER:", "DoubleStringCharacter");
+          console.log("ENTER:", "DoubleStringCharacters");
         if (state.tokenize) {
-          return $TOKEN("DoubleStringCharacter", state, DoubleStringCharacter$0(state));
+          return $TOKEN("DoubleStringCharacters", state, DoubleStringCharacters$0(state));
         } else {
-          return DoubleStringCharacter$0(state);
+          return DoubleStringCharacters$0(state);
         }
       }
-      var SingleStringCharacter$0 = $R$0($EXPECT($R10, fail, "SingleStringCharacter /(?:\\\\.|[^'])+/"));
-      function SingleStringCharacter(state) {
+      var SingleStringCharacters$0 = $TR($EXPECT($R10, fail, "SingleStringCharacters /(?:\\\\.|[^'])*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+        return { $loc, token: $0 };
+      });
+      function SingleStringCharacters(state) {
         if (state.verbose)
-          console.log("ENTER:", "SingleStringCharacter");
+          console.log("ENTER:", "SingleStringCharacters");
         if (state.tokenize) {
-          return $TOKEN("SingleStringCharacter", state, SingleStringCharacter$0(state));
+          return $TOKEN("SingleStringCharacters", state, SingleStringCharacters$0(state));
         } else {
-          return SingleStringCharacter$0(state);
+          return SingleStringCharacters$0(state);
         }
       }
       var TripleDoubleStringCharacters$0 = $TR($EXPECT($R11, fail, 'TripleDoubleStringCharacters /(?:"(?!"")|#(?!\\{)|\\\\.|[^#"])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
@@ -3054,19 +3060,7 @@ var Civet = (() => {
           return CoffeeStringSubstitution$0(state);
         }
       }
-      var CoffeeSubstitutionStart$0 = $TV($EXPECT($L88, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
-        return { $loc, token: "${" };
-      });
-      function CoffeeSubstitutionStart(state) {
-        if (state.verbose)
-          console.log("ENTER:", "CoffeeSubstitutionStart");
-        if (state.tokenize) {
-          return $TOKEN("CoffeeSubstitutionStart", state, CoffeeSubstitutionStart$0(state));
-        } else {
-          return CoffeeSubstitutionStart$0(state);
-        }
-      }
-      var RegularExpressionLiteral$0 = $TV($TEXT($S($EXPECT($L45, fail, 'RegularExpressionLiteral "/"'), RegularExpressionBody, $EXPECT($L45, fail, 'RegularExpressionLiteral "/"'), RegularExpressionFlags)), function($skip, $loc, $0, $1) {
+      var RegularExpressionLiteral$0 = $TV($TEXT($S($EXPECT($L44, fail, 'RegularExpressionLiteral "/"'), RegularExpressionBody, $EXPECT($L44, fail, 'RegularExpressionLiteral "/"'), RegularExpressionFlags)), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function RegularExpressionLiteral(state) {
@@ -3108,17 +3102,18 @@ var Civet = (() => {
           return RegularExpressionFlags$0(state);
         }
       }
-      var TemplateLiteral$0 = $S($EXPECT($L0, fail, 'TemplateLiteral "`"'), $Q($C(TemplateCharacters, TemplateSubstitution)), $EXPECT($L0, fail, 'TemplateLiteral "`"'));
+      var TemplateLiteral$0 = $TS($S(TripleTick, $Q($C(TemplateBlockCharacters, TemplateSubstitution)), TripleTick), function($skip, $loc, $0, $1, $2, $3) {
+        return module.dedentBlockSubstitutions($0);
+      });
+      var TemplateLiteral$1 = $S($EXPECT($L0, fail, 'TemplateLiteral "`"'), $Q($C(TemplateCharacters, TemplateSubstitution)), $EXPECT($L0, fail, 'TemplateLiteral "`"'));
       function TemplateLiteral(state) {
-        if (state.verbose)
-          console.log("ENTER:", "TemplateLiteral");
         if (state.tokenize) {
-          return $TOKEN("TemplateLiteral", state, TemplateLiteral$0(state));
+          return $TOKEN("TemplateLiteral", state, TemplateLiteral$0(state) || TemplateLiteral$1(state));
         } else {
-          return TemplateLiteral$0(state);
+          return TemplateLiteral$0(state) || TemplateLiteral$1(state);
         }
       }
-      var TemplateSubstitution$0 = $S($EXPECT($L89, fail, 'TemplateSubstitution "${"'), Expression, __, CloseBrace);
+      var TemplateSubstitution$0 = $S(SubstitutionStart, Expression, __, CloseBrace);
       function TemplateSubstitution(state) {
         if (state.verbose)
           console.log("ENTER:", "TemplateSubstitution");
@@ -3128,7 +3123,9 @@ var Civet = (() => {
           return TemplateSubstitution$0(state);
         }
       }
-      var TemplateCharacters$0 = $R$0($EXPECT($R16, fail, "TemplateCharacters /(?:\\$(?!\\{)|\\\\.|[^$`])+/"));
+      var TemplateCharacters$0 = $TR($EXPECT($R16, fail, "TemplateCharacters /(?:\\$(?!\\{)|\\\\.|[^$`])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+        return { $loc, token: $0 };
+      });
       function TemplateCharacters(state) {
         if (state.verbose)
           console.log("ENTER:", "TemplateCharacters");
@@ -3138,7 +3135,19 @@ var Civet = (() => {
           return TemplateCharacters$0(state);
         }
       }
-      var ReservedWord$0 = $R$0($EXPECT($R17, 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|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
+      var TemplateBlockCharacters$0 = $TR($EXPECT($R17, fail, "TemplateBlockCharacters /(?:\\$(?!\\{)|`(?!``)|\\\\.|[^$`])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+        return { $loc, token: $0 };
+      });
+      function TemplateBlockCharacters(state) {
+        if (state.verbose)
+          console.log("ENTER:", "TemplateBlockCharacters");
+        if (state.tokenize) {
+          return $TOKEN("TemplateBlockCharacters", state, TemplateBlockCharacters$0(state));
+        } else {
+          return TemplateBlockCharacters$0(state);
+        }
+      }
+      var ReservedWord$0 = $R$0($EXPECT($R18, 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|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
       function ReservedWord(state) {
         if (state.verbose)
           console.log("ENTER:", "ReservedWord");
@@ -3157,7 +3166,7 @@ var Civet = (() => {
           return Comment$0(state) || Comment$1(state);
         }
       }
-      var SingleLineComment$0 = $TR($EXPECT($R18, fail, "SingleLineComment /\\/\\/[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var SingleLineComment$0 = $TR($EXPECT($R19, fail, "SingleLineComment /\\/\\/[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       var SingleLineComment$1 = CoffeeSingleLineComment;
@@ -3177,7 +3186,7 @@ var Civet = (() => {
           return MultiLineComment$0(state) || MultiLineComment$1(state);
         }
       }
-      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L90, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L91, fail, 'JSMultiLineComment "*/"')), $EXPECT($R19, fail, "JSMultiLineComment /./"))), $EXPECT($L91, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L84, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L85, fail, 'JSMultiLineComment "*/"')), $EXPECT($R20, fail, "JSMultiLineComment /./"))), $EXPECT($L85, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function JSMultiLineComment(state) {
@@ -3189,7 +3198,7 @@ var Civet = (() => {
           return JSMultiLineComment$0(state);
         }
       }
-      var CoffeeSingleLineComment$0 = $TR($EXPECT($R20, fail, "CoffeeSingleLineComment /#([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var CoffeeSingleLineComment$0 = $TR($EXPECT($R21, fail, "CoffeeSingleLineComment /#([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         if (!module.coffeeCompat)
           return $skip;
         return { $loc, token: `//${$1}` };
@@ -3203,7 +3212,7 @@ var Civet = (() => {
           return CoffeeSingleLineComment$0(state);
         }
       }
-      var CoffeeMultiLineComment$0 = $TS($S($EXPECT($L92, fail, 'CoffeeMultiLineComment "###"'), $TEXT($Q($S($N($C($EXPECT($L92, fail, 'CoffeeMultiLineComment "###"'), $EXPECT($L91, fail, 'CoffeeMultiLineComment "*/"'))), $EXPECT($R19, fail, "CoffeeMultiLineComment /./")))), $EXPECT($L92, fail, 'CoffeeMultiLineComment "###"')), function($skip, $loc, $0, $1, $2, $3) {
+      var CoffeeMultiLineComment$0 = $TS($S($EXPECT($L86, fail, 'CoffeeMultiLineComment "###"'), $TEXT($Q($S($N($C($EXPECT($L86, fail, 'CoffeeMultiLineComment "###"'), $EXPECT($L85, fail, 'CoffeeMultiLineComment "*/"'))), $EXPECT($R20, fail, "CoffeeMultiLineComment /./")))), $EXPECT($L86, fail, 'CoffeeMultiLineComment "###"')), function($skip, $loc, $0, $1, $2, $3) {
         return { $loc, token: `/*${$2}*/` };
       });
       function CoffeeMultiLineComment(state) {
@@ -3215,7 +3224,7 @@ var Civet = (() => {
           return CoffeeMultiLineComment$0(state);
         }
       }
-      var InlineComment$0 = $TV($TEXT($S($EXPECT($L90, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L91, fail, 'InlineComment "*/"')), $EXPECT($R21, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L91, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
+      var InlineComment$0 = $TV($TEXT($S($EXPECT($L84, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L85, fail, 'InlineComment "*/"')), $EXPECT($R22, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L85, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function InlineComment(state) {
@@ -3227,7 +3236,7 @@ var Civet = (() => {
           return InlineComment$0(state);
         }
       }
-      var RestOfLine$0 = $S($Q($C($R$0($EXPECT($R22, fail, "RestOfLine /[ \\t]+/")), SingleLineComment, MultiLineComment)), EOL);
+      var RestOfLine$0 = $S($Q($C(NonNewlineWhitespace, SingleLineComment, MultiLineComment)), EOL);
       function RestOfLine(state) {
         if (state.verbose)
           console.log("ENTER:", "RestOfLine");
@@ -3237,7 +3246,7 @@ var Civet = (() => {
           return RestOfLine$0(state);
         }
       }
-      var TrailingComment$0 = $R$0($EXPECT($R23, fail, "TrailingComment /[\\t ]+/"));
+      var TrailingComment$0 = NonNewlineWhitespace;
       var TrailingComment$1 = InlineComment;
       var TrailingComment$2 = SingleLineComment;
       function TrailingComment(state) {
@@ -3257,7 +3266,7 @@ var Civet = (() => {
           return _$0(state);
         }
       }
-      var NonNewlineWhitespace$0 = $TR($EXPECT($R22, fail, "NonNewlineWhitespace /[ \\t]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var NonNewlineWhitespace$0 = $TR($EXPECT($R23, fail, "NonNewlineWhitespace /[ \\t]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function NonNewlineWhitespace(state) {
@@ -3324,7 +3333,7 @@ var Civet = (() => {
           return Loc$0(state);
         }
       }
-      var As$0 = $TS($S($EXPECT($L93, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var As$0 = $TS($S($EXPECT($L87, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function As(state) {
@@ -3336,7 +3345,7 @@ var Civet = (() => {
           return As$0(state);
         }
       }
-      var Async$0 = $TV($EXPECT($L94, fail, 'Async "async"'), function($skip, $loc, $0, $1) {
+      var Async$0 = $TV($EXPECT($L88, fail, 'Async "async"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Async(state) {
@@ -3348,7 +3357,7 @@ var Civet = (() => {
           return Async$0(state);
         }
       }
-      var Await$0 = $TS($S($EXPECT($L95, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Await$0 = $TS($S($EXPECT($L89, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Await(state) {
@@ -3360,7 +3369,19 @@ var Civet = (() => {
           return Await$0(state);
         }
       }
-      var Catch$0 = $TV($EXPECT($L96, fail, 'Catch "catch"'), function($skip, $loc, $0, $1) {
+      var Case$0 = $TS($S($EXPECT($L90, fail, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+        return { $loc, token: $1 };
+      });
+      function Case(state) {
+        if (state.verbose)
+          console.log("ENTER:", "Case");
+        if (state.tokenize) {
+          return $TOKEN("Case", state, Case$0(state));
+        } else {
+          return Case$0(state);
+        }
+      }
+      var Catch$0 = $TV($EXPECT($L91, fail, 'Catch "catch"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Catch(state) {
@@ -3372,7 +3393,7 @@ var Civet = (() => {
           return Catch$0(state);
         }
       }
-      var Class$0 = $TV($EXPECT($L97, 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) {
@@ -3384,7 +3405,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($L24, fail, 'CloseBrace "}"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function CloseBrace(state) {
@@ -3396,7 +3417,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($L23, fail, 'CloseBracket "]"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function CloseBracket(state) {
@@ -3408,7 +3429,7 @@ var Civet = (() => {
           return CloseBracket$0(state);
         }
       }
-      var CloseParen$0 = $TV($EXPECT($L18, 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) {
@@ -3420,7 +3441,19 @@ var Civet = (() => {
           return CloseParen$0(state);
         }
       }
-      var Colon$0 = $TV($EXPECT($L98, fail, 'Colon ":"'), function($skip, $loc, $0, $1) {
+      var CoffeeSubstitutionStart$0 = $TV($EXPECT($L93, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
+        return { $loc, token: "${" };
+      });
+      function CoffeeSubstitutionStart(state) {
+        if (state.verbose)
+          console.log("ENTER:", "CoffeeSubstitutionStart");
+        if (state.tokenize) {
+          return $TOKEN("CoffeeSubstitutionStart", state, CoffeeSubstitutionStart$0(state));
+        } else {
+          return CoffeeSubstitutionStart$0(state);
+        }
+      }
+      var Colon$0 = $TV($EXPECT($L94, fail, 'Colon ":"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Colon(state) {
@@ -3432,7 +3465,31 @@ var Civet = (() => {
           return Colon$0(state);
         }
       }
-      var Dot$0 = $TV($EXPECT($L99, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
+      var ConstructorShorthand$0 = $TV($EXPECT($L9, fail, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
+        return { $loc, token: "constructor" };
+      });
+      function ConstructorShorthand(state) {
+        if (state.verbose)
+          console.log("ENTER:", "ConstructorShorthand");
+        if (state.tokenize) {
+          return $TOKEN("ConstructorShorthand", state, ConstructorShorthand$0(state));
+        } else {
+          return ConstructorShorthand$0(state);
+        }
+      }
+      var Default$0 = $TS($S($EXPECT($L82, fail, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+        return { $loc, token: $1 };
+      });
+      function Default(state) {
+        if (state.verbose)
+          console.log("ENTER:", "Default");
+        if (state.tokenize) {
+          return $TOKEN("Default", state, Default$0(state));
+        } else {
+          return Default$0(state);
+        }
+      }
+      var Dot$0 = $TV($EXPECT($L95, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Dot(state) {
@@ -3444,7 +3501,19 @@ var Civet = (() => {
           return Dot$0(state);
         }
       }
-      var Else$0 = $TV($EXPECT($L100, fail, 'Else "else"'), function($skip, $loc, $0, $1) {
+      var DoubleQuote$0 = $TV($EXPECT($L96, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
+        return { $loc, token: $1 };
+      });
+      function DoubleQuote(state) {
+        if (state.verbose)
+          console.log("ENTER:", "DoubleQuote");
+        if (state.tokenize) {
+          return $TOKEN("DoubleQuote", state, DoubleQuote$0(state));
+        } else {
+          return DoubleQuote$0(state);
+        }
+      }
+      var Else$0 = $TV($EXPECT($L97, fail, 'Else "else"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Else(state) {
@@ -3456,7 +3525,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($L41, fail, 'Equals "="'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Equals(state) {
@@ -3468,7 +3537,7 @@ var Civet = (() => {
           return Equals$0(state);
         }
       }
-      var Export$0 = $TS($S($EXPECT($L101, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Export$0 = $TS($S($EXPECT($L98, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Export(state) {
@@ -3480,7 +3549,7 @@ var Civet = (() => {
           return Export$0(state);
         }
       }
-      var For$0 = $TS($S($EXPECT($L102, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var For$0 = $TS($S($EXPECT($L99, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function For(state) {
@@ -3492,7 +3561,7 @@ var Civet = (() => {
           return For$0(state);
         }
       }
-      var From$0 = $TS($S($EXPECT($L103, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var From$0 = $TS($S($EXPECT($L100, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function From(state) {
@@ -3504,7 +3573,7 @@ var Civet = (() => {
           return From$0(state);
         }
       }
-      var Function$0 = $TV($EXPECT($L104, fail, 'Function "function"'), function($skip, $loc, $0, $1) {
+      var Function$0 = $TV($EXPECT($L101, fail, 'Function "function"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Function(state) {
@@ -3516,7 +3585,7 @@ var Civet = (() => {
           return Function$0(state);
         }
       }
-      var GetOrSet$0 = $TS($S($C($EXPECT($L105, fail, 'GetOrSet "get"'), $EXPECT($L106, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var GetOrSet$0 = $TS($S($C($EXPECT($L102, fail, 'GetOrSet "get"'), $EXPECT($L103, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function GetOrSet(state) {
@@ -3528,7 +3597,7 @@ var Civet = (() => {
           return GetOrSet$0(state);
         }
       }
-      var If$0 = $TV($EXPECT($L107, fail, 'If "if"'), function($skip, $loc, $0, $1) {
+      var If$0 = $TV($EXPECT($L104, fail, 'If "if"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function If(state) {
@@ -3540,7 +3609,7 @@ var Civet = (() => {
           return If$0(state);
         }
       }
-      var Import$0 = $TS($S($EXPECT($L13, fail, 'Import "import"'), $Y($EXPECT($R26, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
+      var Import$0 = $TS($S($EXPECT($L11, fail, 'Import "import"'), $Y($EXPECT($R26, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Import(state) {
@@ -3552,7 +3621,7 @@ var Civet = (() => {
           return Import$0(state);
         }
       }
-      var In$0 = $TV($EXPECT($L66, fail, 'In "in"'), function($skip, $loc, $0, $1) {
+      var In$0 = $TV($EXPECT($L65, fail, 'In "in"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function In(state) {
@@ -3564,7 +3633,7 @@ var Civet = (() => {
           return In$0(state);
         }
       }
-      var LetOrConst$0 = $TV($C($EXPECT($L108, fail, 'LetOrConst "let"'), $EXPECT($L109, fail, 'LetOrConst "const"')), function($skip, $loc, $0, $1) {
+      var LetOrConst$0 = $TV($C($EXPECT($L105, fail, 'LetOrConst "let"'), $EXPECT($L106, fail, 'LetOrConst "const"')), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function LetOrConst(state) {
@@ -3576,7 +3645,7 @@ var Civet = (() => {
           return LetOrConst$0(state);
         }
       }
-      var Loop$0 = $TS($S($EXPECT($L110, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Loop$0 = $TS($S($EXPECT($L107, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "while(true)" };
       });
       function Loop(state) {
@@ -3588,7 +3657,7 @@ var Civet = (() => {
           return Loop$0(state);
         }
       }
-      var New$0 = $TV($EXPECT($L111, fail, 'New "new"'), function($skip, $loc, $0, $1) {
+      var New$0 = $TV($EXPECT($L108, fail, 'New "new"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function New(state) {
@@ -3600,7 +3669,7 @@ var Civet = (() => {
           return New$0(state);
         }
       }
-      var Of$0 = $TV($EXPECT($L112, fail, 'Of "of"'), function($skip, $loc, $0, $1) {
+      var Of$0 = $TV($EXPECT($L109, fail, 'Of "of"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Of(state) {
@@ -3612,7 +3681,7 @@ var Civet = (() => {
           return Of$0(state);
         }
       }
-      var OpenBrace$0 = $TV($EXPECT($L113, fail, 'OpenBrace "{"'), function($skip, $loc, $0, $1) {
+      var OpenBrace$0 = $TV($EXPECT($L110, fail, 'OpenBrace "{"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenBrace(state) {
@@ -3624,7 +3693,7 @@ var Civet = (() => {
           return OpenBrace$0(state);
         }
       }
-      var OpenBracket$0 = $TV($EXPECT($L114, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
+      var OpenBracket$0 = $TV($EXPECT($L111, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenBracket(state) {
@@ -3636,7 +3705,7 @@ var Civet = (() => {
           return OpenBracket$0(state);
         }
       }
-      var OpenParen$0 = $TV($EXPECT($L115, fail, 'OpenParen "("'), function($skip, $loc, $0, $1) {
+      var OpenParen$0 = $TV($EXPECT($L112, fail, 'OpenParen "("'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenParen(state) {
@@ -3648,7 +3717,7 @@ var Civet = (() => {
           return OpenParen$0(state);
         }
       }
-      var QuestionMark$0 = $TV($EXPECT($L116, fail, 'QuestionMark "?"'), function($skip, $loc, $0, $1) {
+      var QuestionMark$0 = $TV($EXPECT($L113, fail, 'QuestionMark "?"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function QuestionMark(state) {
@@ -3660,7 +3729,7 @@ var Civet = (() => {
           return QuestionMark$0(state);
         }
       }
-      var Return$0 = $TS($S($EXPECT($L117, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Return$0 = $TS($S($EXPECT($L114, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Return(state) {
@@ -3672,7 +3741,7 @@ var Civet = (() => {
           return Return$0(state);
         }
       }
-      var Semicolon$0 = $TV($EXPECT($L73, fail, 'Semicolon ";"'), function($skip, $loc, $0, $1) {
+      var Semicolon$0 = $TV($EXPECT($L72, fail, 'Semicolon ";"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Semicolon(state) {
@@ -3684,10 +3753,34 @@ var Civet = (() => {
           return Semicolon$0(state);
         }
       }
-      var Static$0 = $TV($EXPECT($L118, fail, 'Static "static"'), function($skip, $loc, $0, $1) {
+      var SingleQuote$0 = $TV($EXPECT($L115, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
+        return { $loc, token: $1 };
+      });
+      function SingleQuote(state) {
+        if (state.verbose)
+          console.log("ENTER:", "SingleQuote");
+        if (state.tokenize) {
+          return $TOKEN("SingleQuote", state, SingleQuote$0(state));
+        } else {
+          return SingleQuote$0(state);
+        }
+      }
+      var Star$0 = $TV($EXPECT($L43, fail, 'Star "*"'), function($skip, $loc, $0, $1) {
+        return { $loc, token: $1 };
+      });
+      function Star(state) {
+        if (state.verbose)
+          console.log("ENTER:", "Star");
+        if (state.tokenize) {
+          return $TOKEN("Star", state, Star$0(state));
+        } else {
+          return Star$0(state);
+        }
+      }
+      var Static$0 = $TV($EXPECT($L116, fail, 'Static "static"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
-      var Static$1 = $TS($S($EXPECT($L11, fail, 'Static "@"'), $N($EXPECT($L115, fail, 'Static "("'))), function($skip, $loc, $0, $1, $2) {
+      var Static$1 = $TS($S($EXPECT($L9, fail, 'Static "@"'), $N($EXPECT($L112, fail, 'Static "("'))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "static " };
       });
       function Static(state) {
@@ -3697,7 +3790,19 @@ var Civet = (() => {
           return Static$0(state) || Static$1(state);
         }
       }
-      var Switch$0 = $TV($EXPECT($L119, fail, 'Switch "switch"'), function($skip, $loc, $0, $1) {
+      var SubstitutionStart$0 = $TV($EXPECT($L117, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
+        return { $loc, token: $1 };
+      });
+      function SubstitutionStart(state) {
+        if (state.verbose)
+          console.log("ENTER:", "SubstitutionStart");
+        if (state.tokenize) {
+          return $TOKEN("SubstitutionStart", state, SubstitutionStart$0(state));
+        } else {
+          return SubstitutionStart$0(state);
+        }
+      }
+      var Switch$0 = $TS($S($EXPECT($L118, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Switch(state) {
@@ -3709,7 +3814,7 @@ var Civet = (() => {
           return Switch$0(state);
         }
       }
-      var Target$0 = $TV($EXPECT($L120, fail, 'Target "target"'), function($skip, $loc, $0, $1) {
+      var Target$0 = $TV($EXPECT($L119, fail, 'Target "target"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Target(state) {
@@ -3721,7 +3826,7 @@ var Civet = (() => {
           return Target$0(state);
         }
       }
-      var TripleDoubleQuote$0 = $TV($EXPECT($L121, fail, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
+      var TripleDoubleQuote$0 = $TV($EXPECT($L120, fail, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleDoubleQuote(state) {
@@ -3733,7 +3838,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($L121, fail, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleSingleQuote(state) {
@@ -3745,7 +3850,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($L122, fail, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleTick(state) {
@@ -3757,7 +3862,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($L123, fail, 'Try "try"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Try(state) {
@@ -3769,7 +3874,7 @@ var Civet = (() => {
           return Try$0(state);
         }
       }
-      var Unless$0 = $TV($EXPECT($L125, fail, 'Unless "unless"'), function($skip, $loc, $0, $1) {
+      var Unless$0 = $TV($EXPECT($L124, fail, 'Unless "unless"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Unless(state) {
@@ -3781,7 +3886,7 @@ var Civet = (() => {
           return Unless$0(state);
         }
       }
-      var Var$0 = $TV($EXPECT($L126, fail, 'Var "var"'), function($skip, $loc, $0, $1) {
+      var Var$0 = $TV($EXPECT($L125, fail, 'Var "var"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Var(state) {
@@ -3793,7 +3898,7 @@ var Civet = (() => {
           return Var$0(state);
         }
       }
-      var When$0 = $TS($S($EXPECT($L127, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var When$0 = $TS($S($EXPECT($L126, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "case" };
       });
       function When(state) {
@@ -3805,6 +3910,18 @@ var Civet = (() => {
           return When$0(state);
         }
       }
+      var Yield$0 = $TS($S($EXPECT($L127, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+        return { $loc, token: $1 };
+      });
+      function Yield(state) {
+        if (state.verbose)
+          console.log("ENTER:", "Yield");
+        if (state.tokenize) {
+          return $TOKEN("Yield", state, Yield$0(state));
+        } else {
+          return Yield$0(state);
+        }
+      }
       var JSXElement$0 = JSXSelfClosingElement;
       var JSXElement$1 = $TS($S(JSXOpeningElement, $Q(JSXChildren), __, JSXClosingElement), function($skip, $loc, $0, $1, $2, $3, $4) {
         if ($1[1] !== $4[2]) {
@@ -3819,7 +3936,7 @@ var Civet = (() => {
           return JSXElement$0(state) || JSXElement$1(state);
         }
       }
-      var JSXSelfClosingElement$0 = $S($EXPECT($L7, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L128, fail, 'JSXSelfClosingElement "/>"'));
+      var JSXSelfClosingElement$0 = $S($EXPECT($L5, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L128, fail, 'JSXSelfClosingElement "/>"'));
       function JSXSelfClosingElement(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXSelfClosingElement");
@@ -3829,7 +3946,7 @@ var Civet = (() => {
           return JSXSelfClosingElement$0(state);
         }
       }
-      var JSXOpeningElement$0 = $S($EXPECT($L7, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L54, fail, 'JSXOpeningElement ">"'));
+      var JSXOpeningElement$0 = $S($EXPECT($L5, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L53, fail, 'JSXOpeningElement ">"'));
       function JSXOpeningElement(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXOpeningElement");
@@ -3839,7 +3956,7 @@ var Civet = (() => {
           return JSXOpeningElement$0(state);
         }
       }
-      var JSXClosingElement$0 = $S($EXPECT($L129, fail, 'JSXClosingElement "</"'), __, $TEXT(JSXElementName), __, $EXPECT($L54, fail, 'JSXClosingElement ">"'));
+      var JSXClosingElement$0 = $S($EXPECT($L129, fail, 'JSXClosingElement "</"'), __, $TEXT(JSXElementName), __, $EXPECT($L53, fail, 'JSXClosingElement ">"'));
       function JSXClosingElement(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXClosingElement");
@@ -3889,7 +4006,7 @@ var Civet = (() => {
           return JSXAttributes$0(state);
         }
       }
-      var JSXAttribute$0 = $S(OpenBrace, __, $EXPECT($L19, fail, 'JSXAttribute "..."'), __, AssignmentExpression, __, CloseBrace);
+      var JSXAttribute$0 = $S(OpenBrace, __, $EXPECT($L17, fail, 'JSXAttribute "..."'), __, AssignmentExpression, __, CloseBrace);
       var JSXAttribute$1 = $S(JSXAttributeName, $E(JSXAttributeInitializer));
       function JSXAttribute(state) {
         if (state.tokenize) {
@@ -3961,7 +4078,7 @@ var Civet = (() => {
           return JSXText$0(state);
         }
       }
-      var JSXChildExpression$0 = $S(__, $E($S($EXPECT($L19, fail, 'JSXChildExpression "..."'), __)), AssignmentExpression);
+      var JSXChildExpression$0 = $S(__, $E($S($EXPECT($L17, fail, 'JSXChildExpression "..."'), __)), AssignmentExpression);
       function JSXChildExpression(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXChildExpression");
@@ -4169,7 +4286,7 @@ var Civet = (() => {
           return ReturnTypeSuffix$0(state);
         }
       }
-      var TypePredicate$0 = $S(Type, $E($S(__, $EXPECT($L57, fail, 'TypePredicate "is"'), NonIdContinue, Type)));
+      var TypePredicate$0 = $S(Type, $E($S(__, $EXPECT($L56, fail, 'TypePredicate "is"'), NonIdContinue, Type)));
       function TypePredicate(state) {
         if (state.verbose)
           console.log("ENTER:", "TypePredicate");
@@ -4220,7 +4337,7 @@ var Civet = (() => {
         }
       }
       var TypeUnaryOp$0 = $EXPECT($L138, fail, 'TypeUnaryOp "keyof"');
-      var TypeUnaryOp$1 = $EXPECT($L72, fail, 'TypeUnaryOp "typeof"');
+      var TypeUnaryOp$1 = $EXPECT($L71, fail, 'TypeUnaryOp "typeof"');
       var TypeUnaryOp$2 = $EXPECT($L139, fail, 'TypeUnaryOp "infer"');
       function TypeUnaryOp(state) {
         if (state.tokenize) {
@@ -4251,7 +4368,7 @@ var Civet = (() => {
           return TypePrimary$0(state) || TypePrimary$1(state) || TypePrimary$2(state) || TypePrimary$3(state) || TypePrimary$4(state);
         }
       }
-      var TypeConditional$0 = $S(TypeBinary, $E($S(__, $EXPECT($L8, fail, 'TypeConditional "extends"'), Type, $E($S(__, QuestionMark, Type, __, Colon, Type)))));
+      var TypeConditional$0 = $S(TypeBinary, $E($S(__, $EXPECT($L6, fail, 'TypeConditional "extends"'), Type, $E($S(__, QuestionMark, Type, __, Colon, Type)))));
       function TypeConditional(state) {
         if (state.verbose)
           console.log("ENTER:", "TypeConditional");
@@ -4262,7 +4379,7 @@ var Civet = (() => {
         }
       }
       var TypeLiteral$0 = Literal;
-      var TypeLiteral$1 = $EXPECT($L71, fail, 'TypeLiteral "void"');
+      var TypeLiteral$1 = $EXPECT($L70, fail, 'TypeLiteral "void"');
       var TypeLiteral$2 = $EXPECT($L140, fail, 'TypeLiteral "[]"');
       function TypeLiteral(state) {
         if (state.tokenize) {
@@ -4271,8 +4388,8 @@ var Civet = (() => {
           return TypeLiteral$0(state) || TypeLiteral$1(state) || TypeLiteral$2(state);
         }
       }
-      var TypeBinaryOp$0 = $EXPECT($L69, fail, 'TypeBinaryOp "|"');
-      var TypeBinaryOp$1 = $EXPECT($L67, fail, 'TypeBinaryOp "&"');
+      var TypeBinaryOp$0 = $EXPECT($L68, fail, 'TypeBinaryOp "|"');
+      var TypeBinaryOp$1 = $EXPECT($L66, fail, 'TypeBinaryOp "&"');
       function TypeBinaryOp(state) {
         if (state.tokenize) {
           return $TOKEN("TypeBinaryOp", state, TypeBinaryOp$0(state) || TypeBinaryOp$1(state));
@@ -4280,7 +4397,7 @@ var Civet = (() => {
           return TypeBinaryOp$0(state) || TypeBinaryOp$1(state);
         }
       }
-      var FunctionType$0 = $S(Parameters, __, $EXPECT($L6, fail, 'FunctionType "=>"'), Type);
+      var FunctionType$0 = $S(Parameters, __, $EXPECT($L4, fail, 'FunctionType "=>"'), Type);
       function FunctionType(state) {
         if (state.verbose)
           console.log("ENTER:", "FunctionType");
@@ -4290,7 +4407,7 @@ var Civet = (() => {
           return FunctionType$0(state);
         }
       }
-      var TypeArguments$0 = $S(__, $EXPECT($L7, fail, 'TypeArguments "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L54, fail, 'TypeArguments ">"'));
+      var TypeArguments$0 = $S(__, $EXPECT($L5, fail, 'TypeArguments "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L53, fail, 'TypeArguments ">"'));
       function TypeArguments(state) {
         if (state.verbose)
           console.log("ENTER:", "TypeArguments");
@@ -4300,7 +4417,7 @@ var Civet = (() => {
           return TypeArguments$0(state);
         }
       }
-      var TypeParameters$0 = $TS($S(__, $EXPECT($L7, fail, 'TypeParameters "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L54, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+      var TypeParameters$0 = $TS($S(__, $EXPECT($L5, fail, 'TypeParameters "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L53, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
         return { ts: true, children: $0 };
       });
       function TypeParameters(state) {
@@ -4322,7 +4439,7 @@ var Civet = (() => {
           return TypeParameter$0(state);
         }
       }
-      var TypeConstraint$0 = $S(__, $EXPECT($L8, fail, 'TypeConstraint "extends"'), Type);
+      var TypeConstraint$0 = $S(__, $EXPECT($L6, fail, 'TypeConstraint "extends"'), Type);
       function TypeConstraint(state) {
         if (state.verbose)
           console.log("ENTER:", "TypeConstraint");
@@ -4333,8 +4450,8 @@ var Civet = (() => {
         }
       }
       var TypeParameterDelimiter$0 = $S($Q(_), Comma);
-      var TypeParameterDelimiter$1 = $Y($S($Q(_), $EXPECT($L54, fail, 'TypeParameterDelimiter ">"')));
-      var TypeParameterDelimiter$2 = $TV($Y($S(__, $EXPECT($L54, fail, 'TypeParameterDelimiter ">"'))), function($skip, $loc, $0, $1) {
+      var TypeParameterDelimiter$1 = $Y($S($Q(_), $EXPECT($L53, fail, 'TypeParameterDelimiter ">"')));
+      var TypeParameterDelimiter$2 = $TV($Y($S(__, $EXPECT($L53, fail, 'TypeParameterDelimiter ">"'))), function($skip, $loc, $0, $1) {
         return { $loc, token: "," };
       });
       var TypeParameterDelimiter$3 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
@@ -4550,6 +4667,57 @@ var Civet = (() => {
           const compatRe = /use coffee-compat/;
           module.coffeeCompat = directives.some((d) => d[1].token?.match(compatRe));
         }
+        module.parsePosition = function() {
+          let s = Error().stack.split(/\n    at /);
+          s.shift();
+          s = s.filter((e) => !e.match(/^eval/)).map((e) => e.split(" ")[0]);
+          s = s.slice(1, s.indexOf("Program") + 1);
+          return s;
+        };
+        module.insertTrimmingSpace = function(spacing, c) {
+          let target = spacing;
+          while (Array.isArray(target)) {
+            target = target[0];
+          }
+          if (target.token) {
+            target.token = target.token.replace(/^ ?/, c);
+          }
+          return spacing;
+        };
+        module.modifyString = function(str) {
+          return str.replace(/(?<!\\)(\\\\)*\n/g, "$1\\n");
+        };
+        module.dedentBlockSubstitutions = function($02) {
+          const [s, strWithSubstitutions, e] = $02;
+          if (strWithSubstitutions.length === 0) {
+            return $02;
+          }
+          let initialSpacing, i = 0, l = strWithSubstitutions.length, results = [s];
+          const { token } = strWithSubstitutions[0];
+          if (token) {
+            initialSpacing = token.match(/^(\r?\n|\n)\s+/);
+          } else {
+            initialSpacing = false;
+          }
+          while (i < l) {
+            let segment = strWithSubstitutions[i];
+            if (segment.token) {
+              segment = module.dedentBlockString(segment, initialSpacing, false);
+              if (i === 0) {
+                segment.token = segment.token.replace(/^(\r?\n|\n)/, "");
+              }
+              if (i === l - 1) {
+                segment.token = segment.token.replace(/(\r?\n|\n)[ \t]*$/, "");
+              }
+              results.push(segment);
+            } else {
+              results.push(segment);
+            }
+            i++;
+          }
+          results.push(e);
+          return results;
+        };
         module.dedentBlockString = function({ $loc: $loc2, token: str }, spacing, trim = true) {
           if (spacing == null)
             spacing = str.match(/^(\r?\n|\n)[ \t]+/);