more refactoring and implemented exec_init

1 files changed, 19 insertions, 12 deletions

diff --git a/lib/DATS/init.dats b/lib/DATS/init.dats
index c2ae39d..206dc6f 100644
--- a/lib/DATS/init.dats
+++ b/lib/DATS/init.dats
@@ -26,7 +26,25 @@ in
     panic("Not initialized")
 end
 
-implement{vt} exec_void$fwork (v) = panic("Not overloaded")
+//NOTE: lot of duplicate code
+implement{vt} exec_init (r) = let
+  val (vbox pf | p) = ref_get_viewptr{initializable vt}(r)
+in
+  if p->initialized then
+    let
+      prval () = opt_unsome p->obj
+      val () = exec_void$fwork<vt>(p->obj)
+      prval () = opt_some  p->obj
+    in
+    end
+  else (
+    $effmask_ref(initialize<vt>(r));
+    if p->initialized then 
+      $effmask_ref(exec_void<vt>(r))
+    else
+      panic("Not inialized");
+  )
+end
 
 implement{vt} {a} exec (r) = let
   val (vbox pf | p) = ref_get_viewptr{initializable vt}(r)
@@ -45,10 +63,6 @@ in
   )
 end
 
-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)
@@ -59,10 +73,3 @@ in
       val () = p->initialized := initialize$fwork(p->obj)
     in end
 end
-
-implement{vt} initialize$fwork (v) = let
-  prval () = opt_none v
-in
-  false
-end
-