From 138f6f2d2475f97856f638deb9d38ac0d298aa33 Mon Sep 17 00:00:00 2001
From: timofey <tim@ongoteam.yaconnect.com>
Date: Sun, 30 Jul 2023 19:09:51 +0000
Subject: [PATCH] `mode::regular`

---
 src/mode.rs         |  5 ++-
 src/mode/regular.rs | 75 +++++++++++++++++++++++++++++++++++++++++++++
 src/rcore.rs        |  2 +-
 src/rcore/modes.rs  | 71 ------------------------------------------
 4 files changed, 80 insertions(+), 73 deletions(-)
 create mode 100644 src/mode/regular.rs

diff --git a/src/mode.rs b/src/mode.rs
index 15247c4..4c6fb23 100644
--- a/src/mode.rs
+++ b/src/mode.rs
@@ -1,5 +1,9 @@
+mod regular;
+
 use std::marker::PhantomData;
 
+pub use self::regular::RegularMode;
+
 /// See [`ModeResult`].
 pub type ParseSuccess<M, A, I> = <M as Mode>::ParseSuccess<A, I>;
 
@@ -23,7 +27,6 @@ pub type ModeResult<M, A, E, I> = Result<ParseSuccess<M, A, I>, E>;
 /// | [`RegularMode`]  | `A`                          | [`Result<A, E>`]                | `A`                          |
 /// | [`InliningMode`] | [`(A, I)`]                   | `E`                             | [`()`]                       |
 ///
-/// [`RegularMode`]: crate::rcore::RegularMode
 /// [`InliningMode`]: crate::rstd::inlining::InliningMode
 /// [`(A, I)`]: tuple
 /// [`()`]: unit
diff --git a/src/mode/regular.rs b/src/mode/regular.rs
new file mode 100644
index 0000000..4d242d1
--- /dev/null
+++ b/src/mode/regular.rs
@@ -0,0 +1,75 @@
+use super::*;
+
+/// [`Mode`] for [`RegularFactory`] and [`RegularAtomic`].
+///
+/// [`RegularFactory`]: crate::rcore::RegularFactory
+/// [`RegularAtomic`]: crate::rstd::atomic::RegularAtomic
+pub struct RegularMode;
+
+impl Mode for RegularMode {
+    /// Discards the parser.
+    type ParseSuccess<A, I> = A;
+
+    /// Tries to extend the value.
+    type ExtensionResult<A, E> = Result<A, E>;
+
+    /// Keeps the value.
+    type ExtensionSource<A> = A;
+
+    fn bind<A0, A1, E, I>(
+        s: Self::ParseSuccess<A0, I>,
+        f: impl FnOnce(A0) -> Result<A1, E>,
+    ) -> ModeResult<Self, A1, E, I> {
+        f(s)
+    }
+
+    fn map<A0, A1, I>(
+        s: Self::ParseSuccess<A0, I>,
+        f: impl FnOnce(A0) -> A1,
+    ) -> Self::ParseSuccess<A1, I> {
+        f(s)
+    }
+
+    fn seal<A, I>(s: Self::ParseSuccess<A, I>) -> A {
+        s
+    }
+
+    fn xmap_err<A, E0, E1>(
+        result: Self::ExtensionResult<A, E0>,
+        f: impl FnOnce(E0) -> E1,
+    ) -> Self::ExtensionResult<A, E1> {
+        result.map_err(f)
+    }
+
+    fn xbind<A0, A1, E>(
+        result: Self::ExtensionResult<A0, E>,
+        f: impl FnOnce(A0) -> Result<A1, E>,
+    ) -> Self::ExtensionResult<A1, E> {
+        result.and_then(f)
+    }
+
+    fn xseal<A, E>(result: Self::ExtensionResult<A, E>) -> Result<A, E> {
+        result
+    }
+
+    fn smap<A0, A1>(
+        source: Self::ExtensionSource<A0>,
+        f: impl FnOnce(A0) -> A1,
+    ) -> Self::ExtensionSource<A1> {
+        f(source)
+    }
+
+    fn prepare<A>(a: A) -> Self::ExtensionSource<A> {
+        a
+    }
+
+    fn xsbind<AB, A, B, E>(
+        ab: Self::ExtensionSource<AB>,
+        t2ab: impl FnOnce(AB) -> (A, B),
+        ce: impl FnOnce(Self::ExtensionSource<B>) -> Self::ExtensionResult<B, E>,
+        ab2t: impl FnOnce(A, B) -> Result<AB, E>,
+    ) -> Self::ExtensionResult<AB, E> {
+        let (b, c) = t2ab(ab);
+        ab2t(b, ce(c)?)
+    }
+}
diff --git a/src/rcore.rs b/src/rcore.rs
index 45bea6b..4af7999 100644
--- a/src/rcore.rs
+++ b/src/rcore.rs
@@ -35,7 +35,7 @@ pub use self::inctx::InCtx;
 pub use self::inlining::{Inlining, InliningExt, InliningResultExt};
 pub use self::modes::{
     CRegularFactory, ExtensionResultM, ExtensionSourceM, FactoryModeParse, FactoryModeProxy,
-    ModeResultM, RegularFactory, RegularMode,
+    ModeResultM, RegularFactory,
 };
 pub use self::origin::{OFctr, Origin};
 pub use self::point::Point;
