diff options
Diffstat (limited to 'src/boot/fe')
| -rw-r--r-- | src/boot/fe/cexp.ml | 14 | ||||
| -rw-r--r-- | src/boot/fe/item.ml | 7 | ||||
| -rw-r--r-- | src/boot/fe/parser.ml | 6 |
3 files changed, 22 insertions, 5 deletions
diff --git a/src/boot/fe/cexp.ml b/src/boot/fe/cexp.ml index f69d35bd16f..e14bda51295 100644 --- a/src/boot/fe/cexp.ml +++ b/src/boot/fe/cexp.ml @@ -380,6 +380,7 @@ and eval_cexp (env:env) (exp:cexp) : cdir array = ps.pstate_temp_id ps.pstate_node_id ps.pstate_opaque_id + ps.pstate_crate_cache ps.pstate_sess ps.pstate_get_mod ps.pstate_get_cenv_tok @@ -427,7 +428,12 @@ and eval_cexp (env:env) (exp:cexp) : cdir array = end u.use_meta in - ps.pstate_get_mod meta_pat id ps.pstate_node_id ps.pstate_opaque_id + ps.pstate_get_mod + meta_pat + id + ps.pstate_node_id + ps.pstate_opaque_id + ps.pstate_crate_cache in iflog ps begin @@ -618,6 +624,7 @@ let parse_crate_file (sess:Session.sess) (get_mod:get_mod_fn) (infer_lib_name:(Ast.ident -> filename)) + (crate_cache:(crate_id, Ast.mod_items) Hashtbl.t) : Ast.crate = let fname = Session.filename_of sess.Session.sess_in in let tref = ref (Temp 0) in @@ -659,7 +666,7 @@ let parse_crate_file | Some (PVAL_num n) -> LIT_INT n in let ps = - make_parser tref nref oref sess get_mod get_cenv_tok + make_parser tref nref oref crate_cache sess get_mod get_cenv_tok infer_lib_name required required_syms fname in let env = { env_bindings = bindings; @@ -723,6 +730,7 @@ let parse_src_file (sess:Session.sess) (get_mod:get_mod_fn) (infer_lib_name:(Ast.ident -> filename)) + (crate_cache:(crate_id, Ast.mod_items) Hashtbl.t) : Ast.crate = let fname = Session.filename_of sess.Session.sess_in in let tref = ref (Temp 0) in @@ -735,7 +743,7 @@ let parse_src_file ident) ps) in let ps = - make_parser tref nref oref sess get_mod get_cenv_tok + make_parser tref nref oref crate_cache sess get_mod get_cenv_tok infer_lib_name required required_syms fname in with_err_handling sess diff --git a/src/boot/fe/item.ml b/src/boot/fe/item.ml index 287fbb41475..a0275be1e75 100644 --- a/src/boot/fe/item.ml +++ b/src/boot/fe/item.ml @@ -1159,7 +1159,12 @@ and parse_use let bpos = lexpos ps in let id = (span ps apos bpos ()).id in let (path, items) = - ps.pstate_get_mod meta id ps.pstate_node_id ps.pstate_opaque_id + ps.pstate_get_mod + meta + id + ps.pstate_node_id + ps.pstate_opaque_id + ps.pstate_crate_cache in let bpos = lexpos ps in expect ps SEMI; diff --git a/src/boot/fe/parser.ml b/src/boot/fe/parser.ml index 4add7b01b0e..0c7a2f6f543 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; |