diff options
| author | Patrick Walton <[email protected]> | 2010-09-08 15:38:07 -0700 |
|---|---|---|
| committer | Patrick Walton <[email protected]> | 2010-09-08 15:38:39 -0700 |
| commit | 2172a3bcf44bbecfe9469451cdaed96b5beee71e (patch) | |
| tree | 58e7d09ae2b352733e56d0244d8aa0851e5737c7 /src/boot/fe/parser.ml | |
| parent | Cleaned up locking in the kernel. (diff) | |
| download | rust-2172a3bcf44bbecfe9469451cdaed96b5beee71e.tar.xz rust-2172a3bcf44bbecfe9469451cdaed96b5beee71e.zip | |
First lame stab at solving the diamond import problem
Diffstat (limited to 'src/boot/fe/parser.ml')
| -rw-r--r-- | src/boot/fe/parser.ml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/boot/fe/parser.ml b/src/boot/fe/parser.ml index 4add7b01..0c7a2f6f 100644 --- a/src/boot/fe/parser.ml +++ b/src/boot/fe/parser.ml @@ -8,7 +8,8 @@ type get_mod_fn = (Ast.meta_pat -> node_id -> (node_id ref) -> (opaque_id ref) - -> (filename * Ast.mod_items)) + -> (crate_id, Ast.mod_items) Hashtbl.t + -> (filename * Ast.mod_items)) ;; type pstate = @@ -22,6 +23,7 @@ type pstate = pstate_temp_id : temp_id ref; pstate_node_id : node_id ref; pstate_opaque_id : opaque_id ref; + pstate_crate_cache : (crate_id, Ast.mod_items) Hashtbl.t; pstate_get_mod : get_mod_fn; pstate_get_cenv_tok : pstate -> Ast.ident -> token; pstate_infer_lib_name : (Ast.ident -> filename); @@ -44,6 +46,7 @@ let make_parser (tref:temp_id ref) (nref:node_id ref) (oref:opaque_id ref) + (crate_cache:(crate_id, Ast.mod_items) Hashtbl.t) (sess:Session.sess) (get_mod:get_mod_fn) (get_cenv_tok:pstate -> Ast.ident -> token) @@ -69,6 +72,7 @@ let make_parser pstate_temp_id = tref; pstate_node_id = nref; pstate_opaque_id = oref; + pstate_crate_cache = crate_cache; pstate_get_mod = get_mod; pstate_get_cenv_tok = get_cenv_tok; pstate_infer_lib_name = infer_lib_name; |