Reduced visibility of specialized expression parsers

Author: ngeor

rusty_parser/src/expr/binary_expression.rs

@@ -10,7 +10,7 @@ use crate::tokens::{TokenType, any_token};
 use crate::{ExpressionPos, ExpressionPosTrait, ExpressionTrait, Keyword, Operator};
 
 // result ::= <non-bin-expr> <operator> <expr>
-pub fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
+pub(super) fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
     non_bin_expr()
         .then_with_in_context(
             second_parser(),

rusty_parser/src/expr/built_in_function_call.rs

@@ -5,7 +5,7 @@ use crate::input::StringView;
 use crate::pc_specific::WithPos;
 use crate::{ExpressionPos, ParserError};
 
-pub fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
+pub(super) fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
     built_in_function_call_p().with_pos()
 }
 

rusty_parser/src/expr/function_call_or_array_element.rs

@@ -16,7 +16,7 @@ use crate::{Expression, ExpressionPos, Expressions, NameAsTokens, ParserError};
 //
 // A function can be qualified.
 
-pub fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
+pub(super) fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
     name_as_tokens_p()
         .and(
             in_parenthesis(csv(expression_pos_p()).or_default()),

rusty_parser/src/expr/guard.rs

@@ -8,7 +8,7 @@ use crate::tokens::{any_symbol_of, any_token_of};
 /// `result ::= " " | "("`
 ///
 /// The "(" will be undone.
-pub fn parser() -> impl Parser<StringView, Output = (), Error = ParserError> {
+pub(super) fn parser() -> impl Parser<StringView, Output = (), Error = ParserError> {
     whitespace_guard()
         .or(lparen_guard())
         .with_expected_message("Expected: '(' or whitespace")

rusty_parser/src/expr/integer_or_long_literal.rs

@@ -8,7 +8,7 @@ use crate::tokens::{TokenType, any_token_of};
 use crate::{Expression, ExpressionPos};
 
 // result ::= <digits> | <hex-digits> | <oct-digits>
-pub fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
+pub(super) fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
     any_token_of!(
         TokenType::Digits,
         TokenType::HexDigits,

rusty_parser/src/expr/parenthesis.rs

@@ -5,7 +5,7 @@ use crate::input::StringView;
 use crate::pc_specific::{OrExpected, WithPos, in_parenthesis};
 use crate::{Expression, ExpressionPos, ParserError};
 
-pub fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
+pub(super) fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
     in_parenthesis(expression_pos_p().or_expected("expression inside parenthesis"))
         .map(|child| Expression::Parenthesis(Box::new(child)))
         .with_pos()

rusty_parser/src/expr/single_or_double_literal.rs

@@ -12,7 +12,7 @@ use crate::{Expression, ExpressionPos, ParserError};
 
 // TODO support more qualifiers besides '#'
 
-pub fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
+pub(super) fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
     // read integer digits optionally (might start with . e.g. `.123`)
     digits()
         .to_option()

rusty_parser/src/expr/string_literal.rs

@@ -6,7 +6,7 @@ use crate::pc_specific::*;
 use crate::tokens::{MatchMode, TokenType, any_symbol_of, any_token_of};
 use crate::{Expression, ExpressionPos, ParserError};
 
-pub fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
+pub(super) fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
     surround(
         string_delimiter(),
         inside_string(),

rusty_parser/src/expr/unary_expression.rs

@@ -7,7 +7,7 @@ use crate::pc_specific::{OrExpected, WithPos, keyword};
 use crate::tokens::minus_sign;
 use crate::{ExpressionPos, ExpressionPosTrait, Keyword, ParserError, UnaryOperator};
 
-pub fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
+pub(super) fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
     seq2(
         unary_op(),
         expression_pos_p().or_expected("expression after unary operator"),

rusty_parser/src/expr/variable.rs

@@ -1,4 +1,3 @@
-// TODO consider nesting variable/function_call modules inside property as they are only used there
 use std::collections::VecDeque;
 
 use rusty_pc::*;
@@ -17,7 +16,7 @@ use crate::{
 // must not be followed by parenthesis (solved by ordering of parsers)
 //
 // if <identifier-with-dots> contains dots, it might be converted to a property expression
-pub fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
+pub(super) fn parser() -> impl Parser<StringView, Output = ExpressionPos, Error = ParserError> {
     name_as_tokens_p().map(map_to_expr).with_pos()
 }