Minils printer v1 ( not tested, with ~contracts )
This commit is contained in:
parent
545a514ba5
commit
96405852f1
|
@ -43,6 +43,9 @@ let mk_arg name ty =
|
||||||
let mk_param name =
|
let mk_param name =
|
||||||
{ p_name = name }
|
{ p_name = name }
|
||||||
|
|
||||||
|
|
||||||
|
let print_param ff p = Names.print_name ff p.p_name
|
||||||
|
|
||||||
let mk_field n ty =
|
let mk_field n ty =
|
||||||
{ f_name = n; f_type = ty }
|
{ f_name = n; f_type = ty }
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
open Misc
|
open Misc
|
||||||
open Ident
|
open Ident
|
||||||
open Minils
|
open Minils
|
||||||
open Global
|
open Signature
|
||||||
open Location
|
open Location
|
||||||
|
|
||||||
type error = | Etypeclash of ct * ct
|
type error = | Etypeclash of ct * ct
|
||||||
|
@ -26,12 +26,13 @@ let error kind = raise (TypingError(kind))
|
||||||
|
|
||||||
let message e kind =
|
let message e kind =
|
||||||
begin match kind with
|
begin match kind with
|
||||||
Etypeclash(actual_ct, expected_ct) ->
|
Etypeclash(actual_ct, expected_ct) -> ()
|
||||||
|
(*TODO remettre en route quand Printer fonctionne
|
||||||
Printf.eprintf "%aClock Clash: this expression has clock %a, \n\
|
Printf.eprintf "%aClock Clash: this expression has clock %a, \n\
|
||||||
but is expected to have clock %a.\n"
|
but is expected to have clock %a.\n"
|
||||||
Printer.print_exp e
|
Printer.print_exp e
|
||||||
Printer.print_clock actual_ct
|
Printer.print_clock actual_ct
|
||||||
Printer.print_clock expected_ct
|
Printer.print_clock expected_ct*)
|
||||||
end;
|
end;
|
||||||
raise Error
|
raise Error
|
||||||
|
|
||||||
|
@ -238,11 +239,12 @@ let typing_eqs h eq_list =
|
||||||
try
|
try
|
||||||
expect h ty_pat e
|
expect h ty_pat e
|
||||||
with Error ->
|
with Error ->
|
||||||
|
(* TODO remettre en route quand Printer fonctionne
|
||||||
(* DEBUG *)
|
(* DEBUG *)
|
||||||
Printf.eprintf "Complete expression: %a\n"
|
Printf.eprintf "Complete expression: %a\n"
|
||||||
Printer.print_exp e;
|
Printer.print_exp e;
|
||||||
Printf.eprintf "Clock pattern: %a\n"
|
Printf.eprintf "Clock pattern: %a\n"
|
||||||
Printer.print_clock ty_pat;
|
Printer.print_clock ty_pat; *)
|
||||||
raise Error
|
raise Error
|
||||||
)
|
)
|
||||||
) eq_list
|
) eq_list
|
||||||
|
|
|
@ -4,9 +4,17 @@ open Ident
|
||||||
open Types
|
open Types
|
||||||
open Static
|
open Static
|
||||||
open Format
|
open Format
|
||||||
|
open Signature
|
||||||
open Pp_tools
|
open Pp_tools
|
||||||
|
|
||||||
|
|
||||||
|
let iterator_to_string i =
|
||||||
|
match i with
|
||||||
|
| Imap -> "map"
|
||||||
|
| Ifold -> "fold"
|
||||||
|
| Imapfold -> "mapfold"
|
||||||
|
|
||||||
|
|
||||||
let rec print_pat ff = function
|
let rec print_pat ff = function
|
||||||
| Evarpat n -> print_ident ff n
|
| Evarpat n -> print_ident ff n
|
||||||
| Etuplepat pat_list ->
|
| Etuplepat pat_list ->
|
||||||
|
@ -25,7 +33,7 @@ let rec print_clock ff = function
|
||||||
fprintf ff "@[%a@]" (print_list_r print_clock "("" *"")") ct_list
|
fprintf ff "@[%a@]" (print_list_r print_clock "("" *"")") ct_list
|
||||||
|
|
||||||
let print_vd ff { v_name = n; v_type = ty; v_clock = ck } =
|
let print_vd ff { v_name = n; v_type = ty; v_clock = ck } =
|
||||||
fprintf ff "@[<v>%a : %a at %a@]" print_ident n print_type ty print_ck ck
|
fprintf ff "@[<v>%a : %a :: %a@]" print_ident n print_type ty print_ck ck
|
||||||
|
|
||||||
let rec print_c ff = function
|
let rec print_c ff = function
|
||||||
| Cint i -> fprintf ff "%d" i
|
| Cint i -> fprintf ff "%d" i
|
||||||
|
@ -33,19 +41,31 @@ let rec print_c ff = function
|
||||||
| Cconstr tag -> print_longname ff tag
|
| Cconstr tag -> print_longname ff tag
|
||||||
| Carray (n, c) -> fprintf ff "@[%a^%a@]" print_c c print_size_exp n
|
| Carray (n, c) -> fprintf ff "@[%a^%a@]" print_c c print_size_exp n
|
||||||
|
|
||||||
let print_params ff = function
|
let print_params ff l = print_list_l print_size_exp "<<"","">>" ff l
|
||||||
| [] -> ()
|
|
||||||
| l -> print_list_r print_size_exp "<<"","">>" ff l
|
|
||||||
|
|
||||||
let rec print_args ff e_list =
|
let print_node_params ff l = print_list_l print_param "<<"","">>" ff l
|
||||||
|
|
||||||
|
let print_node_args ff l = print_list_l print_vd "("","")" ff l
|
||||||
|
|
||||||
|
let print_index ff idx = print_list print_size_exp "[""][""]" ff idx
|
||||||
|
|
||||||
|
let rec print_dyn_index ff idx = print_list print_exp "[""][""]" ff idx
|
||||||
|
|
||||||
|
and print_args ff e_list =
|
||||||
fprintf ff "@[%a@]" (print_list_r print_exp "("","")") e_list
|
fprintf ff "@[%a@]" (print_list_r print_exp "("","")") e_list
|
||||||
|
|
||||||
and print_op ff op =
|
and print_op ff op =
|
||||||
fprintf ff "%a %a" print_longname op.op_name print_params op.op_params
|
fprintf ff "%a %a" print_longname op.op_name print_params op.op_params
|
||||||
|
|
||||||
and print_exp ff e =
|
and print_exp ff e =
|
||||||
(if !Misc.full_type_info then fprintf ff "(" else ();
|
if !Misc.full_type_info then
|
||||||
(match e.e_desc with
|
fprintf ff "@[<hov2>(%a@ : %a)@]" print_exp_desc e.e_desc print_type e.e_ty
|
||||||
|
else fprintf ff "%a" print_exp_desc e.e_desc
|
||||||
|
|
||||||
|
and print_every ff reset =
|
||||||
|
print_opt (fun ff id -> fprintf ff " every %a" print_ident id) ff reset
|
||||||
|
|
||||||
|
and print_exp_desc ff = function
|
||||||
| Evar x -> print_ident ff x
|
| Evar x -> print_ident ff x
|
||||||
| Econstvar x -> print_name ff x
|
| Econstvar x -> print_name ff x
|
||||||
| Econst c -> print_c ff c
|
| Econst c -> print_c ff c
|
||||||
|
@ -53,154 +73,90 @@ and print_exp ff e =
|
||||||
(print_c ff c; fprintf ff " fby "; print_exp ff e)
|
(print_c ff c; fprintf ff " fby "; print_exp ff e)
|
||||||
| Efby (None, e) -> (fprintf ff "pre "; print_exp ff e)
|
| Efby (None, e) -> (fprintf ff "pre "; print_exp ff e)
|
||||||
| Ecall (op, args, reset) ->
|
| Ecall (op, args, reset) ->
|
||||||
fprintf ff "%a %a every %a" print_op op print_args args print_ident x
|
fprintf ff "%a %a%a"
|
||||||
|
print_op op print_args args print_every reset
|
||||||
| Ewhen (e, c, n) ->
|
| Ewhen (e, c, n) ->
|
||||||
fprintf ff "@[(%a when %a(%a))@]"
|
fprintf ff "@[(%a when %a(%a))@]"
|
||||||
print_exp e print_longname c print_ident n
|
print_exp e print_longname c print_ident n
|
||||||
| Eifthenelse (e1, e2, e3) ->
|
| Eifthenelse (e1, e2, e3) ->
|
||||||
fprintf ff "@[if %a@ then %a@ else @]"
|
fprintf ff "@[<hv>if %a@ then %a@ else %a@]"
|
||||||
print_exp e1 print_exp e2 print_exp e3
|
print_exp e1 print_exp e2 print_exp e3
|
||||||
| Emerge (x, tag_e_list) ->
|
| Emerge (x, tag_e_list) ->
|
||||||
fprintf ff "@[<hov2>merge %a@ @[%a@]@]"
|
fprintf ff "@[<hov2>merge %a@ @[%a@]@]"
|
||||||
print_ident x print_tag_e_list tag_e_list
|
print_ident x print_tag_e_list tag_e_list
|
||||||
| Etuple e_list -> (*TODO*)
|
| Etuple e_list ->
|
||||||
(fprintf ff "@[(";
|
fprintf ff "@[%a@]" (print_list_r print_exp "("","")") e_list
|
||||||
print_list ff print_exp "," e_list;
|
|
||||||
fprintf ff ")@]")
|
|
||||||
| Efield (e, field) ->
|
| Efield (e, field) ->
|
||||||
(print_exp ff e; fprintf ff "."; print_longname ff field)
|
fprintf ff "%a.%a" print_exp e print_longname field
|
||||||
| Estruct f_e_list ->
|
| Estruct f_e_list ->
|
||||||
(fprintf ff "@[<v 1>{";
|
print_record (print_couple print_longname print_exp """ =""") ff f_e_list
|
||||||
print_list ff
|
| Earray e_list ->
|
||||||
(fun ff (field, e) ->
|
fprintf ff "@[%a@]" (print_list_r print_exp "["";""]") e_list
|
||||||
(print_longname ff field; fprintf ff " = "; print_exp ff e))
|
| Earray_op(array_op) ->
|
||||||
";" f_e_list;
|
print_array_op ff array_op
|
||||||
fprintf ff "}@]")
|
|
||||||
| (*Array operators*) Earray e_list ->
|
|
||||||
(fprintf ff "@[[";
|
|
||||||
print_list ff print_exp ";" e_list;
|
|
||||||
fprintf ff "]@]")
|
|
||||||
| Erepeat (n, e) -> (print_exp ff e; fprintf ff "^"; print_size_exp ff n)
|
|
||||||
| Eselect (idx, e) ->
|
|
||||||
(print_exp ff e;
|
|
||||||
fprintf ff "[";
|
|
||||||
print_list ff print_size_exp "][" idx;
|
|
||||||
fprintf ff "]")
|
|
||||||
| Eselect_dyn (idx, _, e1, e2) ->
|
|
||||||
(fprintf ff "@[";
|
|
||||||
print_exp ff e1;
|
|
||||||
fprintf ff "[";
|
|
||||||
print_list ff print_exp "][" idx;
|
|
||||||
fprintf ff "] default ";
|
|
||||||
print_exp ff e2;
|
|
||||||
fprintf ff "@]")
|
|
||||||
| Eupdate (idx, e1, e2) ->
|
|
||||||
(fprintf ff "@[";
|
|
||||||
print_exp ff e1;
|
|
||||||
fprintf ff " with [";
|
|
||||||
print_list ff print_size_exp "][" idx;
|
|
||||||
fprintf ff "] = ";
|
|
||||||
print_exp ff e2;
|
|
||||||
fprintf ff "@]")
|
|
||||||
| Eselect_slice (idx1, idx2, e) ->
|
|
||||||
(print_exp ff e;
|
|
||||||
fprintf ff "[";
|
|
||||||
print_size_exp ff idx1;
|
|
||||||
fprintf ff "..";
|
|
||||||
print_size_exp ff idx2;
|
|
||||||
fprintf ff "]")
|
|
||||||
| Econcat (e1, e2) ->
|
|
||||||
(print_exp ff e1; fprintf ff " @@ "; print_exp ff e2)
|
|
||||||
| Eiterator (it, f, params, n, e_list, reset) ->
|
|
||||||
(fprintf ff "(";
|
|
||||||
fprintf ff "%s" (iterator_to_string it);
|
|
||||||
fprintf ff " ";
|
|
||||||
(match params with
|
|
||||||
| [] -> print_longname ff f
|
|
||||||
| l ->
|
|
||||||
(fprintf ff "(";
|
|
||||||
print_longname ff f;
|
|
||||||
print_call_params ff params;
|
|
||||||
fprintf ff ")"));
|
|
||||||
fprintf ff " <<";
|
|
||||||
print_size_exp ff n;
|
|
||||||
fprintf ff ">>) (@[";
|
|
||||||
print_list ff print_exp "," e_list;
|
|
||||||
fprintf ff ")@]";
|
|
||||||
(match reset with
|
|
||||||
| None -> ()
|
|
||||||
| Some r -> fprintf ff " every %s" (name r)))
|
|
||||||
| Efield_update (f, e1, e2) ->
|
| Efield_update (f, e1, e2) ->
|
||||||
(fprintf ff "@[";
|
fprintf ff "@[%a@ with .%a =@ %a@]"
|
||||||
print_exp ff e1;
|
print_exp e1 print_longname f print_exp e2
|
||||||
fprintf ff " with .";
|
|
||||||
print_longname ff f;
|
|
||||||
fprintf ff " = ";
|
and print_array_op ff = function
|
||||||
print_exp ff e2;
|
| Erepeat (n, e) -> (print_exp ff e; fprintf ff "^"; print_size_exp ff n)
|
||||||
fprintf ff "@]"));
|
| Eselect (idx, e) -> fprintf ff "@[%a%a@]" print_exp e print_index idx
|
||||||
if !Misc.full_type_info
|
| Eselect_dyn (idx, _, e1, e2) ->
|
||||||
then
|
fprintf ff "@[%a%a default %a@]"
|
||||||
(fprintf ff " : %a)" print_type e.e_ty;
|
print_exp e1 print_dyn_index idx print_exp e2
|
||||||
if e.e_loc = no_location then fprintf ff " (no loc)" else ())
|
| Eupdate (idx, e1, e2) ->
|
||||||
else ())
|
fprintf ff "@[%a with %a = %a@]" print_exp e1 print_index idx print_exp e2
|
||||||
|
| Eselect_slice (idx1, idx2, e) ->
|
||||||
|
fprintf ff "@[%a[%a..%a]@]"
|
||||||
|
print_exp e print_size_exp idx1 print_size_exp idx2
|
||||||
|
| Econcat (e1, e2) -> fprintf ff "%a @@ %a" print_exp e1 print_exp e2
|
||||||
|
| Eiterator (it, f, params, n, e_list, r) ->
|
||||||
|
fprintf ff "(%s (%a%a) <<%a>>)@ @[%a@]%a"
|
||||||
|
(iterator_to_string it) print_longname f print_params params
|
||||||
|
print_size_exp n (print_list_l print_exp "("","")") e_list print_every r
|
||||||
|
|
||||||
and print_tag_e_list ff tag_e_list =
|
and print_tag_e_list ff tag_e_list =
|
||||||
print_list ff
|
fprintf ff "@[%a@]"
|
||||||
(fun ff (tag, e) ->
|
(print_list
|
||||||
(fprintf ff "@[(";
|
(print_couple print_longname print_exp "("" ->"")") """""") tag_e_list
|
||||||
print_longname ff tag;
|
|
||||||
fprintf ff " -> ";
|
|
||||||
print_exp ff e;
|
|
||||||
fprintf ff ")@]@,"))
|
|
||||||
"" tag_e_list
|
|
||||||
|
|
||||||
let print_eq ff { eq_lhs = p; eq_rhs = e } = (* (\* DEBUG *\) *)
|
|
||||||
(* fprintf ff " : "; *) (* print_ck ff e.e_ck; *)
|
let print_eq ff { eq_lhs = p; eq_rhs = e } =
|
||||||
(* (\* END DEBUG *\) *)
|
|
||||||
(fprintf ff "@[<hov 2>";
|
|
||||||
print_pat ff p;
|
|
||||||
fprintf ff " =@ ";
|
|
||||||
print_exp ff e;
|
|
||||||
if !Misc.full_type_info
|
if !Misc.full_type_info
|
||||||
then (fprintf ff "@ at "; print_ck ff e.e_ck)
|
then fprintf ff "@[<hov2>%a :: %a =@ %a;@]"
|
||||||
else ();
|
print_pat p print_ck e.e_ck print_exp e
|
||||||
fprintf ff ";@]")
|
else fprintf ff "@[<hov2>%a =@ %a;@]" print_pat p print_exp e
|
||||||
|
|
||||||
|
|
||||||
let print_eqs ff l =
|
let print_eqs ff l =
|
||||||
(fprintf ff "@[<v>"; print_list ff print_eq "" l; fprintf ff "@]")
|
fprintf ff "@\n@[<hv2>let@ %a@]@ tel" (print_list print_eq """""") l
|
||||||
|
|
||||||
let print_open_module ff name =
|
let print_open_module ff name = fprintf ff "@[open %a@]@." print_name name
|
||||||
(fprintf ff "@[open "; print_name ff name; fprintf ff "@.@]")
|
|
||||||
|
|
||||||
let print_type_def ff { t_name = name; t_desc = tdesc } =
|
let rec print_type_def ff { t_name = name; t_desc = tdesc } =
|
||||||
match tdesc with
|
fprintf ff "@[type %s%a@]@." name print_type_desc tdesc
|
||||||
| Type_abs -> fprintf ff "@[type %s@\n@]" name
|
|
||||||
|
and print_field ff field =
|
||||||
|
fprintf ff "%a:@ %a" print_name field.f_name print_type field.f_type
|
||||||
|
|
||||||
|
and print_type_desc ff = function
|
||||||
|
| Type_abs -> ()
|
||||||
| Type_enum tag_name_list ->
|
| Type_enum tag_name_list ->
|
||||||
(fprintf ff "@[type %s = " name;
|
fprintf ff " =@ %a" (print_list print_name """|""") tag_name_list
|
||||||
print_list ff print_name "|" tag_name_list;
|
|
||||||
fprintf ff "@\n@]")
|
|
||||||
| Type_struct f_ty_list ->
|
| Type_struct f_ty_list ->
|
||||||
(fprintf ff "@[type %s = " name;
|
fprintf ff " =@ %a"
|
||||||
fprintf ff "@[<v 1>{";
|
(print_record print_field) f_ty_list
|
||||||
print_list ff
|
|
||||||
(fun ff (field, ty) ->
|
|
||||||
(print_name ff field; fprintf ff ": "; print_type ff ty))
|
|
||||||
";" f_ty_list;
|
|
||||||
fprintf ff "}@]@\n@]")
|
|
||||||
|
|
||||||
let print_contract ff
|
let print_contract ff
|
||||||
{
|
{ c_local = l; c_eq = eqs;
|
||||||
c_local = l;
|
c_assume = e_a; c_enforce = e_g; c_controllables = cl } =
|
||||||
c_eq = eqs;
|
fprintf ff "@\n@[<v2>";
|
||||||
c_assume = e_a;
|
|
||||||
c_enforce = e_g;
|
|
||||||
c_controllables = cl
|
|
||||||
} =
|
|
||||||
(if l <> []
|
(if l <> []
|
||||||
then
|
then
|
||||||
(fprintf ff "contract\n";
|
(fprintf ff "contract\n";
|
||||||
fprintf ff "@[<hov 4>var ";
|
fprintf ff "@[<hov 4>var ";
|
||||||
print_list ff print_vd ";" l;
|
print_list_l print_vd """;""" ff l;
|
||||||
fprintf ff ";@]\n")
|
fprintf ff ";@]\n")
|
||||||
else ();
|
else ();
|
||||||
if eqs <> []
|
if eqs <> []
|
||||||
|
@ -211,43 +167,22 @@ let print_contract ff
|
||||||
fprintf ff "tel\n")
|
fprintf ff "tel\n")
|
||||||
else ();
|
else ();
|
||||||
fprintf ff "assume@ %a@;enforce@ %a with (" print_exp e_a print_exp e_g;
|
fprintf ff "assume@ %a@;enforce@ %a with (" print_exp e_a print_exp e_g;
|
||||||
print_list ff print_vd ";" cl;
|
print_list_l print_vd """;""" ff cl;
|
||||||
fprintf ff ")")
|
fprintf ff ")@]")
|
||||||
|
|
||||||
let print_node_params ff =
|
|
||||||
function
|
|
||||||
| [] -> ()
|
|
||||||
| l -> (fprintf ff "<<"; print_list ff print_name "," l; fprintf ff ">>")
|
|
||||||
|
|
||||||
let print_node ff
|
let print_node ff
|
||||||
{
|
{ n_name = n; n_input = ni; n_output = no;
|
||||||
n_name = n;
|
n_contract = contract; n_local = nl; n_equs = ne; n_params = params } =
|
||||||
n_input = ni;
|
fprintf ff "@[<hov2>node %s%a%a@ returns %a%a@\n%a%a@]@."
|
||||||
n_output = no;
|
n
|
||||||
n_contract = contract;
|
print_node_params params
|
||||||
n_local = nl;
|
print_node_args ni
|
||||||
n_equs = ne;
|
print_node_args no
|
||||||
n_params = params
|
(print_opt print_contract) contract
|
||||||
} =
|
(print_list_l print_vd "var "";"";") nl
|
||||||
(fprintf ff "@[<v 2>node %s" n;
|
print_eqs ne
|
||||||
print_node_params ff params;
|
|
||||||
fprintf ff "(@[";
|
|
||||||
print_list ff print_vd ";" ni;
|
|
||||||
fprintf ff "@]) returns (@[";
|
|
||||||
print_list ff print_vd ";" no;
|
|
||||||
fprintf ff "@])@,";
|
|
||||||
optunit (print_contract ff) contract;
|
|
||||||
if nl <> []
|
|
||||||
then
|
|
||||||
(fprintf ff "@[<hov 2>var ";
|
|
||||||
print_list ff print_vd ";" nl;
|
|
||||||
fprintf ff ";@]@,")
|
|
||||||
else ();
|
|
||||||
fprintf ff "@[<v 2>let @,";
|
|
||||||
print_eqs ff ne;
|
|
||||||
fprintf ff "@]@;";
|
|
||||||
fprintf ff "tel";
|
|
||||||
fprintf ff "@.@]")
|
|
||||||
|
|
||||||
let print_exp oc e =
|
let print_exp oc e =
|
||||||
let ff = formatter_of_out_channel oc in (print_exp ff e; fprintf ff "@.")
|
let ff = formatter_of_out_channel oc in (print_exp ff e; fprintf ff "@.")
|
||||||
|
|
|
@ -10,18 +10,21 @@
|
||||||
|
|
||||||
open Format
|
open Format
|
||||||
|
|
||||||
let rec print_list print ff = function
|
(** print the list x1...xn : \@\[[lp][x1][sep][x2]...[sep][xn][rp]\]\@
|
||||||
|
and nothing if the list is empty *)
|
||||||
|
let rec print_list print lp sep rp ff = function
|
||||||
| [] -> ()
|
| [] -> ()
|
||||||
| x::l ->
|
| x::l ->
|
||||||
fprintf ff "@[<hv2>%a@]" print x;
|
fprintf ff "@[<hov2>%s%a" lp print x;
|
||||||
List.iter (fprintf ff "@ @[<hv2>%a@]" print) l
|
List.iter (fprintf ff "@]%s@,@[<hv2>%a" sep print) l;
|
||||||
|
fprintf ff "%s@]" rp
|
||||||
|
|
||||||
(** print the list x1...xn : \@\[[lp][x1][sep] [x2]...[sep] [xn][rp]\]\@
|
(** print the list x1...xn : \@\[[lp][x1][sep] [x2]...[sep] [xn][rp]\]\@
|
||||||
and nothing if the list is empty *)
|
and nothing if the list is empty *)
|
||||||
let rec print_list_r print lp sep rp ff = function
|
let rec print_list_r print lp sep rp ff = function
|
||||||
| [] -> ()
|
| [] -> ()
|
||||||
| x :: l ->
|
| x :: l ->
|
||||||
fprintf ff "@[<hv2>%s%a" lp print x;
|
fprintf ff "@[<hov2>%s%a" lp print x;
|
||||||
List.iter (fprintf ff "%s@]@ @[<hv2>%a" sep print) l;
|
List.iter (fprintf ff "%s@]@ @[<hv2>%a" sep print) l;
|
||||||
fprintf ff "%s@]" rp
|
fprintf ff "%s@]" rp
|
||||||
|
|
||||||
|
@ -30,7 +33,7 @@ let rec print_list_r print lp sep rp ff = function
|
||||||
let rec print_list_l print lp sep rp ff = function
|
let rec print_list_l print lp sep rp ff = function
|
||||||
| [] -> ()
|
| [] -> ()
|
||||||
| x :: l ->
|
| x :: l ->
|
||||||
fprintf ff "@[<hv2>%s%a" lp print x;
|
fprintf ff "@[<hov2>%s%a" lp print x;
|
||||||
List.iter (fprintf ff "@]@ @[<hv2>%s%a" sep print) l;
|
List.iter (fprintf ff "@]@ @[<hv2>%s%a" sep print) l;
|
||||||
fprintf ff "%s@]" rp
|
fprintf ff "%s@]" rp
|
||||||
(*
|
(*
|
||||||
|
|
Loading…
Reference in a new issue