diff options
| author | bors <bors@rust-lang.org> | 2013-03-28 01:33:48 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-28 01:33:48 -0700 |
| commit | d31053277aa8ced6778334d49de150b1393073eb (patch) | |
| tree | 31668595eea6ddcaac498b6a3f16994d8c4fd4fa /src/libsyntax/parse | |
| parent | 3ff8e01cee398e3800d329e1017241a107b45e5b (diff) | |
| parent | e5dda811a9818a3289a3a1354f98731e46730bd9 (diff) | |
| download | rust-d31053277aa8ced6778334d49de150b1393073eb.tar.gz rust-d31053277aa8ced6778334d49de150b1393073eb.zip | |
auto merge of #5586 : pcwalton/rust/expr-repeat-vstore, r=graydon
r? @graydon
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 6ca91791ffd..8d65f02119b 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -232,7 +232,7 @@ pub fn Parser(sess: @mut ParseSess, token: @mut copy tok0.tok, span: @mut copy tok0.sp, last_span: @mut copy tok0.sp, - buffer: @mut [copy tok0, .. 4], + buffer: @mut ([copy tok0, .. 4]), buffer_start: @mut 0, buffer_end: @mut 0, tokens_consumed: @mut 0, @@ -1653,12 +1653,11 @@ pub impl Parser { hi = e.span.hi; // HACK: turn @[...] into a @-evec ex = match e.node { - expr_vec(*) if m == m_mutbl => + expr_vec(*) | expr_repeat(*) if m == m_mutbl => expr_vstore(e, expr_vstore_mut_box), - expr_vec(*) if m == m_imm => expr_vstore(e, expr_vstore_box), - expr_lit(@codemap::spanned { - node: lit_str(_), span: _}) if m == m_imm => - expr_vstore(e, expr_vstore_box), + expr_vec(*) | + expr_lit(@codemap::spanned { node: lit_str(_), span: _}) | + expr_repeat(*) if m == m_imm => expr_vstore(e, expr_vstore_box), _ => expr_unary(box(m), e) }; } @@ -1673,8 +1672,9 @@ pub impl Parser { hi = e.span.hi; // HACK: turn ~[...] into a ~-evec ex = match e.node { - expr_vec(*) | expr_lit(@codemap::spanned { - node: lit_str(_), span: _}) + expr_vec(*) | + expr_lit(@codemap::spanned { node: lit_str(_), span: _}) | + expr_repeat(*) if m == m_imm => expr_vstore(e, expr_vstore_uniq), _ => expr_unary(uniq(m), e) }; |