X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=compiler%2Fsrc%2Flib%2Ftiger%2Ftiger_semant.ml;h=a3893fa89a49f5650e3e0da9cc973d5a9c99a684;hb=54e838f482844369048d4f88e87a092a87162b72;hp=a0fdf3d6ace12ecc157be04095c293f612b78b86;hpb=76c771a77658a04ddd658455d1c77578d3ff9a79;p=tiger.ml.git diff --git a/compiler/src/lib/tiger/tiger_semant.ml b/compiler/src/lib/tiger/tiger_semant.ml index a0fdf3d..a3893fa 100644 --- a/compiler/src/lib/tiger/tiger_semant.ml +++ b/compiler/src/lib/tiger/tiger_semant.ml @@ -3,6 +3,7 @@ module List = ListLabels 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 @@ -19,17 +20,35 @@ module Semant : sig * Appel's *) val transExp : env:Env.t -> A.exp -> expty - val transVar : env:Env.t -> A.var -> expty - val transDec : env:Env.t -> A.dec -> Env.t - val transTy : env:Env.t -> A.ty -> Type.t (* needs only type env *) + + (* transVar does not seem to be needed, as trvar handles all our cases. + * Am I wrong? + * + * val transVar : env:Env.t -> A.var -> expty + * + *) end = struct type expty = { exp : Translate.exp ; ty : Type.t } - let unimplemented () = - failwith "unimplemented" + let rec actual_ty ty ~pos = + match ty with + | Type.Name (name, ty_opt_ref) -> + (match !ty_opt_ref with + | None -> + E.raise (E.Unknown_type {ty_id=name; pos}) + | Some ty -> + actual_ty ty ~pos + ) + | Type.Unit + | Type.Nil + | Type.Int + | Type.String + | Type.Record _ + | Type.Array _ -> + ty let return ty = {exp = (); ty} let return_unit = return Type.Unit @@ -42,6 +61,9 @@ end = struct | Some ty -> ty | None -> E.raise (E.Unknown_type {ty_id=sym; pos}) + let env_get_typ_actual ~sym ~env ~pos : Type.t = + actual_ty (env_get_typ ~sym ~env ~pos) ~pos + let env_get_val ~sym ~env ~pos : Value.t = match Env.get_val env sym with | Some ty -> ty @@ -54,10 +76,7 @@ end = struct E.raise (E.Wrong_type {expected=ty_left; given=ty_right; pos}) let check_int expty ~pos : unit = - check_same {exp=(); ty=Type.Int} expty ~pos - - (* TODO: actual_ty *) - (* TODO: mutual recursion *) + check_same return_int expty ~pos let rec transExp ~env exp = let rec trexp exp = @@ -71,24 +90,34 @@ end = struct | 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 {exp=(); ty = ty_expected} (trexp exp_given) ~pos; - ); - return 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}) ) | A.OpExp {oper; left; right; pos} -> trop oper ~left ~right ~pos | A.RecordExp {fields=field_exps; typ; pos} -> - let ty = env_get_typ ~sym:typ ~env ~pos in + let ty = env_get_typ_actual ~sym:typ ~env ~pos in Type.if_record ty ~f:(fun field_tys -> List.iter field_exps ~f:(fun (field, exp, pos) -> (match List.assoc_opt field field_tys with | Some field_ty -> - check_same {exp=(); ty=field_ty} (trexp exp) ~pos + check_same (return (actual_ty ~pos field_ty)) (trexp exp) ~pos | None -> E.raise (E.No_such_field_in_record {field; record=ty; pos}) @@ -98,13 +127,18 @@ end = struct ~otherwise:(fun () -> E.raise (E.Wrong_type_used_as_record {ty_id=typ; ty; pos}) ); - return ty - | A.SeqExp exps -> - (* Ignoring value because we only care if a type-checking exception - * is raised in one of trexp calls: *) - List.iter exps ~f:(fun (exp, _) -> ignore (trexp exp)); - (* FIXME: Return type of last expression, not unit. *) + return (actual_ty ~pos ty) + | A.SeqExp [] -> return_unit + | A.SeqExp exps -> + let last xs = + xs + |> List.rev (* Yes, redundant, but clean-looking ;-P *) + |> List.hd (* Empty is matched in above SeqExp match case *) + in + exps + |> List.map ~f:(fun (exp, _) -> trexp exp) + |> last | A.AssignExp {var; exp; pos} -> check_same (trvar var) (trexp exp) ~pos; (* TODO: Add var->exp to val env? *) @@ -131,7 +165,8 @@ end = struct check_int (trexp lo) ~pos; check_int (trexp hi) ~pos; (* Only care if a type-error is raised *) - ignore (transExp ~env:(Env.set_typ env var Type.Int) body); + let env = Env.set_val env var (Value.Var {ty = Type.Int}) in + ignore (transExp ~env body); return_unit | A.BreakExp _ -> return_unit @@ -144,16 +179,16 @@ end = struct transExp body ~env | A.ArrayExp {typ; size; init; pos} -> check_int (trexp size) ~pos; - let ty = env_get_typ ~sym:typ ~env ~pos in + let ty = env_get_typ_actual ~sym:typ ~env ~pos in Type.if_array ty ~f:(fun ty_elements -> - check_same {exp=(); ty=ty_elements} (trexp init) ~pos + check_same (return (actual_ty ~pos ty_elements)) (trexp init) ~pos ) ~otherwise:(fun () -> E.raise (E.Wrong_type_used_as_array {ty_id=typ; ty; pos}) ); - return ty + return (actual_ty ~pos ty) | A.VarExp var -> trvar var ) @@ -162,7 +197,7 @@ end = struct | A.SimpleVar {symbol=sym; pos} -> (match env_get_val ~sym ~env ~pos with | Value.Fun _ -> E.raise (E.Id_is_a_function {id=sym; pos}) - | Value.Var {ty} -> return ty + | Value.Var {ty} -> return (actual_ty ~pos ty) ) | A.FieldVar {var; symbol; pos} -> let {exp=_; ty} = trvar var in @@ -174,7 +209,7 @@ end = struct E.raise (E.No_such_field_in_record {field=symbol; record=ty; pos}) | Some ty -> - return ty + return (actual_ty ~pos ty) ) ) ~otherwise:(fun () -> E.raise (E.Exp_not_a_record {ty; pos})) @@ -183,10 +218,11 @@ end = struct check_int (trexp exp) ~pos; Type.if_array ty - ~f:(fun ty_elements -> return ty_elements) + ~f:(fun ty_elements -> return (actual_ty ~pos ty_elements)) ~otherwise:(fun () -> E.raise (E.Exp_not_an_array {ty; pos})) ) and trop oper ~left ~right ~pos = + (* TODO: Refactor trop - all opers return bool/int *) let expty_left = trexp left in let expty_right = trexp right in check_same expty_left expty_right ~pos; @@ -208,7 +244,7 @@ end = struct || (T.is_array ty) || (T.is_record ty) then - return ty + return_int (* Because we have no bool type *) else E.raise (E.Invalid_operand_type { oper @@ -224,7 +260,7 @@ end = struct if (T.is_int ty) || (T.is_string ty) then - return ty + return_int (* Because we have no bool type *) else E.raise (E.Invalid_operand_type { oper @@ -235,7 +271,7 @@ end = struct ) in trexp exp - and transDec ~env dec = + and transDec ~(env : Env.t) (dec : A.dec) : Env.t = (match dec with | A.VarDec {name; typ=typ_opt; init; pos=pos_outter; escape=_} -> let ty = @@ -243,25 +279,41 @@ end = struct | None, {ty; exp=()} -> ty | Some (sym, pos_inner), expty_init -> - let ty = env_get_typ ~sym ~env ~pos:pos_inner in - check_same {exp=(); ty} expty_init ~pos:pos_outter; + let ty = env_get_typ_actual ~sym ~env ~pos:pos_inner in + check_same (return ty) expty_init ~pos:pos_outter; ty ) in Env.set_val env name (Value.Var {ty}) | A.TypeDecs typedecs -> - List.fold_left typedecs ~init:env ~f:( - fun env (A.TypeDec {name; ty; pos=_}) -> - let ty = transTy ~env ty in - Env.set_typ env name ty - ) + let env = + List.fold_left typedecs ~init:env ~f:( + fun env (A.TypeDec {name; ty=_; pos=_}) -> + Env.set_typ env name (Type.Name (name, ref None)) + ) + in + 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) -> + ty_opt_ref := Some ty + | Type.Unit + | Type.Nil + | Type.Int + | Type.String + | Type.Record _ + | Type.Array _ -> + () + ) + ); + 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 ~env ~sym:typ ~pos in + 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) ) @@ -274,13 +326,13 @@ end = struct | None -> Type.Unit | Some (sym, pos) -> - env_get_typ ~sym ~env ~pos + env_get_typ_actual ~sym ~env ~pos in Env.set_val env name (Value.Fun {formals; result}) ) ) - and transTy ~env typ = - (match typ with + and transTy ~(env : Env.t) (ty_exp : A.ty) : Type.t = + (match ty_exp with | A.NameTy {symbol=sym; pos} -> env_get_typ ~sym ~env ~pos | A.RecordTy fields -> @@ -295,16 +347,6 @@ end = struct let element_ty = env_get_typ ~sym ~env ~pos in Type.new_array element_ty ) - - let transVar ~env:_ var = - (match var with - | A.SimpleVar {symbol=_; _} -> - unimplemented () - | A.FieldVar {var=_; symbol=_; _} -> - unimplemented () - | A.SubscriptVar {var=_; exp=_; _} -> - unimplemented () - ) end open Semant