Skip to content

Commit

Permalink
ParserBase: rename new() to with_name()
Browse files Browse the repository at this point in the history
Signed-off-by: Tibor Benke <ihrwein@gmail.com>
  • Loading branch information
ihrwein committed Aug 19, 2015
1 parent 08e76f4 commit 0c5ccc3
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/parsers/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pub struct ParserBase {
}

impl ParserBase {
pub fn new(name: String) -> ParserBase {
pub fn with_name(name: String) -> ParserBase {
ParserBase { name: name }
}

Expand Down
2 changes: 1 addition & 1 deletion src/parsers/greedy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pub struct GreedyParser {

impl GreedyParser {
pub fn new(name: String) -> GreedyParser {
GreedyParser{ base: ParserBase::new(name),
GreedyParser{ base: ParserBase::with_name(name),
end_string: None }
}

Expand Down
10 changes: 5 additions & 5 deletions src/parsers/length_checked.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ pub struct LengthCheckedParserBase {
}

impl LengthCheckedParserBase {
pub fn new(name: String) -> LengthCheckedParserBase {
LengthCheckedParserBase { base: ParserBase::new(name),
pub fn with_name(name: String) -> LengthCheckedParserBase {
LengthCheckedParserBase { base: ParserBase::with_name(name),
min_length: None,
max_length: None }
}
Expand Down Expand Up @@ -71,14 +71,14 @@ mod test {

#[test]
fn test_given_parser_when_the_match_length_is_not_constrained_then_the_match_length_is_ok_in_every_case() {
let base = LengthCheckedParserBase::new("name".to_string());
let base = LengthCheckedParserBase::with_name("name".to_string());
assert_eq!(base.is_match_length_ok(42), true);
assert_eq!(base.is_match_length_ok(1), true);
}

#[test]
fn test_given_parser_when_the_minimum_match_length_is_set_then_the_shorter_matches_are_discarded() {
let mut base = LengthCheckedParserBase::new("name".to_string());
let mut base = LengthCheckedParserBase::with_name("name".to_string());
base.set_min_length(10);
assert_eq!(base.is_match_length_ok(42), true);
assert_eq!(base.is_match_length_ok(1), false);
Expand All @@ -88,7 +88,7 @@ mod test {

#[test]
fn test_given_parser_when_the_maximum_match_length_is_set_then_the_longer_matches_are_discarded() {
let mut base = LengthCheckedParserBase::new("name".to_string());
let mut base = LengthCheckedParserBase::with_name("name".to_string());
base.set_max_length(10);
assert_eq!(base.is_match_length_ok(42), false);
assert_eq!(base.is_match_length_ok(1), true);
Expand Down
2 changes: 1 addition & 1 deletion src/parsers/set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub struct SetParser {
impl SetParser {
pub fn new(name: String, set: &str) -> SetParser {
SetParser{ character_set: SetParser::create_set_from_str(set),
base: LengthCheckedParserBase::new(name)}
base: LengthCheckedParserBase::with_name(name)}
}

pub fn from_str(name: &str, set: &str) -> SetParser {
Expand Down

0 comments on commit 0c5ccc3

Please sign in to comment.