user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Give a special error message when [de]serializing fails because the interner isn't in TLS yet.

Browse source
This commit is contained in:
Paul Stansifer 2012-08-23 11:47:35 -07:00
parent 89bbaff84f
commit 129c4b694b
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libsyntax/ast.rs
View file

@ -31,14 +31,20 @@ fn deserialize_span<D>(_d: D) -> span {
type spanned<T> = {node: T, span: span};
fn serialize_ident<S: serializer>(s: S, i: ident) {
let intr = unsafe{ task::local_data_get(parse::token::interner_key) };
let intr = match unsafe{task::local_data_get(parse::token::interner_key)}{
none => fail ~"serialization: TLS interner not set up",
some(intr) => intr
};
s.emit_str(*(*intr.get()).get(i));
s.emit_str(*(*intr).get(i));
}
fn deserialize_ident<D: deserializer>(d: D) -> ident {
let intr = unsafe{ task::local_data_get(parse::token::interner_key) };
let intr = match unsafe{task::local_data_get(parse::token::interner_key)}{
none => fail ~"deserialization: TLS interner not set up",
some(intr) => intr
};
(*intr.get()).intern(@d.read_str())
(*intr).intern(@d.read_str())
}
type ident = token::str_num;