diff --git a/src/rcore/modes.rs b/src/rcore/modes.rs
index c74c7d6..7a5c8aa 100644
--- a/src/rcore/modes.rs
+++ b/src/rcore/modes.rs
@@ -73,77 +73,6 @@ where
     }
 }
 
-/// [`Mode`] for [`RegularFactory`].
-pub struct RegularMode;
-
-impl Mode for RegularMode {
-    /// Discards the parser.
-    type ParseSuccess<A, I> = A;
-
-    /// Tries to extend the value.
-    type ExtensionResult<A, E> = Result<A, E>;
-
-    /// Keeps the value.
-    type ExtensionSource<A> = A;
-
-    fn bind<A0, A1, E, I>(
-        s: Self::ParseSuccess<A0, I>,
-        f: impl FnOnce(A0) -> Result<A1, E>,
-    ) -> ModeResult<Self, A1, E, I> {
-        f(s)
-    }
-
-    fn map<A0, A1, I>(
-        s: Self::ParseSuccess<A0, I>,
-        f: impl FnOnce(A0) -> A1,
-    ) -> Self::ParseSuccess<A1, I> {
-        f(s)
-    }
-
-    fn seal<A, I>(s: Self::ParseSuccess<A, I>) -> A {
-        s
-    }
-
-    fn xmap_err<A, E0, E1>(
-        result: Self::ExtensionResult<A, E0>,
-        f: impl FnOnce(E0) -> E1,
-    ) -> Self::ExtensionResult<A, E1> {
-        result.map_err(f)
-    }
-
-    fn xbind<A0, A1, E>(
-        result: Self::ExtensionResult<A0, E>,
-        f: impl FnOnce(A0) -> Result<A1, E>,
-    ) -> Self::ExtensionResult<A1, E> {
-        result.and_then(f)
-    }
-
-    fn xseal<A, E>(result: Self::ExtensionResult<A, E>) -> Result<A, E> {
-        result
-    }
-
-    fn smap<A0, A1>(
-        source: Self::ExtensionSource<A0>,
-        f: impl FnOnce(A0) -> A1,
-    ) -> Self::ExtensionSource<A1> {
-        f(source)
-    }
-
-    fn prepare<A>(a: A) -> Self::ExtensionSource<A> {
-        a
-    }
-
-    fn xsbind<AB, A, B, E>(
-        ab: Self::ExtensionSource<AB>,
-        t2ab: impl FnOnce(AB) -> (A, B),
-        ce: impl FnOnce(Self::ExtensionSource<B>) -> Self::ExtensionResult<B, E>,
-        ab2t: impl FnOnce(A, B) -> Result<AB, E>,
-    ) -> Self::ExtensionResult<AB, E> {
-        let (b, c) = t2ab(ab);
-        ab2t(b, ce(c)?)
-    }
-}
-
 /// For auto-deriving [`RegularFactory`] from concrete implementations.
 pub trait CRegularFactory<'a, Ctx: Context<'a>>:
     FactoryBase<'a, Ctx> + ImplMode<Mode = RegularMode>