squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge pull request #3700 from erickt/cargo-interner

Browse source 
allow interner cache to be shared across parsers (#3699)
This commit is contained in:
Tim Chevalier 2012-10-09 14:50:01 -07:00
parent 0aa42bc91e 1ac75d2269
commit 15d8457104
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/libsyntax/parse/token.rs
View file

@ -343,29 +343,34 @@ macro_rules! interner_key (
)
fn mk_ident_interner() -> @ident_interner {
/* the indices here must correspond to the numbers in special_idents */
let init_vec = ~[@~"_", @~"anon", @~"drop", @~"", @~"unary", @~"!",
unsafe {
match task::local_data::local_data_get(interner_key!()) {
Some(interner) => *interner,
None => {
// the indices here must correspond to the numbers in
// special_idents.
let init_vec = ~[
@~"_", @~"anon", @~"drop", @~"", @~"unary", @~"!",
@~"[]", @~"unary-", @~"__extensions__", @~"self",
@~"item", @~"block", @~"stmt", @~"pat", @~"expr",
@~"ty", @~"ident", @~"path", @~"tt", @~"matchers",
@~"str", @~"TyVisitor", @~"arg", @~"descrim",
@~"__rust_abi", @~"__rust_stack_shim", @~"TyDesc",
@~"dtor", @~"main", @~"<opaque>", @~"blk", @~"static",
@~"intrinsic", @~"__foreign_mod__"];
@~"intrinsic", @~"__foreign_mod__"
];
let rv = @ident_interner {
interner: interner::mk_prefill::<@~str>(init_vec)
interner: interner::mk_prefill(init_vec)
};
/* having multiple interners will just confuse the serializer */
unsafe {
assert task::local_data::local_data_get(interner_key!()).is_none()
};
unsafe {
task::local_data::local_data_set(interner_key!(), @rv)
};
task::local_data::local_data_set(interner_key!(), @rv);
rv
}
}
}
}
/* for when we don't care about the contents; doesn't interact with TLD or
serialization */