1 files changed, 16 insertions, 7 deletions
diff --git a/lib/DATS/init.dats b/lib/DATS/init.dats
index cfdc12e..c2ae39d 100644
--- a/lib/DATS/init.dats
+++ b/lib/DATS/init.dats
@@ -1,5 +1,7 @@
 #include "share/atspre_staload.hats"
 staload "lib/SATS/init.sats"
+staload "lib/SATS/panic.sats"
+staload UN = "prelude/SATS/unsafe.sats"
 
 #define ATS_DYNLOADFLAG 0
 
@@ -20,26 +22,33 @@ in
       prval () = opt_some  p->obj
     in
     end
+  else
+    panic("Not initialized")
 end
 
-implement{vt} exec_void$fwork (v) = ()
+implement{vt} exec_void$fwork (v) = panic("Not overloaded")
 
-implement{vt} {a} exec  (r,default) = let
+implement{vt} {a} exec (r) = let
   val (vbox pf | p) = ref_get_viewptr{initializable vt}(r)
 in
   if p->initialized then
     let
       prval () = opt_unsome p->obj
-      val a = exec$fwork (p->obj,default)
+      val out = exec$fwork<vt><a> (p->obj)
       prval () = opt_some  p->obj
     in
-      a
+      out
     end
-  else
-    default
+  else (
+    panic("Not inialized");
+    $UN.ptr0_get<a>(the_null_ptr)
+  )
 end
 
-implement{vt} {a} exec$fwork (v,default) = default
+implement{vt} {a} exec$fwork (v) = (
+  (panic("Not overloaded")); 
+  $UN.ptr0_get<a>(the_null_ptr)
+)
 
 implement{vt} initialize (r) = let
   val (vbox pf | p) = ref_get_viewptr{initializable vt}(r)