chore(pc): Moved IifParser to its own module and renamed to IifCtxParser

Author: ngeor

rusty_parser/src/core/print.rs

@@ -161,7 +161,7 @@ fn print_args_parser() -> impl Parser<StringView, Output = Vec<PrintArg>, Error
 }
 
 fn print_arg_parser() -> impl Parser<StringView, bool, Output = PrintArg, Error = ParserError> {
-    IifParser::new(delimiter_print_arg(), any_print_arg())
+    IifCtxParser::new(delimiter_print_arg(), any_print_arg())
 }
 
 fn any_print_arg() -> impl Parser<StringView, Output = PrintArg, Error = ParserError> {

rusty_parser/src/expr/binary_expression.rs

@@ -44,7 +44,7 @@ fn is_keyword_op(op: &Positioned<Operator>) -> bool {
 fn expr_after_binary_operator()
 -> impl Parser<StringView, bool, Output = ExpressionPos, Error = ParserError> {
     // boxed breaks apart the recursive type evaluation
-    IifParser::new(
+    IifCtxParser::new(
         // the previous operator is a keyword op, must have whitespace or parenthesis
         ws_expr_pos_p().boxed(),
         // the previous operator is a symbol, whitespace is optional
@@ -71,7 +71,7 @@ fn non_bin_expr() -> impl Parser<StringView, Output = ExpressionPos, Error = Par
 /// parenthesis. If that is the case, leading whitespace is not required for
 /// keyword based operators.
 fn operator() -> impl Parser<StringView, bool, Output = Positioned<Operator>, Error = ParserError> {
-    IifParser::new(
+    IifCtxParser::new(
         // no whitespace needed
         lead_opt_ws(operator_p()),
         // whitespace needed

rusty_parser/src/pc_specific/whitespace.rs

@@ -1,4 +1,4 @@
-use rusty_pc::{IifParser, Parser, SurroundMode, surround};
+use rusty_pc::{IifCtxParser, Parser, SurroundMode, surround};
 
 use crate::ParserError;
 use crate::input::StringView;
@@ -84,7 +84,7 @@ where
 /// * `1 + 2AND` the lack of whitespace before `AND` is an error
 pub fn conditionally_opt_whitespace()
 -> impl Parser<StringView, bool, Output = (), Error = ParserError> {
-    IifParser::new(
+    IifCtxParser::new(
         // allow none
         opt_ws(),
         // whitespace is required

rusty_pc/src/ctx.rs

@@ -44,41 +44,3 @@ where
         self.0 = Some(ctx.clone());
     }
 }
-/// Based on the boolean context, parses using the left or the right parser.
-pub struct IifParser<L, R> {
-    left: L,
-    right: R,
-    context: bool,
-}
-
-impl<L, R> IifParser<L, R> {
-    pub fn new(left: L, right: R) -> Self {
-        Self {
-            left,
-            right,
-            context: false,
-        }
-    }
-}
-
-impl<L, R, I> Parser<I, bool> for IifParser<L, R>
-where
-    I: InputTrait,
-    L: Parser<I>,
-    R: Parser<I, Output = L::Output, Error = L::Error>,
-{
-    type Output = L::Output;
-    type Error = L::Error;
-
-    fn parse(&mut self, input: &mut I) -> Result<Self::Output, Self::Error> {
-        if self.context {
-            self.left.parse(input)
-        } else {
-            self.right.parse(input)
-        }
-    }
-
-    fn set_context(&mut self, ctx: &bool) {
-        self.context = *ctx;
-    }
-}

rusty_pc/src/iif_ctx.rs

@@ -0,0 +1,45 @@
+use crate::{InputTrait, Parser};
+
+/// Based on the boolean context, parses using the left or the right parser.
+pub struct IifCtxParser<L, R> {
+    left: L,
+    right: R,
+    context: bool,
+}
+
+impl<L, R> IifCtxParser<L, R> {
+    pub fn new<I>(left: L, right: R) -> Self
+    where
+        I: InputTrait,
+        L: Parser<I>,
+        R: Parser<I, Output = L::Output, Error = L::Error>,
+    {
+        Self {
+            left,
+            right,
+            context: false,
+        }
+    }
+}
+
+impl<L, R, I> Parser<I, bool> for IifCtxParser<L, R>
+where
+    I: InputTrait,
+    L: Parser<I>,
+    R: Parser<I, Output = L::Output, Error = L::Error>,
+{
+    type Output = L::Output;
+    type Error = L::Error;
+
+    fn parse(&mut self, input: &mut I) -> Result<Self::Output, Self::Error> {
+        if self.context {
+            self.left.parse(input)
+        } else {
+            self.right.parse(input)
+        }
+    }
+
+    fn set_context(&mut self, ctx: &bool) {
+        self.context = *ctx;
+    }
+}

rusty_pc/src/lib.rs

@@ -9,6 +9,7 @@ pub mod delimited;
 pub mod filter;
 pub mod filter_map;
 pub mod flatten;
+mod iif_ctx;
 mod lazy;
 pub mod many;
 pub mod many_ctx;
@@ -30,6 +31,7 @@ mod token;
 mod top_level;
 
 pub use ctx::*;
+pub use iif_ctx::*;
 pub use lazy::*;
 pub use or::*;
 pub use parser::*;