mirror of
https://github.com/storytold/gridcraft.git
synced 2026-11-03 00:41:56 -06:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7e7f79d630 |
@@ -14,8 +14,13 @@ fn matches(hay: &str, what: &str, case: bool, whole: bool) -> bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// `*`/`?` wildcard match with `~` escapes.
|
/// `*`/`?` wildcard match with `~` escapes.
|
||||||
|
///
|
||||||
|
/// The pattern runs as a bit-parallel automaton over the text: one pass, each character costing
|
||||||
|
/// one step per 64 pattern positions. Backtracking to the last `*` after a mismatch rescans the
|
||||||
|
/// text and costs text × pattern comparisons on a long, repetitive cell, for every cell a
|
||||||
|
/// filter or Find visits.
|
||||||
pub(crate) fn wildcard(text: &str, pat: &str) -> bool {
|
pub(crate) fn wildcard(text: &str, pat: &str) -> bool {
|
||||||
let t: Vec<char> = text.chars().collect();
|
// The pattern as (character, escaped) items, runs of `*` folded into one.
|
||||||
let mut p: Vec<(char, bool)> = Vec::new();
|
let mut p: Vec<(char, bool)> = Vec::new();
|
||||||
let mut it = pat.chars();
|
let mut it = pat.chars();
|
||||||
while let Some(c) = it.next() {
|
while let Some(c) = it.next() {
|
||||||
@@ -23,32 +28,56 @@ pub(crate) fn wildcard(text: &str, pat: &str) -> bool {
|
|||||||
if let Some(n) = it.next() {
|
if let Some(n) = it.next() {
|
||||||
p.push((n, true));
|
p.push((n, true));
|
||||||
}
|
}
|
||||||
} else {
|
} else if c != '*' || p.last() != Some(&('*', false)) {
|
||||||
p.push((c, false));
|
p.push((c, false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let (mut ti, mut pi) = (0usize, 0usize);
|
let words = (p.len() + 1).div_ceil(64);
|
||||||
let (mut star, mut mark) = (None, 0usize);
|
let bit = |set: &mut [u64], i: usize| set[i / 64] |= 1 << (i % 64);
|
||||||
while ti < t.len() {
|
// Positions holding a `*`, a `?`, and each literal character.
|
||||||
if pi < p.len() && (p[pi] == ('?', false) || (p[pi].0 == t[ti] && p[pi] != ('*', false))) {
|
let mut stars = vec![0u64; words];
|
||||||
ti += 1;
|
let mut any = vec![0u64; words];
|
||||||
pi += 1;
|
let mut lits: std::collections::HashMap<char, Vec<u64>> = std::collections::HashMap::new();
|
||||||
} else if pi < p.len() && p[pi] == ('*', false) {
|
for (i, item) in p.iter().enumerate() {
|
||||||
star = Some(pi);
|
match item {
|
||||||
mark = ti;
|
('*', false) => bit(&mut stars, i),
|
||||||
pi += 1;
|
('?', false) => bit(&mut any, i),
|
||||||
} else if let Some(sp) = star {
|
(c, _) => bit(lits.entry(*c).or_insert_with(|| vec![0u64; words]), i),
|
||||||
pi = sp + 1;
|
|
||||||
mark += 1;
|
|
||||||
ti = mark;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
while pi < p.len() && p[pi] == ('*', false) {
|
// A set bit i: the text read so far matches the first i pattern items. A `*` matches nothing
|
||||||
pi += 1;
|
// as well, so a state at a `*` is also at the item after it.
|
||||||
|
let close = |set: &mut Vec<u64>| {
|
||||||
|
let mut carry = 0u64;
|
||||||
|
for w in 0..words {
|
||||||
|
let s = set[w] & stars[w];
|
||||||
|
let next = (s << 1) | carry;
|
||||||
|
carry = s >> 63;
|
||||||
|
set[w] |= next;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let mut state = vec![0u64; words];
|
||||||
|
bit(&mut state, 0);
|
||||||
|
close(&mut state);
|
||||||
|
let mut next = vec![0u64; words];
|
||||||
|
for ch in text.chars() {
|
||||||
|
let lit = lits.get(&ch);
|
||||||
|
let mut carry = 0u64;
|
||||||
|
let mut alive = 0u64;
|
||||||
|
for w in 0..words {
|
||||||
|
// Items that read `ch` advance; a `*` reads it and stays.
|
||||||
|
let m = state[w] & (any[w] | lit.map_or(0, |l| l[w]));
|
||||||
|
next[w] = (m << 1) | carry | (state[w] & stars[w]);
|
||||||
|
carry = m >> 63;
|
||||||
|
alive |= next[w];
|
||||||
|
}
|
||||||
|
if alive == 0 {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
std::mem::swap(&mut state, &mut next);
|
||||||
|
close(&mut state);
|
||||||
}
|
}
|
||||||
pi == p.len()
|
state[p.len() / 64] & (1 << (p.len() % 64)) != 0
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) fn find(s: &mut Session, p: &Json) -> Result<Json> {
|
pub(super) fn find(s: &mut Session, p: &Json) -> Result<Json> {
|
||||||
|
|||||||
@@ -302,6 +302,79 @@ fn wildcards() {
|
|||||||
assert!(wildcard("", "*"));
|
assert!(wildcard("", "*"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The backtracking matcher `wildcard` replaced, as the reference for its results.
|
||||||
|
fn wildcard_backtracking(text: &str, pat: &str) -> bool {
|
||||||
|
let t: Vec<char> = text.chars().collect();
|
||||||
|
let mut p: Vec<(char, bool)> = Vec::new();
|
||||||
|
let mut it = pat.chars();
|
||||||
|
while let Some(c) = it.next() {
|
||||||
|
if c == '~' {
|
||||||
|
if let Some(n) = it.next() {
|
||||||
|
p.push((n, true));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
p.push((c, false));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let (mut ti, mut pi) = (0usize, 0usize);
|
||||||
|
let (mut star, mut mark) = (None, 0usize);
|
||||||
|
while ti < t.len() {
|
||||||
|
if pi < p.len() && (p[pi] == ('?', false) || (p[pi].0 == t[ti] && p[pi] != ('*', false))) {
|
||||||
|
ti += 1;
|
||||||
|
pi += 1;
|
||||||
|
} else if pi < p.len() && p[pi] == ('*', false) {
|
||||||
|
star = Some(pi);
|
||||||
|
mark = ti;
|
||||||
|
pi += 1;
|
||||||
|
} else if let Some(sp) = star {
|
||||||
|
pi = sp + 1;
|
||||||
|
mark += 1;
|
||||||
|
ti = mark;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
while pi < p.len() && p[pi] == ('*', false) {
|
||||||
|
pi += 1;
|
||||||
|
}
|
||||||
|
pi == p.len()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn wildcard_agrees_with_backtracking() {
|
||||||
|
// Every text up to 5 characters over a small alphabet against every pattern up to 4 items.
|
||||||
|
let alphabet = ['a', 'b', '*', '?', '~'];
|
||||||
|
let all = |n: usize, chars: &[char]| -> Vec<String> {
|
||||||
|
let mut out = vec![String::new()];
|
||||||
|
let mut level = vec![String::new()];
|
||||||
|
for _ in 0..n {
|
||||||
|
level = level.iter().flat_map(|s| chars.iter().map(move |c| format!("{s}{c}"))).collect();
|
||||||
|
out.extend(level.iter().cloned());
|
||||||
|
}
|
||||||
|
out
|
||||||
|
};
|
||||||
|
let texts = all(5, &['a', 'b', '*']);
|
||||||
|
for pat in all(4, &alphabet) {
|
||||||
|
for text in &texts {
|
||||||
|
assert_eq!(wildcard(text, &pat), wildcard_backtracking(text, &pat), "{text:?} ~ {pat:?}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Patterns longer than one 64-bit word.
|
||||||
|
let long = format!("*{}*b?", "a".repeat(70));
|
||||||
|
for text in [format!("x{}yb1", "a".repeat(70)), format!("{}b", "a".repeat(71)), "a".repeat(200)] {
|
||||||
|
assert_eq!(wildcard(&text, &long), wildcard_backtracking(&text, &long), "{text}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn wildcard_on_long_repetitive_text_is_linear() {
|
||||||
|
// The backtracking matcher compared about text × pattern characters here (10^8).
|
||||||
|
let text = "a".repeat(20_000);
|
||||||
|
let pat = format!("*{}b", "a".repeat(5_000));
|
||||||
|
assert!(!wildcard(&text, &pat));
|
||||||
|
assert!(wildcard(&format!("{text}b"), &pat));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn tsv() {
|
fn tsv() {
|
||||||
assert_eq!(parse_tsv("a\tb\n1\t2\n"), vec![vec!["a", "b"], vec!["1", "2"]]);
|
assert_eq!(parse_tsv("a\tb\n1\t2\n"), vec![vec!["a", "b"], vec!["1", "2"]]);
|
||||||
|
|||||||
Reference in New Issue
Block a user