diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-08-18 11:37:19 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-08-18 13:09:50 -0700 |
| commit | ec898244f7b543dfe4c5a04fd42e638d7c521f7b (patch) | |
| tree | 67f8f21d39c8dc25b78cb3dae72a7c3620feb383 /src/comp/syntax | |
| parent | 250cc45c3bf4fc3e623e72b8b36d66a4e0fb1dcf (diff) | |
| download | rust-ec898244f7b543dfe4c5a04fd42e638d7c521f7b.tar.gz rust-ec898244f7b543dfe4c5a04fd42e638d7c521f7b.zip | |
Remove seq_kind from ast::expr_vec
Diffstat (limited to 'src/comp/syntax')
| -rw-r--r-- | src/comp/syntax/ast.rs | 2 | ||||
| -rw-r--r-- | src/comp/syntax/ext/concat_idents.rs | 2 | ||||
| -rw-r--r-- | src/comp/syntax/ext/env.rs | 2 | ||||
| -rw-r--r-- | src/comp/syntax/ext/fmt.rs | 4 | ||||
| -rw-r--r-- | src/comp/syntax/ext/ident_to_str.rs | 2 | ||||
| -rw-r--r-- | src/comp/syntax/ext/simplext.rs | 12 | ||||
| -rw-r--r-- | src/comp/syntax/fold.rs | 4 | ||||
| -rw-r--r-- | src/comp/syntax/parse/parser.rs | 8 | ||||
| -rw-r--r-- | src/comp/syntax/print/pprust.rs | 4 | ||||
| -rw-r--r-- | src/comp/syntax/visit.rs | 2 |
10 files changed, 21 insertions, 21 deletions
diff --git a/src/comp/syntax/ast.rs b/src/comp/syntax/ast.rs index 066a0b9675b..2bafc3da800 100644 --- a/src/comp/syntax/ast.rs +++ b/src/comp/syntax/ast.rs @@ -292,7 +292,7 @@ tag seq_kind { sk_unique; sk_rc; } type expr = {id: node_id, node: expr_, span: span}; tag expr_ { - expr_vec([@expr], mutability, seq_kind); + expr_vec([@expr], mutability); expr_rec([field], option::t<@expr>); expr_call(@expr, [@expr]); expr_tup([@expr]); diff --git a/src/comp/syntax/ext/concat_idents.rs b/src/comp/syntax/ext/concat_idents.rs index 61eb791f6e0..13f87e044c4 100644 --- a/src/comp/syntax/ext/concat_idents.rs +++ b/src/comp/syntax/ext/concat_idents.rs @@ -5,7 +5,7 @@ import syntax::ast; fn expand_syntax_ext(cx: &ext_ctxt, sp: codemap::span, arg: @ast::expr, _body: option::t<str>) -> @ast::expr { let args: [@ast::expr] = alt arg.node { - ast::expr_vec(elts, _, _) { elts } + ast::expr_vec(elts, _) { elts } _ { cx.span_fatal(sp, "#concat_idents requires a vector argument .") } }; let res: ast::ident = ""; diff --git a/src/comp/syntax/ext/env.rs b/src/comp/syntax/ext/env.rs index 142bff8f7dc..50c5bda5858 100644 --- a/src/comp/syntax/ext/env.rs +++ b/src/comp/syntax/ext/env.rs @@ -13,7 +13,7 @@ export expand_syntax_ext; fn expand_syntax_ext(cx: &ext_ctxt, sp: codemap::span, arg: @ast::expr, _body: option::t<str>) -> @ast::expr { let args: [@ast::expr] = alt arg.node { - ast::expr_vec(elts, _, _) { elts } + ast::expr_vec(elts, _) { elts } _ { cx.span_fatal(sp, "#env requires arguments of the form `[...]`.") } }; if vec::len::<@ast::expr>(args) != 1u { diff --git a/src/comp/syntax/ext/fmt.rs b/src/comp/syntax/ext/fmt.rs index 33c8cebb183..738b65c7d91 100644 --- a/src/comp/syntax/ext/fmt.rs +++ b/src/comp/syntax/ext/fmt.rs @@ -18,7 +18,7 @@ export expand_syntax_ext; fn expand_syntax_ext(cx: &ext_ctxt, sp: span, arg: @ast::expr, _body: option::t<str>) -> @ast::expr { let args: [@ast::expr] = alt arg.node { - ast::expr_vec(elts, _, _) { elts } + ast::expr_vec(elts, _) { elts } _ { cx.span_fatal(sp, "#fmt requires arguments of the form `[...]`.") } }; if vec::len::<@ast::expr>(args) == 0u { @@ -73,7 +73,7 @@ fn pieces_to_expr(cx: &ext_ctxt, sp: span, pieces: &[piece], } fn make_vec_expr(cx: &ext_ctxt, sp: span, exprs: &[@ast::expr]) -> @ast::expr { - let vecexpr = ast::expr_vec(exprs, ast::imm, ast::sk_unique); + let vecexpr = ast::expr_vec(exprs, ast::imm); ret @{id: cx.next_id(), node: vecexpr, span: sp}; } fn make_call(cx: &ext_ctxt, sp: span, fn_path: &[ast::ident], diff --git a/src/comp/syntax/ext/ident_to_str.rs b/src/comp/syntax/ext/ident_to_str.rs index 2681228976d..ce24e2605e4 100644 --- a/src/comp/syntax/ext/ident_to_str.rs +++ b/src/comp/syntax/ext/ident_to_str.rs @@ -6,7 +6,7 @@ import syntax::ast; fn expand_syntax_ext(cx: &ext_ctxt, sp: codemap::span, arg: @ast::expr, _body: option::t<str>) -> @ast::expr { let args: [@ast::expr] = alt arg.node { - ast::expr_vec(elts, _, _) { elts } + ast::expr_vec(elts, _) { elts } _ { cx.span_fatal(sp, "#ident_to_str requires a vector argument .") } }; if vec::len::<@ast::expr>(args) != 1u { diff --git a/src/comp/syntax/ext/simplext.rs b/src/comp/syntax/ext/simplext.rs index dbe3920f4e8..6386b628744 100644 --- a/src/comp/syntax/ext/simplext.rs +++ b/src/comp/syntax/ext/simplext.rs @@ -449,7 +449,7 @@ fn p_t_s_rec(cx: &ext_ctxt, m: &matchable, s: &selector, b: &binders) { match_expr(e) { alt e.node { expr_path(p_pth) { p_t_s_r_path(cx, p_pth, s, b); } - expr_vec(p_elts, _, _) { + expr_vec(p_elts, _) { alt elts_to_ell(cx, p_elts) { {pre: pre, rep: some(repeat_me), post: post} { p_t_s_r_length(cx, vec::len(pre) + vec::len(post), @@ -607,7 +607,7 @@ fn p_t_s_r_ellipses(cx: &ext_ctxt, repeat_me: @expr, offset: uint, ret alt m { match_expr(e) { alt e.node { - expr_vec(arg_elts, _, _) { + expr_vec(arg_elts, _) { let elts = ~[]; let idx = offset; while idx < vec::len(arg_elts) { @@ -636,7 +636,7 @@ fn p_t_s_r_length(cx: &ext_ctxt, len: uint, at_least: bool, s: selector, ret alt m { match_expr(e) { alt e.node { - expr_vec(arg_elts, _, _) { + expr_vec(arg_elts, _) { let actual_len = vec::len(arg_elts); if (at_least && actual_len >= len) || actual_len == len { some(leaf(match_exact)) @@ -660,7 +660,7 @@ fn p_t_s_r_actual_vector(cx: &ext_ctxt, elts: [@expr], _repeat_after: bool, ret alt m { match_expr(e) { alt e.node { - expr_vec(arg_elts, _, _) { + expr_vec(arg_elts, _) { some(leaf(match_expr(arg_elts.(idx)))) } _ { none } @@ -678,7 +678,7 @@ fn p_t_s_r_actual_vector(cx: &ext_ctxt, elts: [@expr], _repeat_after: bool, fn add_new_extension(cx: &ext_ctxt, sp: span, arg: @expr, _body: option::t<str>) -> base::macro_def { let args: [@ast::expr] = alt arg.node { - ast::expr_vec(elts, _, _) { elts } + ast::expr_vec(elts, _) { elts } _ { cx.span_fatal(sp, "#macro requires arguments of the form `[...]`.") } @@ -688,7 +688,7 @@ fn add_new_extension(cx: &ext_ctxt, sp: span, arg: @expr, let clauses: [@clause] = ~[]; for arg: @expr in args { alt arg.node { - expr_vec(elts, mut, seq_kind) { + expr_vec(elts, mut) { if vec::len(elts) != 2u { cx.span_fatal((*arg).span, "extension clause must consist of [" + diff --git a/src/comp/syntax/fold.rs b/src/comp/syntax/fold.rs index b81a56c576f..5593ddb21c6 100644 --- a/src/comp/syntax/fold.rs +++ b/src/comp/syntax/fold.rs @@ -339,8 +339,8 @@ fn noop_fold_expr(e: &expr_, fld: ast_fold) -> expr_ { ret alt e { - expr_vec(exprs, mut, seq_kind) { - expr_vec(fld.map_exprs(fld.fold_expr, exprs), mut, seq_kind) + expr_vec(exprs, mut) { + expr_vec(fld.map_exprs(fld.fold_expr, exprs), mut) } expr_rec(fields, maybe_expr) { expr_rec(vec::map(fold_field, fields), diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs index da033bd9f1f..9357b11fa03 100644 --- a/src/comp/syntax/parse/parser.rs +++ b/src/comp/syntax/parse/parser.rs @@ -885,7 +885,7 @@ fn parse_bottom_expr(p: &parser) -> @ast::expr { let es = parse_seq_to_end(token::RBRACKET, some(token::COMMA), parse_expr, p); - ex = ast::expr_vec(es, mut, ast::sk_unique); + ex = ast::expr_vec(es, mut); } else if (p.peek() == token::POUND_LT) { p.bump(); let ty = parse_ty(p, false); @@ -909,7 +909,7 @@ fn parse_bottom_expr(p: &parser) -> @ast::expr { let es = parse_seq_to_end(token::RBRACKET, some(token::COMMA), parse_expr, p); - ex = ast::expr_vec(es, mut, ast::sk_unique); + ex = ast::expr_vec(es, mut); } token::LIT_STR(s) { p.bump(); @@ -1079,7 +1079,7 @@ fn parse_syntax_ext_naked(p: &parser, lo: uint) -> @ast::expr { }; let hi = es.span.hi; let e = mk_expr(p, es.span.lo, hi, - ast::expr_vec(es.node, ast::imm, ast::sk_rc)); + ast::expr_vec(es.node, ast::imm)); ret mk_mac_expr(p, lo, hi, ast::mac_invoc(pth, e, none)); } @@ -1636,7 +1636,7 @@ fn stmt_ends_with_semi(stmt: &ast::stmt) -> bool { } ast::stmt_expr(e, _) { ret alt e.node { - ast::expr_vec(_, _, _) { true } + ast::expr_vec(_, _) { true } ast::expr_rec(_, _) { true } ast::expr_tup(_) { true } ast::expr_call(_, _) { true } diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs index eb7e8c72697..900b141b67f 100644 --- a/src/comp/syntax/print/pprust.rs +++ b/src/comp/syntax/print/pprust.rs @@ -694,7 +694,7 @@ fn print_mac(s: &ps, m: &ast::mac) { word(s.s, "#"); print_path(s, path, false); alt (arg.node) { - ast::expr_vec(_,_,_) {} + ast::expr_vec(_,_) {} _ { word(s.s, " "); } } print_expr(s, arg); @@ -718,7 +718,7 @@ fn print_expr(s: &ps, expr: &@ast::expr) { let ann_node = node_expr(s, expr); s.ann.pre(ann_node); alt expr.node { - ast::expr_vec(exprs, mut, kind) { + ast::expr_vec(exprs, mut) { ibox(s, indent_unit); word(s.s, "["); if mut == ast::mut { diff --git a/src/comp/syntax/visit.rs b/src/comp/syntax/visit.rs index ee271231d18..f7d3832aad6 100644 --- a/src/comp/syntax/visit.rs +++ b/src/comp/syntax/visit.rs @@ -245,7 +245,7 @@ fn visit_mac<E>(m: mac, e: &E, v: &vt<E>) { fn visit_expr<E>(ex: &@expr, e: &E, v: &vt<E>) { alt ex.node { - expr_vec(es, _, _) { visit_exprs(es, e, v); } + expr_vec(es, _) { visit_exprs(es, e, v); } expr_rec(flds, base) { for f: field in flds { v.visit_expr(f.node.expr, e, v); } visit_expr_opt(base, e, v); |
