refactor cast

src/std/cast.rs

@@ -60,44 +60,90 @@ impl<'a> Display for CastError<'a> {
     }
 }
 
+impl<'a> CastError<'a> {
+    fn pure<Ctx: 'a + Context>(self) -> HashResolution<'a, Ctx>
+    where
+        Ctx::LookupError<'a>: From<CastError<'a>>,
+    {
+        Ctx::T::pure(Err(self.into()))
+    }
+}
+
+impl<'a, Ctx: 'a + Context> CastResolver<'a, Ctx> {
+    fn rc(points: Vec<Point<'a, Ctx, TypelessMentionable<'a, Ctx>>>) -> Rc<dyn Resolver<'a, Ctx>>
+    where
+        Ctx::LookupError<'a>: From<CastError<'a>>,
+    {
+        Rc::new(Self { points })
+    }
+
+    fn _get_point(
+        &self,
+        index: usize,
+    ) -> Result<&Point<'a, Ctx, TypelessMentionable<'a, Ctx>>, CastError<'a>> {
+        match self.points.get(index) {
+            Some(point) => Ok(point),
+            None => Err(CastError::AddressIndexOutOfBounds {
+                index,
+                length: self.points.len(),
+            }),
+        }
+    }
+
+    fn _validate_point(
+        &self,
+        point: &Point<'a, Ctx, TypelessMentionable<'a, Ctx>>,
+        address: Address,
+    ) -> Result<(), CastError<'a>> {
+        if point.point == address.point {
+            Ok(())
+        } else {
+            Err(CastError::AddressPointMismatch {
+                expected: point.point,
+                received: address.point,
+                index: address.index,
+            })
+        }
+    }
+
+    fn get_point(
+        &self,
+        address: Address,
+    ) -> Result<&Point<'a, Ctx, TypelessMentionable<'a, Ctx>>, CastError<'a>> {
+        let point = self._get_point(address.index)?;
+        self._validate_point(point, address)?;
+        Ok(point)
+    }
+}
+
+fn cast_resolved<'a, Ctx: 'a + Context>(
+    resolved: ResolutionResult<'a, Ctx, TypelessMentionable<'a, Ctx>>,
+) -> HashResolutionResult<'a, Ctx>
+where
+    Ctx::LookupError<'a>: From<CastError<'a>>,
+{
+    match resolved {
+        Ok(mentionable) => Ok((
+            mentionable.bytes(),
+            CastResolver::rc(mentionable.points_vec()),
+        )),
+        Err(error) => Err(match error {
+            ResolutionError::Lookup(lookup_error) => lookup_error,
+            ResolutionError::Parse(parse_error) => CastError::Typeless(parse_error).into(),
+        }),
+    }
+}
+
 impl<'a, Ctx: 'a + Context> Resolver<'a, Ctx> for CastResolver<'a, Ctx>
 where
     Ctx::LookupError<'a>: From<CastError<'a>>,
 {
     fn resolve(self: Rc<Self>, address: Address) -> HashResolution<'a, Ctx> {
-        let point = match self.points.get(address.index) {
+        let point = match self.get_point(address) {
-            Some(point) => point,
+            Ok(point) => point,
-            None => {
+            Err(cast_error) => return cast_error.pure::<Ctx>(),
-                return Ctx::T::pure(Err(CastError::AddressIndexOutOfBounds {
-                    index: address.index,
-                    length: self.points.len(),
-                }
-                .into()));
-            }
         };
-        if point.point != address.point {
+        Ctx::T::fmap(cast_resolved, point.resolve())
-            return Ctx::T::pure(Err(CastError::AddressPointMismatch {
-                expected: point.point,
-                received: address.point,
-                index: address.index,
-            }
-            .into()));
-        }
-        Ctx::T::fmap(
-            |resolved| match resolved {
-                Ok(mentionable) => {
-                    let resolver: Rc<dyn Resolver<'a, Ctx>> = Rc::new(CastResolver {
-                        points: mentionable.points_vec(),
-                    });
-                    Ok((mentionable.bytes(), resolver))
-                }
-                Err(error) => Err(match error {
-                    ResolutionError::Lookup(lookup_error) => lookup_error,
-                    ResolutionError::Parse(parse_error) => CastError::Typeless(parse_error).into(),
-                }),
-            },
-            point.resolve(),
-        )
     }
 }
 
