Better type checking and virtual table works

Still need to move logic into the interface methods.

Author: Willem Wyndham

src/compiler.ts

@@ -2956,7 +2956,15 @@ export class Compiler extends DiagnosticEmitter {
           fromType.toString(),
           toType.toString());
       } else {
-        this.checkInterfaceImplementation(toType, fromType, reportNode);
+        if (this.checkInterfaceImplementation(toType, fromType, reportNode)){
+          (<Interface>toType.classReference).implementers.add(fromType.classReference);
+        } else {
+          this.error(
+            DiagnosticCode.Type_0_is_not_assignable_to_type_1,
+            reportNode.range,
+            fromType.toString(),
+            toType.toString());
+        }
       }
     }
     else if (!fromType.isAssignableTo(toType)) {
@@ -9274,30 +9282,23 @@ export class Compiler extends DiagnosticEmitter {
     return module.addFunction(func.internalName, typeRef, null, body);
   }
 
-  checkInterfaceImplementation(toType: Type, fromType: Type, reportNode: Node): void {
+  checkInterfaceImplementation(toType: Type, fromType: Type, reportNode: Node): bool {
     const _interface = (<Interface>toType.classReference!);
     const _class = fromType.classReference!;
     var imems: Map<string, Element>;
-    var mems: Map<string, Element>;
+    var mems: Map<string, Element> | null;
     if (_interface.prototype.instanceMembers == null) {
-      return;
-    } else {
-      imems = _interface.prototype.instanceMembers;
-      if (_class.prototype.instanceMembers == null) {
-        // All members missing
-
-        return;
-      } else {
-        mems = _class.prototype.instanceMembers;
-      }
+      return true;
     }
+    imems = _interface.prototype.instanceMembers;
+    mems = _class.prototype.instanceMembers;
+  
     var error = false;
     var incorrectMember = false;
     for (const [name, imem] of imems.entries()) {
       error = error || incorrectMember;
       incorrectMember = true;
-      let mem = mems.get(name);
-      if (mem == null) {
+      if (mems == null || mems.get(name) == null) {
         // Error!
         this.error(
           DiagnosticCode.Property_0_is_missing_in_type_1_but_required_in_type_2,
@@ -9308,6 +9309,7 @@ export class Compiler extends DiagnosticEmitter {
         );
         continue;
       }
+      let mem  = mems.get(name)!;
       if (imem.kind != mem.kind) {
         // Interfaces can't have properties
         if (!(mem.kind == ElementKind.PROPERTY_PROTOTYPE  && imem.kind == ElementKind.FIELD_PROTOTYPE)) {
@@ -9378,19 +9380,21 @@ export class Compiler extends DiagnosticEmitter {
           from.toString(),
           to.toString()
           );
-        continue;
-        // Error
-      }
-      incorrectMember = false;
+          continue;
+          // Error
+        }
+        incorrectMember = false;
     }
+      error = error || incorrectMember;// case where contiune skips the last check.
     if (error) {
       this.error(
         DiagnosticCode.Class_0_incorrectly_implements_interface_1,
           _class.identifierNode.range,
-          fromType.toString(),
-          toType.toString()
-          );
+            fromType.toString(),
+            toType.toString()
+            );
     }
+    return !error;
   }
 }
 

tests/compiler/interface-fail.json

@@ -3,22 +3,42 @@
     "--runtime none"
   ],
   "stderr": [
-  "TS2322: Type 'interface-fail/BadFoo' is not assignable to type 'interface-fail/IFoo'.",
-   "const aBadFoo: IFoo =  new BadFoo();",
-  "TS2420: Class 'interface-fail/BadFoo' incorrectly implements interface 'interface-fail/IFoo'.",
-   "class BadFoo implements IFoo {",
-  "TS2741: Property 'foo' is missing in type 'interface-fail/BadFoo' but required in type 'interface-fail/IFoo'.",
-   "class BadFoo implements IFoo {",
-  "TS2322: Type 'BadFoo.faa' is not assignable to type 'IFoo.faa'.",
-     "faa(i: i32, i2: i32): i32 {",
-  "TS2322: Type 'interface-fail/AnotherBadFoo' is not assignable to type 'interface-fail/IFoo'.",
-   "const anotherBadFoo: IFoo = new AnotherBadFoo();",
-  "TS2420: Class 'interface-fail/AnotherBadFoo' incorrectly implements interface 'interface-fail/IFoo'.",
+    "TS2741: Property 'foo' is missing in type 'BadFoo' but required in type 'IFoo'.",
+     "class BadFoo implements IFoo {",
+
+    "TS2322: Type '(i: i32, i2: i32) => i32' is not assignable to type '(i: i32, i2: i32) => ~lib/string/String'.",
+    "class BadFoo implements IFoo {",
+    
+    "TS2420: Class 'interface-fail/BadFoo' incorrectly implements interface 'interface-fail/IFoo'.",
+    "class BadFoo implements IFoo {",
+    
+    "TS2322: Type 'interface-fail/BadFoo' is not assignable to type 'interface-fail/IFoo'.",
+    "const aBadFoo: IFoo =  new BadFoo();",
+
+   "TS2741: Property 'foo' is missing in type 'AnotherBadFoo' but required in type 'IFoo'.",
    "class AnotherBadFoo {}",
-  "TS2741: Property 'foo' is missing in type 'interface-fail/AnotherBadFoo' but required in type 'interface-fail/IFoo'.",
+
+  "TS2741: Property 'faa' is missing in type 'AnotherBadFoo' but required in type 'IFoo'.",
    "class AnotherBadFoo {}",
-  "TS2741: Property 'faa' is missing in type 'interface-fail/AnotherBadFoo' but required in type 'interface-fail/IFoo'.",
+
+  "TS2420: Class 'interface-fail/AnotherBadFoo' incorrectly implements interface 'interface-fail/IFoo'.",
    "class AnotherBadFoo {}",
+
+  "TS2322: Type 'interface-fail/AnotherBadFoo' is not assignable to type 'interface-fail/IFoo'.",
+   "const anotherBadFoo: IFoo = new AnotherBadFoo();",
+
   "TS2322: Type 'i32' is not assignable to type 'interface-fail/IFoo'.",
-  "const intFoo: IFoo = <i32>5;"]
+   "const intFoo: IFoo = <i32>5;",
+
+  "TS2741: Property 'get val' is missing in type 'BadProps' but required in type 'Properties'.",
+   "class BadProps implements Properties {",
+
+  "TS2420: Class 'interface-fail/BadProps' incorrectly implements interface 'interface-fail/Properties'.",
+   "class BadProps implements Properties {",
+
+  "TS2322: Type 'interface-fail/BadProps' is not assignable to type 'interface-fail/Properties'.",
+   "const badProp = <Properties> new BadProps();"
+    
+
+]
   }

