Created dedicated ToFatalParser

Author: ngeor

rusty_pc/src/lib.rs

@@ -27,6 +27,7 @@ mod supplier;
 mod surround;
 pub mod text;
 mod then_with;
+pub mod to_fatal;
 pub mod to_option;
 mod token;
 mod top_level;

rusty_pc/src/map_err.rs

@@ -42,18 +42,6 @@ where
     fn map(&self, err: E) -> E;
 }
 
-/// Converts a soft error into a fatal equivalent.
-pub struct ToFatalErrorMapper;
-
-impl<E> ErrorMapper<E> for ToFatalErrorMapper
-where
-    E: ParserErrorTrait,
-{
-    fn map(&self, err: E) -> E {
-        err.to_fatal()
-    }
-}
-
 /// Overrides a soft error with the given value.
 pub struct SoftErrorOverrider<E>(E);
 

rusty_pc/src/parser.rs

@@ -10,12 +10,11 @@ use crate::flatten::FlattenParser;
 use crate::many::{ManyCombiner, ManyParser, VecManyCombiner};
 use crate::map::{MapParser, MapToUnitParser};
 use crate::map_ctx::MapCtxParser;
-use crate::map_err::{
-    ErrorMapper, FatalErrorOverrider, MapErrParser, SoftErrorOverrider, ToFatalErrorMapper
-};
+use crate::map_err::{ErrorMapper, FatalErrorOverrider, MapErrParser, SoftErrorOverrider};
 use crate::no_context::NoContextParser;
 use crate::or_default::OrDefaultParser;
 use crate::peek::PeekParser;
+use crate::to_fatal::ToFatalParser;
 use crate::to_option::ToOptionParser;
 
 /// A parser uses the given input in order to produce a result.
@@ -337,14 +336,6 @@ where
         self.map_err(FatalErrorOverrider::new(err))
     }
 
-    /// If this parser returns a soft error, it will be converted to a fatal error.
-    fn to_fatal(self) -> MapErrParser<Self, ToFatalErrorMapper>
-    where
-        Self: Sized,
-    {
-        self.map_err(ToFatalErrorMapper)
-    }
-
     // =======================================================================
     // NoContext
     // =======================================================================
@@ -413,6 +404,18 @@ where
         ThenWithContextParser::new(self, other, combiner)
     }
 
+    // =======================================================================
+    // ToFatal
+    // =======================================================================
+
+    /// If this parser returns a soft error, it will be converted to a fatal error.
+    fn to_fatal(self) -> ToFatalParser<Self>
+    where
+        Self: Sized,
+    {
+        ToFatalParser::new(self)
+    }
+
     // =======================================================================
     // ToOption
     // =======================================================================

rusty_pc/src/to_fatal.rs

@@ -0,0 +1,38 @@
+use crate::map_decorator::{MapDecorator, MapDecoratorMarker};
+use crate::{InputTrait, Parser, ParserErrorTrait};
+
+pub struct ToFatalParser<P> {
+    parser: P,
+}
+
+impl<P> ToFatalParser<P> {
+    pub(crate) fn new(parser: P) -> Self {
+        Self { parser }
+    }
+}
+
+impl<I, C, P> MapDecorator<I, C> for ToFatalParser<P>
+where
+    I: InputTrait,
+    P: Parser<I, C>,
+{
+    type OriginalOutput = P::Output;
+    type Output = P::Output;
+    type Error = P::Error;
+
+    fn decorated(
+        &mut self,
+    ) -> &mut impl Parser<I, C, Output = Self::OriginalOutput, Error = Self::Error> {
+        &mut self.parser
+    }
+
+    fn map_ok(&self, ok: Self::OriginalOutput) -> Result<Self::Output, Self::Error> {
+        Ok(ok)
+    }
+
+    fn map_soft_error(&self, err: Self::Error) -> Result<Self::Output, Self::Error> {
+        Err(err.to_fatal())
+    }
+}
+
+impl<P> MapDecoratorMarker for ToFatalParser<P> {}