empty statement tests

baselines/reference/emptyStatement.errors.baseline

@@ -0,0 +1 @@
+[]

baselines/reference/emptyStatement.js.baseline

@@ -0,0 +1 @@
+"var x = 1;\nvar y = 2"

baselines/reference/emptyStatement.tree.baseline

@@ -0,0 +1,54 @@
+{
+  "locals": {
+    "x": [
+      {
+        "kind": "Var",
+        "pos": 3
+      }
+    ],
+    "y": [
+      {
+        "kind": "Var",
+        "pos": 22
+      }
+    ]
+  },
+  "statements": [
+    {
+      "kind": "Var",
+      "name": {
+        "kind": "Identifier",
+        "text": "x"
+      },
+      "typename": {
+        "kind": "Identifier",
+        "text": "number"
+      },
+      "init": {
+        "kind": "Literal",
+        "value": 1
+      }
+    },
+    {
+      "kind": "EmptyStatement"
+    },
+    {
+      "kind": "Var",
+      "name": {
+        "kind": "Identifier",
+        "text": "y"
+      },
+      "typename": {
+        "kind": "Identifier",
+        "text": "number"
+      },
+      "init": {
+        "kind": "Literal",
+        "value": 2
+      }
+    },
+    {
+      "kind": "EmptyStatement"
+    }
+  ]
+}

baselines/reference/redeclare.tree.baseline

@@ -29,6 +29,9 @@
         "kind": "Literal",
         "value": 2
       }
+    },
+    {
+      "kind": "EmptyStatement"
     }
   ]
 }

baselines/reference/singleIdentifier.tree.baseline

@@ -7,6 +7,9 @@
         "kind": "Identifier",
         "text": "x"
       }
+    },
+    {
+      "kind": "EmptyStatement"
     }
   ]
 }

baselines/reference/singleTypedVar.tree.baseline

@@ -22,6 +22,9 @@
         "kind": "Literal",
         "value": 1
       }
+    },
+    {
+      "kind": "EmptyStatement"
     }
   ]
 }

baselines/reference/singleVar.tree.baseline

@@ -18,6 +18,9 @@
         "kind": "Literal",
         "value": 1
       }
+    },
+    {
+      "kind": "EmptyStatement"
     }
   ]
 }

baselines/reference/twoStatements.tree.baseline

@@ -32,6 +32,9 @@
           "value": 2
         }
       }
+    },
+    {
+      "kind": "EmptyStatement"
     }
   ]
 }

baselines/reference/twoTypedStatements.tree.baseline

@@ -36,6 +36,9 @@
           "value": 2
         }
       }
+    },
+    {
+      "kind": "EmptyStatement"
     }
   ]
 }

baselines/reference/typeAlias.tree.baseline

@@ -192,6 +192,9 @@
         "kind": "Identifier",
         "text": "Net"
       }
+    },
+    {
+      "kind": "EmptyStatement"
     }
   ]
 }

src/emit.ts

@@ -1,7 +1,7 @@
 import { Statement, Node, Expression } from './types';
 
 export function emit(statements: Statement[]) {
-  return statements.map(emitStatement).join(';\n');
+  return statements.filter(Boolean).map(emitStatement).join(';\n');
 }
 
 function emitStatement(statement: Statement): string {
@@ -15,6 +15,8 @@ function emitStatement(statement: Statement): string {
       )}`;
     case Node.TypeAlias:
       return `type ${statement.name.text} = ${statement.typename.text}`;
+    case Node.EmptyStatement:
+      return '';
   }
 }
 

src/parse.ts

@@ -70,7 +70,7 @@ export function parse(lexer: Lexer): Module {
       const typename = parseIdentifier();
       return { kind: Node.TypeAlias, name, typename, pos };
     } else if (tryParseTokens([Token.EOF, Token.Semicolon])) {
-      return { kind: Node.EmptyStatement, pos };
+      return { kind: Node.EmptyStatement };
     }
     return { kind: Node.ExpressionStatement, expr: parseExpression(), pos };
   }

src/test.ts

@@ -67,6 +67,14 @@ let lexResult = sum(
   ),
 );
 
+// const [tree, errors, js] = compile(
+//   fs.readFileSync('tests/' + 'emptyStatement.ts', 'utf8'),
+// );
+// const name = 'emptyStatement.ts'.slice(0, 'emptyStatement.ts'.length - 3);
+// test('tree', name, displayModule(tree)) +
+//   test('errors', name, errors) +
+//   test('js', name, js);
+
 let compileResult = sum(
   fs.readdirSync('tests').map((file) => {
     const [tree, errors, js] = compile(

src/transform.ts

@@ -16,6 +16,8 @@ function typescript(statements: Statement[]) {
         return [{ ...statement, typename: undefined }];
       case Node.TypeAlias:
         return [];
+      case Node.EmptyStatement:
+        return [];
     }
   }
 }

src/types.ts

@@ -79,7 +79,7 @@ export type TypeAlias = Location & {
   typename: Identifier;
 };
 
-export type EmptyStatement = Location & {
+export type EmptyStatement = {
   kind: Node.EmptyStatement;
 };
 

tests/emptyStatement.ts

@@ -0,0 +1 @@
+var x: number = 1;;var y: number = 2;