@danielx/civet 0.4.19-pre.3 → 0.4.19-pre.4

package/dist/browser.js

@@ -490,6 +490,7 @@ var Civet = (() => {
         ThinArrowFunction,
         Arrow,
         Block,
+        ThenClause,
         BracedOrEmptyBlock,
         EmptyBlock,
         BracedBlock,
@@ -566,6 +567,7 @@ var Civet = (() => {
         ForDeclaration,
         ForBinding,
         SwitchStatement,
+        EmptyCondition,
         SwitchExpression,
         CaseBlock,
         NestedCaseClauses,
@@ -2385,12 +2387,8 @@ var Civet = (() => {
         var exps = value[2];
         return { "type": "BlockStatement", "expressions": exps, "children": value };
       });
-      var Block$2 = $T($S($E(Then), Statement), function(value) {
-        return value[1];
-      });
-      var Block$3 = $T($S($E(Then), __, Statement), function(value) {
-        return [value[1], value[2]];
-      });
+      var Block$2 = ThenClause;
+      var Block$3 = $S($Q(TrailingComment), Statement);
       function Block(state) {
         if (state.tokenize) {
           return $TOKEN("Block", state, Block$0(state) || Block$1(state) || Block$2(state) || Block$3(state));
@@ -2398,6 +2396,18 @@ var Civet = (() => {
           return Block$0(state) || Block$1(state) || Block$2(state) || Block$3(state);
         }
       }
+      var ThenClause$0 = $T($S(Then, $Q(TrailingComment), Statement), function(value) {
+        return [value[1], value[2]];
+      });
+      function ThenClause(state) {
+        if (state.verbose)
+          console.log("ENTER:", "ThenClause");
+        if (state.tokenize) {
+          return $TOKEN("ThenClause", state, ThenClause$0(state));
+        } else {
+          return ThenClause$0(state);
+        }
+      }
       var BracedOrEmptyBlock$0 = BracedBlock;
       var BracedOrEmptyBlock$1 = EmptyBlock;
       function BracedOrEmptyBlock(state) {
@@ -3877,8 +3887,30 @@ var Civet = (() => {
           return ForBinding$0(state) || ForBinding$1(state);
         }
       }
-      var SwitchStatement$0 = $T($S(Switch, Condition, CaseBlock), function(value) {
-        return { "type": "SwitchStatement", "children": value };
+      var SwitchStatement$0 = $TS($S(Switch, $C(EmptyCondition, Condition), CaseBlock), function($skip, $loc, $0, $1, $2, $3) {
+        var condition = $2;
+        var caseBlock = $3;
+        if (condition.type === "EmptyCondition") {
+          caseBlock.clauses.forEach(({ cases }) => {
+            if (cases) {
+              cases.forEach((c) => {
+                const exp = c[1];
+                switch (exp.type) {
+                  case "Identifier":
+                  case "Literal":
+                    c.splice(1, 0, "!");
+                    break;
+                  default:
+                    c.splice(1, 1, "!(", exp, ")");
+                }
+              });
+            }
+          });
+        }
+        return {
+          type: "SwitchStatement",
+          children: $0
+        };
       });
       function SwitchStatement(state) {
         if (state.verbose)
@@ -3889,6 +3921,24 @@ var Civet = (() => {
           return SwitchStatement$0(state);
         }
       }
+      var EmptyCondition$0 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
+        return {
+          type: "EmptyCondition",
+          children: [{
+            $loc,
+            token: " (false)"
+          }]
+        };
+      });
+      function EmptyCondition(state) {
+        if (state.verbose)
+          console.log("ENTER:", "EmptyCondition");
+        if (state.tokenize) {
+          return $TOKEN("EmptyCondition", state, EmptyCondition$0(state));
+        } else {
+          return EmptyCondition$0(state);
+        }
+      }
       var SwitchExpression$0 = $TV(SwitchStatement, function($skip, $loc, $0, $1) {
         var e = $0;
         module.addImplicitReturns(e.children[2]);
@@ -3959,18 +4009,20 @@ var Civet = (() => {
         }
       }
       var CaseClause$0 = $T($S(Case, CaseExpressionList, $C(NestedBlockStatements, NoExpressions)), function(value) {
-        var exps = value[2];
-        return { "type": "CaseClause", "expressions": exps, "children": value };
+        var cases = value[1];
+        var expressions = value[2];
+        return { "type": "CaseClause", "cases": cases, "expressions": expressions, "children": value };
       });
-      var CaseClause$1 = $T($S(When, CaseExpressionList, NestedBlockStatements, InsertBreak), function(value) {
-        var exps = value[2];
-        return { "type": "WhenClause", "expressions": exps, "children": value };
+      var CaseClause$1 = $T($S(When, CaseExpressionList, $C(ThenClause, NestedBlockStatements), InsertBreak), function(value) {
+        var cases = value[1];
+        var expressions = value[2];
+        return { "type": "WhenClause", "cases": cases, "expressions": expressions, "children": value };
       });
       var CaseClause$2 = $T($S(Default, ImpliedColon, $C(NestedBlockStatements, NoExpressions)), function(value) {
         var exps = value[2];
         return { "type": "DefaultClause", "expressions": exps, "children": value };
       });
-      var CaseClause$3 = $TS($S(Else, ImpliedColon, NestedBlockStatements), function($skip, $loc, $0, $1, $2, $3) {
+      var CaseClause$3 = $TS($S(Else, ImpliedColon, $C(NestedBlockStatements, $S($Q(TrailingComment), Statement))), function($skip, $loc, $0, $1, $2, $3) {
         var exps = $3;
         $1.token = "default";
         return {

package/dist/main.js

@@ -489,6 +489,7 @@ var require_parser = __commonJS({
       ThinArrowFunction,
       Arrow,
       Block,
+      ThenClause,
       BracedOrEmptyBlock,
       EmptyBlock,
       BracedBlock,
@@ -565,6 +566,7 @@ var require_parser = __commonJS({
       ForDeclaration,
       ForBinding,
       SwitchStatement,
+      EmptyCondition,
       SwitchExpression,
       CaseBlock,
       NestedCaseClauses,
@@ -2384,12 +2386,8 @@ var require_parser = __commonJS({
       var exps = value[2];
       return { "type": "BlockStatement", "expressions": exps, "children": value };
     });
-    var Block$2 = $T($S($E(Then), Statement), function(value) {
-      return value[1];
-    });
-    var Block$3 = $T($S($E(Then), __, Statement), function(value) {
-      return [value[1], value[2]];
-    });
+    var Block$2 = ThenClause;
+    var Block$3 = $S($Q(TrailingComment), Statement);
     function Block(state) {
       if (state.tokenize) {
         return $TOKEN("Block", state, Block$0(state) || Block$1(state) || Block$2(state) || Block$3(state));
@@ -2397,6 +2395,18 @@ var require_parser = __commonJS({
         return Block$0(state) || Block$1(state) || Block$2(state) || Block$3(state);
       }
     }
+    var ThenClause$0 = $T($S(Then, $Q(TrailingComment), Statement), function(value) {
+      return [value[1], value[2]];
+    });
+    function ThenClause(state) {
+      if (state.verbose)
+        console.log("ENTER:", "ThenClause");
+      if (state.tokenize) {
+        return $TOKEN("ThenClause", state, ThenClause$0(state));
+      } else {
+        return ThenClause$0(state);
+      }
+    }
     var BracedOrEmptyBlock$0 = BracedBlock;
     var BracedOrEmptyBlock$1 = EmptyBlock;
     function BracedOrEmptyBlock(state) {
@@ -3876,8 +3886,30 @@ var require_parser = __commonJS({
         return ForBinding$0(state) || ForBinding$1(state);
       }
     }
-    var SwitchStatement$0 = $T($S(Switch, Condition, CaseBlock), function(value) {
-      return { "type": "SwitchStatement", "children": value };
+    var SwitchStatement$0 = $TS($S(Switch, $C(EmptyCondition, Condition), CaseBlock), function($skip, $loc, $0, $1, $2, $3) {
+      var condition = $2;
+      var caseBlock = $3;
+      if (condition.type === "EmptyCondition") {
+        caseBlock.clauses.forEach(({ cases }) => {
+          if (cases) {
+            cases.forEach((c) => {
+              const exp = c[1];
+              switch (exp.type) {
+                case "Identifier":
+                case "Literal":
+                  c.splice(1, 0, "!");
+                  break;
+                default:
+                  c.splice(1, 1, "!(", exp, ")");
+              }
+            });
+          }
+        });
+      }
+      return {
+        type: "SwitchStatement",
+        children: $0
+      };
     });
     function SwitchStatement(state) {
       if (state.verbose)
@@ -3888,6 +3920,24 @@ var require_parser = __commonJS({
         return SwitchStatement$0(state);
       }
     }
+    var EmptyCondition$0 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
+      return {
+        type: "EmptyCondition",
+        children: [{
+          $loc,
+          token: " (false)"
+        }]
+      };
+    });
+    function EmptyCondition(state) {
+      if (state.verbose)
+        console.log("ENTER:", "EmptyCondition");
+      if (state.tokenize) {
+        return $TOKEN("EmptyCondition", state, EmptyCondition$0(state));
+      } else {
+        return EmptyCondition$0(state);
+      }
+    }
     var SwitchExpression$0 = $TV(SwitchStatement, function($skip, $loc, $0, $1) {
       var e = $0;
       module2.addImplicitReturns(e.children[2]);
@@ -3958,18 +4008,20 @@ var require_parser = __commonJS({
       }
     }
     var CaseClause$0 = $T($S(Case, CaseExpressionList, $C(NestedBlockStatements, NoExpressions)), function(value) {
-      var exps = value[2];
-      return { "type": "CaseClause", "expressions": exps, "children": value };
+      var cases = value[1];
+      var expressions = value[2];
+      return { "type": "CaseClause", "cases": cases, "expressions": expressions, "children": value };
     });
-    var CaseClause$1 = $T($S(When, CaseExpressionList, NestedBlockStatements, InsertBreak), function(value) {
-      var exps = value[2];
-      return { "type": "WhenClause", "expressions": exps, "children": value };
+    var CaseClause$1 = $T($S(When, CaseExpressionList, $C(ThenClause, NestedBlockStatements), InsertBreak), function(value) {
+      var cases = value[1];
+      var expressions = value[2];
+      return { "type": "WhenClause", "cases": cases, "expressions": expressions, "children": value };
     });
     var CaseClause$2 = $T($S(Default, ImpliedColon, $C(NestedBlockStatements, NoExpressions)), function(value) {
       var exps = value[2];
       return { "type": "DefaultClause", "expressions": exps, "children": value };
     });
-    var CaseClause$3 = $TS($S(Else, ImpliedColon, NestedBlockStatements), function($skip, $loc, $0, $1, $2, $3) {
+    var CaseClause$3 = $TS($S(Else, ImpliedColon, $C(NestedBlockStatements, $S($Q(TrailingComment), Statement))), function($skip, $loc, $0, $1, $2, $3) {
       var exps = $3;
       $1.token = "default";
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.4.19-pre.3",
+  "version": "0.4.19-pre.4",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "exports": {