OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #15118 : stepancheg/rust/concat, r=alexcrichton 

(And in other extensions implemented with `get_exprs_from_tts` function).
This commit is contained in:
bors 2014-06-24 19:36:47 +00:00
parent 719ffc2484 85467b6b41
commit 87f3741fdf
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libsyntax/ext/base.rs
View File

@ -593,11 +593,14 @@ pub fn get_exprs_from_tts(cx: &mut ExtCtxt,
.collect()); .collect());
let mut es = Vec::new(); let mut es = Vec::new();
while p.token != token::EOF { while p.token != token::EOF {
if es.len() != 0 && !p.eat(&token::COMMA) { es.push(cx.expand_expr(p.parse_expr()));
if p.eat(&token::COMMA) {
continue;
}
if p.token != token::EOF {
cx.span_err(sp, "expected token: `,`"); cx.span_err(sp, "expected token: `,`");
return None; return None;
} }
es.push(cx.expand_expr(p.parse_expr()));
} }
Some(es) Some(es)
} }

4
src/test/run-pass/concat.rs
View File

@ -1,4 +1,4 @@
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT // Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at // file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT. // http://rust-lang.org/COPYRIGHT.
// //
@ -11,6 +11,8 @@
pub fn main() { pub fn main() {
assert_eq!(format!(concat!("foo", "bar", "{}"), "baz"), "foobarbaz".to_string()); assert_eq!(format!(concat!("foo", "bar", "{}"), "baz"), "foobarbaz".to_string());
assert_eq!(format!(concat!()), "".to_string()); assert_eq!(format!(concat!()), "".to_string());
// check trailing comma is allowed in concat
assert_eq!(concat!("qux", "quux",).to_string(), "quxquux".to_string());
assert_eq!( assert_eq!(
concat!(1, 2i, 3u, 4f32, 4.0, 'a', true, ()), concat!(1, 2i, 3u, 4f32, 4.0, 'a', true, ()),