diff options
| author | Luqman Aden <me@luqman.ca> | 2013-03-12 00:09:53 -0700 |
|---|---|---|
| committer | Luqman Aden <me@luqman.ca> | 2013-03-12 01:03:34 -0700 |
| commit | 7f500ab4c1303723192952f9ae1f09290bc1fe1e (patch) | |
| tree | 57b72b84cf4d8ca50b3d8f0ec903894522cc4e28 | |
| parent | 5aa734d6a1946e526832bb602e1bb271bf26c0b1 (diff) | |
| download | rust-7f500ab4c1303723192952f9ae1f09290bc1fe1e.tar.gz rust-7f500ab4c1303723192952f9ae1f09290bc1fe1e.zip | |
Keep everything tidy.
| -rw-r--r-- | src/librustc/middle/typeck/check/mod.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ast.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/asm.rs | 17 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs index e59dc1398a0..445cab4ba95 100644 --- a/src/librustc/middle/typeck/check/mod.rs +++ b/src/librustc/middle/typeck/check/mod.rs @@ -2303,7 +2303,7 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt, let region_lb = ty::re_scope(expr.id); instantiate_path(fcx, pth, tpt, expr.span, expr.id, region_lb); } - ast::expr_inline_asm(*) => { + ast::expr_inline_asm(*) => { fcx.require_unsafe(expr.span, ~"use of inline assembly"); fcx.write_nil(id); } diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index dab5de47aa6..7b4b382393f 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -600,7 +600,7 @@ pub enum expr_ { expr_again(Option<ident>), expr_ret(Option<@expr>), expr_log(log_level, @expr, @expr), - + /* asm, clobbers + constraints, volatile */ expr_inline_asm(@~str, @~str, bool), diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index 229d1d2a95e..3f1aea59ab5 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -55,7 +55,6 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree]) let mut state = Asm; loop outer: { - match state { Asm => { asm = expr_to_str(cx, p.parse_expr(), @@ -65,11 +64,11 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree]) while *p.token != token::EOF && *p.token != token::COLON && *p.token != token::MOD_SEP { - + if outputs.len() != 0 { p.eat(&token::COMMA); } - + let constraint = p.parse_str(); p.expect(&token::LPAREN); let out = p.parse_expr(); @@ -82,11 +81,11 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree]) while *p.token != token::EOF && *p.token != token::COLON && *p.token != token::MOD_SEP { - + if inputs.len() != 0 { p.eat(&token::COMMA); } - + let constraint = p.parse_str(); p.expect(&token::LPAREN); let in = p.parse_expr(); @@ -100,11 +99,11 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree]) while *p.token != token::EOF && *p.token != token::COLON && *p.token != token::MOD_SEP { - + if clobs.len() != 0 { p.eat(&token::COMMA); } - + let clob = ~"~{" + *p.parse_str() + ~"}"; clobs.push(clob); } @@ -113,7 +112,7 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree]) } Options => { let option = *p.parse_str(); - + if option == ~"volatile" { volatile = true; } @@ -146,7 +145,7 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree]) } else if *p.token == token::EOF { break outer; } else { - state + state }; } } |