Migrated AndThenErrParser to MapDecorator

Author: ngeor

rusty_pc/src/and_then_err.rs

@@ -1,4 +1,5 @@
-use crate::{InputTrait, Parser, ParserErrorTrait};
+use crate::map_decorator::{MapDecorator, MapDecoratorMarker};
+use crate::{InputTrait, Parser};
 
 pub struct AndThenErrParser<P, F> {
     parser: P,
@@ -11,23 +12,29 @@ impl<P, F> AndThenErrParser<P, F> {
     }
 }
 
-impl<I, C, P, F> Parser<I, C> for AndThenErrParser<P, F>
+impl<I, C, P, F> MapDecorator<I, C> for AndThenErrParser<P, F>
 where
     I: InputTrait,
     P: Parser<I, C>,
     F: Fn(P::Error) -> Result<P::Output, P::Error>,
 {
+    type OriginalOutput = P::Output;
     type Output = P::Output;
     type Error = P::Error;
-    fn parse(&mut self, input: &mut I) -> Result<Self::Output, Self::Error> {
-        match self.parser.parse(input) {
-            Ok(value) => Ok(value),
-            Err(err) if err.is_soft() => (self.mapper)(err),
-            Err(err) => Err(err),
-        }
+
+    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) -> Self::Output {
+        ok
     }
 
-    fn set_context(&mut self, ctx: &C) {
-        self.parser.set_context(ctx)
+    fn map_soft_error(&self, err: Self::Error) -> Result<Self::Output, Self::Error> {
+        (self.mapper)(err)
     }
 }
+
+impl<P, F> MapDecoratorMarker for AndThenErrParser<P, F> {}