From 8486474f377faf2d800d79166a7abe6b975e3e50 Mon Sep 17 00:00:00 2001 From: JSDurand Date: Fri, 2 Jun 2023 15:00:48 +0800 Subject: Fix a bug of duplication from planting after sploing I should have staged and committed these changes separately, but I am too lazy to deal with that. The main changes in this commit are that I added the derive macro that automates the delegation of the Graph trait. This saves a lot of boiler-plate codes. The second main change, perhaps the most important one, is that I found and tried to fix a bug that caused duplication of nodes. The bug arises from splitting or cloning a node multiple times, and immediately planting the same fragment under the new "sploned" node. That is, when we try to splone the node again, we found that we need to splone, because the node that was created by the same sploning process now has a different label because of the planting of the fragment. Then after the sploning, we plant the fragment again. This makes the newly sploned node have the same label (except for the clone index) and the same children as the node that was sploned and planted in the previous rounds. The fix is to check for the existence of a node that has the same set of children as the about-to-be-sploned node, except for the last one, which contains the about-to-be-planted fragment as a prefix. If that is the case, treat it as an already existing node, so that we do not have to splone the node again. This is consistent with the principle to not create what we do not need. --- nfa/src/default/nfa.rs | 56 ++++++-------------------------------------- nfa/src/default/regex.rs | 60 +++++++++--------------------------------------- 2 files changed, 18 insertions(+), 98 deletions(-) (limited to 'nfa/src/default') diff --git a/nfa/src/default/nfa.rs b/nfa/src/default/nfa.rs index 6b1e56f..d2fe88e 100644 --- a/nfa/src/default/nfa.rs +++ b/nfa/src/default/nfa.rs @@ -12,8 +12,10 @@ use crate::{ use core::fmt::{Debug, Display}; +use graph_macro::Graph; + /// Default NFA implementation. -#[derive(Debug, Clone)] +#[derive(Debug, Clone, Graph)] pub struct DefaultNFA { graph: DLGraph, } @@ -31,51 +33,7 @@ impl Default for DefaultNFA { // I deliberately avoid using [`Deref`][std::ops::Deref] here, as I do // not want to dereference an NFA to a Graph. -impl Graph for DefaultNFA { - type Iter<'a> = as Graph>::Iter<'a> where T: 'a; - - #[inline] - fn is_empty(&self) -> bool { - self.graph.is_empty() - } - - #[inline] - fn nodes_len(&self) -> usize { - self.graph.nodes_len() - } - - #[inline] - fn children_of(&self, node_id: usize) -> Result, GError> { - self.graph.children_of(node_id) - } - - #[inline] - fn degree(&self, node_id: usize) -> Result { - self.graph.degree(node_id) - } - - #[inline] - fn is_empty_node(&self, node_id: usize) -> Result { - self.graph.is_empty_node(node_id) - } - - #[inline] - fn has_edge(&self, source: usize, target: usize) -> Result { - self.graph.has_edge(source, target) - } - - #[inline] - fn print_viz(&self, filename: &str) -> Result<(), std::io::Error> { - self.graph.print_viz(filename) - } - - #[inline] - fn replace_by_builder(&mut self, _builder: impl Builder) { - unimplemented!() - } -} - -impl LabelGraph for DefaultNFA { +impl LabelGraph for DefaultNFA { type Iter<'a> = as LabelGraph>::Iter<'a> where T: 'a; type LabelIter<'a> = as LabelGraph>::LabelIter<'a> where T: 'a; @@ -119,14 +77,14 @@ impl LabelGraph for DefaultNFA { } } -impl LabelExtGraph for DefaultNFA { +impl LabelExtGraph for DefaultNFA { #[inline] fn extend(&mut self, edges: impl IntoIterator) -> Result { self.graph.extend(edges) } } -impl Nfa for DefaultNFA { +impl Nfa for DefaultNFA { type FromRegex = DefaultNFA; // Reminder: This is an adopted version of Thompson's @@ -484,7 +442,7 @@ impl Nfa for DefaultNFA { } } -impl Display for DefaultNFA { +impl Display for DefaultNFA { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { Debug::fmt(self, f) } diff --git a/nfa/src/default/regex.rs b/nfa/src/default/regex.rs index 1c22687..1b1b325 100644 --- a/nfa/src/default/regex.rs +++ b/nfa/src/default/regex.rs @@ -4,6 +4,8 @@ use graph::{error::Error as GError, ALGraph, ExtGraph, Graph, GraphLabel}; use crate::{desrec::DesRec, error::Error, Regex}; +use graph_macro::Graph; + #[cfg(feature = "recursion")] use receme::{algebra::Algebra, catana::Cata}; @@ -64,9 +66,10 @@ impl Display for RegexType { } /// A default implementation of regular expressions. -#[derive(Debug, Clone)] -pub struct DefaultRegex { +#[derive(Debug, Clone, Graph)] +pub struct DefaultRegex { /// The underlying graph is stored using adjacency lists. + #[graph] graph: ALGraph, /// The types of the underlying nodes. types: Vec>, @@ -76,7 +79,7 @@ pub struct DefaultRegex { root: Option, } -impl Default for DefaultRegex { +impl Default for DefaultRegex { fn default() -> Self { Self { graph: Default::default(), @@ -503,54 +506,13 @@ impl DefaultRegex { } } -impl Display for DefaultRegex { +impl Display for DefaultRegex { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { write!(f, "{}", self.to_string_with(|t| format!("{t}"))?) } } -impl Graph for DefaultRegex { - type Iter<'a> = ::Iter<'a> - where - Self: 'a; - - #[inline] - fn is_empty(&self) -> bool { - self.graph.is_empty() - } - - #[inline] - fn nodes_len(&self) -> usize { - self.graph.nodes_len() - } - - #[inline] - fn children_of(&self, node_id: usize) -> Result, GError> { - self.graph.children_of(node_id) - } - - #[inline] - fn degree(&self, node_id: usize) -> Result { - self.graph.degree(node_id) - } - - #[inline] - fn is_empty_node(&self, node_id: usize) -> Result { - self.graph.is_empty_node(node_id) - } - - #[inline] - fn has_edge(&self, source: usize, target: usize) -> Result { - self.graph.has_edge(source, target) - } - - #[inline] - fn replace_by_builder(&mut self, _builder: impl graph::Builder) { - unimplemented!() - } -} - -impl Regex> for DefaultRegex { +impl Regex> for DefaultRegex { /// Return the root of the regular expression. #[inline] fn root(&self) -> Option { @@ -649,7 +611,7 @@ pub struct DefaultRegParser { _phantom: PhantomData, } -impl DefaultRegParser { +impl DefaultRegParser { /// Query if a terminal or a non-terminal is already found. /// /// If found, return the associated index of the terminal or @@ -676,7 +638,7 @@ impl DefaultRegParser { } } -impl Default for DefaultRegParser { +impl Default for DefaultRegParser { fn default() -> Self { Self { ter_map: Default::default(), @@ -686,7 +648,7 @@ impl Default for DefaultRegParser { } } -impl DesRec for DefaultRegParser { +impl DesRec for DefaultRegParser { type Label = RegexType; type Regex = DefaultRegex; -- cgit v1.2.3-18-g5258