diff options
| author | Luqman Aden <me@luqman.ca> | 2013-03-10 22:34:25 -0700 |
|---|---|---|
| committer | Luqman Aden <me@luqman.ca> | 2013-03-12 01:03:34 -0700 |
| commit | 885d0d3d3369bef72590a4d5671c0de83e968dda (patch) | |
| tree | e8aba38593e148e934f3efd22171dbfbd776d210 | |
| parent | 666e1b463600841ae593a1468a837dc59bb7cab5 (diff) | |
| download | rust-885d0d3d3369bef72590a4d5671c0de83e968dda.tar.gz rust-885d0d3d3369bef72590a4d5671c0de83e968dda.zip | |
Stop parsing __asm__.
| -rw-r--r-- | src/etc/vim/syntax/rust.vim | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax/parse/token.rs | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index ccd1ddc2430..f811fbf5855 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -11,7 +11,7 @@ elseif exists("b:current_syntax") endif syn match rustAssert "\<assert\(\w\)*" -syn keyword rustKeyword __asm__ as break +syn keyword rustKeyword as break syn keyword rustKeyword copy do drop else extern syn keyword rustKeyword for if impl let log syn keyword rustKeyword loop match mod once priv pub pure diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 6076ad0ce0e..51e36d9ec02 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1184,14 +1184,6 @@ pub impl Parser { } } hi = self.span.hi; - } else if self.eat_keyword(&~"__asm__") { - self.expect(&token::LPAREN); - let asm = self.parse_str(); - self.expect(&token::COMMA); - let cons = self.parse_str(); - ex = expr_inline_asm(asm, cons); - hi = self.span.hi; - self.expect(&token::RPAREN); } else if self.eat_keyword(&~"log") { self.expect(&token::LPAREN); let lvl = self.parse_expr(); diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 5cfe0bef9b8..81aacbf173d 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -488,7 +488,6 @@ pub fn temporary_keyword_table() -> HashMap<~str, ()> { pub fn strict_keyword_table() -> HashMap<~str, ()> { let words = HashMap(); let keys = ~[ - ~"__asm__", ~"as", ~"assert", ~"break", ~"const", ~"copy", |