@danielx/civet 0.4.13 → 0.4.14

package/dist/browser.js

@@ -520,17 +520,21 @@ var Civet = (() => {
         UnaryOp,
         ModuleItem,
         StatementListItem,
-        PostfixConditional,
+        PostfixStatement,
         Statement,
         EmptyStatement,
         BlockStatement,
         IfStatement,
+        IfClause,
+        UnlessClause,
         IterationStatement,
         LoopStatement,
+        LoopClause,
         DoWhileStatement,
         WhileStatement,
         WhileClause,
         ForStatement,
+        ForClause,
         ForStatementControl,
         ForInOfDeclaration,
         ForDeclaration,
@@ -636,6 +640,7 @@ var Civet = (() => {
         ConstructorShorthand,
         Default,
         Delete,
+        Do,
         Dot,
         DotDotDot,
         DoubleQuote,
@@ -672,9 +677,11 @@ var Civet = (() => {
         Try,
         Typeof,
         Unless,
+        Until,
         Var,
         Void,
         When,
+        While,
         Yield,
         JSXElement,
         JSXSelfClosingElement,
@@ -836,65 +843,65 @@ var Civet = (() => {
       var $L69 = $L("^");
       var $L70 = $L("|");
       var $L71 = $L(";");
-      var $L72 = $L("do");
-      var $L73 = $L("while");
-      var $L74 = $L("until");
-      var $L75 = $L("finally");
-      var $L76 = $L("break");
-      var $L77 = $L("continue");
-      var $L78 = $L("debugger");
-      var $L79 = $L("import type");
-      var $L80 = $L("default");
-      var $L81 = $L(":=");
-      var $L82 = $L("/*");
-      var $L83 = $L("*/");
-      var $L84 = $L("###");
-      var $L85 = $L("as");
-      var $L86 = $L("async");
-      var $L87 = $L("await");
-      var $L88 = $L("`");
-      var $L89 = $L("case");
-      var $L90 = $L("catch");
-      var $L91 = $L("class");
-      var $L92 = $L("#{");
-      var $L93 = $L(":");
-      var $L94 = $L("delete");
-      var $L95 = $L(".");
-      var $L96 = $L("...");
-      var $L97 = $L('"');
-      var $L98 = $L("else");
-      var $L99 = $L("export");
-      var $L100 = $L("for");
-      var $L101 = $L("from");
-      var $L102 = $L("function");
-      var $L103 = $L("get");
-      var $L104 = $L("set");
-      var $L105 = $L("if");
-      var $L106 = $L("let");
-      var $L107 = $L("const");
-      var $L108 = $L("loop");
-      var $L109 = $L("new");
-      var $L110 = $L("of");
-      var $L111 = $L("{");
-      var $L112 = $L("[");
-      var $L113 = $L("(");
-      var $L114 = $L("?");
-      var $L115 = $L("return");
-      var $L116 = $L("'");
-      var $L117 = $L("static");
-      var $L118 = $L("${");
-      var $L119 = $L("switch");
-      var $L120 = $L("target");
-      var $L121 = $L("throw");
-      var $L122 = $L('"""');
-      var $L123 = $L("'''");
-      var $L124 = $L("```");
-      var $L125 = $L("try");
-      var $L126 = $L("typeof");
-      var $L127 = $L("unless");
-      var $L128 = $L("var");
-      var $L129 = $L("void");
-      var $L130 = $L("when");
+      var $L72 = $L("finally");
+      var $L73 = $L("break");
+      var $L74 = $L("continue");
+      var $L75 = $L("debugger");
+      var $L76 = $L("import type");
+      var $L77 = $L("default");
+      var $L78 = $L(":=");
+      var $L79 = $L("/*");
+      var $L80 = $L("*/");
+      var $L81 = $L("###");
+      var $L82 = $L("as");
+      var $L83 = $L("async");
+      var $L84 = $L("await");
+      var $L85 = $L("`");
+      var $L86 = $L("case");
+      var $L87 = $L("catch");
+      var $L88 = $L("class");
+      var $L89 = $L("#{");
+      var $L90 = $L(":");
+      var $L91 = $L("delete");
+      var $L92 = $L("do");
+      var $L93 = $L(".");
+      var $L94 = $L("...");
+      var $L95 = $L('"');
+      var $L96 = $L("else");
+      var $L97 = $L("export");
+      var $L98 = $L("for");
+      var $L99 = $L("from");
+      var $L100 = $L("function");
+      var $L101 = $L("get");
+      var $L102 = $L("set");
+      var $L103 = $L("if");
+      var $L104 = $L("let");
+      var $L105 = $L("const");
+      var $L106 = $L("loop");
+      var $L107 = $L("new");
+      var $L108 = $L("of");
+      var $L109 = $L("{");
+      var $L110 = $L("[");
+      var $L111 = $L("(");
+      var $L112 = $L("?");
+      var $L113 = $L("return");
+      var $L114 = $L("'");
+      var $L115 = $L("static");
+      var $L116 = $L("${");
+      var $L117 = $L("switch");
+      var $L118 = $L("target");
+      var $L119 = $L("throw");
+      var $L120 = $L('"""');
+      var $L121 = $L("'''");
+      var $L122 = $L("```");
+      var $L123 = $L("try");
+      var $L124 = $L("typeof");
+      var $L125 = $L("unless");
+      var $L126 = $L("until");
+      var $L127 = $L("var");
+      var $L128 = $L("void");
+      var $L129 = $L("when");
+      var $L130 = $L("while");
       var $L131 = $L("yield");
       var $L132 = $L("/>");
       var $L133 = $L("</");
@@ -936,7 +943,7 @@ var Civet = (() => {
       var $R21 = $R(new RegExp("(?:\\$(?!\\{)|\\\\.|[^$`])+", "suy"));
       var $R22 = $R(new RegExp("(?:\\$(?!\\{)|`(?!``)|\\\\.|[^$`])+", "suy"));
       var $R23 = $R(new RegExp("(?:on|off|yes|no)(?!\\p{ID_Continue})", "suy"));
-      var $R24 = $R(new RegExp("(?:and|as|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
+      var $R24 = $R(new RegExp("(?:and|as|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|loop|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
       var $R25 = $R(new RegExp("\\/\\/[^\\r\\n]*", "suy"));
       var $R26 = $R(new RegExp(".", "suy"));
       var $R27 = $R(new RegExp("#([^\\r\\n]*)", "suy"));
@@ -2437,49 +2444,36 @@ var Civet = (() => {
           return ModuleItem$0(state) || ModuleItem$1(state) || ModuleItem$2(state);
         }
       }
-      var StatementListItem$0 = $TS($S($C(Declaration, Statement), $E(PostfixConditional), Loc), function($skip, $loc, $0, $1, $2, $3) {
+      var StatementListItem$0 = Declaration;
+      var StatementListItem$1 = $TS($S(Statement, $Q(TrailingComment), $E(PostfixStatement)), function($skip, $loc, $0, $1, $2, $3) {
         var statement = $1;
-        var cond = $2;
-        var l = $3;
-        if (cond)
-          return [cond, statement, { $loc: l.$loc, token: "}" }];
+        var ws = $2;
+        var post = $3;
+        if (post) {
+          post.children.push(statement);
+          if (!module.isWhitespaceOrEmpty(ws))
+            post.children.push(ws);
+          return post;
+        }
         return statement;
       });
       function StatementListItem(state) {
-        if (state.verbose)
-          console.log("ENTER:", "StatementListItem");
         if (state.tokenize) {
-          return $TOKEN("StatementListItem", state, StatementListItem$0(state));
+          return $TOKEN("StatementListItem", state, StatementListItem$0(state) || StatementListItem$1(state));
         } else {
-          return StatementListItem$0(state);
+          return StatementListItem$0(state) || StatementListItem$1(state);
         }
       }
-      var PostfixConditional$0 = $TS($S($Q(TrailingComment), $C(If, Unless), NonIdContinue, Loc, ExpressionWithIndentedApplicationSuppressed, Loc), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-        var ws = $1;
-        var cond = $2;
-        var l1 = $4;
-        var exp = $5;
-        var l2 = $6;
-        let openParens = { $loc: l1.$loc, token: "(!(" };
-        let closingParens = { $loc: l2.$loc, token: "))" };
-        let space = { $loc: l2.$loc, token: " " };
-        let openingBrace = { $loc: l2.$loc, token: "{" };
-        if (cond.token === "if") {
-          cond.token = "if";
-          closingParens.token = ")";
-          openParens.token = "(";
-        } else {
-          cond.token = "if";
-        }
-        return [ws, cond, openParens, exp, closingParens, space, openingBrace];
-      });
-      function PostfixConditional(state) {
-        if (state.verbose)
-          console.log("ENTER:", "PostfixConditional");
+      var PostfixStatement$0 = ForClause;
+      var PostfixStatement$1 = IfClause;
+      var PostfixStatement$2 = LoopClause;
+      var PostfixStatement$3 = UnlessClause;
+      var PostfixStatement$4 = WhileClause;
+      function PostfixStatement(state) {
         if (state.tokenize) {
-          return $TOKEN("PostfixConditional", state, PostfixConditional$0(state));
+          return $TOKEN("PostfixStatement", state, PostfixStatement$0(state) || PostfixStatement$1(state) || PostfixStatement$2(state) || PostfixStatement$3(state) || PostfixStatement$4(state));
         } else {
-          return PostfixConditional$0(state);
+          return PostfixStatement$0(state) || PostfixStatement$1(state) || PostfixStatement$2(state) || PostfixStatement$3(state) || PostfixStatement$4(state);
         }
       }
       var Statement$0 = KeywordStatement;
@@ -2523,13 +2517,43 @@ var Civet = (() => {
           return BlockStatement$0(state);
         }
       }
-      var IfStatement$0 = $T($S(If, Condition, Block, $E($S(__, Else, Block))), function(value) {
+      var IfStatement$0 = $TS($S(IfClause, Block, $E($S(__, Else, Block))), function($skip, $loc, $0, $1, $2, $3) {
+        var clause = $1;
+        var block = $2;
+        var e = $3;
+        clause.children.push(block);
+        if (e)
+          clause.children.push(e);
+        return clause;
+      });
+      var IfStatement$1 = $TS($S(UnlessClause, Block), function($skip, $loc, $0, $1, $2) {
+        var clause = $1;
+        var block = $2;
+        clause.children.push(block);
+        return clause;
+      });
+      function IfStatement(state) {
+        if (state.tokenize) {
+          return $TOKEN("IfStatement", state, IfStatement$0(state) || IfStatement$1(state));
+        } else {
+          return IfStatement$0(state) || IfStatement$1(state);
+        }
+      }
+      var IfClause$0 = $T($S(If, Condition), function(value) {
         return { "type": "IfStatement", "children": value };
       });
-      var IfStatement$1 = $TS($S(Unless, Condition, Block), function($skip, $loc, $0, $1, $2, $3) {
+      function IfClause(state) {
+        if (state.verbose)
+          console.log("ENTER:", "IfClause");
+        if (state.tokenize) {
+          return $TOKEN("IfClause", state, IfClause$0(state));
+        } else {
+          return IfClause$0(state);
+        }
+      }
+      var UnlessClause$0 = $TS($S(Unless, Condition), function($skip, $loc, $0, $1, $2) {
         var kind = $1;
         var condition = $2;
-        var block = $3;
         condition.forEach((c) => {
           if (!c)
             return;
@@ -2541,22 +2565,22 @@ var Civet = (() => {
         kind.token = "if";
         return {
           type: "IfStatement",
-          children: [kind, condition, block]
+          children: [kind, condition]
         };
       });
-      function IfStatement(state) {
+      function UnlessClause(state) {
+        if (state.verbose)
+          console.log("ENTER:", "UnlessClause");
         if (state.tokenize) {
-          return $TOKEN("IfStatement", state, IfStatement$0(state) || IfStatement$1(state));
+          return $TOKEN("UnlessClause", state, UnlessClause$0(state));
         } else {
-          return IfStatement$0(state) || IfStatement$1(state);
+          return UnlessClause$0(state);
         }
       }
       var IterationStatement$0 = LoopStatement;
       var IterationStatement$1 = DoWhileStatement;
       var IterationStatement$2 = WhileStatement;
-      var IterationStatement$3 = $T($S(ForStatement), function(value) {
-        return { "type": "IterationStatement", "children": value };
-      });
+      var IterationStatement$3 = ForStatement;
       function IterationStatement(state) {
         if (state.tokenize) {
           return $TOKEN("IterationStatement", state, IterationStatement$0(state) || IterationStatement$1(state) || IterationStatement$2(state) || IterationStatement$3(state));
@@ -2564,8 +2588,11 @@ var Civet = (() => {
           return IterationStatement$0(state) || IterationStatement$1(state) || IterationStatement$2(state) || IterationStatement$3(state);
         }
       }
-      var LoopStatement$0 = $T($S(Loop, Block), function(value) {
-        return { "type": "IterationStatement", "children": value };
+      var LoopStatement$0 = $TS($S(LoopClause, Block), function($skip, $loc, $0, $1, $2) {
+        var clause = $1;
+        var block = $2;
+        clause.children.push(block);
+        return clause;
       });
       function LoopStatement(state) {
         if (state.verbose)
@@ -2576,7 +2603,19 @@ var Civet = (() => {
           return LoopStatement$0(state);
         }
       }
-      var DoWhileStatement$0 = $T($S($EXPECT($L72, fail, 'DoWhileStatement "do"'), NonIdContinue, Block, __, WhileClause), function(value) {
+      var LoopClause$0 = $T($S(Loop), function(value) {
+        return { "type": "IterationStatement", "children": value };
+      });
+      function LoopClause(state) {
+        if (state.verbose)
+          console.log("ENTER:", "LoopClause");
+        if (state.tokenize) {
+          return $TOKEN("LoopClause", state, LoopClause$0(state));
+        } else {
+          return LoopClause$0(state);
+        }
+      }
+      var DoWhileStatement$0 = $T($S(Do, BracedBlock, __, WhileClause), function(value) {
         return { "type": "IterationStatement", "children": value };
       });
       function DoWhileStatement(state) {
@@ -2588,8 +2627,11 @@ var Civet = (() => {
           return DoWhileStatement$0(state);
         }
       }
-      var WhileStatement$0 = $T($S(WhileClause, Block), function(value) {
-        return { "type": "IterationStatement", "children": value };
+      var WhileStatement$0 = $TS($S(WhileClause, Block), function($skip, $loc, $0, $1, $2) {
+        var clause = $1;
+        var block = $2;
+        clause.children.push(block);
+        return clause;
       });
       function WhileStatement(state) {
         if (state.verbose)
@@ -2600,15 +2642,19 @@ var Civet = (() => {
           return WhileStatement$0(state);
         }
       }
-      var WhileClause$0 = $TS($S($C($EXPECT($L73, fail, 'WhileClause "while"'), $EXPECT($L74, fail, 'WhileClause "until"')), NonIdContinue, Condition), function($skip, $loc, $0, $1, $2, $3) {
+      var WhileClause$0 = $TS($S($C(While, Until), Condition), function($skip, $loc, $0, $1, $2) {
         var kind = $1;
-        var cond = $3;
-        if (kind === "until") {
+        var cond = $2;
+        if (kind.token === "until") {
           cond[1] = "(!(";
-          cond[4] = "))";
-          return ["while", cond];
+          cond[cond.length - 1] = "))";
+          kind.token = "while";
+          $0 = [kind, cond];
         }
-        return $0;
+        return {
+          type: "IterationStatement",
+          children: $0
+        };
       });
       function WhileClause(state) {
         if (state.verbose)
@@ -2619,7 +2665,12 @@ var Civet = (() => {
           return WhileClause$0(state);
         }
       }
-      var ForStatement$0 = $S(For, __, ForStatementControl, Block);
+      var ForStatement$0 = $TS($S(ForClause, Block), function($skip, $loc, $0, $1, $2) {
+        var clause = $1;
+        var block = $2;
+        clause.children.push(block);
+        return clause;
+      });
       function ForStatement(state) {
         if (state.verbose)
           console.log("ENTER:", "ForStatement");
@@ -2629,6 +2680,18 @@ var Civet = (() => {
           return ForStatement$0(state);
         }
       }
+      var ForClause$0 = $T($S(For, __, ForStatementControl), function(value) {
+        return { "type": "IterationStatement", "children": value };
+      });
+      function ForClause(state) {
+        if (state.verbose)
+          console.log("ENTER:", "ForClause");
+        if (state.tokenize) {
+          return $TOKEN("ForClause", state, ForClause$0(state));
+        } else {
+          return ForClause$0(state);
+        }
+      }
       var ForStatementControl$0 = $S(OpenParen, __, $C(LexicalDeclaration, VariableStatement, $E(Expression)), __, Semicolon, $E(Expression), Semicolon, $E(Expression), __, CloseParen);
       var ForStatementControl$1 = $S(InsertOpenParen, __, $C(LexicalDeclaration, VariableStatement, $E(Expression)), __, Semicolon, $E(Expression), Semicolon, $E($S($N(EOS), Expression)), InsertCloseParen);
       var ForStatementControl$2 = $S(OpenParen, __, ForInOfDeclaration, __, In, Expression, __, CloseParen);
@@ -2849,7 +2912,7 @@ var Civet = (() => {
           return CatchBind$0(state) || CatchBind$1(state);
         }
       }
-      var Finally$0 = $S(__, $EXPECT($L75, fail, 'Finally "finally"'), BracedBlock);
+      var Finally$0 = $S(__, $EXPECT($L72, fail, 'Finally "finally"'), BracedBlock);
       function Finally(state) {
         if (state.verbose)
           console.log("ENTER:", "Finally");
@@ -2869,7 +2932,10 @@ var Civet = (() => {
         }
       }
       var Condition$0 = $S(__, OpenParen, Expression, __, CloseParen);
-      var Condition$1 = $S($N(EOS), __, InsertOpenParen, ExpressionWithIndentedApplicationSuppressed, InsertCloseParen);
+      var Condition$1 = $TS($S($N(EOS), __, InsertOpenParen, ExpressionWithIndentedApplicationSuppressed, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        $0.shift();
+        return $0;
+      });
       function Condition(state) {
         if (state.tokenize) {
           return $TOKEN("Condition", state, Condition$0(state) || Condition$1(state));
@@ -2915,13 +2981,13 @@ var Civet = (() => {
           return ExpressionStatement$0(state);
         }
       }
-      var KeywordStatement$0 = $T($S($EXPECT($L76, fail, 'KeywordStatement "break"'), NonIdContinue), function(value) {
+      var KeywordStatement$0 = $T($S($EXPECT($L73, fail, 'KeywordStatement "break"'), NonIdContinue), function(value) {
         return { "type": "BreakStatement", "children": value };
       });
-      var KeywordStatement$1 = $T($S($EXPECT($L77, fail, 'KeywordStatement "continue"'), NonIdContinue), function(value) {
+      var KeywordStatement$1 = $T($S($EXPECT($L74, fail, 'KeywordStatement "continue"'), NonIdContinue), function(value) {
         return { "type": "ContinueStatement", "children": value };
       });
-      var KeywordStatement$2 = $T($S($EXPECT($L78, fail, 'KeywordStatement "debugger"'), NonIdContinue), function(value) {
+      var KeywordStatement$2 = $T($S($EXPECT($L75, fail, 'KeywordStatement "debugger"'), NonIdContinue), function(value) {
         return { "type": "DebuggerStatement", "children": value };
       });
       var KeywordStatement$3 = $T($S(Return, $E(MaybeNestedExpression)), function(value) {
@@ -2946,7 +3012,7 @@ var Civet = (() => {
           return MaybeNestedExpression$0(state) || MaybeNestedExpression$1(state);
         }
       }
-      var ImportDeclaration$0 = $T($S($EXPECT($L79, fail, 'ImportDeclaration "import type"'), NonIdContinue, __, ImportClause, __, FromClause), function(value) {
+      var ImportDeclaration$0 = $T($S($EXPECT($L76, fail, 'ImportDeclaration "import type"'), NonIdContinue, __, ImportClause, __, FromClause), function(value) {
         return { "ts": true, "children": value };
       });
       var ImportDeclaration$1 = $S(Import, __, ImportClause, __, FromClause);
@@ -3084,7 +3150,7 @@ var Civet = (() => {
           return ImportedBinding$0(state);
         }
       }
-      var ExportDeclaration$0 = $S(Export, __, $EXPECT($L80, fail, 'ExportDeclaration "default"'), NonIdContinue, __, $C(HoistableDeclaration, ClassDeclaration, AssignmentExpression));
+      var ExportDeclaration$0 = $S(Export, __, $EXPECT($L77, 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) {
@@ -3166,7 +3232,7 @@ var Civet = (() => {
           return LexicalDeclaration$0(state) || LexicalDeclaration$1(state);
         }
       }
-      var ConstAssignment$0 = $TV($EXPECT($L81, fail, 'ConstAssignment ":="'), function($skip, $loc, $0, $1) {
+      var ConstAssignment$0 = $TV($EXPECT($L78, fail, 'ConstAssignment ":="'), function($skip, $loc, $0, $1) {
         return { $loc, token: "=" };
       });
       function ConstAssignment(state) {
@@ -3540,7 +3606,7 @@ var Civet = (() => {
         }
       }
       var ReservedWord$0 = $S(CoffeeBooleansEnabled, $R$0($EXPECT($R23, fail, "ReservedWord /(?:on|off|yes|no)(?!\\p{ID_Continue})/")));
-      var ReservedWord$1 = $R$0($EXPECT($R24, fail, "ReservedWord /(?:and|as|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
+      var ReservedWord$1 = $R$0($EXPECT($R24, fail, "ReservedWord /(?:and|as|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|loop|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
       function ReservedWord(state) {
         if (state.tokenize) {
           return $TOKEN("ReservedWord", state, ReservedWord$0(state) || ReservedWord$1(state));
@@ -3577,7 +3643,7 @@ var Civet = (() => {
           return MultiLineComment$0(state) || MultiLineComment$1(state);
         }
       }
-      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L82, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L83, fail, 'JSMultiLineComment "*/"')), $EXPECT($R26, fail, "JSMultiLineComment /./"))), $EXPECT($L83, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L79, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L80, fail, 'JSMultiLineComment "*/"')), $EXPECT($R26, fail, "JSMultiLineComment /./"))), $EXPECT($L80, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function JSMultiLineComment(state) {
@@ -3601,7 +3667,7 @@ var Civet = (() => {
           return CoffeeSingleLineComment$0(state);
         }
       }
-      var CoffeeMultiLineComment$0 = $TS($S($EXPECT($L84, fail, 'CoffeeMultiLineComment "###"'), $TEXT($Q($S($N($C($EXPECT($L84, fail, 'CoffeeMultiLineComment "###"'), $EXPECT($L83, fail, 'CoffeeMultiLineComment "*/"'))), $EXPECT($R26, fail, "CoffeeMultiLineComment /./")))), $EXPECT($L84, fail, 'CoffeeMultiLineComment "###"')), function($skip, $loc, $0, $1, $2, $3) {
+      var CoffeeMultiLineComment$0 = $TS($S($EXPECT($L81, fail, 'CoffeeMultiLineComment "###"'), $TEXT($Q($S($N($C($EXPECT($L81, fail, 'CoffeeMultiLineComment "###"'), $EXPECT($L80, fail, 'CoffeeMultiLineComment "*/"'))), $EXPECT($R26, fail, "CoffeeMultiLineComment /./")))), $EXPECT($L81, fail, 'CoffeeMultiLineComment "###"')), function($skip, $loc, $0, $1, $2, $3) {
         return { $loc, token: `/*${$2}*/` };
       });
       function CoffeeMultiLineComment(state) {
@@ -3613,7 +3679,7 @@ var Civet = (() => {
           return CoffeeMultiLineComment$0(state);
         }
       }
-      var InlineComment$0 = $TV($TEXT($S($EXPECT($L82, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L83, fail, 'InlineComment "*/"')), $EXPECT($R28, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L83, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
+      var InlineComment$0 = $TV($TEXT($S($EXPECT($L79, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L80, fail, 'InlineComment "*/"')), $EXPECT($R28, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L80, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function InlineComment(state) {
@@ -3720,7 +3786,7 @@ var Civet = (() => {
           return Loc$0(state);
         }
       }
-      var As$0 = $TS($S($EXPECT($L85, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var As$0 = $TS($S($EXPECT($L82, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function As(state) {
@@ -3732,7 +3798,7 @@ var Civet = (() => {
           return As$0(state);
         }
       }
-      var Async$0 = $TV($EXPECT($L86, fail, 'Async "async"'), function($skip, $loc, $0, $1) {
+      var Async$0 = $TV($EXPECT($L83, fail, 'Async "async"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Async(state) {
@@ -3744,7 +3810,7 @@ var Civet = (() => {
           return Async$0(state);
         }
       }
-      var Await$0 = $TS($S($EXPECT($L87, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Await$0 = $TS($S($EXPECT($L84, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Await(state) {
@@ -3756,7 +3822,7 @@ var Civet = (() => {
           return Await$0(state);
         }
       }
-      var Backtick$0 = $TV($EXPECT($L88, fail, 'Backtick "`"'), function($skip, $loc, $0, $1) {
+      var Backtick$0 = $TV($EXPECT($L85, fail, 'Backtick "`"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Backtick(state) {
@@ -3768,7 +3834,7 @@ var Civet = (() => {
           return Backtick$0(state);
         }
       }
-      var Case$0 = $TS($S($EXPECT($L89, fail, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Case$0 = $TS($S($EXPECT($L86, fail, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Case(state) {
@@ -3780,7 +3846,7 @@ var Civet = (() => {
           return Case$0(state);
         }
       }
-      var Catch$0 = $TV($EXPECT($L90, fail, 'Catch "catch"'), function($skip, $loc, $0, $1) {
+      var Catch$0 = $TV($EXPECT($L87, fail, 'Catch "catch"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Catch(state) {
@@ -3792,7 +3858,7 @@ var Civet = (() => {
           return Catch$0(state);
         }
       }
-      var Class$0 = $TV($EXPECT($L91, fail, 'Class "class"'), function($skip, $loc, $0, $1) {
+      var Class$0 = $TV($EXPECT($L88, fail, 'Class "class"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Class(state) {
@@ -3840,7 +3906,7 @@ var Civet = (() => {
           return CloseParen$0(state);
         }
       }
-      var CoffeeSubstitutionStart$0 = $TV($EXPECT($L92, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
+      var CoffeeSubstitutionStart$0 = $TV($EXPECT($L89, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "${" };
       });
       function CoffeeSubstitutionStart(state) {
@@ -3852,7 +3918,7 @@ var Civet = (() => {
           return CoffeeSubstitutionStart$0(state);
         }
       }
-      var Colon$0 = $TV($EXPECT($L93, fail, 'Colon ":"'), function($skip, $loc, $0, $1) {
+      var Colon$0 = $TV($EXPECT($L90, fail, 'Colon ":"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Colon(state) {
@@ -3876,7 +3942,7 @@ var Civet = (() => {
           return ConstructorShorthand$0(state);
         }
       }
-      var Default$0 = $TS($S($EXPECT($L80, fail, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Default$0 = $TS($S($EXPECT($L77, fail, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Default(state) {
@@ -3888,7 +3954,7 @@ var Civet = (() => {
           return Default$0(state);
         }
       }
-      var Delete$0 = $TS($S($EXPECT($L94, fail, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Delete$0 = $TS($S($EXPECT($L91, fail, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Delete(state) {
@@ -3900,7 +3966,19 @@ var Civet = (() => {
           return Delete$0(state);
         }
       }
-      var Dot$0 = $TV($EXPECT($L95, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
+      var Do$0 = $TS($S($EXPECT($L92, fail, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+        return { $loc, token: $1 };
+      });
+      function Do(state) {
+        if (state.verbose)
+          console.log("ENTER:", "Do");
+        if (state.tokenize) {
+          return $TOKEN("Do", state, Do$0(state));
+        } else {
+          return Do$0(state);
+        }
+      }
+      var Dot$0 = $TV($EXPECT($L93, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Dot(state) {
@@ -3912,7 +3990,7 @@ var Civet = (() => {
           return Dot$0(state);
         }
       }
-      var DotDotDot$0 = $TV($EXPECT($L96, fail, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
+      var DotDotDot$0 = $TV($EXPECT($L94, fail, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function DotDotDot(state) {
@@ -3924,7 +4002,7 @@ var Civet = (() => {
           return DotDotDot$0(state);
         }
       }
-      var DoubleQuote$0 = $TV($EXPECT($L97, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
+      var DoubleQuote$0 = $TV($EXPECT($L95, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function DoubleQuote(state) {
@@ -3936,7 +4014,7 @@ var Civet = (() => {
           return DoubleQuote$0(state);
         }
       }
-      var Else$0 = $TV($EXPECT($L98, fail, 'Else "else"'), function($skip, $loc, $0, $1) {
+      var Else$0 = $TV($EXPECT($L96, fail, 'Else "else"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Else(state) {
@@ -3960,7 +4038,7 @@ var Civet = (() => {
           return Equals$0(state);
         }
       }
-      var Export$0 = $TS($S($EXPECT($L99, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Export$0 = $TS($S($EXPECT($L97, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Export(state) {
@@ -3972,7 +4050,7 @@ var Civet = (() => {
           return Export$0(state);
         }
       }
-      var For$0 = $TS($S($EXPECT($L100, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var For$0 = $TS($S($EXPECT($L98, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function For(state) {
@@ -3984,7 +4062,7 @@ var Civet = (() => {
           return For$0(state);
         }
       }
-      var From$0 = $TS($S($EXPECT($L101, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var From$0 = $TS($S($EXPECT($L99, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function From(state) {
@@ -3996,7 +4074,7 @@ var Civet = (() => {
           return From$0(state);
         }
       }
-      var Function$0 = $TV($EXPECT($L102, fail, 'Function "function"'), function($skip, $loc, $0, $1) {
+      var Function$0 = $TV($EXPECT($L100, fail, 'Function "function"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Function(state) {
@@ -4008,7 +4086,7 @@ var Civet = (() => {
           return Function$0(state);
         }
       }
-      var GetOrSet$0 = $TS($S($C($EXPECT($L103, fail, 'GetOrSet "get"'), $EXPECT($L104, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var GetOrSet$0 = $TS($S($C($EXPECT($L101, fail, 'GetOrSet "get"'), $EXPECT($L102, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function GetOrSet(state) {
@@ -4020,7 +4098,7 @@ var Civet = (() => {
           return GetOrSet$0(state);
         }
       }
-      var If$0 = $TV($EXPECT($L105, fail, 'If "if"'), function($skip, $loc, $0, $1) {
+      var If$0 = $TV($EXPECT($L103, fail, 'If "if"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function If(state) {
@@ -4056,7 +4134,7 @@ var Civet = (() => {
           return In$0(state);
         }
       }
-      var LetOrConst$0 = $TV($C($EXPECT($L106, fail, 'LetOrConst "let"'), $EXPECT($L107, fail, 'LetOrConst "const"')), function($skip, $loc, $0, $1) {
+      var LetOrConst$0 = $TV($C($EXPECT($L104, fail, 'LetOrConst "let"'), $EXPECT($L105, fail, 'LetOrConst "const"')), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function LetOrConst(state) {
@@ -4068,7 +4146,7 @@ var Civet = (() => {
           return LetOrConst$0(state);
         }
       }
-      var Loop$0 = $TS($S($EXPECT($L108, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Loop$0 = $TS($S($EXPECT($L106, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "while(true)" };
       });
       function Loop(state) {
@@ -4080,7 +4158,7 @@ var Civet = (() => {
           return Loop$0(state);
         }
       }
-      var New$0 = $TV($EXPECT($L109, fail, 'New "new"'), function($skip, $loc, $0, $1) {
+      var New$0 = $TV($EXPECT($L107, fail, 'New "new"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function New(state) {
@@ -4092,7 +4170,7 @@ var Civet = (() => {
           return New$0(state);
         }
       }
-      var Of$0 = $TV($EXPECT($L110, fail, 'Of "of"'), function($skip, $loc, $0, $1) {
+      var Of$0 = $TV($EXPECT($L108, fail, 'Of "of"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Of(state) {
@@ -4104,7 +4182,7 @@ var Civet = (() => {
           return Of$0(state);
         }
       }
-      var OpenBrace$0 = $TV($EXPECT($L111, fail, 'OpenBrace "{"'), function($skip, $loc, $0, $1) {
+      var OpenBrace$0 = $TV($EXPECT($L109, fail, 'OpenBrace "{"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenBrace(state) {
@@ -4116,7 +4194,7 @@ var Civet = (() => {
           return OpenBrace$0(state);
         }
       }
-      var OpenBracket$0 = $TV($EXPECT($L112, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
+      var OpenBracket$0 = $TV($EXPECT($L110, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenBracket(state) {
@@ -4128,7 +4206,7 @@ var Civet = (() => {
           return OpenBracket$0(state);
         }
       }
-      var OpenParen$0 = $TV($EXPECT($L113, fail, 'OpenParen "("'), function($skip, $loc, $0, $1) {
+      var OpenParen$0 = $TV($EXPECT($L111, fail, 'OpenParen "("'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenParen(state) {
@@ -4140,7 +4218,7 @@ var Civet = (() => {
           return OpenParen$0(state);
         }
       }
-      var QuestionMark$0 = $TV($EXPECT($L114, fail, 'QuestionMark "?"'), function($skip, $loc, $0, $1) {
+      var QuestionMark$0 = $TV($EXPECT($L112, fail, 'QuestionMark "?"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function QuestionMark(state) {
@@ -4152,7 +4230,7 @@ var Civet = (() => {
           return QuestionMark$0(state);
         }
       }
-      var Return$0 = $TS($S($EXPECT($L115, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Return$0 = $TS($S($EXPECT($L113, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Return(state) {
@@ -4176,7 +4254,7 @@ var Civet = (() => {
           return Semicolon$0(state);
         }
       }
-      var SingleQuote$0 = $TV($EXPECT($L116, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
+      var SingleQuote$0 = $TV($EXPECT($L114, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function SingleQuote(state) {
@@ -4200,10 +4278,10 @@ var Civet = (() => {
           return Star$0(state);
         }
       }
-      var Static$0 = $TV($EXPECT($L117, fail, 'Static "static"'), function($skip, $loc, $0, $1) {
+      var Static$0 = $TV($EXPECT($L115, fail, 'Static "static"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
-      var Static$1 = $TS($S($EXPECT($L8, fail, 'Static "@"'), $N($EXPECT($L113, fail, 'Static "("'))), function($skip, $loc, $0, $1, $2) {
+      var Static$1 = $TS($S($EXPECT($L8, fail, 'Static "@"'), $N($EXPECT($L111, fail, 'Static "("'))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "static " };
       });
       function Static(state) {
@@ -4213,7 +4291,7 @@ var Civet = (() => {
           return Static$0(state) || Static$1(state);
         }
       }
-      var SubstitutionStart$0 = $TV($EXPECT($L118, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
+      var SubstitutionStart$0 = $TV($EXPECT($L116, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function SubstitutionStart(state) {
@@ -4225,7 +4303,7 @@ var Civet = (() => {
           return SubstitutionStart$0(state);
         }
       }
-      var Switch$0 = $TS($S($EXPECT($L119, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Switch$0 = $TS($S($EXPECT($L117, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Switch(state) {
@@ -4237,7 +4315,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($L118, fail, 'Target "target"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Target(state) {
@@ -4249,7 +4327,7 @@ var Civet = (() => {
           return Target$0(state);
         }
       }
-      var Throw$0 = $TS($S($EXPECT($L121, fail, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Throw$0 = $TS($S($EXPECT($L119, fail, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Throw(state) {
@@ -4261,7 +4339,7 @@ var Civet = (() => {
           return Throw$0(state);
         }
       }
-      var TripleDoubleQuote$0 = $TV($EXPECT($L122, 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) {
@@ -4273,7 +4351,7 @@ var Civet = (() => {
           return TripleDoubleQuote$0(state);
         }
       }
-      var TripleSingleQuote$0 = $TV($EXPECT($L123, 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) {
@@ -4285,7 +4363,7 @@ var Civet = (() => {
           return TripleSingleQuote$0(state);
         }
       }
-      var TripleTick$0 = $TV($EXPECT($L124, 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) {
@@ -4297,7 +4375,7 @@ var Civet = (() => {
           return TripleTick$0(state);
         }
       }
-      var Try$0 = $TV($EXPECT($L125, 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) {
@@ -4309,7 +4387,7 @@ var Civet = (() => {
           return Try$0(state);
         }
       }
-      var Typeof$0 = $TS($S($EXPECT($L126, fail, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Typeof$0 = $TS($S($EXPECT($L124, fail, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Typeof(state) {
@@ -4321,7 +4399,7 @@ var Civet = (() => {
           return Typeof$0(state);
         }
       }
-      var Unless$0 = $TV($EXPECT($L127, fail, 'Unless "unless"'), function($skip, $loc, $0, $1) {
+      var Unless$0 = $TV($EXPECT($L125, fail, 'Unless "unless"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Unless(state) {
@@ -4333,7 +4411,19 @@ var Civet = (() => {
           return Unless$0(state);
         }
       }
-      var Var$0 = $TV($EXPECT($L128, fail, 'Var "var"'), function($skip, $loc, $0, $1) {
+      var Until$0 = $TS($S($EXPECT($L126, fail, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+        return { $loc, token: $1 };
+      });
+      function Until(state) {
+        if (state.verbose)
+          console.log("ENTER:", "Until");
+        if (state.tokenize) {
+          return $TOKEN("Until", state, Until$0(state));
+        } else {
+          return Until$0(state);
+        }
+      }
+      var Var$0 = $TV($EXPECT($L127, fail, 'Var "var"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Var(state) {
@@ -4345,7 +4435,7 @@ var Civet = (() => {
           return Var$0(state);
         }
       }
-      var Void$0 = $TS($S($EXPECT($L129, fail, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Void$0 = $TS($S($EXPECT($L128, fail, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Void(state) {
@@ -4357,7 +4447,7 @@ var Civet = (() => {
           return Void$0(state);
         }
       }
-      var When$0 = $TS($S($EXPECT($L130, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var When$0 = $TS($S($EXPECT($L129, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "case" };
       });
       function When(state) {
@@ -4369,6 +4459,18 @@ var Civet = (() => {
           return When$0(state);
         }
       }
+      var While$0 = $TS($S($EXPECT($L130, fail, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+        return { $loc, token: $1 };
+      });
+      function While(state) {
+        if (state.verbose)
+          console.log("ENTER:", "While");
+        if (state.tokenize) {
+          return $TOKEN("While", state, While$0(state));
+        } else {
+          return While$0(state);
+        }
+      }
       var Yield$0 = $TS($S($EXPECT($L131, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
@@ -4814,7 +4916,7 @@ var Civet = (() => {
         }
       }
       var TypeUnaryOp$0 = $EXPECT($L142, fail, 'TypeUnaryOp "keyof"');
-      var TypeUnaryOp$1 = $EXPECT($L126, fail, 'TypeUnaryOp "typeof"');
+      var TypeUnaryOp$1 = $EXPECT($L124, fail, 'TypeUnaryOp "typeof"');
       var TypeUnaryOp$2 = $EXPECT($L143, fail, 'TypeUnaryOp "infer"');
       function TypeUnaryOp(state) {
         if (state.tokenize) {
@@ -4905,7 +5007,7 @@ var Civet = (() => {
         }
       }
       var TypeLiteral$0 = Literal;
-      var TypeLiteral$1 = $TV($EXPECT($L129, fail, 'TypeLiteral "void"'), function($skip, $loc, $0, $1) {
+      var TypeLiteral$1 = $TV($EXPECT($L128, fail, 'TypeLiteral "void"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "void" };
       });
       var TypeLiteral$2 = $TV($EXPECT($L144, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
@@ -5406,6 +5508,16 @@ var Civet = (() => {
           insertReturn(block);
           return block;
         };
+        module.isWhitespaceOrEmpty = function(node) {
+          if (!node)
+            return true;
+          if (!node.length)
+            return true;
+          if (typeof node === "string")
+            return node.match(/^\s*$/);
+          if (Array.isArray(node))
+            return node.every(module.isWhitespaceOrEmpty);
+        };
         module.expandChainedComparisons = function([first, binops]) {
           const relationalOps = ["==", "===", "!=", "!==", "<", "<=", ">", ">=", "in", "instanceof"];
           const lowerPrecedenceOps = ["??", "&&", "||", "&", "|", "^"];