diff options
| author | Graydon Hoare <[email protected]> | 2010-06-30 21:00:09 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2010-06-30 21:00:09 -0700 |
| commit | edfcd3a723366cd4afd1f4f44a5a958da34e6c58 (patch) | |
| tree | afa2a6c8f4172e7a116d53986e8ec7b0cc490662 /src/boot/me | |
| parent | Add TYSPEC_mutable, merge control-flag for it and auto_deref into unify_ctx s... (diff) | |
| download | rust-edfcd3a723366cd4afd1f4f44a5a958da34e6c58.tar.xz rust-edfcd3a723366cd4afd1f4f44a5a958da34e6c58.zip | |
Add relaxed init-context in which we're willing to auto-deref.
Diffstat (limited to 'src/boot/me')
| -rw-r--r-- | src/boot/me/type.ml | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/boot/me/type.ml b/src/boot/me/type.ml index 26407014..9b09bf79 100644 --- a/src/boot/me/type.ml +++ b/src/boot/me/type.ml @@ -191,6 +191,11 @@ let lval_ctx = mut_ok = true } ;; +let init_ctx = + { ext_ok = true; + mut_ok = true } +;; + let strict_ctx = { ext_ok = false; mut_ok = false } @@ -1150,7 +1155,7 @@ let process_crate (cx:ctxt) (crate:Ast.crate) : unit = let tvbase = any() in unify_lval rval_ctx base tvbase; unify_tyvars rval_ctx tvrec tvbase; - unify_lval lval_ctx dst tvrec + unify_lval init_ctx dst tvrec | Ast.STMT_init_rec (dst, fields, None) -> let dct = Hashtbl.create 10 in @@ -1160,7 +1165,7 @@ let process_crate (cx:ctxt) (crate:Ast.crate) : unit = Hashtbl.add dct ident tv in Array.iter add_field fields; - unify_lval lval_ctx dst (ref (TYSPEC_record dct)) + unify_lval init_ctx dst (ref (TYSPEC_record dct)) | Ast.STMT_init_tup (dst, members) -> let member_to_tv atom = @@ -1169,16 +1174,16 @@ let process_crate (cx:ctxt) (crate:Ast.crate) : unit = tv in let member_tvs = Array.map member_to_tv members in - unify_lval lval_ctx dst (ref (TYSPEC_tuple member_tvs)) + unify_lval init_ctx dst (ref (TYSPEC_tuple member_tvs)) | Ast.STMT_init_vec (dst, atoms) -> let tv = any() in let unify_with_tv atom = unify_atom rval_ctx atom tv in Array.iter unify_with_tv atoms; - unify_lval lval_ctx dst (ref (TYSPEC_vector tv)) + unify_lval init_ctx dst (ref (TYSPEC_vector tv)) | Ast.STMT_init_str (dst, _) -> - unify_lval lval_ctx dst (ty Ast.TY_str) + unify_lval init_ctx dst (ty Ast.TY_str) | Ast.STMT_copy (dst, expr) -> let tv = any() in |