Skip to content

Commit 9070e12

Browse files
committed
refactor _match with nest loop
1 parent d73cc5f commit 9070e12

3 files changed

Lines changed: 677 additions & 275 deletions

File tree

‎benches/benches.rs‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,15 @@ struct Pattern {
1010
}
1111

1212
impl Pattern {
13-
fn state<'a, S: engine::StrDrive>(
14-
&self,
15-
string: S,
16-
) -> (engine::Request<'a, S>, engine::State<S>) {
13+
fn state<'a, S: engine::StrDrive>(&self, string: S) -> (engine::Request<'a, S>, engine::State) {
1714
self.state_range(string, 0..usize::MAX)
1815
}
1916

2017
fn state_range<'a, S: engine::StrDrive>(
2118
&self,
2219
string: S,
2320
range: std::ops::Range<usize>,
24-
) -> (engine::Request<'a, S>, engine::State<S>) {
21+
) -> (engine::Request<'a, S>, engine::State) {
2522
let req = engine::Request::new(string, range.start, range.end, self.code, false);
2623
let state = engine::State::default();
2724
(req, state)
@@ -93,29 +90,22 @@ fn benchmarks(b: &mut Bencher) {
9390
b.iter(move || {
9491
for (p, s) in &tests {
9592
let (req, mut state) = p.state(s.clone());
96-
state.search(req);
97-
assert!(state.has_matched);
93+
assert!(state.search(req));
9894
let (req, mut state) = p.state(s.clone());
99-
state.pymatch(req);
100-
assert!(state.has_matched);
95+
assert!(state.pymatch(&req));
10196
let (mut req, mut state) = p.state(s.clone());
10297
req.match_all = true;
103-
state.pymatch(req);
104-
assert!(state.has_matched);
98+
assert!(state.pymatch(&req));
10599
let s2 = format!("{}{}{}", " ".repeat(10000), s, " ".repeat(10000));
106100
let (req, mut state) = p.state_range(s2.as_str(), 0..usize::MAX);
107-
state.search(req);
108-
assert!(state.has_matched);
101+
assert!(state.search(req));
109102
let (req, mut state) = p.state_range(s2.as_str(), 10000..usize::MAX);
110-
state.pymatch(req);
111-
assert!(state.has_matched);
103+
assert!(state.pymatch(&req));
112104
let (req, mut state) = p.state_range(s2.as_str(), 10000..10000 + s.len());
113-
state.pymatch(req);
114-
assert!(state.has_matched);
105+
assert!(state.pymatch(&req));
115106
let (mut req, mut state) = p.state_range(s2.as_str(), 10000..10000 + s.len());
116107
req.match_all = true;
117-
state.pymatch(req);
118-
assert!(state.has_matched);
108+
assert!(state.pymatch(&req));
119109
}
120110
})
121111
}

0 commit comments

Comments
 (0)