Skip to content

Commit 5042366

Browse files
pcwaltonpcwalton
committed
---
yaml --- r: 31646 b: refs/heads/dist-snap c: e02b1b1 h: refs/heads/master v: v3
1 parent fb94f68 commit 5042366

File tree

12 files changed

+143
-41
lines changed

12 files changed

+143
-41
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
10-
refs/heads/dist-snap: 4174de8bb941c3edbeb14f42ab4ebbfff5fb176d
10+
refs/heads/dist-snap: e02b1b1ec8696715c08fc970b67d9eaa6c91b15e
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/dist-snap/src/libsyntax/ast.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,10 @@ enum expr_ {
350350
// A struct literal expression.
351351
//
352352
// XXX: Add functional record update.
353-
expr_struct(@path, ~[field])
353+
expr_struct(@path, ~[field]),
354+
355+
// A vector literal constructed from one repeated element.
356+
expr_repeat(@expr /* element */, @expr /* count */, mutability)
354357
}
355358

356359
#[auto_serialize]

‎branches/dist-snap/src/libsyntax/fold.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,8 @@ fn noop_fold_expr(e: expr_, fld: ast_fold) -> expr_ {
402402
expr_vec(exprs, mutt) {
403403
expr_vec(fld.map_exprs(|x| fld.fold_expr(x), exprs), mutt)
404404
}
405+
expr_repeat(expr, count, mutt) =>
406+
expr_repeat(fld.fold_expr(expr), fld.fold_expr(count), mutt),
405407
expr_rec(fields, maybe_expr) {
406408
expr_rec(vec::map(fields, fold_field),
407409
option::map(maybe_expr, |x| fld.fold_expr(x)))

‎branches/dist-snap/src/libsyntax/parse/lexer.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,10 @@ fn next_token_inner(rdr: string_reader) -> token::token {
483483
',' { bump(rdr); return token::COMMA; }
484484
'.' {
485485
bump(rdr);
486+
if rdr.curr == '.' && nextch(rdr) != '.' {
487+
bump(rdr);
488+
return token::DOTDOT;
489+
}
486490
if rdr.curr == '.' && nextch(rdr) == '.' {
487491
bump(rdr);
488492
bump(rdr);

‎branches/dist-snap/src/libsyntax/parse/parser.rs

Lines changed: 58 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,34 @@ import ast::{_mod, add, alt_check, alt_exhaustive, arg, arm, attribute,
2727
expr_call, expr_cast, expr_copy, expr_do_body,
2828
expr_fail, expr_field, expr_fn, expr_fn_block, expr_if,
2929
expr_index, expr_lit, expr_log, expr_loop,
30-
expr_loop_body, expr_mac, expr_move, expr_path,
31-
expr_rec, expr_ret, expr_swap, expr_struct, expr_tup, expr_unary,
32-
expr_unary_move, expr_vec, expr_vstore, expr_while, extern_fn,
33-
field, fn_decl, foreign_item, foreign_item_fn, foreign_mod,
34-
ident, impure_fn, infer, inherited, init_assign, init_move,
35-
initializer, instance_var, item, item_, item_class, item_const,
36-
item_enum, item_fn, item_foreign_mod, item_impl, item_mac,
37-
item_mod, item_trait, item_ty, lit, lit_, lit_bool, lit_float,
38-
lit_int, lit_int_unsuffixed, lit_nil, lit_str, lit_uint, local,
39-
m_const, m_imm, m_mutbl, mac_, mac_aq, mac_ellipsis, mac_invoc,
40-
mac_invoc_tt, mac_var, matcher, match_nonterminal, match_seq,
41-
match_tok, method, mode, mt, mul, mutability, neg, noreturn, not,
42-
pat, pat_box, pat_enum, pat_ident, pat_lit, pat_range, pat_rec,
43-
pat_tup, pat_uniq, pat_wild, path, private, proto, proto_any,
44-
proto_bare, proto_block, proto_box, proto_uniq, provided, public,
45-
pure_fn, purity, re_anon, re_named, region, rem, required,
46-
ret_style, return_val, self_ty, shl, shr, stmt, stmt_decl,
47-
stmt_expr, stmt_semi, subtract, sty_box, sty_by_ref, sty_region,
48-
sty_uniq, sty_value, token_tree, trait_method, trait_ref,
49-
tt_delim, tt_seq, tt_tok, tt_nonterminal, ty, ty_, ty_bot,
50-
ty_box, ty_field, ty_fn, ty_infer, ty_mac, ty_method, ty_nil,
51-
ty_param, ty_path, ty_ptr, ty_rec, ty_rptr, ty_tup, ty_u32,
52-
ty_uniq, ty_vec, ty_fixed_length, unchecked_blk, uniq,
53-
unsafe_blk, unsafe_fn, variant, view_item, view_item_,
54-
view_item_export, view_item_import, view_item_use, view_path,
55-
view_path_glob, view_path_list, view_path_simple, visibility,
56-
vstore, vstore_box, vstore_fixed, vstore_slice, vstore_uniq};
30+
expr_loop_body, expr_mac, expr_move, expr_path, expr_rec,
31+
expr_repeat, expr_ret, expr_swap, expr_struct, expr_tup,
32+
expr_unary, expr_unary_move, expr_vec, expr_vstore, expr_while,
33+
extern_fn, field, fn_decl, foreign_item, foreign_item_fn,
34+
foreign_mod, ident, impure_fn, infer, inherited, init_assign,
35+
init_move, initializer, instance_var, item, item_, item_class,
36+
item_const, item_enum, item_fn, item_foreign_mod, item_impl,
37+
item_mac, item_mod, item_trait, item_ty, lit, lit_, lit_bool,
38+
lit_float, lit_int, lit_int_unsuffixed, lit_nil, lit_str,
39+
lit_uint, local, m_const, m_imm, m_mutbl, mac_, mac_aq,
40+
mac_ellipsis, mac_invoc, mac_invoc_tt, mac_var, matcher,
41+
match_nonterminal, match_seq, match_tok, method, mode, mt, mul,
42+
mutability, neg, noreturn, not, pat, pat_box, pat_enum,
43+
pat_ident, pat_lit, pat_range, pat_rec, pat_tup, pat_uniq,
44+
pat_wild, path, private, proto, proto_any, proto_bare,
45+
proto_block, proto_box, proto_uniq, provided, public, pure_fn,
46+
purity, re_anon, re_named, region, rem, required, ret_style,
47+
return_val, self_ty, shl, shr, stmt, stmt_decl, stmt_expr,
48+
stmt_semi, subtract, sty_box, sty_by_ref, sty_region, sty_uniq,
49+
sty_value, token_tree, trait_method, trait_ref, tt_delim, tt_seq,
50+
tt_tok, tt_nonterminal, ty, ty_, ty_bot, ty_box, ty_field, ty_fn,
51+
ty_infer, ty_mac, ty_method, ty_nil, ty_param, ty_path, ty_ptr,
52+
ty_rec, ty_rptr, ty_tup, ty_u32, ty_uniq, ty_vec,
53+
ty_fixed_length, unchecked_blk, uniq, unsafe_blk, unsafe_fn,
54+
variant, view_item, view_item_, view_item_export,
55+
view_item_import, view_item_use, view_path, view_path_glob,
56+
view_path_list, view_path_simple, visibility, vstore, vstore_box,
57+
vstore_fixed, vstore_slice, vstore_uniq};
5758

5859
export file_type;
5960
export parser;
@@ -365,6 +366,7 @@ class parser {
365366
// Parses something like "&x"
366367
fn parse_region() -> @region {
367368
self.expect(token::BINOP(token::AND));
369+
368370
alt copy self.token {
369371
token::IDENT(sid, _) {
370372
self.bump();
@@ -812,11 +814,36 @@ class parser {
812814
} else if self.token == token::LBRACKET {
813815
self.bump();
814816
let mutbl = self.parse_mutability();
815-
let es = self.parse_seq_to_end(
816-
token::RBRACKET, seq_sep_trailing_allowed(token::COMMA),
817-
|p| p.parse_expr());
817+
if self.token == token::RBRACKET {
818+
// Empty vector.
819+
self.bump();
820+
ex = expr_vec(~[], mutbl);
821+
} else {
822+
// Nonempty vector.
823+
let first_expr = self.parse_expr();
824+
if self.token == token::COMMA &&
825+
self.look_ahead(1) == token::DOTDOT {
826+
// Repeating vector syntax: [ 0, ..512 ]
827+
self.bump();
828+
self.bump();
829+
let count = self.parse_expr();
830+
self.expect(token::RBRACKET);
831+
ex = expr_repeat(first_expr, count, mutbl);
832+
} else if self.token == token::COMMA {
833+
// Vector with two or more elements.
834+
self.bump();
835+
let remaining_exprs =
836+
self.parse_seq_to_end(token::RBRACKET,
837+
seq_sep_trailing_allowed(token::COMMA),
838+
|p| p.parse_expr());
839+
ex = expr_vec(~[first_expr] + remaining_exprs, mutbl);
840+
} else {
841+
// Vector with one element.
842+
self.expect(token::RBRACKET);
843+
ex = expr_vec(~[first_expr], mutbl);
844+
}
845+
}
818846
hi = self.span.hi;
819-
ex = expr_vec(es, mutbl);
820847
} else if self.token == token::ELLIPSIS {
821848
self.bump();
822849
return pexpr(self.mk_mac_expr(lo, self.span.hi, mac_ellipsis));

‎branches/dist-snap/src/libsyntax/parse/token.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ enum token {
4949
/* Structural symbols */
5050
AT,
5151
DOT,
52+
DOTDOT,
5253
ELLIPSIS,
5354
COMMA,
5455
SEMI,
@@ -134,6 +135,7 @@ fn to_str(in: interner<@~str>, t: token) -> ~str {
134135
/* Structural symbols */
135136
AT { ~"@" }
136137
DOT { ~"." }
138+
DOTDOT { ~".." }
137139
ELLIPSIS { ~"..." }
138140
COMMA { ~"," }
139141
SEMI { ~";" }

‎branches/dist-snap/src/libsyntax/print/pprust.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -948,6 +948,22 @@ fn print_expr(s: ps, &&expr: @ast::expr) {
948948
word(s.s, ~"]");
949949
end(s);
950950
}
951+
952+
ast::expr_repeat(element, count, mutbl) => {
953+
ibox(s, indent_unit);
954+
word(s.s, ~"[");
955+
if mutbl == ast::m_mutbl {
956+
word(s.s, ~"mut");
957+
nbsp(s);
958+
}
959+
print_expr(s, element);
960+
word(s.s, ~",");
961+
word(s.s, ~"..");
962+
print_expr(s, count);
963+
word(s.s, ~"]");
964+
end(s);
965+
}
966+
951967
ast::expr_rec(fields, wth) {
952968
word(s.s, ~"{");
953969
commasep_cmnt(s, consistent, fields, print_field, get_span);

‎branches/dist-snap/src/libsyntax/visit.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,10 @@ fn visit_expr<E>(ex: @expr, e: E, v: vt<E>) {
364364
alt ex.node {
365365
expr_vstore(x, _) { v.visit_expr(x, e, v); }
366366
expr_vec(es, _) { visit_exprs(es, e, v); }
367+
expr_repeat(element, count, _) => {
368+
v.visit_expr(element, e, v);
369+
v.visit_expr(count, e, v);
370+
}
367371
expr_rec(flds, base) {
368372
for flds.each |f| { v.visit_expr(f.node.expr, e, v); }
369373
visit_expr_opt(base, e, v);

‎branches/dist-snap/src/rustc/middle/borrowck/categorization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ impl public_methods for borrowck_ctxt {
182182
ast::expr_block(*) | ast::expr_loop(*) | ast::expr_alt(*) |
183183
ast::expr_lit(*) | ast::expr_break | ast::expr_mac(*) |
184184
ast::expr_again | ast::expr_rec(*) | ast::expr_struct(*) |
185-
ast::expr_unary_move(*) {
185+
ast::expr_unary_move(*) | ast::expr_repeat(*) {
186186
return self.cat_rvalue(expr, expr_ty);
187187
}
188188
}

‎branches/dist-snap/src/rustc/middle/liveness.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,8 @@ fn visit_expr(expr: @expr, &&self: @ir_maps, vt: vt<@ir_maps>) {
471471
expr_unary(*) | expr_fail(*) |
472472
expr_break | expr_again | expr_lit(_) | expr_ret(*) |
473473
expr_block(*) | expr_move(*) | expr_unary_move(*) | expr_assign(*) |
474-
expr_swap(*) | expr_assign_op(*) | expr_mac(*) | expr_struct(*) => {
474+
expr_swap(*) | expr_assign_op(*) | expr_mac(*) | expr_struct(*) |
475+
expr_repeat(*) => {
475476
visit::visit_expr(expr, self, vt);
476477
}
477478
}
@@ -1057,6 +1058,11 @@ class liveness {
10571058
self.propagate_through_exprs(exprs, succ)
10581059
}
10591060

1061+
expr_repeat(element, count, _) => {
1062+
let succ = self.propagate_through_expr(count, succ);
1063+
self.propagate_through_expr(element, succ)
1064+
}
1065+
10601066
expr_rec(fields, with_expr) {
10611067
let succ = self.propagate_through_opt_expr(with_expr, succ);
10621068
do fields.foldr(succ) |field, succ| {
@@ -1468,7 +1474,7 @@ fn check_expr(expr: @expr, &&self: @liveness, vt: vt<@liveness>) {
14681474
expr_cast(*) | expr_unary(*) | expr_fail(*) |
14691475
expr_ret(*) | expr_break | expr_again | expr_lit(_) |
14701476
expr_block(*) | expr_swap(*) | expr_mac(*) | expr_addr_of(*) |
1471-
expr_struct(*) {
1477+
expr_struct(*) | expr_repeat(*) {
14721478
visit::visit_expr(expr, self, vt);
14731479
}
14741480
}

‎branches/dist-snap/src/rustc/middle/trans/type_use.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ fn mark_for_expr(cx: ctx, e: @expr) {
158158
expr_rec(_, _) | expr_struct(*) | expr_tup(_) |
159159
expr_unary(box(_), _) | expr_unary(uniq(_), _) |
160160
expr_binary(add, _, _) |
161-
expr_copy(_) | expr_move(_, _) | expr_unary_move(_) {
161+
expr_copy(_) | expr_move(_, _) | expr_unary_move(_) |
162+
expr_repeat(*) => {
162163
node_type_needs(cx, use_repr, e.id);
163164
}
164165
expr_cast(base, _) {

‎branches/dist-snap/src/rustc/middle/typeck/check.rs

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,6 +1150,27 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
11501150
is_loop_body, some(fcx));
11511151
}
11521152

1153+
fn eval_repeat_count(fcx: @fn_ctxt, count_expr: @ast::expr, span: span)
1154+
-> uint {
1155+
let tcx = fcx.ccx.tcx;
1156+
match const_eval::eval_const_expr(tcx, count_expr) {
1157+
const_eval::const_int(count) => return count as uint,
1158+
const_eval::const_uint(count) => return count as uint,
1159+
const_eval::const_float(count) => {
1160+
tcx.sess.span_err(span,
1161+
~"expected signed or unsigned integer for \
1162+
repeat count but found float");
1163+
return count as uint;
1164+
}
1165+
const_eval::const_str(_) => {
1166+
tcx.sess.span_err(span,
1167+
~"expected signed or unsigned integer for \
1168+
repeat count but found string");
1169+
return 0;
1170+
}
1171+
}
1172+
}
1173+
11531174
// Check field access expressions
11541175
fn check_field(fcx: @fn_ctxt, expr: @ast::expr, is_callee: bool,
11551176
base: @ast::expr, field: ast::ident, tys: ~[@ast::ty])
@@ -1252,19 +1273,26 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
12521273
alt expr.node {
12531274
ast::expr_vstore(ev, vst) {
12541275
let typ = alt ev.node {
1255-
ast::expr_lit(@{node: ast::lit_str(s), span:_}) {
1276+
ast::expr_lit(@{node: ast::lit_str(s), span:_}) => {
12561277
let tt = ast_expr_vstore_to_vstore(fcx, ev, str::len(*s), vst);
12571278
ty::mk_estr(tcx, tt)
12581279
}
1259-
ast::expr_vec(args, mutbl) {
1280+
ast::expr_vec(args, mutbl) => {
12601281
let tt = ast_expr_vstore_to_vstore(fcx, ev, vec::len(args), vst);
12611282
let t: ty::t = fcx.infcx.next_ty_var();
12621283
for args.each |e| { bot |= check_expr_with(fcx, e, t); }
12631284
ty::mk_evec(tcx, {ty: t, mutbl: mutbl}, tt)
12641285
}
1265-
_ {
1266-
tcx.sess.span_bug(expr.span, ~"vstore modifier on non-sequence")
1286+
ast::expr_repeat(element, count_expr, mutbl) => {
1287+
let count = eval_repeat_count(fcx, count_expr, expr.span);
1288+
fcx.write_ty(count_expr.id, ty::mk_uint(tcx));
1289+
let tt = ast_expr_vstore_to_vstore(fcx, ev, count, vst);
1290+
let t: ty::t = fcx.infcx.next_ty_var();
1291+
bot |= check_expr_with(fcx, element, t);
1292+
ty::mk_evec(tcx, {ty: t, mutbl: mutbl}, tt)
12671293
}
1294+
_ =>
1295+
tcx.sess.span_bug(expr.span, ~"vstore modifier on non-sequence")
12681296
};
12691297
fcx.write_ty(ev.id, typ);
12701298
fcx.write_ty(id, typ);
@@ -1613,6 +1641,15 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
16131641
ty::vstore_fixed(args.len()));
16141642
fcx.write_ty(id, typ);
16151643
}
1644+
ast::expr_repeat(element, count_expr, mutbl) {
1645+
let count = eval_repeat_count(fcx, count_expr, expr.span);
1646+
fcx.write_ty(count_expr.id, ty::mk_uint(tcx));
1647+
let t: ty::t = fcx.infcx.next_ty_var();
1648+
bot |= check_expr_with(fcx, element, t);
1649+
let t = ty::mk_evec(tcx, {ty: t, mutbl: mutbl},
1650+
ty::vstore_fixed(count));
1651+
fcx.write_ty(id, t);
1652+
}
16161653
ast::expr_tup(elts) {
16171654
let mut elt_ts = ~[];
16181655
vec::reserve(elt_ts, vec::len(elts));

0 commit comments

Comments
 (0)