module A = Tiger_absyn
module Env = Tiger_env
module E = Tiger_error
-module Symbol = Tiger_symbol
module Translate = Tiger_translate
module Type = Tiger_env_type
module Value = Tiger_env_value
| A.CallExp {func; args; pos} ->
(match env_get_val ~sym:func ~env ~pos with
| Value.Fun {formals; result} ->
- List.iter2 formals args ~f:(fun ty_expected exp_given ->
- check_same (return (actual_ty ~pos ty_expected)) (trexp exp_given) ~pos;
- );
- return (actual_ty ~pos result)
+ let expected = List.length formals in
+ let given = List.length args in
+ if given = expected then
+ begin
+ List.iter2 formals args ~f:(fun ty_expected exp_given ->
+ check_same
+ (return (actual_ty ~pos ty_expected))
+ (trexp exp_given)
+ ~pos;
+ );
+ return (actual_ty ~pos result)
+ end
+ else
+ E.raise (E.Wrong_number_of_args {func; expected; given; pos})
| Value.Var _ ->
E.raise (E.Id_not_a_function {id=func; pos})
)
List.iter typedecs ~f:(fun (A.TypeDec {name; ty=ty_exp; pos}) ->
let ty = transTy ~env ty_exp in
(match env_get_typ ~sym:name ~env ~pos with
- | Type.Name (name, ty_opt_ref) ->
+ | Type.Name (_, ty_opt_ref) ->
ty_opt_ref := Some ty
| Type.Unit
| Type.Nil
);
env
| A.FunDecs fundecs ->
- List.fold_left fundecs ~init:env ~f:(
- fun env (A.FunDec {name; params; result; body; pos=_}) ->
- let (env_for_body, formals_in_reverse_order) =
- List.fold_left params ~init:(env, []) ~f:(
- fun (env, formals) (A.Field {name; escape=_; typ; pos}) ->
- let ty = env_get_typ_actual ~env ~sym:typ ~pos in
- let env = Env.set_val env name (Value.Var {ty}) in
- (env, ty :: formals)
+ let env_with_fun_heads_only =
+ List.fold_left fundecs ~init:env ~f:(
+ fun env (A.FunDec {name; params; result; body=_; pos=_}) ->
+ let formals =
+ List.map params ~f:(
+ fun (A.Field {name=_; typ; pos; escape=_}) ->
+ env_get_typ_actual ~env ~sym:typ ~pos
+ )
+ in
+ let result =
+ match result with
+ | Some (s, p) -> env_get_typ_actual ~sym:s ~env ~pos:p
+ | None -> Type.Unit
+ in
+ Env.set_val env name (Value.Fun {formals; result})
+ )
+ in
+ List.iter fundecs ~f:(
+ fun (A.FunDec {name=_; params; result=_; body; pos=_}) ->
+ let env_with_fun_heads_and_local_vars =
+ List.fold_left params ~init:env_with_fun_heads_only ~f:(
+ fun env (A.Field {name=var_name; escape=_; typ; pos}) ->
+ let var_ty = env_get_typ_actual ~env ~sym:typ ~pos in
+ Env.set_val env var_name (Value.Var {ty = var_ty})
)
in
- (* ignore because we only care if an exception is raised *)
- ignore (transExp ~env:env_for_body body);
- let formals = List.rev formals_in_reverse_order in
- let result =
- match result with
- | None ->
- Type.Unit
- | Some (sym, pos) ->
- env_get_typ_actual ~sym ~env ~pos
- in
- Env.set_val env name (Value.Fun {formals; result})
- )
+ (* we only care if an exception is raised *)
+ ignore (transExp ~env:env_with_fun_heads_and_local_vars body);
+ );
+ env_with_fun_heads_only
)
and transTy ~(env : Env.t) (ty_exp : A.ty) : Type.t =
(match ty_exp with