(parser) ref: module organisation for visibility management

Author: t-webber

src/parser/display.rs

@@ -0,0 +1,28 @@
+//! Defines functions to display complex types, like options and vectors.
+
+use core::fmt;
+
+use crate::EMPTY;
+
+/// Displays the fullness, with `..` if the content is still pushable
+pub const fn repr_fullness(full: bool) -> &'static str {
+    if full { "" } else { ".." }
+}
+
+/// Displays an option with the [`EMPTY`] string.
+#[expect(clippy::ref_option)]
+pub fn repr_option<T: fmt::Display>(opt: &Option<T>) -> String {
+    opt.as_ref().map_or_else(|| EMPTY.to_owned(), T::to_string)
+}
+/// Displays an option with the [`EMPTY`] string.
+pub fn repr_option_vec<T: fmt::Display>(vec: &[Option<T>]) -> String {
+    vec.iter().map(repr_option).collect::<Vec<_>>().join(", ")
+}
+
+/// Displays a vector with the [`EMPTY`] string.
+pub fn repr_vec<T: fmt::Display>(vec: &[T]) -> String {
+    vec.iter()
+        .map(|node| format!("{node}"))
+        .collect::<Vec<_>>()
+        .join(", ")
+}

src/parser/keyword/attributes.rs

@@ -4,17 +4,14 @@
 
 use core::fmt;
 
-use super::Ast;
 use super::control_flow::traits::ControlFlow as _;
 use super::sort::PushInNode;
 use crate::lexer::api::Keyword;
 use crate::parser::modifiers::push::Push as _;