@@ -116,9 +162,7 @@ where
     ) -> CastResult<'a, Ctx, A> {
         factory.parse_slice(
             &self.bytes(),
-            map_resolver(Rc::new(CastResolver {
+            map_resolver(CastResolver::rc(self.points_vec())),
-                points: self.points_vec(),
-            })),
         )
     }
 
@@ -128,15 +172,13 @@ where
     }
 }
 
-impl<'a, Ctx: Context> Point<'a, Ctx, TypelessMentionable<'a, Ctx>>
+fn cast_resolve<'a, Ctx: 'a + Context, A: Mentionable<'a, Ctx>>(
+    typeless_origin: Rc<dyn Origin<'a, Ctx, Mtbl = TypelessMentionable<'a, Ctx>>>,
+    factory: A::Fctr,
+) -> Resolution<'a, Ctx, A>
 where
     Ctx::LookupError<'a>: From<CastError<'a>>,
 {
-    /// See [`TypelessMentionable::cast`]
-    pub fn cast<A: Mentionable<'a, Ctx>>(&self, factory: A::Fctr) -> Point<'a, Ctx, A> {
-        let typeless_origin = self.origin.clone();
-        let origin: Rc<dyn Origin<Ctx, Mtbl = A>> = wrapped_origin(factory.clone(), move || {
-            let factory = factory.clone();
     Ctx::T::fmap(
         move |resolved| match resolved {
             Ok(typeless_mentionable) => match typeless_mentionable.cast(factory) {
@@ -145,17 +187,42 @@ where
             },
             Err(error) => Err(ResolutionError::Lookup(match error {
                 ResolutionError::Lookup(lookup_error) => lookup_error,
-                        ResolutionError::Parse(parse_error) => {
+                ResolutionError::Parse(parse_error) => CastError::Typeless(parse_error).into(),
-                            CastError::Typeless(parse_error).into()
-                        }
             })),
         },
         typeless_origin.clone().resolve(),
     )
-        });
+}
+
+fn cast_origin<'a, Ctx: 'a + Context, A: Mentionable<'a, Ctx>>(
+    typeless_origin: Rc<dyn Origin<'a, Ctx, Mtbl = TypelessMentionable<'a, Ctx>>>,
+    factory: A::Fctr,
+) -> Rc<dyn Origin<'a, Ctx, Mtbl = A>>
+where
+    Ctx::LookupError<'a>: From<CastError<'a>>,
+{
+    wrapped_origin(factory.clone(), move || {
+        cast_resolve(typeless_origin.clone(), factory.clone())
+    })
+}
+
+impl<'a, Ctx: 'a + Context> Point<'a, Ctx, TypelessMentionable<'a, Ctx>>
+where
+    Ctx::LookupError<'a>: From<CastError<'a>>,
+{
+    fn cast_origin<A: Mentionable<'a, Ctx>>(
+        &self,
+        factory: A::Fctr,
+    ) -> Rc<dyn Origin<'a, Ctx, Mtbl = A>> {
+        let typeless_origin = self.origin.clone();
+        cast_origin(typeless_origin, factory)
+    }
+
+    /// See [`TypelessMentionable::cast`]
+    pub fn cast<A: Mentionable<'a, Ctx>>(&self, factory: A::Fctr) -> Point<'a, Ctx, A> {
         Point {
             point: self.point,
-            origin,
+            origin: self.cast_origin(factory),
         }
     }
 }