CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-09-20 00:41:05 +03:00
Code Issues Projects Releases Wiki Activity

better error management when building with make_app

Browse Source
This commit is contained in:
adelaett 2023-02-28 08:33:17 +01:00
parent 2ae2ff7d50
commit 5fe09238c5
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
compiler/shared_ast/expr.ml
View File

@ -718,7 +718,7 @@ let make_abs xs e taus pos =
in
eabs (bind xs e) taus mark
let make_app e args pos =
let make_app ?(decl_ctx = None) e args pos =
let mark =
fold_marks
(fun _ -> pos)
@ -730,36 +730,18 @@ let make_app e args pos =
assert (Type.unifiable_list tx' (List.map (fun x -> x.ty) argtys));
tr
| TAny -> fty.ty
| _ -> assert false))
| _ -> (
match decl_ctx with
| None -> assert false
| Some decl_ctx ->
Errors.raise_error
"INTERNAL ERROR: wrong type: found %a while expecting either \
an Arrow or Any"
(Print.typ decl_ctx) fty.ty)))
(List.map Marked.get_mark (e :: args))
in
eapp e args mark
let make_app' e u pos decl_ctx =
let mark =
fold_marks
(fun _ -> pos)
(function
| [] -> assert false
| fty :: argtys ->
List.fold_left
(fun tf tx ->
match Marked.unmark tf with
| TArrow (tx', tr) ->
assert (Type.unifiable tx.ty tx');
(* wrong arg type *)
tr
| TAny -> tf
| _ ->
Errors.raise_error
"INTERNAL ERROR: wrong type: found %a while expecting either \
an Arrow or Any"
(Print.typ decl_ctx) tf)
fty.ty argtys)
(List.map Marked.get_mark (e :: u))
in
eapp e u mark
let empty_thunked_term mark =
let silent = Var.make "_" in
let pos = mark_pos mark in