AST-81 Run Definedness checker from pipeline

src/definedness.ml

@@ -198,4 +198,8 @@ and decs msgs decs : f =
   M.disjoint_union (map_of_set Eager e) (map_of_set Delayed d) |>
     M.filter (fun v _ -> M.mem v defWhen = false)
 
-let check_prog msgs prog = ignore (decs msgs prog.it)
+let check_prog prog =
+  Diag.with_message_store (fun msgs ->
+    ignore (decs msgs prog.it);
+    Some ()
+  )

src/definedness.mli

@@ -1 +1 @@
-val check_prog : Diag.msg_store -> Syntax.prog -> unit
+val check_prog : Syntax.prog -> unit Diag.result

src/pipeline.ml

@@ -137,6 +137,14 @@ let typecheck_library senv filename prog : Typing.scope Diag.result =
   phase "Checking" prog.Source.note;
   Typing.check_library senv (filename, prog)
 
+(* Definedness checking *)
+
+let defindeness_prog prog : unit Diag.result =
+  phase "Definedness" prog.Source.note;
+  Definedness.check_prog prog
+
+let defindeness_progs progs : unit Diag.result =
+  Diag.traverse_ defindeness_prog progs
 
 (* Imported file loading *)
 
@@ -189,11 +197,12 @@ let chase_imports senv0 imports : (Syntax.libraries * Typing.scope) Diag.result
       Diag.bind (Resolve_import.resolve prog base) (fun more_imports ->
       Diag.bind (go_set more_imports) (fun () ->
       Diag.bind (typecheck_library !senv f prog) (fun sscope ->
+      Diag.bind (defindeness_prog prog) (fun () ->
       libraries := (f, prog) :: !libraries; (* NB: Conceptually an append *)
       senv := Typing.adjoin_scope !senv sscope;
       pending := remove f !pending;
       Diag.return ()
-      )))))
+      ))))))
     end
     and go_set todo = Diag.traverse_ go (elements todo)
   in
@@ -208,8 +217,9 @@ let load_progs parse senv : load_result =
     (List.map snd rs) in
   Diag.bind (chase_imports senv libraries) (fun (libraries, senv') ->
   Diag.bind (typecheck_progs senv' progs') (fun senv'' ->
+  Diag.bind (defindeness_progs progs') (fun _ ->
   Diag.return (libraries, progs', senv'')
-  ))))
+  )))))
 
 let load_decl parse_one senv : load_decl_result =
   Diag.bind parse_one (fun parsed ->

src/typing.ml

@@ -1492,7 +1492,6 @@ let infer_prog scope prog : (T.typ * scope) Diag.result =
         (fun prog ->
           let env = env_of_scope msgs scope in
           let res = infer_block env prog.it prog.at in
-          Definedness.check_prog msgs prog;
           res
         )
         prog
@@ -1513,7 +1512,6 @@ let check_library scope (filename, prog) : scope Diag.result =
       (fun prog ->
         let env = env_of_scope msgs scope in
         let typ = infer_library env prog.it prog.at in
-        Definedness.check_prog msgs prog;
         library_scope filename typ
       )
       prog

test/fail/ok/ast81-clash.tc.ok

@@ -1 +1 @@
-Fatal error: exception Env.Make(X).Clash("x")
+ast81-clash.as:8.11-8.12: type error, duplicate definition for x in block