bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use keywords::Invalid

Browse source
This commit is contained in:
Stefan Schindler 2016-11-27 17:59:36 +01:00
parent 2dc3fdf2bd
commit 28b64dc1b9
2 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/grammar/verify.rs
View file

@ -35,11 +35,11 @@ use syntax::parse::token::{self, BinOpToken, DelimToken, Lit, Token};
use syntax::parse::lexer::TokenAndSpan; use syntax::parse::lexer::TokenAndSpan;
use syntax_pos::Pos; use syntax_pos::Pos;
use syntax::symbol::Symbol; use syntax::symbol::{Symbol, keywords};
fn parse_token_list(file: &str) -> HashMap<String, token::Token> { fn parse_token_list(file: &str) -> HashMap<String, token::Token> {
fn id() -> token::Token { fn id() -> token::Token {
Token::Ident(ast::Ident::with_empty_ctxt(Symbol::invalid())) Token::Ident(ast::Ident::with_empty_ctxt(keywords::Invalid.name()))
} }
let mut res = HashMap::new(); let mut res = HashMap::new();
@ -65,7 +65,7 @@ fn parse_token_list(file: &str) -> HashMap<String, token::Token> {
"SHL" => Token::BinOp(BinOpToken::Shl), "SHL" => Token::BinOp(BinOpToken::Shl),
"LBRACE" => Token::OpenDelim(DelimToken::Brace), "LBRACE" => Token::OpenDelim(DelimToken::Brace),
"RARROW" => Token::RArrow, "RARROW" => Token::RArrow,
"LIT_STR" => Token::Literal(Lit::Str_(Symbol::invalid()), None), "LIT_STR" => Token::Literal(Lit::Str_(keywords::Invalid.name()), None),
"DOTDOT" => Token::DotDot, "DOTDOT" => Token::DotDot,
"MOD_SEP" => Token::ModSep, "MOD_SEP" => Token::ModSep,
"DOTDOTDOT" => Token::DotDotDot, "DOTDOTDOT" => Token::DotDotDot,
@ -75,21 +75,22 @@ fn parse_token_list(file: &str) -> HashMap<String, token::Token> {
"ANDAND" => Token::AndAnd, "ANDAND" => Token::AndAnd,
"AT" => Token::At, "AT" => Token::At,
"LBRACKET" => Token::OpenDelim(DelimToken::Bracket), "LBRACKET" => Token::OpenDelim(DelimToken::Bracket),
"LIT_STR_RAW" => Token::Literal(Lit::StrRaw(Symbol::invalid(), 0), None), "LIT_STR_RAW" => Token::Literal(Lit::StrRaw(keywords::Invalid.name(), 0), None),
"RPAREN" => Token::CloseDelim(DelimToken::Paren), "RPAREN" => Token::CloseDelim(DelimToken::Paren),
"SLASH" => Token::BinOp(BinOpToken::Slash), "SLASH" => Token::BinOp(BinOpToken::Slash),
"COMMA" => Token::Comma, "COMMA" => Token::Comma,
"LIFETIME" => Token::Lifetime(ast::Ident::with_empty_ctxt(Symbol::invalid())), "LIFETIME" => Token::Lifetime(
ast::Ident::with_empty_ctxt(keywords::Invalid.name())),
"CARET" => Token::BinOp(BinOpToken::Caret), "CARET" => Token::BinOp(BinOpToken::Caret),
"TILDE" => Token::Tilde, "TILDE" => Token::Tilde,
"IDENT" => id(), "IDENT" => id(),
"PLUS" => Token::BinOp(BinOpToken::Plus), "PLUS" => Token::BinOp(BinOpToken::Plus),
"LIT_CHAR" => Token::Literal(Lit::Char(Symbol::invalid()), None), "LIT_CHAR" => Token::Literal(Lit::Char(keywords::Invalid.name()), None),
"LIT_BYTE" => Token::Literal(Lit::Byte(Symbol::invalid()), None), "LIT_BYTE" => Token::Literal(Lit::Byte(keywords::Invalid.name()), None),
"EQ" => Token::Eq, "EQ" => Token::Eq,
"RBRACKET" => Token::CloseDelim(DelimToken::Bracket), "RBRACKET" => Token::CloseDelim(DelimToken::Bracket),
"COMMENT" => Token::Comment, "COMMENT" => Token::Comment,
"DOC_COMMENT" => Token::DocComment(Symbol::invalid()), "DOC_COMMENT" => Token::DocComment(keywords::Invalid.name()),
"DOT" => Token::Dot, "DOT" => Token::Dot,
"EQEQ" => Token::EqEq, "EQEQ" => Token::EqEq,
"NE" => Token::Ne, "NE" => Token::Ne,
@ -99,9 +100,9 @@ fn parse_token_list(file: &str) -> HashMap<String, token::Token> {
"BINOP" => Token::BinOp(BinOpToken::Plus), "BINOP" => Token::BinOp(BinOpToken::Plus),
"POUND" => Token::Pound, "POUND" => Token::Pound,
"OROR" => Token::OrOr, "OROR" => Token::OrOr,
"LIT_INTEGER" => Token::Literal(Lit::Integer(Symbol::invalid()), None), "LIT_INTEGER" => Token::Literal(Lit::Integer(keywords::Invalid.name()), None),
"BINOPEQ" => Token::BinOpEq(BinOpToken::Plus), "BINOPEQ" => Token::BinOpEq(BinOpToken::Plus),
"LIT_FLOAT" => Token::Literal(Lit::Float(Symbol::invalid()), None), "LIT_FLOAT" => Token::Literal(Lit::Float(keywords::Invalid.name()), None),
"WHITESPACE" => Token::Whitespace, "WHITESPACE" => Token::Whitespace,
"UNDERSCORE" => Token::Underscore, "UNDERSCORE" => Token::Underscore,
"MINUS" => Token::BinOp(BinOpToken::Minus), "MINUS" => Token::BinOp(BinOpToken::Minus),
@ -111,10 +112,11 @@ fn parse_token_list(file: &str) -> HashMap<String, token::Token> {
"OR" => Token::BinOp(BinOpToken::Or), "OR" => Token::BinOp(BinOpToken::Or),
"GT" => Token::Gt, "GT" => Token::Gt,
"LE" => Token::Le, "LE" => Token::Le,
"LIT_BINARY" => Token::Literal(Lit::ByteStr(Symbol::invalid()), None), "LIT_BINARY" => Token::Literal(Lit::ByteStr(keywords::Invalid.name()), None),
"LIT_BINARY_RAW" => Token::Literal(Lit::ByteStrRaw(Symbol::invalid(), 0), None), "LIT_BINARY_RAW" => Token::Literal(
Lit::ByteStrRaw(keywords::Invalid.name(), 0), None),
"QUESTION" => Token::Question, "QUESTION" => Token::Question,
"SHEBANG" => Token::Shebang(Symbol::invalid()), "SHEBANG" => Token::Shebang(keywords::Invalid.name()),
_ => continue, _ => continue,
}; };

4
src/libsyntax/symbol.rs
View file

@ -35,10 +35,6 @@ impl Symbol {
with_interner(|interner| interner.gensym(string)) with_interner(|interner| interner.gensym(string))
} }
pub fn invalid() -> Self {
Symbol(0u32)
}
pub fn as_str(self) -> InternedString { pub fn as_str(self) -> InternedString {
with_interner(|interner| unsafe { with_interner(|interner| unsafe {
InternedString { InternedString {