Bundle the kind with the con

samples/counter.txt

@@ -1,7 +1,7 @@
 -- Checking counter.as:
-type Counter <: actor {dec : shared () -> (); read : shared () -> async Int}
-let Counter : class Int -> Counter
-let c : Counter
+type Counter = actor {dec : shared () -> (); read : shared () -> async Int}
+let Counter : Int -> Counter
+let c : actor {dec : shared () -> (); read : shared () -> async Int}
 let show : (Text, Int) -> ()
 let showAsync : (Text, async Int) -> ()
 let testDec : () -> ()
@@ -287,8 +287,8 @@ testRead()
     <= ()
   <= ()
 -- Finished counter.as:
-let Counter : class Int -> Counter = func
-let c : Counter = {dec = func; read = func}
+let Counter : Int -> Counter = func
+let c : actor {dec : shared () -> (); read : shared () -> async Int} = {dec = func; read = func}
 let show : (Text, Int) -> () = func
 let showAsync : (Text, async Int) -> () = func
 let testDec : () -> () = func

samples/quicksort.txt

@@ -1,10 +1,10 @@
 -- Checking quicksort.as:
 type Array<T> = [var T]
-type QS<T> <: {quicksort : (Array<T>, Nat, Nat) -> ()}
-let QS : class <T>((T, T) -> Int) -> QS<T>
+type QS<T> = {quicksort : (Array<T>, Nat, Nat) -> ()}
+let QS : <T>((T, T) -> Int) -> QS<T>
 let a : [var Int]
 let cmpi : (Int, Int) -> Int
-let qs : QS<Int>
+let qs : {quicksort : (Array<Int>, Nat, Nat) -> ()}
 -- Interpreting quicksort.as:
 QS(func)
   <= {quicksort = func}
@@ -97,8 +97,8 @@ quicksort([8, 3, 9, 5, 2], 0, 4)
     <= ()
   <= ()
 -- Finished quicksort.as:
-let QS : class <T>((T, T) -> Int) -> QS<T> = func
+let QS : <T>((T, T) -> Int) -> QS<T> = func
 let a : [var Int] = [2, 3, 5, 8, 9]
 let cmpi : (Int, Int) -> Int = func
-let qs : QS<Int> = {quicksort = func}
+let qs : {quicksort : (Array<Int>, Nat, Nat) -> ()} = {quicksort = func}
 

src/arrange_ir.ml

@@ -67,8 +67,8 @@ and dec d = match d.it with
   | VarD (i, e) -> "VarD" $$ [id i; exp e]
   | FuncD (cc, i, tp, p, t, e) ->
     "FuncD" $$ [call_conv cc; id i] @ List.map typ_bind tp @ [pat p; typ t; exp e]
-  | TypD (c,k) ->
-    "TypD" $$ [con c; kind k]
+  | TypD c ->
+    "TypD" $$ [con c; kind (Type.kind c)]
 
 and typ_bind (tb : typ_bind) =
   Con.to_string tb.it.con $$ [typ tb.it.bound]