balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Michelson: show type_map for programs with type errors

Browse Source
This commit is contained in:
Milo Davis 2017-07-19 16:40:23 +02:00 committed by Benjamin Canou
parent 4bd9a864cf
commit 77433a5f15
3 changed files with 86 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/client/embedded/alpha/client_proto_programs.ml
View File

@ -178,7 +178,7 @@ let print_program locations ppf ((c : Script.code), type_map) =
(print_expr no_locations) c.ret_type (print_expr no_locations) c.ret_type
(print_typed_code locations) (c.code, type_map) (print_typed_code locations) (c.code, type_map)
let report_typechecking_errors cctxt errs = let report_typechecking_errors ?show_types cctxt errs =
let open Client_commands in let open Client_commands in
let open Script_typed_ir in let open Script_typed_ir in
let open Script_ir_translator in let open Script_ir_translator in
@ -217,7 +217,7 @@ let report_typechecking_errors cctxt errs =
let rec collect_locations acc = function let rec collect_locations acc = function
| (Ill_typed_data (_, _, _) | (Ill_typed_data (_, _, _)
| Ill_formed_type (_, _) | Ill_formed_type (_, _)
| Ill_typed_contract (_, _, _, _)) :: _ | Ill_typed_contract (_, _, _, _, _)) :: _
| [] -> | [] ->
let assoc, _ = let assoc, _ =
List.fold_left List.fold_left
@ -272,7 +272,10 @@ let report_typechecking_errors cctxt errs =
| Some s -> Format.fprintf ppf "%s " s) | Some s -> Format.fprintf ppf "%s " s)
name name
(print_expr locations) expr (print_expr locations) expr
| Ill_typed_contract (expr, arg_ty, ret_ty, storage_ty) -> | Ill_typed_contract (expr, arg_ty, ret_ty, storage_ty, type_map) ->
(match show_types with
| Some prog -> cctxt.message "%a\n" (print_program no_locations) (prog, type_map)
| None -> Lwt.return ()) >>= fun () ->
cctxt.warning cctxt.warning
"@[<v 2>Ill typed contract:@ %a@]" "@[<v 2>Ill typed contract:@ %a@]"
(print_program locations) (print_program locations)
@ -420,7 +423,7 @@ let report_typechecking_errors cctxt errs =
let locations = match errs with let locations = match errs with
| (Ill_typed_data (_, _, _) | (Ill_typed_data (_, _, _)
| Ill_formed_type (_, _) | Ill_formed_type (_, _)
| Ill_typed_contract (_, _, _, _)) :: rest -> | Ill_typed_contract (_, _, _, _, _)) :: rest ->
collect_locations [] rest collect_locations [] rest
| _ -> locations in | _ -> locations in
match errs with match errs with
@ -636,7 +639,8 @@ let commands () =
return () return ()
else return () else return ()
| Error errs -> | Error errs ->
report_typechecking_errors cctxt errs >>= fun () -> report_typechecking_errors
?show_types:(if !show_types then Some program else None) cctxt errs >>= fun () ->
failwith "ill-typed program") ; failwith "ill-typed program") ;
command ~group ~desc: "ask the node to typecheck a data expression" command ~group ~desc: "ask the node to typecheck a data expression"

133
src/proto/alpha/script_ir_translator.ml
View File

