Leaving OPEN use seq6 for now

Author: ngeor

rusty_parser/src/built_ins/open.rs

@@ -34,8 +34,6 @@ pub fn parse() -> impl Parser<StringView, Output = Statement, Error = ParserErro
     seq6(
         keyword(Keyword::Open),
         ws_expr_pos_ws_p().or_expected("file name after OPEN"),
-        // keyword::For or Keyword::Access or Keyword::AS
-        // TODO merge the next 3 parsers altogether
         parse_open_mode_p().to_option(),
         parse_open_access_p().to_option(),
         parse_file_number_p().or_expected("AS file-number"),

rusty_parser/src/expr/parsers.rs

@@ -6,6 +6,11 @@ use crate::pc_specific::*;
 use crate::tokens::comma_ws;
 use crate::{ExpressionPos, ExpressionTrait, Expressions, Keyword, ParserError};
 
+/// Parses an expression.
+pub fn expression_pos_p() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
+    lazy(super::binary_expression::parser)
+}
+
 /// `( expr [, expr]* )`
 pub fn in_parenthesis_csv_expressions_non_opt(
     expectation: &str,
@@ -35,10 +40,6 @@ pub fn csv_expressions_first_guarded()
     )
 }
 
-pub fn expression_pos_p() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
-    lazy(eager_expression_pos_p)
-}
-
 /// Parses an expression that is either preceded by whitespace
 /// or is a parenthesis expression.
 ///
@@ -61,7 +62,6 @@ pub fn ws_expr_pos_p() -> impl Parser<StringView, Output = ExpressionPos, Error
 /// <ws> <expr-in-parenthesis> <ws> |
 /// <expr-in-parenthesis>
 /// ```
-#[deprecated]
 pub fn ws_expr_pos_ws_p() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
     followed_by_ws(ws_expr_pos_p())
 }
@@ -76,12 +76,6 @@ fn followed_by_ws(
     )
 }
 
-/// Parses an expression
-fn eager_expression_pos_p() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError>
-{
-    super::binary_expression::parser()
-}
-
 /// Parses an expression,
 /// then demands whitespace, unless the expression is a parenthesis.
 /// Finally it demands the given keyword.