Moved or_expected into pc

Author: ngeor

rusty_parser/src/core/sub_call.rs

@@ -4,7 +4,6 @@ use rusty_pc::*;
 use crate::error::ParserError;
 use crate::expr::{csv_expressions_first_guarded, expression_pos_p, property};
 use crate::input::StringView;
-use crate::pc_specific::*;
 use crate::tokens::equal_sign_ws;
 use crate::*;
 

rusty_parser/src/expr/binary_expression.rs

@@ -5,7 +5,7 @@ use rusty_pc::*;
 use crate::error::ParserError;
 use crate::expr::{expression_pos_p, ws_expr_pos_p};
 use crate::input::StringView;
-use crate::pc_specific::{OrExpected, WithPos, lead_opt_ws, lead_ws};
+use crate::pc_specific::{WithPos, lead_opt_ws, lead_ws};
 use crate::tokens::{TokenType, any_token};
 use crate::{ExpressionPos, ExpressionPosTrait, ExpressionTrait, Keyword, Operator};
 

rusty_parser/src/expr/parenthesis.rs

@@ -2,7 +2,7 @@ use rusty_pc::*;
 
 use crate::expr::expression_pos_p;
 use crate::input::StringView;
-use crate::pc_specific::{OrExpected, WithPos, in_parenthesis};
+use crate::pc_specific::{WithPos, in_parenthesis};
 use crate::{Expression, ExpressionPos, ParserError};
 
 pub(super) fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {

rusty_parser/src/expr/parsers.rs

@@ -149,6 +149,6 @@ fn opt_keyword_expr(
     let msg = format!("expression after {}", keyword);
     conditionally_opt_whitespace()
         .and_keep_right(keyword_ignoring(keyword).no_context())
-        .and_keep_right(ws_expr_pos_p().or_expected(&msg).no_context())
+        .and_keep_right(ws_expr_pos_p().or_expected(msg).no_context())
         .to_option()
 }

rusty_parser/src/expr/property.rs

@@ -4,7 +4,6 @@ use rusty_pc::*;
 use crate::core::{name_as_tokens_p, token_to_type_qualifier};
 use crate::error::ParserError;
 use crate::input::StringView;
-use crate::pc_specific::OrExpected;
 use crate::tokens::dot;
 use crate::{BareName, Expression, ExpressionPos, ExpressionType, Name, NameAsTokens};
 

rusty_parser/src/expr/unary_expression.rs

@@ -3,7 +3,7 @@ use rusty_pc::*;
 
 use crate::expr::{expression_pos_p, ws_expr_pos_p};
 use crate::input::StringView;
-use crate::pc_specific::{OrExpected, WithPos, keyword};
+use crate::pc_specific::{WithPos, keyword};
 use crate::tokens::minus_sign;
 use crate::{ExpressionPos, ExpressionPosTrait, Keyword, ParserError, UnaryOperator};
 

rusty_parser/src/pc_specific/csv.rs

@@ -2,7 +2,6 @@ use rusty_pc::*;
 
 use crate::error::ParserError;
 use crate::input::StringView;
-use crate::pc_specific::OrExpected;
 use crate::tokens::comma_ws;
 
 /// Comma separated list of items.

rusty_parser/src/pc_specific/mod.rs

@@ -7,13 +7,11 @@ mod whitespace;
 #[cfg(debug_assertions)]
 pub mod logging;
 
-mod or_expected;
 mod with_pos;
 
 pub use self::csv::*;
 pub use self::in_parenthesis::*;
 pub use self::keyword::*;
 pub use self::keyword_map::*;
-pub use self::or_expected::*;
 pub use self::whitespace::*;
 pub use self::with_pos::*;

rusty_parser/src/pc_specific/or_expected.rs

@@ -320,7 +320,9 @@ where
 
     /// If this parser returns a soft error, the soft error will be replaced
     /// by transforming the given message into an error.
+    ///
     /// The parameter will be converted with the standard `From` trait.
+    /// It is expected that the conversion returns a soft error.
     fn with_expected_message<E>(self, msg: E) -> MapSoftErrParser<Self, Self::Error>
     where
         Self: Sized,
@@ -339,6 +341,19 @@ where
         self.with_soft_err(err)
     }
 
+    /// Converts the soft errors of this parser to fatal errors
+    /// based on the given error message.
+    ///
+    /// The message parameter will be converted with the standard `From` trait.
+    /// The resulting error is converted into a fatal one.
+    fn or_expected<E>(self, msg: E) -> MapSoftErrParser<Self, Self::Error>
+    where
+        Self: Sized,
+        Self::Error: From<E>,
+    {
+        self.with_soft_err(Self::Error::from(msg).to_fatal())
+    }
+
     // =======================================================================
     // NoContext
     // =======================================================================