[determinacy] big refactor

src/API.ml

@@ -1353,6 +1353,7 @@ module Utils = struct
   let map_acc = BuiltInData.map_acc
 
   module type Show = Util.Show
+  module type ShowKey = Util.ShowKey
   module type Show1 = Util.Show1
   module Map = Util.Map
   module Set = Util.Set

src/API.mli

@@ -859,7 +859,6 @@ module BuiltIn : sig
 
 end
 
-
 (* ************************************************************************* *)
 (* ********************* Advanced Extension API **************************** *)
 (* ************************************************************************* *)
@@ -1333,6 +1332,12 @@ module Utils : sig
     val show : t -> string
   end
 
+  module type ShowKey = sig
+    type key
+    val pp_key : Format.formatter -> key -> unit
+    val show_key : key -> string
+  end
+
   module type Show1 = sig
     type 'a t
     val pp : (Format.formatter -> 'a -> unit) -> Format.formatter -> 'a t -> unit

src/builtin.elpi

@@ -359,7 +359,7 @@ external pred unix.process.close i:unix.process, o:diagnostic.
 %  -- Debugging --
 
 % [term_to_string T S] prints T to S
-external pred term_to_string i:any, o:string.
+external pred term_to_string o:any, o:string.
 
 % == Lambda Prolog builtins =====================================
 
@@ -693,11 +693,11 @@ map2-filter [] [] _ [].
 map2-filter [X|XS] [Y|YS] F [Z|ZS] :- F X Y Z, !, map2-filter XS YS F ZS.
 map2-filter [_|XS] [_|YS] F ZS :- map2-filter XS YS F ZS.
 
-pred map-ok i:list A, i:(pred i:A, i:B, o:diagnostic), o:list B, o:diagnostic.
+pred map-ok i:list A, i:(pred i:A, o:B, o:diagnostic), o:list B, o:diagnostic.
 map-ok [X|L] P [Y|YS] S :- P X Y S0, if (S0 = ok) (map-ok L P YS S) (S = S0).
 map-ok [] _ [] ok.
 
-pred fold-map i:list A, i:B, i:(pred i:A, i:B, o:C, o:B), o:list C, o:B.
+pred fold-map i:list A, i:B, i:(pred i:A, o:B, o:C, o:B), o:list C, o:B.
 fold-map [] A _ [] A.
 fold-map [X|XS] A F [Y|YS] A2 :- F X A Y A1, fold-map XS A1 F YS A2.
 

src/builtin.ml

@@ -596,15 +596,18 @@ This API only works reliably since OCaml 4.12.|}))))),
   LPDoc " -- Debugging --";
 
   MLCode(Pred("term_to_string",
-    In(any,     "T",
+    InOut(ioarg_any,     "T",
     Out(string, "S",
     Easy        "prints T to S")),
   (fun t _ ~depth ->
+     match t with
+     | NoData -> ?: None +! "_"
+     | Data t ->
      let b = Buffer.create 1024 in
      let fmt = Format.formatter_of_buffer b in
      Format.fprintf fmt "%a" (RawPp.term depth) t ;
      Format.pp_print_flush fmt ();
-       !:(Buffer.contents b))),
+     ?: None +! (Buffer.contents b))),
   DocAbove);
 
   ]

src/builtin_stdlib.elpi

@@ -159,11 +159,11 @@ map2-filter [] [] _ [].
 map2-filter [X|XS] [Y|YS] F [Z|ZS] :- F X Y Z, !, map2-filter XS YS F ZS.
 map2-filter [_|XS] [_|YS] F ZS :- map2-filter XS YS F ZS.
 
-pred map-ok i:list A, i:(pred i:A, i:B, o:diagnostic), o:list B, o:diagnostic.
+pred map-ok i:list A, i:(pred i:A, o:B, o:diagnostic), o:list B, o:diagnostic.
 map-ok [X|L] P [Y|YS] S :- P X Y S0, if (S0 = ok) (map-ok L P YS S) (S = S0).
 map-ok [] _ [] ok.
 
-pred fold-map i:list A, i:B, i:(pred i:A, i:B, o:C, o:B), o:list C, o:B.
+pred fold-map i:list A, i:B, i:(pred i:A, o:B, o:C, o:B), o:list C, o:B.
 fold-map [] A _ [] A.
 fold-map [X|XS] A F [Y|YS] A2 :- F X A Y A1, fold-map XS A1 F YS A2.