aboutsummaryrefslogtreecommitdiff
path: root/src/boot/fe/cexp.ml
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2010-09-20 13:06:49 -0700
committerGraydon Hoare <[email protected]>2010-09-20 13:06:49 -0700
commit7ab3b305e4f2b8f7d1e24c45756cfe23b0859ddc (patch)
tree4897e598c2a06a76bfd0c2e709e6828126b29d29 /src/boot/fe/cexp.ml
parentBeginnings of post-resolve simplify pass. (diff)
downloadrust-7ab3b305e4f2b8f7d1e24c45756cfe23b0859ddc.tar.xz
rust-7ab3b305e4f2b8f7d1e24c45756cfe23b0859ddc.zip
Move id counters into sess in preparation for moving desugaring to middle-end.
Diffstat (limited to 'src/boot/fe/cexp.ml')
-rw-r--r--src/boot/fe/cexp.ml20
1 files changed, 3 insertions, 17 deletions
diff --git a/src/boot/fe/cexp.ml b/src/boot/fe/cexp.ml
index d856b131..ac05105e 100644
--- a/src/boot/fe/cexp.ml
+++ b/src/boot/fe/cexp.ml
@@ -381,9 +381,6 @@ and eval_cexp (env:env) (exp:cexp) : cdir array =
let ps = env.env_ps in
let p =
make_parser
- ps.pstate_temp_id
- ps.pstate_node_id
- ps.pstate_opaque_id
ps.pstate_crate_cache
ps.pstate_sess
ps.pstate_get_mod
@@ -432,12 +429,7 @@ 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_crate_cache
+ ps.pstate_get_mod meta_pat id ps.pstate_crate_cache
in
iflog ps
begin
@@ -631,9 +623,6 @@ let parse_crate_file
(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
- let nref = ref (Node 0) in
- let oref = ref (Opaque 0) in
let required = Hashtbl.create 4 in
let required_syms = Hashtbl.create 4 in
let files = Hashtbl.create 0 in
@@ -670,7 +659,7 @@ let parse_crate_file
| Some (PVAL_num n) -> LIT_INT n
in
let ps =
- make_parser tref nref oref crate_cache sess get_mod get_cenv_tok
+ make_parser crate_cache sess get_mod get_cenv_tok
infer_lib_name required required_syms fname
in
let env = { env_bindings = bindings;
@@ -737,9 +726,6 @@ let parse_src_file
(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
- let nref = ref (Node 0) in
- let oref = ref (Opaque 0) in
let required = Hashtbl.create 0 in
let required_syms = Hashtbl.create 0 in
let get_cenv_tok ps ident =
@@ -747,7 +733,7 @@ let parse_src_file
ident) ps)
in
let ps =
- make_parser tref nref oref crate_cache sess get_mod get_cenv_tok
+ make_parser crate_cache sess get_mod get_cenv_tok
infer_lib_name required required_syms fname
in
with_err_handling sess