Restructure modules

src/lib.rs

@@ -1,15 +1 @@
-pub mod attributes;
+pub mod parser;
-pub mod blocks;
-pub mod comments;
-pub mod concatenations;
-pub mod continuous_assignments;
-pub mod expressions;
-pub mod identifiers;
-pub mod lvalues;
-pub mod numbers;
-pub mod operators;
-pub mod primaries;
-pub mod proceduals;
-pub mod strings;
-pub mod subroutine_calls;
-pub mod utils;

src/parser.rs

@@ -0,0 +1,8 @@
+pub mod behavioral_statements;
+pub mod expressions;
+pub mod general;
+pub mod utils;
+pub use behavioral_statements::*;
+pub use expressions::*;
+pub use general::*;
+pub use utils::*;

src/parser/behavioral_statements/continuous_assignment_and_net_alias_statements.rs

@@ -1,7 +1,4 @@
-use crate::expressions::*;
+use crate::parser::*;
-use crate::lvalues::*;
-use crate::proceduals::*;
-use crate::utils::*;
 use nom::branch::*;
 use nom::combinator::*;
 use nom::multi::*;

src/parser/behavioral_statements/mod.rs

@@ -0,0 +1,6 @@
+pub mod continuous_assignment_and_net_alias_statements;
+pub mod parallel_and_sequential_blocks;
+pub mod procedual_blocks_and_assignments;
+pub use continuous_assignment_and_net_alias_statements::*;
+pub use parallel_and_sequential_blocks::*;
+pub use procedual_blocks_and_assignments::*;

src/parser/behavioral_statements/parallel_and_sequential_blocks.rs

@@ -1,5 +1,4 @@
-use crate::identifiers::*;
+use crate::parser::*;
-use crate::utils::*;
 use nom::branch::*;
 use nom::combinator::*;
 use nom::multi::*;

src/parser/behavioral_statements/procedual_blocks_and_assignments.rs

@@ -1,10 +1,4 @@
-use crate::continuous_assignments::*;
+use crate::parser::*;
-use crate::expressions::*;
-use crate::identifiers::*;
-use crate::lvalues::*;
-use crate::operators::*;
-use crate::primaries::*;
-use crate::utils::*;
 use nom::branch::*;
 use nom::combinator::*;
 use nom::sequence::*;

src/parser/expressions/concatenations.rs

@@ -1,5 +1,4 @@
-use crate::expressions::*;
+use crate::parser::*;
-use crate::utils::*;
 use nom::branch::*;
 use nom::combinator::*;
 use nom::multi::*;

src/parser/expressions/expression_leftside_values.rs

@@ -1,7 +1,4 @@
-use crate::concatenations::*;
+use crate::parser::*;
-use crate::identifiers::*;
-use crate::primaries::*;
-use crate::utils::*;
 use nom::branch::*;
 use nom::combinator::*;
 use nom::multi::*;

src/parser/expressions/expressions.rs

@@ -1,10 +1,4 @@
-use crate::attributes::*;
+use crate::parser::*;
-use crate::identifiers::*;
-use crate::lvalues::*;
-use crate::operators::*;
-use crate::primaries::*;
-use crate::proceduals::*;
-use crate::utils::*;
 use nom::branch::*;
 use nom::combinator::*;
 use nom::multi::*;

src/parser/expressions/mod.rs

@@ -0,0 +1,16 @@
+pub mod concatenations;
+pub mod expression_leftside_values;
+pub mod expressions;
+pub mod numbers;
+pub mod operators;
+pub mod primaries;
+pub mod strings;
+pub mod subroutine_calls;
+pub use concatenations::*;
+pub use expression_leftside_values::*;
+pub use expressions::*;
+pub use numbers::*;
+pub use operators::*;
+pub use primaries::*;
+pub use strings::*;
+pub use subroutine_calls::*;

src/parser/expressions/numbers.rs

@@ -1,4 +1,4 @@
-use crate::utils::*;
+use crate::parser::*;
 use nom::branch::*;
 use nom::bytes::complete::*;
 use nom::character::complete::*;

src/parser/expressions/operators.rs

@@ -1,4 +1,4 @@
-use crate::utils::*;
+use crate::parser::*;
 use nom::branch::*;
 use nom::IResult;
 

src/parser/expressions/primaries.rs

@@ -1,10 +1,4 @@
-use crate::concatenations::*;
+use crate::parser::*;
-use crate::expressions::*;
-use crate::identifiers::*;
-use crate::numbers::*;
-use crate::strings::*;
-use crate::subroutine_calls::*;
-use crate::utils::*;
 use nom::branch::*;
 use nom::combinator::*;
 use nom::multi::*;

src/parser/expressions/strings.rs

@@ -1,4 +1,4 @@
-use crate::utils::*;
+use crate::parser::*;
 use nom::bytes::complete::*;
 use nom::combinator::*;
 use nom::multi::*;

src/parser/expressions/subroutine_calls.rs

@@ -1,8 +1,4 @@
-use crate::attributes::*;
+use crate::parser::*;
-use crate::expressions::*;
-use crate::identifiers::*;
-use crate::primaries::*;
-use crate::utils::*;
 use nom::branch::*;
 use nom::combinator::*;
 use nom::multi::*;

src/parser/general/attributes.rs

@@ -1,6 +1,4 @@
-use crate::expressions::*;
+use crate::parser::*;
-use crate::identifiers::*;
-use crate::utils::*;
 use nom::combinator::*;
 use nom::multi::*;
 use nom::sequence::*;

src/parser/general/identifiers.rs

@@ -1,6 +1,4 @@
-use crate::expressions::*;
+use crate::parser::*;
-use crate::primaries::*;
-use crate::utils::*;
 use nom::branch::*;
 use nom::bytes::complete::*;
 use nom::combinator::*;

src/parser/general/mod.rs

@@ -0,0 +1,6 @@
+pub mod attributes;
+pub mod comments;
+pub mod identifiers;
+pub use attributes::*;
+pub use comments::*;
+pub use identifiers::*;

src/parser/utils.rs

@@ -1,4 +1,4 @@
-use crate::identifiers::*;
+use crate::parser::*;
 use nom::bytes::complete::*;
 use nom::character::complete::*;
 use nom::IResult;