Fix cascade_fn! (#12)

Cargo.toml

@@ -1,7 +1,7 @@
 workspace = { members = ["procs"] }
 [package]
 name = "statecs"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src/system.rs

@@ -11,7 +11,7 @@ macro_rules! chain {
  |x| {$first(x)}
  };
  [$first:expr, $($exprs:expr),* $(,)?] => {
- |x| {(chain![$($exprs),*])($first(x))}
+ |x| { let x = $first(x); $(let x = $exprs(x);)* x}
  };
 }
 

src/tuple_proc.rs

@@ -16,18 +16,25 @@ pub trait IntoTupleProcessor<IType, OType, _M> {
 
 #[macro_export]
 macro_rules! cascade {
- ($val:expr => $expr:expr) => {
+ ($val:expr => $expr:expr) => {{
+ use $crate::IntoTupleProcessor;
  $expr.into_tuple_processor().cascade($val)
- };
+ }};
 }
 
 #[macro_export]
 macro_rules! cascade_fn {
- (ref $expr:expr) => {
- |x| cascade!(x => $expr)
+ (once $expr:expr) => {
+ {
+ let __e = $expr;
+ move |x| { $crate::cascade!(x => __e) }
+ }
  };
  ($expr:expr) => {
- move |x| cascade!(x => $expr)
+ {
+ let mut __e = $expr;
+ move |x| { $crate::cascade!(x => &mut __e) }
+ }
  };
 }