diff options
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 40 | ||||
| -rw-r--r-- | src/libsyntax/ext/trace_macros.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/macro_parser.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/macro_rules.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/transcribe.rs | 4 |
5 files changed, 28 insertions, 28 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 1963f3aef49..1547446957e 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -548,52 +548,52 @@ impl Visitor<()> for NewNameFinderContext { } } // use the default traversal for non-pat_idents - _ => visit::visit_pat(self as @Visitor<()>, pattern, ()) + _ => visit::visit_pat(self as @mut Visitor<()>, pattern, ()) } } // XXX: Methods below can become default methods. fn visit_mod(@mut self, module: &ast::_mod, _: span, _: NodeId, _: ()) { - visit::visit_mod(self as @Visitor<()>, module, ()) + visit::visit_mod(self as @mut Visitor<()>, module, ()) } fn visit_view_item(@mut self, view_item: &ast::view_item, _: ()) { - visit::visit_view_item(self as @Visitor<()>, view_item, ()) + visit::visit_view_item(self as @mut Visitor<()>, view_item, ()) } fn visit_item(@mut self, item: @ast::item, _: ()) { - visit::visit_item(self as @Visitor<()>, item, ()) + visit::visit_item(self as @mut Visitor<()>, item, ()) } fn visit_foreign_item(@mut self, foreign_item: @ast::foreign_item, _: ()) { - visit::visit_foreign_item(self as @Visitor<()>, foreign_item, ()) + visit::visit_foreign_item(self as @mut Visitor<()>, foreign_item, ()) } fn visit_local(@mut self, local: @ast::Local, _: ()) { - visit::visit_local(self as @Visitor<()>, local, ()) + visit::visit_local(self as @mut Visitor<()>, local, ()) } fn visit_block(@mut self, block: &ast::Block, _: ()) { - visit::visit_block(self as @Visitor<()>, block, ()) + visit::visit_block(self as @mut Visitor<()>, block, ()) } fn visit_stmt(@mut self, stmt: @ast::stmt, _: ()) { - visit::visit_stmt(self as @Visitor<()>, stmt, ()) + visit::visit_stmt(self as @mut Visitor<()>, stmt, ()) } fn visit_arm(@mut self, arm: &ast::arm, _: ()) { - visit::visit_arm(self as @Visitor<()>, arm, ()) + visit::visit_arm(self as @mut Visitor<()>, arm, ()) } fn visit_decl(@mut self, decl: @ast::decl, _: ()) { - visit::visit_decl(self as @Visitor<()>, decl, ()) + visit::visit_decl(self as @mut Visitor<()>, decl, ()) } fn visit_expr(@mut self, expr: @ast::expr, _: ()) { - visit::visit_expr(self as @Visitor<()>, expr, ()) + visit::visit_expr(self as @mut Visitor<()>, expr, ()) } fn visit_expr_post(@mut self, _: @ast::expr, _: ()) { @@ -601,11 +601,11 @@ impl Visitor<()> for NewNameFinderContext { } fn visit_ty(@mut self, typ: &ast::Ty, _: ()) { - visit::visit_ty(self as @Visitor<()>, typ, ()) + visit::visit_ty(self as @mut Visitor<()>, typ, ()) } fn visit_generics(@mut self, generics: &ast::Generics, _: ()) { - visit::visit_generics(self as @Visitor<()>, generics, ()) + visit::visit_generics(self as @mut Visitor<()>, generics, ()) } fn visit_fn(@mut self, @@ -615,7 +615,7 @@ impl Visitor<()> for NewNameFinderContext { span: span, node_id: NodeId, _: ()) { - visit::visit_fn(self as @Visitor<()>, + visit::visit_fn(self as @mut Visitor<()>, function_kind, function_declaration, block, @@ -625,13 +625,13 @@ impl Visitor<()> for NewNameFinderContext { } fn visit_ty_method(@mut self, ty_method: &ast::TypeMethod, _: ()) { - visit::visit_ty_method(self as @Visitor<()>, ty_method, ()) + visit::visit_ty_method(self as @mut Visitor<()>, ty_method, ()) } fn visit_trait_method(@mut self, trait_method: &ast::trait_method, _: ()) { - visit::visit_trait_method(self as @Visitor<()>, trait_method, ()) + visit::visit_trait_method(self as @mut Visitor<()>, trait_method, ()) } fn visit_struct_def(@mut self, @@ -640,7 +640,7 @@ impl Visitor<()> for NewNameFinderContext { generics: &ast::Generics, node_id: NodeId, _: ()) { - visit::visit_struct_def(self as @Visitor<()>, + visit::visit_struct_def(self as @mut Visitor<()>, struct_def, ident, generics, @@ -651,18 +651,18 @@ impl Visitor<()> for NewNameFinderContext { fn visit_struct_field(@mut self, struct_field: @ast::struct_field, _: ()) { - visit::visit_struct_field(self as @Visitor<()>, struct_field, ()) + visit::visit_struct_field(self as @mut Visitor<()>, struct_field, ()) } } // return a visitor that extracts the pat_ident paths // from a given pattern and puts them in a mutable // array (passed in to the traversal) -pub fn new_name_finder(idents: @mut ~[ast::ident]) -> @Visitor<()> { +pub fn new_name_finder(idents: @mut ~[ast::ident]) -> @mut Visitor<()> { let context = @mut NewNameFinderContext { ident_accumulator: idents, }; - context as @Visitor<()> + context as @mut Visitor<()> } pub fn expand_block(extsbox: @mut SyntaxEnv, diff --git a/src/libsyntax/ext/trace_macros.rs b/src/libsyntax/ext/trace_macros.rs index f7f17d3ba64..f3e7613d96a 100644 --- a/src/libsyntax/ext/trace_macros.rs +++ b/src/libsyntax/ext/trace_macros.rs @@ -25,7 +25,7 @@ pub fn expand_trace_macros(cx: @ExtCtxt, let tt_rdr = new_tt_reader(cx.parse_sess().span_diagnostic, None, tt.to_owned()); - let rdr = tt_rdr as @reader; + let rdr = tt_rdr as @mut reader; let rust_parser = Parser(sess, cfg.clone(), rdr.dup()); if rust_parser.is_keyword(keywords::True) { diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index 29963a7b461..c208a7f7e3e 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -224,7 +224,7 @@ pub enum parse_result { pub fn parse_or_else( sess: @mut ParseSess, cfg: ast::CrateConfig, - rdr: @reader, + rdr: @mut reader, ms: ~[matcher] ) -> HashMap<ident, @named_match> { match parse(sess, cfg, rdr, ms) { @@ -237,7 +237,7 @@ pub fn parse_or_else( pub fn parse( sess: @mut ParseSess, cfg: ast::CrateConfig, - rdr: @reader, + rdr: @mut reader, ms: &[matcher] ) -> parse_result { let mut cur_eis = ~[]; diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 10735dad32f..54ac1f1e48f 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -59,7 +59,7 @@ pub fn add_new_extension(cx: @ExtCtxt, arg.clone()); let argument_map = parse_or_else(cx.parse_sess(), cx.cfg(), - arg_reader as @reader, + arg_reader as @mut reader, argument_gram); // Extract the arguments: @@ -101,7 +101,7 @@ pub fn add_new_extension(cx: @ExtCtxt, s_d, None, arg.to_owned() - ) as @reader; + ) as @mut reader; match parse(cx.parse_sess(), cx.cfg(), arg_rdr, *mtcs) { success(named_matches) => { let rhs = match rhses[i] { @@ -123,7 +123,7 @@ pub fn add_new_extension(cx: @ExtCtxt, rhs); let p = @Parser(cx.parse_sess(), cx.cfg(), - trncbr as @reader); + trncbr as @mut reader); // Let the context choose how to interpret the result. // Weird, but useful for X-macros. diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs index 9d3e916b500..13bad252243 100644 --- a/src/libsyntax/ext/tt/transcribe.rs +++ b/src/libsyntax/ext/tt/transcribe.rs @@ -30,7 +30,7 @@ struct TtFrame { } pub struct TtReader { - sp_diag: @span_handler, + sp_diag: @mut span_handler, // the unzipped tree: stack: @mut TtFrame, /* for MBE-style macro transcription */ @@ -45,7 +45,7 @@ pub struct TtReader { /** This can do Macro-By-Example transcription. On the other hand, if * `src` contains no `tt_seq`s and `tt_nonterminal`s, `interp` can (and * should) be none. */ -pub fn new_tt_reader(sp_diag: @span_handler, +pub fn new_tt_reader(sp_diag: @mut span_handler, interp: Option<HashMap<ident,@named_match>>, src: ~[ast::token_tree]) -> @mut TtReader { |