From 3ae0cf9898485a2ec35df7d23cd274e7dea5796d Mon Sep 17 00:00:00 2001 From: JSDurand Date: Mon, 8 Jan 2024 16:13:19 +0800 Subject: a commit before the forst query I think the main functionalities are already there, but the lack of querying capabilities makes this not very useful at the moment. This commit is right before an attempt to add this missing piece. --- nfa/src/default/nfa.rs | 10 ++++++++++ nfa/src/default/regex.rs | 6 ++++++ 2 files changed, 16 insertions(+) (limited to 'nfa/src/default') diff --git a/nfa/src/default/nfa.rs b/nfa/src/default/nfa.rs index e38a1a9..42f7fd8 100644 --- a/nfa/src/default/nfa.rs +++ b/nfa/src/default/nfa.rs @@ -43,6 +43,11 @@ impl LabelGraph for DefaultNFA { Self: 'a, T: 'a; + type TupleIter<'a> = as LabelGraph>::TupleIter<'a> + where + Self: 'a, + T: 'a; + #[inline] fn vertex_label(&self, node_id: usize) -> Result, GError> { if self.has_node(node_id) { @@ -66,6 +71,11 @@ impl LabelGraph for DefaultNFA { self.graph.find_children_with_label(node_id, label) } + #[inline] + fn tuples_of(&self, node_id: usize) -> Result, GError> { + self.graph.tuples_of(node_id) + } + #[inline] fn labels_of(&self, node_id: usize) -> Result, GError> { self.graph.labels_of(node_id) diff --git a/nfa/src/default/regex.rs b/nfa/src/default/regex.rs index 8185ca5..261b10c 100644 --- a/nfa/src/default/regex.rs +++ b/nfa/src/default/regex.rs @@ -211,6 +211,12 @@ where .take(self.len()) .collect(); + // FIXME: This seems wrong: we shall perform a depth-first + // search to find nodes without children and collect their + // results first. However this function is not actually used + // elsewhere, so it is left unfixed until it is needed in the + // future. + for index in 0..=self.len() { let algebra_result = { let results_of_children: Vec = self -- cgit v1.2.3-18-g5258