fix: top level statement compile within namespace

Author: Jesse Chen

src/parser.ts

@@ -398,9 +398,7 @@ export class Parser extends DiagnosticEmitter {
               tn.range(declareStart, declareEnd), "declare"
             ); // recoverable
           }
-          if (!namespace) {
-            statement = this.parseStatement(tn, true);
-          } // TODO: else?
+          statement = this.parseStatement(tn, true);
         }
         break;
       }

src/program.ts

@@ -2773,7 +2773,7 @@ export class Program extends DiagnosticEmitter {
           this.initializeVariables(<VariableStatement>member, original);
           break;
         }
-        default: assert(false); // namespace member expected
+        default: break; // namespace could have statement
       }
     }
     if (original != element) copyMembers(original, element); // keep original parent

tests/compiler/namespace.debug.wat

@@ -1,16 +1,20 @@
 (module
  (type $none_=>_i32 (func (result i32)))
  (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
+ (global $namespace/outVariable (mut i32) (i32.const 0))
  (global $namespace/Outer.outerVar (mut i32) (i32.const 1))
  (global $namespace/Outer.Inner.aVar (mut i32) (i32.const 0))
  (global $namespace/Outer.Inner.anotherVar (mut i32) (i32.const 0))
  (global $namespace/Outer.Inner.evenAnotherVar (mut i32) (i32.const 0))
  (global $namespace/Outer.Inner.anEnum.ONE i32 (i32.const 1))
  (global $namespace/Outer.Inner.anEnum.TWO i32 (i32.const 2))
- (global $~lib/memory/__data_end i32 (i32.const 8))
- (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
- (global $~lib/memory/__heap_base i32 (i32.const 32776))
- (memory $0 0)
+ (global $~lib/memory/__data_end i32 (i32.const 60))
+ (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32828))
+ (global $~lib/memory/__heap_base i32 (i32.const 32828))
+ (memory $0 1)
+ (data $0 (i32.const 12) ",\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00\18\00\00\00n\00a\00m\00e\00s\00p\00a\00c\00e\00.\00t\00s\00\00\00\00\00")
  (table $0 1 1 funcref)
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
@@ -24,10 +28,24 @@
   return
  )
  (func $start:namespace
+  i32.const 42
+  global.set $namespace/outVariable
   global.get $namespace/Outer.Inner.aVar
   global.set $namespace/Outer.Inner.anotherVar
   global.get $namespace/Outer.outerVar
   global.set $namespace/Outer.Inner.evenAnotherVar
+  global.get $namespace/outVariable
+  i32.const 42
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 32
+   i32.const 16
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
   global.get $namespace/Outer.Inner.aVar
   drop
   call $namespace/Outer.Inner.aFunc

tests/compiler/namespace.release.wat

@@ -1,4 +1,6 @@
 (module
- (memory $0 0)
+ (memory $0 1)
+ (data $0 (i32.const 1036) ",")
+ (data $0.1 (i32.const 1048) "\02\00\00\00\18\00\00\00n\00a\00m\00e\00s\00p\00a\00c\00e\00.\00t\00s")
  (export "memory" (memory $0))
 )

tests/compiler/namespace.ts

@@ -1,4 +1,6 @@
+let outVariable: i32 = 0;
 namespace Outer {
+  outVariable = 42;
   export var outerVar: i32 = 1;
   export namespace Inner {
     export var aVar: i32 = 0;
@@ -7,9 +9,11 @@ namespace Outer {
     export function aFunc(): i32 { return aVar; }
     export enum anEnum { ONE = 1, TWO = 2 }
     export const enum aConstEnum { ONE = 1, TWO = 2 }
+    export function assertOutVariable(): void { assert(outVariable == 42); }
   }
 }
 
+assert(outVariable == 42);
 Outer.Inner.aVar;
 Outer.Inner.aFunc();
 Outer.Inner.anEnum.ONE;

tests/parser/namespace.ts

@@ -1,4 +1,6 @@
+let outsideVariable:i32 = 0;
 declare namespace A {
+  outsideVariable = 42;
   namespace B {
     export namespace C {
       var aVar: i32;
@@ -13,4 +15,5 @@ declare namespace A {
       var aVar: i32;
     }
   }
+  return; // // ERROR 1108: A 'return' statement can only be used within a function body.
 }

tests/parser/namespace.ts.fixture.ts

@@ -1,4 +1,6 @@
+let outsideVariable: i32 = 0;
 declare namespace A {
+  outsideVariable = 42;
   namespace B {
     export namespace C {
       var aVar: i32;
@@ -13,6 +15,8 @@ declare namespace A {
       var aVar: i32;
     }
   }
+  return;
 }
-// ERROR 1039: "Initializers are not allowed in ambient contexts." in namespace.ts(6,32+1)
-// ERROR 1183: "An implementation cannot be declared in ambient contexts." in namespace.ts(8,37+1)
+// ERROR 1039: "Initializers are not allowed in ambient contexts." in namespace.ts(8,32+1)
+// ERROR 1183: "An implementation cannot be declared in ambient contexts." in namespace.ts(10,37+1)
+// ERROR 1108: "A 'return' statement can only be used within a function body." in namespace.ts(18,3+6)