From 7ab3b305e4f2b8f7d1e24c45756cfe23b0859ddc Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Mon, 20 Sep 2010 13:06:49 -0700
Subject: Move id counters into sess in preparation for moving desugaring to
 middle-end.

---
 src/boot/driver/lib.ml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/boot/driver/lib.ml')

diff --git a/src/boot/driver/lib.ml b/src/boot/driver/lib.ml
index 3b3ee72d..0d0e93be 100644
--- a/src/boot/driver/lib.ml
+++ b/src/boot/driver/lib.ml
@@ -109,11 +109,11 @@ let get_file_mod
     (sess:Session.sess)
     (abi:Abi.abi)
     (filename:filename)
-    (nref:node_id ref)
-    (oref:opaque_id ref)
     : Ast.mod_items =
   let dies = get_dies sess filename in
   let items = Hashtbl.create 0 in
+  let nref = sess.Session.sess_node_id_counter in
+  let oref = sess.Session.sess_opaque_id_counter in
     Dwarf.extract_mod_items nref oref abi items dies;
     items
 ;;
@@ -123,8 +123,6 @@ let get_mod
     (abi:Abi.abi)
     (meta:Ast.meta_pat)
     (use_id:node_id)
-    (nref:node_id ref)
-    (oref:opaque_id ref)
     (crate_item_cache:(crate_id, Ast.mod_items) Hashtbl.t)
     : (filename * Ast.mod_items) =
   let found = Queue.create () in
@@ -215,8 +213,8 @@ let get_mod
       | 1 ->
           let (filename, crate_id) = Queue.pop found in
           let items =
-            htab_search_or_default crate_item_cache crate_id
-              (fun () -> get_file_mod sess abi filename nref oref)
+              htab_search_or_default crate_item_cache crate_id
+                (fun () -> get_file_mod sess abi filename)
           in
             (filename, items)
       | _ -> Common.err (Some use_id) "multiple crates match 'use' clause"
-- 
cgit v1.2.3