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

deprecate fail

Browse Source
This commit is contained in:
galfour 2019-09-26 19:13:25 +02:00
parent 08809f8a5d
commit ef2f6060d5
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/passes/4-typer/typer.ml
View File

@ -206,6 +206,14 @@ module Errors = struct
] in ] in
error ~data title message () error ~data title message ()
let deprecated_fail (ae : I.expression) () =
let title () = "fail is deprecated, use failwith instead" in
let message = title in
let data = [
("location" , fun () -> Format.asprintf "%a" Location.pp ae.location) ;
] in
error ~data title message ()
let constant_error loc lst tv_opt = let constant_error loc lst tv_opt =
let title () = "typing constant" in let title () = "typing constant" in
let message () = "" in let message () = "" in
@ -396,7 +404,7 @@ and type_expression : environment -> ?tv_opt:O.type_value -> I.expression -> O.a
trace main_error @@ trace main_error @@
match ae.expression with match ae.expression with
(* Basic *) (* Basic *)
| E_failwith _ -> fail @@ needs_annotation ae "the failwith keyword" | E_failwith _ -> fail @@ deprecated_fail ae
| E_variable name -> | E_variable name ->
let%bind tv' = let%bind tv' =
trace_option (unbound_variable e name ae.location) trace_option (unbound_variable e name ae.location)

2
src/test/integration_tests.ml
View File

@ -684,7 +684,7 @@ let guess_string_mligo () : unit result =
in expect_eq_n program "main" make_input make_expected in expect_eq_n program "main" make_input make_expected
let basic_mligo () : unit result = let basic_mligo () : unit result =
let%bind typed = mtype_file ~debug_simplify:true "./contracts/basic.mligo" in let%bind typed = mtype_file "./contracts/basic.mligo" in
let%bind result = Run.Of_typed.evaluate_entry typed "foo" in let%bind result = Run.Of_typed.evaluate_entry typed "foo" in
Ast_typed.assert_value_eq Ast_typed.assert_value_eq
(Ast_typed.Combinators.e_a_empty_int (42 + 127), result) (Ast_typed.Combinators.e_a_empty_int (42 + 127), result)