rustc: Parse and typecheck repeating vector expressions; e.g. [ 0, ..512 ]

4 files changed, 52 insertions, 8 deletions

diff --git a/src/rustc/middle/borrowck/categorization.rs b/src/rustc/middle/borrowck/categorization.rs
index 977d373c3f9..ea362e1dfac 100644
--- a/src/rustc/middle/borrowck/categorization.rs
+++ b/src/rustc/middle/borrowck/categorization.rs
@@ -182,7 +182,7 @@ impl public_methods for borrowck_ctxt {
           ast::expr_block(*) | ast::expr_loop(*) | ast::expr_alt(*) |
           ast::expr_lit(*) | ast::expr_break | ast::expr_mac(*) |
           ast::expr_again | ast::expr_rec(*) | ast::expr_struct(*) |
-          ast::expr_unary_move(*) {
+          ast::expr_unary_move(*) | ast::expr_repeat(*) {
             return self.cat_rvalue(expr, expr_ty);
           }
         }
diff --git a/src/rustc/middle/liveness.rs b/src/rustc/middle/liveness.rs
index a868c9190f8..b6be4663a94 100644
--- a/src/rustc/middle/liveness.rs
+++ b/src/rustc/middle/liveness.rs
@@ -471,7 +471,8 @@ fn visit_expr(expr: @expr, &&self: @ir_maps, vt: vt<@ir_maps>) {
       expr_unary(*) | expr_fail(*) |
       expr_break | expr_again | expr_lit(_) | expr_ret(*) |
       expr_block(*) | expr_move(*) | expr_unary_move(*) | expr_assign(*) |
-      expr_swap(*) | expr_assign_op(*) | expr_mac(*) | expr_struct(*) => {
+      expr_swap(*) | expr_assign_op(*) | expr_mac(*) | expr_struct(*) |
+      expr_repeat(*) => {
           visit::visit_expr(expr, self, vt);
       }
     }
@@ -1057,6 +1058,11 @@ class liveness {
             self.propagate_through_exprs(exprs, succ)
           }
 
+          expr_repeat(element, count, _) => {
+            let succ = self.propagate_through_expr(count, succ);
+            self.propagate_through_expr(element, succ)
+          }
+
           expr_rec(fields, with_expr) {
             let succ = self.propagate_through_opt_expr(with_expr, succ);
             do fields.foldr(succ) |field, succ| {
@@ -1468,7 +1474,7 @@ fn check_expr(expr: @expr, &&self: @liveness, vt: vt<@liveness>) {
       expr_cast(*) | expr_unary(*) | expr_fail(*) |
       expr_ret(*) | expr_break | expr_again | expr_lit(_) |
       expr_block(*) | expr_swap(*) | expr_mac(*) | expr_addr_of(*) |
-      expr_struct(*) {
+      expr_struct(*) | expr_repeat(*) {
         visit::visit_expr(expr, self, vt);
       }
     }
diff --git a/src/rustc/middle/trans/type_use.rs b/src/rustc/middle/trans/type_use.rs
index c5a35b4b587..0f9393831ac 100644
--- a/src/rustc/middle/trans/type_use.rs
+++ b/src/rustc/middle/trans/type_use.rs
@@ -158,7 +158,8 @@ fn mark_for_expr(cx: ctx, e: @expr) {
       expr_rec(_, _) | expr_struct(*) | expr_tup(_) |
       expr_unary(box(_), _) | expr_unary(uniq(_), _) |
       expr_binary(add, _, _) |
-      expr_copy(_) | expr_move(_, _) | expr_unary_move(_) {
+      expr_copy(_) | expr_move(_, _) | expr_unary_move(_) |
+      expr_repeat(*) => {
         node_type_needs(cx, use_repr, e.id);
       }
       expr_cast(base, _) {
diff --git a/src/rustc/middle/typeck/check.rs b/src/rustc/middle/typeck/check.rs
index 65ad1b26a8d..dd557f93b9f 100644
--- a/src/rustc/middle/typeck/check.rs
+++ b/src/rustc/middle/typeck/check.rs
@@ -1150,6 +1150,27 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
                  is_loop_body, some(fcx));
     }
 
+    fn eval_repeat_count(fcx: @fn_ctxt, count_expr: @ast::expr, span: span)
+                      -> uint {
+        let tcx = fcx.ccx.tcx;
+        match const_eval::eval_const_expr(tcx, count_expr) {
+            const_eval::const_int(count) => return count as uint,
+            const_eval::const_uint(count) => return count as uint,
+            const_eval::const_float(count) => {
+                tcx.sess.span_err(span,
+                                  ~"expected signed or unsigned integer for \
+                                    repeat count but found float");
+                return count as uint;
+            }
+            const_eval::const_str(_) => {
+                tcx.sess.span_err(span,
+                                  ~"expected signed or unsigned integer for \
+                                    repeat count but found string");
+                return 0;
+            }
+        }
+    }
+
     // Check field access expressions
     fn check_field(fcx: @fn_ctxt, expr: @ast::expr, is_callee: bool,
                    base: @ast::expr, field: ast::ident, tys: ~[@ast::ty])
@@ -1252,19 +1273,26 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
     alt expr.node {
       ast::expr_vstore(ev, vst) {
         let typ = alt ev.node {
-          ast::expr_lit(@{node: ast::lit_str(s), span:_}) {
+          ast::expr_lit(@{node: ast::lit_str(s), span:_}) => {
             let tt = ast_expr_vstore_to_vstore(fcx, ev, str::len(*s), vst);
             ty::mk_estr(tcx, tt)
           }
-          ast::expr_vec(args, mutbl) {
+          ast::expr_vec(args, mutbl) => {
             let tt = ast_expr_vstore_to_vstore(fcx, ev, vec::len(args), vst);
             let t: ty::t = fcx.infcx.next_ty_var();
             for args.each |e| { bot |= check_expr_with(fcx, e, t); }
             ty::mk_evec(tcx, {ty: t, mutbl: mutbl}, tt)
           }
-          _ {
-            tcx.sess.span_bug(expr.span, ~"vstore modifier on non-sequence")
+          ast::expr_repeat(element, count_expr, mutbl) => {
+            let count = eval_repeat_count(fcx, count_expr, expr.span);
+            fcx.write_ty(count_expr.id, ty::mk_uint(tcx));
+            let tt = ast_expr_vstore_to_vstore(fcx, ev, count, vst);
+            let t: ty::t = fcx.infcx.next_ty_var();
+            bot |= check_expr_with(fcx, element, t);
+            ty::mk_evec(tcx, {ty: t, mutbl: mutbl}, tt)
           }
+          _ =>
+            tcx.sess.span_bug(expr.span, ~"vstore modifier on non-sequence")
         };
         fcx.write_ty(ev.id, typ);
         fcx.write_ty(id, typ);
@@ -1613,6 +1641,15 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
                               ty::vstore_fixed(args.len()));
         fcx.write_ty(id, typ);
       }
+      ast::expr_repeat(element, count_expr, mutbl) {
+        let count = eval_repeat_count(fcx, count_expr, expr.span);
+        fcx.write_ty(count_expr.id, ty::mk_uint(tcx));
+        let t: ty::t = fcx.infcx.next_ty_var();
+        bot |= check_expr_with(fcx, element, t);
+        let t = ty::mk_evec(tcx, {ty: t, mutbl: mutbl},
+                            ty::vstore_fixed(count));
+        fcx.write_ty(id, t);
+      }
       ast::expr_tup(elts) {
         let mut elt_ts = ~[];
         vec::reserve(elt_ts, vec::len(elts));