rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

libsyntax: change closures to take fn(&Parser)

Browse Source
This commit is contained in:
Erick Tryzelaar
2013-02-26 06:28:14 -08:00
parent 375c298297
commit 8d239a256d
2 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libsyntax/parse/common.rs
View File

@@ -250,7 +250,7 @@ pub impl Parser {
// before the '>'.
fn parse_seq_to_before_gt<T: Copy>(
sep: Option<token::Token>,
f: fn(Parser) -> T
f: fn(&Parser) -> T
) -> ~[T] {
let mut first = true;
let mut v = ~[];
@@ -263,7 +263,7 @@ pub impl Parser {
}
_ => ()
}
v.push(f(self));
v.push(f(&self));
}
return v;
@@ -271,7 +271,7 @@ pub impl Parser {
fn parse_seq_to_gt<T: Copy>(
sep: Option<token::Token>,
f: fn(Parser) -> T
f: fn(&Parser) -> T
) -> ~[T] {
let v = self.parse_seq_to_before_gt(sep, f);
self.expect_gt();
@@ -282,7 +282,7 @@ pub impl Parser {
// parse a sequence bracketed by '<' and '>'
fn parse_seq_lt_gt<T: Copy>(
sep: Option<token::Token>,
f: fn(Parser) -> T
f: fn(&Parser) -> T
) -> spanned<~[T]> {
let lo = self.span.lo;
self.expect(&token::LT);
@@ -298,7 +298,7 @@ pub impl Parser {
fn parse_seq_to_end<T: Copy>(
ket: &token::Token,
sep: SeqSep,
f: fn(Parser) -> T
f: fn(&Parser) -> T
) -> ~[T] {
let val = self.parse_seq_to_before_end(ket, sep, f);
self.bump();
@@ -311,7 +311,7 @@ pub impl Parser {
fn parse_seq_to_before_end<T: Copy>(
ket: &token::Token,
sep: SeqSep,
f: fn(Parser) -> T
f: fn(&Parser) -> T
) -> ~[T] {
let mut first: bool = true;
let mut v: ~[T] = ~[];
@@ -324,7 +324,7 @@ pub impl Parser {
_ => ()
}
if sep.trailing_sep_allowed && *self.token == *ket { break; }
v.push(f(self));
v.push(f(&self));
}
return v;
}
@@ -336,7 +336,7 @@ pub impl Parser {
bra: &token::Token,
ket: &token::Token,
sep: SeqSep,
f: fn(Parser) -> T
f: fn(&Parser) -> T
) -> ~[T] {
self.expect(bra);
let result = self.parse_seq_to_before_end(ket, sep, f);
@@ -350,7 +350,7 @@ pub impl Parser {
bra: &token::Token,
ket: &token::Token,
sep: SeqSep,
f: fn(Parser) -> T
f: fn(&Parser) -> T
) -> spanned<~[T]> {
let lo = self.span.lo;
self.expect(bra);