about summary refs log tree commit diff
path: root/src/libsyntax/parse/parser.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-12-15 10:46:28 -0800
committerbors <bors@rust-lang.org>2013-12-15 10:46:28 -0800
commitebbd30b5b2699c3f16a3387ed0851a2831076295 (patch)
treee95f52a85ab4a64e0ac858bf4546d673de513f95 /src/libsyntax/parse/parser.rs
parent8d52dfbace05c46754f4f6bb5a25f55906c9d7b0 (diff)
parent998a3bbae0c3d998edb7c3e36173c844492010a5 (diff)
downloadrust-ebbd30b5b2699c3f16a3387ed0851a2831076295.tar.gz
rust-ebbd30b5b2699c3f16a3387ed0851a2831076295.zip
auto merge of #10929 : pcwalton/rust/deboxing, r=pcwalton
...eyword.

r? @brson
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
-rw-r--r--src/libsyntax/parse/parser.rs16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index aa37d859d79..33e3bae99a7 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -2326,6 +2326,22 @@ impl Parser {
               _ => self.mk_unary(UnUniq, e)
             };
           }
+          token::IDENT(_, _) if self.is_keyword(keywords::Box) => {
+            self.bump();
+
+            let subexpression = self.parse_prefix_expr();
+            hi = subexpression.span.hi;
+            // HACK: turn `box [...]` into a boxed-evec
+            ex = match subexpression.node {
+                ExprVec(..) |
+                ExprLit(@codemap::Spanned {
+                    node: lit_str(..),
+                    span: _
+                }) |
+                ExprRepeat(..) => ExprVstore(subexpression, ExprVstoreUniq),
+                _ => self.mk_unary(UnUniq, subexpression)
+            };
+          }
           _ => return self.parse_dot_or_call_expr()
         }
         return self.mk_expr(lo, hi, ex);