Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: normal match repeated pattern #37

Merged
merged 5 commits into from
Jan 2, 2024
Merged

feat: normal match repeated pattern #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bed678c
feat: normal match repeated pattern
TroyKomodo Jan 1, 2024
ee19d34
chore: remove iter copied
fundon Jan 2, 2024
513ce74
fix: revert iter enumerate
fundon Jan 2, 2024
90676a6
chore: remove unless comments
fundon Jan 2, 2024
5afe422
chore: check keeprunning first
fundon Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 31 additions & 89 deletions src/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,76 +197,6 @@ impl<T: fmt::Debug> Node<T> {
}
}
Key::Parameter(k) => match k {
// Kind::Normal => {
// if m == 0 {
// return None;
// }
//
// // slash node
// let mut slash = None;
// // slash position at path
// let sp = bytes.iter().position(|b| *b == b'/');
//
// // static
// if let Some(id) = self.nodes0.as_ref().and_then(|nodes| {
// let tmp = &bytes[0..sp.unwrap_or(m)];
// nodes.iter().find_map(|node| match node.key {
// Key::String(s) => {
// if s[0] == b'/' {
// slash.replace(node);
// return None;
// }
//
// tmp.iter().position(|b| s[0] == *b).and_then(|n| {
// node._find(start + n, &bytes[n..], ranges).map(|id| {
// ranges.push(start);
// ranges.push(start + n);
// id
// })
// })
// }
// _ => unreachable!(),
// })
// }) {
// return Some(id);
// }
//
// // parameter => `:a:b:c`
// if let Some(id) = self.nodes1.as_ref().and_then(|nodes| {
// let b = m - 1 > 0;
// nodes
// .iter()
// .filter(|node| match node.key {
// Key::Parameter(pk)
// if pk == Kind::Normal || pk == Kind::OneOrMore =>
// {
// b
// }
// _ => true,
// })
// .find_map(|node| node._find(start + 1, &bytes[1..], ranges))
// }) {
// ranges.push(start);
// ranges.push(start + 1);
// return Some(id);
// }
//
// if let Some(n) = sp {
// return slash
// .and_then(|node| node._find(start + n, &bytes[n..], ranges))
// .map(|id| {
// ranges.push(start);
// ranges.push(start + n);
// id
// });
// } else {
// return self.value.as_ref().map(|id| {
// ranges.push(start);
// ranges.push(start + m);
// id
// });
// }
// }
Kind::Normal | Kind::Optional | Kind::OptionalSegment => {
if m == 0 {
if k == &Kind::Normal {
Expand All @@ -285,12 +215,29 @@ impl<T: fmt::Debug> Node<T> {
if let Some(id) = self.nodes0.as_ref().and_then(|nodes| {
nodes.iter().find_map(|node| match &node.key {
Key::String(s) => {
bytes.iter().position(|b| s[0] == *b).and_then(|n| {
node._find(start + n, &bytes[n..], ranges).map(|id| {
ranges.push(start..start + n);
id
let mut keep_running = true;
bytes
.iter()
// as it turns out doing .copied() here is much slower than dereferencing in the closure
// https://godbolt.org/z/7dnW91T1Y
.take_while(|b| {
if keep_running && **b == b'/' {
keep_running = false;
true
} else {
keep_running
}
})
.enumerate()
.find_map(|(n, b)| {
if s[0] != *b {
return None;
}
node._find(start + n, &bytes[n..], ranges).map(|id| {
ranges.push(start..start + n);
id
})
})
})
}
Key::Parameter(_) => unreachable!(),
})
Expand Down Expand Up @@ -396,20 +343,15 @@ impl<T: fmt::Debug> Node<T> {
m >= s.len()
};
if right_length {
return bytes
.iter()
.enumerate()
.filter_map(
|(n, b)| if s[0] == *b { Some(n) } else { None },
)
.find_map(|n| {
node._find(start + n, &bytes[n..], ranges).map(
|id| {
ranges.push(start..start + n);
id
},
)
});
return bytes.iter().enumerate().find_map(|(n, b)| {
if s[0] != *b {
return None;
}
node._find(start + n, &bytes[n..], ranges).map(|id| {
ranges.push(start..start + n);
id
})
});
}
}
None
Expand Down
57 changes: 57 additions & 0 deletions tests/tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2257,3 +2257,60 @@ fn test_dots_ext() {

assert_eq!(params.params(), &[("name", "abc.xyz")]);
}

#[test]
fn test_dots_ext_no_qualifier() {
let mut tree = PathTree::new();
let _ = tree.insert("/:name.js", 2);
let _ = tree.insert("/:name.js.gz", 1);

assert_eq!(
format!("{:?}", &tree.node),
r"
/
└── :
└── .js •0
└── .gz •1
"
);

let result = tree.find("/node.js");
assert!(result.is_some());

let (value, params) = result.unwrap();
assert_eq!(value, &2);

assert_eq!(params.params(), &[("name", "node")]);

let result = tree.find("/path.lib.js");
assert!(result.is_some());

let (value, params) = result.unwrap();
assert_eq!(value, &2);

assert_eq!(params.params(), &[("name", "path.lib")]);

let result = tree.find("/node.js.js");
assert!(result.is_some());

let (value, params) = result.unwrap();
assert_eq!(value, &2);

assert_eq!(params.params(), &[("name", "node.js")]);

let result = tree.find("/node.js.gz");
assert!(result.is_some());

let (value, params) = result.unwrap();
assert_eq!(value, &1);

assert_eq!(params.params(), &[("name", "node")]);

let result = tree.find("/node.js.gz.js.gz");
assert!(result.is_some());

let (value, params) = result.unwrap();
assert_eq!(value, &1);

assert_eq!(params.params(), &[("name", "node.js.gz")]);
}