Diffstat (limited to 'src/protocol/visitor/sequence.rs')
| -rw-r--r-- | src/protocol/visitor/sequence.rs | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/protocol/visitor/sequence.rs b/src/protocol/visitor/sequence.rs index d1b16d9..47ea03e 100644 --- a/src/protocol/visitor/sequence.rs +++ b/src/protocol/visitor/sequence.rs @@ -1,34 +1,35 @@ use crate::{ nameable, - protocol::{walker::HintMeta, ControlFlowFor, Effect, SyncEffect, Visitor}, + protocol::{walker::HintMeta, ControlFlowFor, Effect, SyncEffect, Visitor, any_t}, + hkt::hkt }; -pub trait Sequence<'a, 'ctx: 'a, E: Effect<'ctx> = SyncEffect> { - fn visit( +pub trait Sequence<'ctx, E: Effect<'ctx> = SyncEffect> { + fn visit<'a>( &'a mut self, - scope: &'a mut dyn for<'b> SequenceScope<'b, 'ctx, E>, - ) -> ControlFlowFor<'a, 'ctx, E>; + scope: &'a mut dyn SequenceScope<'ctx, E>, + ) -> ControlFlowFor<'a, 'ctx, E> where 'ctx: 'a; } nameable! { - pub struct Name['a, 'ctx: 'a, E]; + pub struct Name['a, 'ctx, E]; - impl [E] for dyn Sequence<'a, 'ctx, E> + 'a where { - E: Effect<'ctx>, + impl [E] for dyn Sequence<'ctx, E> + 'a where { + E: Effect<'ctx> + Effect<'ctx, Status>, 'ctx: 'a } - impl [E] where dyn Sequence<'a, 'ctx, E> + 'a { - E: Effect<'ctx>, + impl [E] where dyn Sequence<'ctx, E> + 'a { + E: Effect<'ctx> + Effect<'ctx, Status>, 'ctx: 'a } } -pub trait SequenceScope<'a, 'ctx: 'a, E = SyncEffect> +pub trait SequenceScope<'ctx, E = SyncEffect> where E: Effect<'ctx> + Effect<'ctx, Status>, { - fn next(&'a mut self, visitor: Visitor<'a, 'ctx, E>) -> ControlFlowFor<'a, 'ctx, E, Status>; + fn next<'a>(&'a mut self, visitor: Visitor<'a, 'ctx, E>) -> ControlFlowFor<'a, 'ctx, E, Status> where 'ctx: 'a; } #[derive(PartialEq, Eq, PartialOrd, Ord, Copy, Clone, Debug)] @@ -37,6 +38,8 @@ pub enum Status { Continue, } +hkt!((any_t): for<'a, 'ctx> pub KnownHkt => Known); + #[derive(Default)] pub struct Known { pub len: (usize, Option<usize>), @@ -46,8 +49,8 @@ pub struct Hint { pub len: (usize, Option<usize>), } -impl<'a, 'ctx: 'a, E: Effect<'ctx>> HintMeta<'a, 'ctx> for dyn Sequence<'a, 'ctx, E> + '_ { - type Known = Known; +impl<'a, 'ctx: 'a, E: Effect<'ctx>> HintMeta<'ctx> for dyn Sequence<'ctx, E> + '_ { + type KnownHkt = KnownHkt<'ctx>; type Hint = Hint; } |