CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-11-08 07:51:43 +03:00
Code Issues Projects Releases Wiki Activity

Fix default typing across modules

Browse Source
This commit is contained in:
Louis Gesbert 2023-11-07 15:46:19 +01:00
parent 9203e4f7bb
commit fd50e6186f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/scopelang/from_desugared.ml
View File

@ -837,16 +837,17 @@ let translate_program
let ctx = make_ctx desugared in
let rec gather_scope_vars acc modules =
ModuleName.Map.fold
(fun _modname mctx acc ->
let acc = gather_scope_vars acc mctx.modules in
ScopeVar.Map.union (fun _ _ -> assert false) acc mctx.scope_var_mapping)
(fun _modname mctx (vmap, reentr) ->
let vmap, reentr = gather_scope_vars (vmap, reentr) mctx.modules in
ScopeVar.Map.union (fun _ _ -> assert false) vmap mctx.scope_var_mapping,
ScopeVar.Map.union (fun _ _ -> assert false) reentr mctx.reentrant_vars)
modules acc
in
let ctx =
{
ctx with
scope_var_mapping = gather_scope_vars ctx.scope_var_mapping ctx.modules;
}
let scope_var_mapping, reentrant_vars =
gather_scope_vars (ctx.scope_var_mapping, ctx.reentrant_vars) ctx.modules
in
{ ctx with scope_var_mapping; reentrant_vars }
in
let rec process_decl_ctx ctx decl_ctx =
let ctx_scopes =

1
compiler/shared_ast/interpreter.ml
View File

@ -522,6 +522,7 @@ and val_to_runtime :
curry (runtime_to_val eval_expr ctx m targ x :: acc) targs)
in
curry [] targs
| TDefault ty, _ -> val_to_runtime eval_expr ctx ty v
| _ ->
Message.raise_internal_error
"Could not convert value of type %a to runtime: %a" (Print.typ ctx) ty