diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2012-12-07 16:26:52 -0800 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2012-12-07 18:29:10 -0800 |
| commit | ab3b75290632c963d3db3828c7ef5d28b882a46f (patch) | |
| tree | 5c80f357360dd3dac87fddfb906b93a23dc0f8f5 /src/libsyntax | |
| parent | 87f3ea7705ccc70d7a4c4cf7fe658dbd53348bf6 (diff) | |
librustc: Implement "&mut [T]" as an expression. r=brson
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 5 | ||||
| -rw-r--r-- | src/libsyntax/print/pprust.rs | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 134f5e68e92..da80bd489b5 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -441,7 +441,8 @@ enum expr_vstore { expr_vstore_uniq, // ~[1,2,3,4] expr_vstore_box, // @[1,2,3,4] expr_vstore_mut_box, // @mut [1,2,3,4] - expr_vstore_slice // &[1,2,3,4] + expr_vstore_slice, // &[1,2,3,4] + expr_vstore_mut_slice, // &mut [1,2,3,4] } pure fn is_blockish(p: ast::Proto) -> bool { diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 7509e43e402..a9a0c1bdc76 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -37,7 +37,7 @@ use ast::{_mod, add, arg, arm, attribute, expr_method_call, expr_paren, expr_path, expr_rec, expr_repeat, expr_ret, expr_swap, expr_struct, expr_tup, expr_unary, expr_unary_move, expr_vec, expr_vstore, expr_vstore_mut_box, - expr_while, extern_fn, field, fn_decl, + expr_vstore_mut_slice, expr_while, extern_fn, field, fn_decl, foreign_item, foreign_item_const, foreign_item_fn, foreign_mod, ident, impure_fn, infer, inherited, item, item_, item_class, item_const, item_enum, item_fn, @@ -1456,6 +1456,9 @@ impl Parser { if m == m_imm => { expr_vstore(e, expr_vstore_slice) } + expr_vec(*) if m == m_mutbl => { + expr_vstore(e, expr_vstore_mut_slice) + } _ => expr_addr_of(m, e) }; } diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index be156a4c656..5b0663f0b44 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1052,6 +1052,10 @@ fn print_expr_vstore(s: ps, t: ast::expr_vstore) { word(s.s, ~"mut"); } ast::expr_vstore_slice => word(s.s, ~"&"), + ast::expr_vstore_mut_slice => { + word(s.s, ~"&"); + word(s.s, ~"mut"); + } } } |