@ -16,7 +16,8 @@ open Script_typed_ir
(* Auxiliary types for error documentation *) (* Auxiliary types for error documentation *)
type namespace = Type_namespace | Constant_namespace | Instr_namespace type namespace = Type_namespace | Constant_namespace | Instr_namespace
type kind = Int_kind | String_kind | Prim_kind | Seq_kind type kind = Int_kind | String_kind | Prim_kind | Seq_kind
type type_map = (int * (Script.expr list * Script.expr list)) list
(* Structure errors *) (* Structure errors *)
type error += Invalid_arity of Script.location * string * int * int type error += Invalid_arity of Script.location * string * int * int
@ -47,7 +48,7 @@ type error += Bad_sign : _ ty -> error
(* Toplevel errors *) (* Toplevel errors *)
type error += Ill_typed_data : string option * Script.expr * _ ty -> error type error += Ill_typed_data : string option * Script.expr * _ ty -> error
type error += Ill_formed_type of string option * Script.expr type error += Ill_formed_type of string option * Script.expr
type error += Ill_typed_contract : Script.expr * _ ty * _ ty * _ ty -> error type error += Ill_typed_contract : Script.expr * _ ty * _ ty * _ ty * type_map -> error
(* ---- Error helpers -------------------------------------------------------*) (* ---- Error helpers -------------------------------------------------------*)
@ -611,9 +612,17 @@ let comparable_ty_of_ty
| Timestamp_t -> ok Timestamp_key | Timestamp_t -> ok Timestamp_key
| ty -> error (Comparable_type_expected (loc, ty)) | ty -> error (Comparable_type_expected (loc, ty))
let rec unparse_stack
: type a. a stack_ty -> Script.expr list
= function
| Empty_t -> []
| Item_t (ty, rest) -> unparse_ty ty :: unparse_stack rest
let rec parse_data let rec parse_data
: type a. context -> a ty -> Script.expr -> a tzresult Lwt.t : type a.
= fun ctxt ty script_data -> ?type_logger: (int * (Script.expr list * Script.expr list) -> unit) ->
context -> a ty -> Script.expr -> a tzresult Lwt.t
= fun ?type_logger ctxt ty script_data ->
let error () = let error () =
Invalid_constant (location script_data, script_data, ty) in Invalid_constant (location script_data, script_data, ty) in
let traced body = let traced body =
@ -699,8 +708,8 @@ let rec parse_data
(* Pairs *) (* Pairs *)
| Pair_t (ta, tb), Prim (_, "Pair", [ va; vb ]) -> | Pair_t (ta, tb), Prim (_, "Pair", [ va; vb ]) ->
traced @@ traced @@
parse_data ctxt ta va >>=? fun va -> parse_data ?type_logger ctxt ta va >>=? fun va ->
parse_data ctxt tb vb >>=? fun vb -> parse_data ?type_logger ctxt tb vb >>=? fun vb ->
return (va, vb) return (va, vb)
| Pair_t _, Prim (loc, "Pair", l) -> | Pair_t _, Prim (loc, "Pair", l) ->
fail @@ Invalid_arity (loc, "Pair", 2, List.length l) fail @@ Invalid_arity (loc, "Pair", 2, List.length l)
@ -709,13 +718,13 @@ let rec parse_data
(* Unions *) (* Unions *)
| Union_t (tl, _), Prim (_, "Left", [ v ]) -> | Union_t (tl, _), Prim (_, "Left", [ v ]) ->
traced @@ traced @@
parse_data ctxt tl v >>=? fun v -> parse_data ?type_logger ctxt tl v >>=? fun v ->
return (L v) return (L v)
| Union_t _, Prim (loc, "Left", l) -> | Union_t _, Prim (loc, "Left", l) ->
fail @@ Invalid_arity (loc, "Left", 1, List.length l) fail @@ Invalid_arity (loc, "Left", 1, List.length l)
| Union_t (_, tr), Prim (_, "Right", [ v ]) -> | Union_t (_, tr), Prim (_, "Right", [ v ]) ->
traced @@ traced @@
parse_data ctxt tr v >>=? fun v -> parse_data ?type_logger ctxt tr v >>=? fun v ->
return (R v) return (R v)
| Union_t _, Prim (loc, "Right", l) -> | Union_t _, Prim (loc, "Right", l) ->
fail @@ Invalid_arity (loc, "Right", 1, List.length l) fail @@ Invalid_arity (loc, "Right", 1, List.length l)
@ -724,13 +733,13 @@ let rec parse_data
(* Lambdas *) (* Lambdas *)
| Lambda_t (ta, tr), (Seq _ as script_instr) -> | Lambda_t (ta, tr), (Seq _ as script_instr) ->
traced @@ traced @@
parse_lambda ctxt ta tr script_instr parse_lambda ?type_logger ctxt ta tr script_instr
| Lambda_t _, expr -> | Lambda_t _, expr ->
traced (fail (Invalid_kind (location expr, [ Seq_kind ], kind expr))) traced (fail (Invalid_kind (location expr, [ Seq_kind ], kind expr)))
(* Options *) (* Options *)
| Option_t t, Prim (_, "Some", [ v ]) -> | Option_t t, Prim (_, "Some", [ v ]) ->
traced @@ traced @@
parse_data ctxt t v >>=? fun v -> parse_data ?type_logger ctxt t v >>=? fun v ->
return (Some v) return (Some v)
| Option_t _, Prim (loc, "Some", l) -> | Option_t _, Prim (loc, "Some", l) ->
fail @@ Invalid_arity (loc, "Some", 1, List.length l) fail @@ Invalid_arity (loc, "Some", 1, List.length l)
@ -745,7 +754,7 @@ let rec parse_data
traced @@ traced @@
fold_left_s fold_left_s
(fun rest v -> (fun rest v ->
parse_data ctxt t v >>=? fun v -> parse_data ?type_logger ctxt t v >>=? fun v ->
return (v :: rest)) return (v :: rest))
[] vs [] vs
| List_t _, expr -> | List_t _, expr ->
@ -755,7 +764,7 @@ let rec parse_data
traced @@ traced @@
fold_left_s fold_left_s
(fun acc v -> (fun acc v ->
parse_comparable_data ctxt t v >>=? fun v -> parse_comparable_data ?type_logger ctxt t v >>=? fun v ->
return (set_update v true acc)) return (set_update v true acc))
(empty_set t) vs (empty_set t) vs
| Set_t _, expr -> | Set_t _, expr ->
@ -766,8 +775,8 @@ let rec parse_data
fold_left_s fold_left_s
(fun acc -> function (fun acc -> function
| Prim (_, "Item", [ k; v ]) -> | Prim (_, "Item", [ k; v ]) ->
parse_comparable_data ctxt tk k >>=? fun k -> parse_comparable_data ?type_logger ctxt tk k >>=? fun k ->
parse_data ctxt tv v >>=? fun v -> parse_data ?type_logger ctxt tv v >>=? fun v ->
return (map_update k (Some v) acc) return (map_update k (Some v) acc)
| Prim (loc, "Item", l) -> | Prim (loc, "Item", l) ->
fail @@ Invalid_arity (loc, "Item", 2, List.length l) fail @@ Invalid_arity (loc, "Item", 2, List.length l)
@ -780,16 +789,19 @@ let rec parse_data
traced (fail (unexpected expr [] Constant_namespace [ "Map" ])) traced (fail (unexpected expr [] Constant_namespace [ "Map" ]))
and parse_comparable_data and parse_comparable_data
: type a. context -> a comparable_ty -> Script.expr -> a tzresult Lwt.t : type a. ?type_logger:(int * (Script.expr list * Script.expr list) -> unit) ->
= fun ctxt ty script_data -> context -> a comparable_ty -> Script.expr -> a tzresult Lwt.t
parse_data ctxt (ty_of_comparable_ty ty) script_data = fun ?type_logger ctxt ty script_data ->
parse_data ?type_logger ctxt (ty_of_comparable_ty ty) script_data
and parse_lambda and parse_lambda
: type arg ret storage. context -> : type arg ret storage. context ->
?storage_type: storage ty -> ?storage_type: storage ty ->
?type_logger: (int * (Script.expr list * Script.expr list) -> unit) ->
arg ty -> ret ty -> Script.expr -> (arg, ret) lambda tzresult Lwt.t = arg ty -> ret ty -> Script.expr -> (arg, ret) lambda tzresult Lwt.t =
fun ctxt ?storage_type arg ret script_instr -> fun ctxt ?storage_type ?type_logger arg ret script_instr ->
parse_instr ctxt ?storage_type script_instr (Item_t (arg, Empty_t)) >>=? function parse_instr ctxt ?storage_type ?type_logger
script_instr (Item_t (arg, Empty_t)) >>=? function
| Typed ({ loc ; aft = (Item_t (ty, Empty_t) as stack_ty) } as descr) -> | Typed ({ loc ; aft = (Item_t (ty, Empty_t) as stack_ty) } as descr) ->
trace trace
(Bad_return (loc, stack_ty, ret)) (Bad_return (loc, stack_ty, ret))
@ -803,8 +815,9 @@ and parse_lambda
and parse_instr and parse_instr
: type bef storage. context -> : type bef storage. context ->
?storage_type: storage ty -> ?storage_type: storage ty ->
?type_logger: (int * (Script.expr list * Script.expr list) -> unit) ->
Script.expr -> bef stack_ty -> bef judgement tzresult Lwt.t = Script.expr -> bef stack_ty -> bef judgement tzresult Lwt.t =
fun ctxt ?storage_type script_instr stack_ty -> fun ctxt ?storage_type ?type_logger script_instr stack_ty ->
let return : bef judgement -> bef judgement tzresult Lwt.t = return in let return : bef judgement -> bef judgement tzresult Lwt.t = return in
let check_item check loc name n m = let check_item check loc name n m =
trace (Bad_stack (loc, name, m, stack_ty)) @@ trace (Bad_stack (loc, name, m, stack_ty)) @@
@ -813,6 +826,10 @@ and parse_instr
let check_item_ty exp got loc n = let check_item_ty exp got loc n =
check_item (ty_eq exp got) loc n in check_item (ty_eq exp got) loc n in
let typed loc (instr, aft) = let typed loc (instr, aft) =
begin match type_logger with
| Some log -> log (loc, (unparse_stack stack_ty, unparse_stack aft))
| None -> ()
end ;
Typed { loc ; instr ; bef = stack_ty ; aft } in Typed { loc ; instr ; bef = stack_ty ; aft } in
match script_instr, stack_ty with match script_instr, stack_ty with
(* stack ops *) (* stack ops *)
@ -828,7 +845,7 @@ and parse_instr
| Prim (loc, "PUSH", [ t ; d ]), | Prim (loc, "PUSH", [ t ; d ]),
stack -> stack ->
(Lwt.return (parse_ty t)) >>=? fun (Ex_ty t) -> (Lwt.return (parse_ty t)) >>=? fun (Ex_ty t) ->
parse_data ctxt t d >>=? fun v -> parse_data ?type_logger ctxt t d >>=? fun v ->
return (typed loc (Const v, Item_t (t, stack))) return (typed loc (Const v, Item_t (t, stack)))
| Prim (loc, "UNIT", []), | Prim (loc, "UNIT", []),
stack -> stack ->
@ -845,8 +862,8 @@ and parse_instr
(Item_t (Option_t t, rest) as bef) -> (Item_t (Option_t t, rest) as bef) ->
check_kind [ Seq_kind ] bt >>=? fun () -> check_kind [ Seq_kind ] bt >>=? fun () ->
check_kind [ Seq_kind ] bf >>=? fun () -> check_kind [ Seq_kind ] bf >>=? fun () ->
parse_instr ?storage_type ctxt bt rest >>=? fun btr -> parse_instr ?storage_type ?type_logger ctxt bt rest >>=? fun btr ->
parse_instr ?storage_type ctxt bf (Item_t (t, rest)) >>=? fun bfr -> parse_instr ?storage_type ?type_logger ctxt bf (Item_t (t, rest)) >>=? fun bfr ->
let branch ibt ibf = let branch ibt ibf =
{ loc ; instr = If_none (ibt, ibf) ; bef ; aft = ibt.aft } in { loc ; instr = If_none (ibt, ibf) ; bef ; aft = ibt.aft } in
merge_branches loc btr bfr { branch } merge_branches loc btr bfr { branch }
@ -873,8 +890,8 @@ and parse_instr
(Item_t (Union_t (tl, tr), rest) as bef) -> (Item_t (Union_t (tl, tr), rest) as bef) ->
check_kind [ Seq_kind ] bt >>=? fun () -> check_kind [ Seq_kind ] bt >>=? fun () ->
check_kind [ Seq_kind ] bf >>=? fun () -> check_kind [ Seq_kind ] bf >>=? fun () ->
parse_instr ?storage_type ctxt bt (Item_t (tl, rest)) >>=? fun btr -> parse_instr ?storage_type ?type_logger ctxt bt (Item_t (tl, rest)) >>=? fun btr ->
parse_instr ?storage_type ctxt bf (Item_t (tr, rest)) >>=? fun bfr -> parse_instr ?storage_type ?type_logger ctxt bf (Item_t (tr, rest)) >>=? fun bfr ->
let branch ibt ibf = let branch ibt ibf =
{ loc ; instr = If_left (ibt, ibf) ; bef ; aft = ibt.aft } in { loc ; instr = If_left (ibt, ibf) ; bef ; aft = ibt.aft } in
merge_branches loc btr bfr { branch } merge_branches loc btr bfr { branch }
@ -891,8 +908,8 @@ and parse_instr
(Item_t (List_t t, rest) as bef) -> (Item_t (List_t t, rest) as bef) ->
check_kind [ Seq_kind ] bt >>=? fun () -> check_kind [ Seq_kind ] bt >>=? fun () ->
check_kind [ Seq_kind ] bf >>=? fun () -> check_kind [ Seq_kind ] bf >>=? fun () ->
parse_instr ?storage_type ctxt bt (Item_t (t, Item_t (List_t t, rest))) >>=? fun btr -> parse_instr ?storage_type ?type_logger ctxt bt (Item_t (t, Item_t (List_t t, rest))) >>=? fun btr ->
parse_instr ?storage_type ctxt bf rest >>=? fun bfr -> parse_instr ?storage_type ?type_logger ctxt bf rest >>=? fun bfr ->
let branch ibt ibf = let branch ibt ibf =
{ loc ; instr = If_cons (ibt, ibf) ; bef ; aft = ibt.aft } in { loc ; instr = If_cons (ibt, ibf) ; bef ; aft = ibt.aft } in
merge_branches loc btr bfr { branch } merge_branches loc btr bfr { branch }
@ -979,14 +996,14 @@ and parse_instr
return (typed loc (Nop, stack)) return (typed loc (Nop, stack))
| Seq (_, [ single ]), | Seq (_, [ single ]),
stack -> stack ->
parse_instr ?storage_type ctxt single stack parse_instr ?storage_type ?type_logger ctxt single stack
| Seq (loc, hd :: tl), | Seq (loc, hd :: tl),
stack -> stack ->
parse_instr ?storage_type ctxt hd stack >>=? begin function parse_instr ?storage_type ?type_logger ctxt hd stack >>=? begin function
| Failed _ -> | Failed _ ->
fail (Fail_not_in_tail_position loc) fail (Fail_not_in_tail_position loc)
| Typed ({ aft = middle } as ihd) -> | Typed ({ aft = middle } as ihd) ->
parse_instr ?storage_type ctxt (Seq (loc, tl)) middle >>=? function parse_instr ?storage_type ?type_logger ctxt (Seq (loc, tl)) middle >>=? function
| Failed { descr } -> | Failed { descr } ->
let descr ret = let descr ret =
{ loc ; instr = Seq (ihd, descr ret) ; { loc ; instr = Seq (ihd, descr ret) ;
@ -999,15 +1016,15 @@ and parse_instr
(Item_t (Bool_t, rest) as bef) -> (Item_t (Bool_t, rest) as bef) ->
check_kind [ Seq_kind ] bt >>=? fun () -> check_kind [ Seq_kind ] bt >>=? fun () ->
check_kind [ Seq_kind ] bf >>=? fun () -> check_kind [ Seq_kind ] bf >>=? fun () ->
parse_instr ?storage_type ctxt bt rest >>=? fun btr -> parse_instr ?storage_type ?type_logger ctxt bt rest >>=? fun btr ->
parse_instr ?storage_type ctxt bf rest >>=? fun bfr -> parse_instr ?storage_type ?type_logger ctxt bf rest >>=? fun bfr ->
let branch ibt ibf = let branch ibt ibf =
{ loc ; instr = If (ibt, ibf) ; bef ; aft = ibt.aft } in { loc ; instr = If (ibt, ibf) ; bef ; aft = ibt.aft } in
merge_branches loc btr bfr { branch } merge_branches loc btr bfr { branch }
| Prim (loc, "LOOP", [ body ]), | Prim (loc, "LOOP", [ body ]),
(Item_t (Bool_t, rest) as stack) -> (Item_t (Bool_t, rest) as stack) ->
check_kind [ Seq_kind ] body >>=? fun () -> check_kind [ Seq_kind ] body >>=? fun () ->
parse_instr ?storage_type ctxt body rest >>=? begin function parse_instr ?storage_type ?type_logger ctxt body rest >>=? begin function
| Typed ibody -> | Typed ibody ->
trace trace
(Unmatched_branches (loc, ibody.aft, stack)) (Unmatched_branches (loc, ibody.aft, stack))
@ -1022,7 +1039,7 @@ and parse_instr
(Lwt.return (parse_ty arg)) >>=? fun (Ex_ty arg) -> (Lwt.return (parse_ty arg)) >>=? fun (Ex_ty arg) ->
(Lwt.return (parse_ty ret)) >>=? fun (Ex_ty ret) -> (Lwt.return (parse_ty ret)) >>=? fun (Ex_ty ret) ->
check_kind [ Seq_kind ] code >>=? fun () -> check_kind [ Seq_kind ] code >>=? fun () ->
parse_lambda ctxt arg ret code >>=? fun lambda -> parse_lambda ?type_logger ctxt arg ret code >>=? fun lambda ->
return (typed loc (Lambda lambda, Item_t (Lambda_t (arg, ret), stack))) return (typed loc (Lambda lambda, Item_t (Lambda_t (arg, ret), stack)))
| Prim (loc, "EXEC", []), | Prim (loc, "EXEC", []),
Item_t (arg, Item_t (Lambda_t (param, ret), rest)) -> Item_t (arg, Item_t (Lambda_t (param, ret), rest)) ->
@ -1031,7 +1048,7 @@ and parse_instr
| Prim (loc, "DIP", [ code ]), | Prim (loc, "DIP", [ code ]),
Item_t (v, rest) -> Item_t (v, rest) ->
check_kind [ Seq_kind ] code >>=? fun () -> check_kind [ Seq_kind ] code >>=? fun () ->
parse_instr ctxt code rest >>=? begin function parse_instr ?type_logger ctxt code rest >>=? begin function
| Typed descr -> | Typed descr ->
return (typed loc (Dip descr, Item_t (v, descr.aft))) return (typed loc (Dip descr, Item_t (v, descr.aft)))
| Failed _ -> | Failed _ ->
@ -1410,8 +1427,9 @@ and parse_contract
type ex_script = Ex_script : ('a, 'b, 'c) script -> ex_script type ex_script = Ex_script : ('a, 'b, 'c) script -> ex_script
let parse_script let parse_script
: context -> Script.storage -> Script.code -> ex_script tzresult Lwt.t : ?type_logger: (int * (Script.expr list * Script.expr list) -> unit) ->
= fun ctxt context -> Script.storage -> Script.code -> ex_script tzresult Lwt.t
= fun ?type_logger ctxt
{ storage; storage_type = init_storage_type } { storage; storage_type = init_storage_type }
{ code; arg_type; ret_type; storage_type } -> { code; arg_type; ret_type; storage_type } ->
(Lwt.return (parse_ty arg_type)) >>=? fun (Ex_ty arg_type) -> (Lwt.return (parse_ty arg_type)) >>=? fun (Ex_ty arg_type) ->
@ -1421,13 +1439,12 @@ let parse_script
let arg_type_full = Pair_t (Pair_t (Tez_t, arg_type), storage_type) in let arg_type_full = Pair_t (Pair_t (Tez_t, arg_type), storage_type) in
let ret_type_full = Pair_t (ret_type, storage_type) in let ret_type_full = Pair_t (ret_type, storage_type) in
Lwt.return (ty_eq init_storage_type storage_type) >>=? fun (Eq _) -> Lwt.return (ty_eq init_storage_type storage_type) >>=? fun (Eq _) ->
parse_data ctxt storage_type storage >>=? fun storage -> parse_data ?type_logger ctxt storage_type storage >>=? fun storage ->
parse_lambda ctxt ~storage_type arg_type_full ret_type_full code >>=? fun code -> trace
(Ill_typed_contract (code, arg_type, ret_type, storage_type, []))
(parse_lambda ctxt ~storage_type ?type_logger arg_type_full ret_type_full code) >>=? fun code ->
return (Ex_script { code; arg_type; ret_type; storage; storage_type }) return (Ex_script { code; arg_type; ret_type; storage; storage_type })
type type_map =
(int * (Script.expr list * Script.expr list)) list
let type_map_enc = let type_map_enc =
let open Data_encoding in let open Data_encoding in
list list
@ -1438,11 +1455,6 @@ let type_map_enc =
(list Script.expr_encoding))) (list Script.expr_encoding)))
let type_map descr = let type_map descr =
let rec unparse_stack
: type a. a stack_ty -> Script.expr list
= function
| Empty_t -> []
| Item_t (ty, rest) -> unparse_ty ty :: unparse_stack rest in
let rec type_map let rec type_map
: type bef aft. type_map -> (bef, aft) descr -> type_map : type bef aft. type_map -> (bef, aft) descr -> type_map
= fun acc { loc ; instr ; bef ; aft } -> = fun acc { loc ; instr ; bef ; aft } ->
@ -1482,6 +1494,7 @@ let type_map descr =
let typecheck_code let typecheck_code
: context -> Script.code -> type_map tzresult Lwt.t : context -> Script.code -> type_map tzresult Lwt.t
= fun ctxt { code; arg_type; ret_type; storage_type } -> = fun ctxt { code; arg_type; ret_type; storage_type } ->
let failure_type_map = ref [] in
trace trace
(Ill_formed_type (Some "parameter", arg_type)) (Ill_formed_type (Some "parameter", arg_type))
(Lwt.return (parse_ty arg_type)) >>=? fun (Ex_ty arg_type) -> (Lwt.return (parse_ty arg_type)) >>=? fun (Ex_ty arg_type) ->
@ -1494,21 +1507,24 @@ let typecheck_code
let arg_type_full = Pair_t (Pair_t (Tez_t, arg_type), storage_type) in let arg_type_full = Pair_t (Pair_t (Tez_t, arg_type), storage_type) in
let ret_type_full = Pair_t (ret_type, storage_type) in let ret_type_full = Pair_t (ret_type, storage_type) in
trace trace
(Ill_typed_contract (code, arg_type, ret_type, storage_type)) (Ill_typed_contract (code, arg_type, ret_type, storage_type, !failure_type_map))
(parse_lambda ctxt (parse_lambda ctxt
~storage_type arg_type_full ret_type_full ~storage_type
~type_logger:(fun x -> failure_type_map := x :: !failure_type_map)
arg_type_full ret_type_full
code) >>=? fun (Lam (descr,_)) -> code) >>=? fun (Lam (descr,_)) ->
return (type_map descr) return (type_map descr)
let typecheck_data let typecheck_data
: context -> Script.expr * Script.expr -> unit tzresult Lwt.t : ?type_logger: (int * (Script.expr list * Script.expr list) -> unit) ->
= fun ctxt (data, exp_ty) -> context -> Script.expr * Script.expr -> unit tzresult Lwt.t
= fun ?type_logger ctxt (data, exp_ty) ->
trace trace
(Ill_formed_type (None, exp_ty)) (Ill_formed_type (None, exp_ty))
(Lwt.return (parse_ty exp_ty)) >>=? fun (Ex_ty exp_ty) -> (Lwt.return (parse_ty exp_ty)) >>=? fun (Ex_ty exp_ty) ->
trace trace
(Ill_typed_data (None, data, exp_ty)) (Ill_typed_data (None, data, exp_ty))
(parse_data ctxt exp_ty data) >>=? fun _ -> (parse_data ?type_logger ctxt exp_ty data) >>=? fun _ ->
return () return ()
(* ---- Error registration --------------------------------------------------*) (* ---- Error registration --------------------------------------------------*)
@ -1898,14 +1914,15 @@ let () =
"The toplevel error thrown when trying to typecheck \ "The toplevel error thrown when trying to typecheck \
a contract code against given input, output and storage types \ a contract code against given input, output and storage types \
(always followed by more precise errors)." (always followed by more precise errors)."
(obj4 (obj5
(req "expectedParameterType" ex_ty_enc) (req "expectedParameterType" ex_ty_enc)
(req "expectedReturnType" ex_ty_enc) (req "expectedReturnType" ex_ty_enc)
(req "expectedStorageType" ex_ty_enc) (req "expectedStorageType" ex_ty_enc)
(req "illTypedExpression" Script.expr_encoding)) (req "illTypedExpression" Script.expr_encoding)
(req "typeMap" type_map_enc))
(function (function
| Ill_typed_contract (expr, arg_ty, ret_ty, storage_ty) -> | Ill_typed_contract (expr, arg_ty, ret_ty, storage_ty, type_map) ->
Some (Ex_ty arg_ty, Ex_ty ret_ty, Ex_ty storage_ty, expr) Some (Ex_ty arg_ty, Ex_ty ret_ty, Ex_ty storage_ty, expr, type_map)
| _ -> None) | _ -> None)
(fun (Ex_ty arg_ty, Ex_ty ret_ty, Ex_ty storage_ty, expr) -> (fun (Ex_ty arg_ty, Ex_ty ret_ty, Ex_ty storage_ty, expr, type_map) ->
Ill_typed_contract (expr, arg_ty, ret_ty, storage_ty)) Ill_typed_contract (expr, arg_ty, ret_ty, storage_ty, type_map))

5
test/scripts/fail.tez
View File

@ -1,9 +1,6 @@
parameter unit parameter unit
code code
{ # This contract will never accept a incoming transaction { # This contract will never accept a incoming transaction
FAIL ; FAIL}
# Alas, FAIL is not (yet?) polymorphic, and we need to keep unused
# instructions for the sake of typing...
CDR ; UNIT ; PAIR }
return unit return unit
storage unit storage unit