refactor: Renamed chain to then_with

Author: ngeor

rusty_parser/src/pc/mod.rs

@@ -4,7 +4,6 @@ mod and;
 mod and_without_undo;
 mod any;
 pub mod boxed;
-mod chain;
 mod delimited;
 mod filter;
 mod filter_map;
@@ -26,13 +25,13 @@ mod row_col_view;
 mod seq;
 mod string_view;
 pub mod supplier;
+mod then_with;
 mod to_option;
 mod tokenizers;
 
 pub use and::*;
 pub use and_without_undo::AndWithoutUndo;
 pub use any::*;
-pub use chain::*;
 pub use delimited::*;
 pub use filter::Filter;
 pub use filter_map::FilterMap;
@@ -49,5 +48,6 @@ pub use parse_result::*;
 pub use parsers::*;
 pub use seq::*;
 pub use string_view::RcStringView;
+pub use then_with::*;
 pub use to_option::ToOption;
 pub use tokenizers::*;

rusty_parser/src/pc/chain.rs rusty_parser/src/pc/then_with.rsrusty_parser/src/pc/chain.rs renamed to rusty_parser/src/pc/then_with.rs

@@ -1,28 +1,32 @@
 use crate::error::ParseError;
 use crate::pc::{ParseResult, ParseResultTrait, Parser};
 
-pub trait Chain<I>: Parser<I>
+/// Similar to `and_without_undo`, but the right parser is created dynamically
+/// based on the result of the first parser.
+pub trait ThenWith<I>: Parser<I>
 where
     Self: Sized,
 {
-    fn chain<RF, R, F, O>(self, right_factory: RF, combiner: F) -> impl Parser<I, Output = O>
+    /// Similar to `and_without_undo`, but the right parser is created dynamically
+    /// based on the result of the first parser.
+    fn then_with<RF, R, F, O>(self, right_factory: RF, combiner: F) -> impl Parser<I, Output = O>
     where
         RF: Fn(&Self::Output) -> R,
         R: Parser<I>,
         F: Fn(Self::Output, R::Output) -> O,
     {
-        ChainParser::new(self, right_factory, combiner)
+        ThenWithParser::new(self, right_factory, combiner)
     }
 }
 
-impl<I, P> Chain<I> for P where P: Parser<I> {}
+impl<I, P> ThenWith<I> for P where P: Parser<I> {}
 
-struct ChainParser<L, R, F> {
+struct ThenWithParser<L, R, F> {
     left: L,
     right: R,
     combiner: F,
 }
-impl<L, R, F> ChainParser<L, R, F> {
+impl<L, R, F> ThenWithParser<L, R, F> {
     pub fn new(left: L, right: R, combiner: F) -> Self {
         Self {
             left,
@@ -32,7 +36,7 @@ impl<L, R, F> ChainParser<L, R, F> {
     }
 }
 
-impl<I, L, RF, R, F, O> Parser<I> for ChainParser<L, RF, F>
+impl<I, L, RF, R, F, O> Parser<I> for ThenWithParser<L, RF, F>
 where
     L: Parser<I>,
     RF: Fn(&L::Output) -> R,

rusty_parser/src/specific/core/expression.rs

@@ -542,7 +542,7 @@ fn preceded_by_ws(
 fn followed_by_ws(
     parser: impl Parser<RcStringView, Output = ExpressionPos>,
 ) -> impl Parser<RcStringView, Output = ExpressionPos> {
-    parser.chain(
+    parser.then_with(
         |expr_pos| {
             let is_paren = expr_pos.is_parenthesis();
             conditionally_opt_whitespace(is_paren).no_incomplete()

rusty_parser/src/specific/core/opt_second_expression.rs

@@ -1,6 +1,8 @@
 use crate::error::ParseError;
 use crate::pc::boxed::boxed;
-use crate::pc::{And, AndWithoutUndo, Chain, Errors, Map, Parser, RcStringView, ToOption, Token};
+use crate::pc::{
+    And, AndWithoutUndo, Errors, Map, Parser, RcStringView, ThenWith, ToOption, Token,
+};
 use crate::specific::core::expression::ws_expr_pos_p;
 use crate::specific::pc_specific::{keyword, opt_whitespace, whitespace};
 use crate::specific::{ExpressionPos, Keyword};
@@ -20,7 +22,7 @@ where
     P: Parser<RcStringView>,
     F: Fn(&P::Output) -> bool,
 {
-    first_parser.chain(
+    first_parser.then_with(
         move |first| {
             let is_paren = is_first_wrapped_in_parenthesis(&first);
             parse_second(keyword, is_paren).to_option()

rusty_parser/src/specific/core/var_name.rs

@@ -111,7 +111,7 @@ where
     T: Clone + Default + VarType + CreateArray<ArrayDimensions = A> + 'static,
     P: Parser<RcStringView, Output = T> + 'static,
 {
-    Seq2::new(name_with_dots(), array_p).chain(
+    Seq2::new(name_with_dots(), array_p).then_with(
         move |(name, _)| name_chain(name, built_in_extended_factory),
         |(name, array), var_type| {
             let bare_name: BareName = name.to_bare_name();