---

yaml
---
r: 29982
b: refs/heads/incoming
c: 7317bf8
h: refs/heads/master
v: v3

Author: paulstansifer

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 9a7890d73af5ebe4bf862fa727427e290da1391b
+refs/heads/incoming: 7317bf8792ebb3f27768109b7d574ee0806cc5e5
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/parse/token.rs

@@ -279,9 +279,18 @@ pure fn is_bar(t: token) -> bool {
 
 type ident_interner = util::interner::interner<@~str>;
 
+mod special_idents {
+    const underscore : uint = 0u;
+    const anon : uint = 1u;
+    const destr : uint = 2u; // 'drop', but that's reserved
+}
+
 fn mk_ident_interner() -> ident_interner {
-    let rv = @interner::mk::<@~str>(|x| str::hash(*x),
-                                    |x,y| str::eq(*x, *y));
+    /* the indices here must correspond to the numbers in special_idents */
+    let init_vec = ~[@~"_", @~"anon", @~"drop"];
+
+    let rv = @interner::mk_prefill::<@~str>(|x| str::hash(*x),
+                                            |x,y| str::eq(*x, *y), init_vec);
     rv
 }
 

branches/incoming/src/libsyntax/util/interner.rs

@@ -18,6 +18,15 @@ fn mk<T: const copy>(+hasher: hashfn<T>, +eqer: eqfn<T>) -> interner<T> {
     return hi as interner::<T>;
 }
 
+fn mk_prefill<T: const copy>(hasher: hashfn<T>, eqer: eqfn<T>,
+                             init: ~[T]) -> interner<T> {
+
+    let rv = mk(hasher, eqer);
+    for init.each() |v| { rv.intern(v); }
+    return rv;
+}
+
+
 /* when traits can extend traits, we should extend index<uint,T> to get [] */
 trait interner<T: const copy> {
     fn intern(T) -> uint;