tests/compiler/interface.optimized.wat

@@ -1,16 +1,22 @@
 (module
+ (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
  (type $FUNCSIG$vi (func (param i32)))
+ (type $FUNCSIG$viiii (func (param i32 i32 i32 i32)))
+ (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32)))
  (type $FUNCSIG$v (func))
  (type $FUNCSIG$ii (func (param i32) (result i32)))
+ (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (memory $0 1)
  (data (i32.const 8) "\18\00\00\00\01\00\00\00\01\00\00\00\18\00\00\00i\00n\00t\00e\00r\00f\00a\00c\00e\00.\00t\00s")
+ (table $0 5 funcref)
+ (elem (i32.const 0) $null $interface/AFoo#foo $interface/AFoo#foo $interface/AFoo#faa $interface/AFoo#faa)
  (global $~lib/rt/stub/startOffset (mut i32) (i32.const 0))
  (global $~lib/rt/stub/offset (mut i32) (i32.const 0))
  (global $interface/aFoo (mut i32) (i32.const 0))
  (global $interface/sFoo (mut i32) (i32.const 0))
  (export "memory" (memory $0))
  (start $start)
- (func $~lib/rt/stub/maybeGrowMemory (; 0 ;) (type $FUNCSIG$vi) (param $0 i32)
+ (func $~lib/rt/stub/maybeGrowMemory (; 1 ;) (type $FUNCSIG$vi) (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -52,7 +58,7 @@
   local.get $0
   global.set $~lib/rt/stub/offset
  )
- (func $~lib/rt/stub/__alloc (; 1 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+ (func $~lib/rt/stub/__alloc (; 2 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/rt/stub/offset
@@ -79,15 +85,48 @@
   i32.store offset=12
   local.get $2
  )
- (func $interface/passAnInterface (; 2 ;) (type $FUNCSIG$vi) (param $0 i32)
+ (func $interface/passAnInterface (; 3 ;) (type $FUNCSIG$vi) (param $0 i32)
+  local.get $0
+  i32.const 1
+  i32.const 0
   local.get $0
   i32.const 8
   i32.sub
   i32.load
-  drop
-  unreachable
+  call $~virtual
+  call_indirect (type $FUNCSIG$iii)
+  i32.const 42
+  i32.ne
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 37
+   i32.const 2
+   call $~lib/builtins/abort
+   unreachable
+  end
+  local.get $0
+  i32.const 1
+  i32.const 3
+  i32.const 1
+  local.get $0
+  i32.const 8
+  i32.sub
+  i32.load
+  call $~virtual
+  call_indirect (type $FUNCSIG$iiii)
+  i32.const 4
+  i32.ne
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 38
+   i32.const 2
+   call $~lib/builtins/abort
+   unreachable
+  end
  )
- (func $start (; 3 ;) (type $FUNCSIG$v)
+ (func $start (; 4 ;) (type $FUNCSIG$v)
   (local $0 i32)
   i32.const 48
   global.set $~lib/rt/stub/startOffset
@@ -112,7 +151,59 @@
   global.get $interface/sFoo
   call $interface/passAnInterface
  )
- (func $null (; 4 ;) (type $FUNCSIG$v)
+ (func $interface/AFoo#foo (; 5 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+  local.get $0
+  i32.load
+  local.get $1
+  i32.add
+ )
+ (func $interface/AFoo#faa (; 6 ;) (type $FUNCSIG$iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  local.get $1
+  local.get $2
+  i32.add
+ )
+ (func $~virtual (; 7 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+  block $block$2$break
+   block $switch$1$case$6
+    block $switch$1$case$3
+     local.get $0
+     br_table $switch$1$case$3 $switch$1$case$6 $block$2$break
+    end
+    local.get $1
+    i32.const 3
+    i32.eq
+    if
+     i32.const 1
+     return
+    else
+     local.get $1
+     i32.const 4
+     i32.ne
+     br_if $block$2$break
+     i32.const 2
+     return
+    end
+    unreachable
+   end
+   local.get $1
+   i32.const 3
+   i32.eq
+   if
+    i32.const 3
+    return
+   else
+    local.get $1
+    i32.const 4
+    i32.eq
+    if
+     i32.const 4
+     return
+    end
+   end
+  end
+  unreachable
+ )
+ (func $null (; 8 ;) (type $FUNCSIG$v)
   nop
  )
 )