-use crate::parser::types::ListInitialiser;
-use crate::parser::types::binary::Binary;
-use crate::parser::types::braced_blocks::BracedBlock;
-use crate::parser::types::ternary::Ternary;
-use crate::parser::types::unary::Unary;
-use crate::parser::types::variable::Variable;
+use crate::parser::operators::api::{Binary, Ternary, Unary};
+use crate::parser::symbols::api::{BracedBlock, ListInitialiser};
+use crate::parser::tree::Ast;
+use crate::parser::variable::Variable;
 
 /// Defines the attribute keywords.
 macro_rules! define_attribute_keywords {

src/parser/keyword/control_flow/keyword.rs

@@ -5,9 +5,9 @@ use core::fmt;
 use super::node::ControlFlowNode;
 use super::traits::ControlFlow as _;
 use crate::parser::keyword::sort::PushInNode;
-use crate::parser::modifiers::ast::can_push::CanPush as _;
 use crate::parser::modifiers::push::Push as _;
-use crate::parser::types::Ast;
+use crate::parser::tree::Ast;
+use crate::parser::tree::api::CanPush as _;
 
 impl From<ControlFlowKeyword> for Ast {
     fn from(keyword: ControlFlowKeyword) -> Self {

src/parser/keyword/control_flow/node.rs

@@ -14,10 +14,10 @@ use super::types::parens_block::{ParensBlockCtrl, ParensBlockKeyword};
 use super::types::return_ctrl::ReturnCtrl;
 use super::types::semi_colon::{SemiColonCtrl, SemiColonKeyword};
 use super::types::typedef::TypedefCtrl;
-use crate::parser::modifiers::conversions::OperatorConversions;
 use crate::parser::modifiers::push::Push;
-use crate::parser::types::Ast;
-use crate::parser::types::braced_blocks::BracedBlock;
+use crate::parser::operators::api::OperatorConversions;
+use crate::parser::symbols::api::BracedBlock;
+use crate::parser::tree::Ast;
 
 /// Derives a method of a [`ControlFlow`] trait for [`ControlFlowNode`] by
 /// directly applying the method on the corresponding control flow.

src/parser/keyword/control_flow/pushable.rs

@@ -2,11 +2,11 @@
 
 use core::{fmt, panic};
 
-use super::node::ControlFlowNode;
-use super::traits::ControlFlow as _;
+use crate::parser::keyword::control_flow::node::ControlFlowNode;
+use crate::parser::keyword::control_flow::traits::ControlFlow as _;
 use crate::parser::keyword::sort::PushInNode;
-use crate::parser::types::Ast;
-use crate::parser::types::braced_blocks::BracedBlock;
+use crate::parser::symbols::api::BracedBlock;
+use crate::parser::tree::Ast;
 
 /// Keywords that must be pushed into an existing control flow
 #[derive(Debug)]

src/parser/keyword/control_flow/traits.rs

@@ -3,7 +3,7 @@
 use core::fmt;
 
 use crate::parser::modifiers::push::Push;
-use crate::parser::types::Ast;
+use crate::parser::tree::Ast;
 
 /// trait specifies the  methods that the control flows need to implement.
 pub trait ControlFlow: Push + fmt::Display {

src/parser/keyword/control_flow/types/case.rs

@@ -2,13 +2,13 @@
 
 use core::{fmt, mem};
 
+use crate::parser::display::repr_fullness;
 use crate::parser::keyword::control_flow::traits::ControlFlow;
 use crate::parser::keyword::control_flow::types::repr_colon_option;
-use crate::parser::modifiers::conversions::OperatorConversions;
 use crate::parser::modifiers::push::Push;
-use crate::parser::repr_fullness;
-use crate::parser::types::Ast;
-use crate::parser::types::braced_blocks::BracedBlock;
+use crate::parser::operators::api::OperatorConversions;
+use crate::parser::symbols::api::BracedBlock;
+use crate::parser::tree::Ast;
 
 /// Keyword expects a colon and a node: `case x: y`
 #[derive(Debug, Default)]

src/parser/keyword/control_flow/types/colon_ast.rs

@@ -2,14 +2,14 @@
 
 use core::{fmt, mem};
 
+use crate::parser::display::repr_fullness;
 use crate::parser::keyword::control_flow::node::ControlFlowNode;
 use crate::parser::keyword::control_flow::traits::ControlFlow;
 use crate::parser::keyword::control_flow::types::repr_colon_option;
-use crate::parser::modifiers::conversions::OperatorConversions;
 use crate::parser::modifiers::push::Push;
-use crate::parser::repr_fullness;
-use crate::parser::types::Ast;
-use crate::parser::types::braced_blocks::BracedBlock;
+use crate::parser::operators::api::OperatorConversions;
+use crate::parser::symbols::api::BracedBlock;
+use crate::parser::tree::Ast;
 
 /// Keyword expects a node and then a colon: `case 2:`
 #[derive(Debug)]

src/parser/keyword/control_flow/types/conditional.rs

@@ -2,16 +2,16 @@
 
 use core::fmt;
 
+use crate::parser::display::{repr_fullness, repr_option};
 use crate::parser::keyword::control_flow::node::{ControlFlowNode, try_push_semicolon_control};
 use crate::parser::keyword::control_flow::pushable::PushableKeyword;
 use crate::parser::keyword::control_flow::traits::ControlFlow;
 use crate::parser::keyword::sort::PushInNode as _;
-use crate::parser::modifiers::ast::can_push::AstPushContext;
-use crate::parser::modifiers::conversions::OperatorConversions;
 use crate::parser::modifiers::push::Push;
-use crate::parser::types::Ast;
-use crate::parser::types::parens::ParensBlock;
-use crate::parser::{repr_fullness, repr_option};
+use crate::parser::operators::api::OperatorConversions;
+use crate::parser::symbols::api::ParensBlock;
+use crate::parser::tree::Ast;
+use crate::parser::tree::api::AstPushContext;
 
 /// `if` keyword
 #[derive(Debug, Default)]

src/parser/keyword/control_flow/types/do_while.rs

@@ -2,14 +2,13 @@
 
 use core::{fmt, mem};
 
+use crate::parser::display::repr_option;
 use crate::parser::keyword::control_flow::node::{ControlFlowNode, try_push_semicolon_control};
 use crate::parser::keyword::control_flow::traits::ControlFlow;
-use crate::parser::modifiers::conversions::OperatorConversions;
 use crate::parser::modifiers::push::Push;
-use crate::parser::repr_option;
-use crate::parser::types::Ast;
-use crate::parser::types::braced_blocks::BracedBlock;
-use crate::parser::types::parens::ParensBlock;
+use crate::parser::operators::api::OperatorConversions;
+use crate::parser::symbols::api::{BracedBlock, ParensBlock};
+use crate::parser::tree::Ast;
 
 /// `do` keyword
 #[derive(Debug, Default)]