Refactor expression module, rename files and imports for consistency …

…and clarity.
DaviRain-Su · Oct 23, 2023 · bab7840 · bab7840
1 parent b1240c7
commit bab7840
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 43 deletions.
diff --git a/src/ast/expression/array_literal.rs → src/ast/expression/array.rs b/src/ast/expression/array_literal.rs → src/ast/expression/array.rs
diff --git a/src/ast/expression/call_expression.rs → src/ast/expression/call.rs b/src/ast/expression/call_expression.rs → src/ast/expression/call.rs
diff --git a/src/ast/expression/function_literal.rs → src/ast/expression/function.rs b/src/ast/expression/function_literal.rs → src/ast/expression/function.rs
diff --git a/src/ast/expression/hash_literal.rs → src/ast/expression/hash.rs b/src/ast/expression/hash_literal.rs → src/ast/expression/hash.rs
diff --git a/src/ast/expression/if_expression.rs b/src/ast/expression/if_expression.rs
@@ -1,4 +1,4 @@
-use crate::ast::expression::integer_literal::IntegerLiteral;
+use crate::ast::expression::integer::IntegerLiteral;
 use crate::ast::expression::Expression;
 use crate::ast::statement::block::BlockStatement;
 use crate::ast::NodeInterface;

diff --git a/src/ast/expression/index_expression.rs → src/ast/expression/index.rs b/src/ast/expression/index_expression.rs → src/ast/expression/index.rs
diff --git a/src/ast/expression/infix_expression.rs → src/ast/expression/infix.rs b/src/ast/expression/infix_expression.rs → src/ast/expression/infix.rs
@@ -1,4 +1,4 @@
-use crate::ast::expression::integer_literal::IntegerLiteral;
+use crate::ast::expression::integer::IntegerLiteral;
 use crate::ast::expression::Expression;
 use crate::ast::statement::expression::ExpressionStatement;
 use crate::ast::NodeInterface;

diff --git a/src/ast/expression/integer_literal.rs → src/ast/expression/integer.rs b/src/ast/expression/integer_literal.rs → src/ast/expression/integer.rs
diff --git a/src/ast/expression/mod.rs b/src/ast/expression/mod.rs
@@ -1,29 +1,29 @@
-use crate::ast::expression::array_literal::ArrayLiteral;
+use crate::ast::expression::array::ArrayLiteral;
 use crate::ast::expression::boolean::Boolean;
-use crate::ast::expression::call_expression::Call;
-use crate::ast::expression::function_literal::FunctionLiteral;
-use crate::ast::expression::hash_literal::HashLiteral;
+use crate::ast::expression::call::Call;
+use crate::ast::expression::function::FunctionLiteral;
+use crate::ast::expression::hash::HashLiteral;
 use crate::ast::expression::if_expression::If;
-use crate::ast::expression::index_expression::Index;
-use crate::ast::expression::infix_expression::Infix;
-use crate::ast::expression::integer_literal::IntegerLiteral;
-use crate::ast::expression::prefix_expression::Prefix;
-use crate::ast::expression::string_literal::StringLiteral;
+use crate::ast::expression::index::Index;
+use crate::ast::expression::infix::Infix;
+use crate::ast::expression::integer::IntegerLiteral;
+use crate::ast::expression::prefix::Prefix;
+use crate::ast::expression::string::StringLiteral;
 use crate::ast::Identifier;
 use crate::ast::NodeInterface;
 use std::fmt::{Display, Formatter};
 
-pub mod array_literal;
+pub mod array;
 pub mod boolean;
-pub mod call_expression;
-pub mod function_literal;
-pub mod hash_literal;
+pub mod call;
+pub mod function;
+pub mod hash;
 pub mod if_expression;
-pub mod index_expression;
-pub mod infix_expression;
-pub mod integer_literal;
-pub mod prefix_expression;
-pub mod string_literal;
+pub mod index;
+pub mod infix;
+pub mod integer;
+pub mod prefix;
+pub mod string;
 
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
 pub enum Expression {

diff --git a/src/ast/expression/prefix_expression.rs → src/ast/expression/prefix.rs b/src/ast/expression/prefix_expression.rs → src/ast/expression/prefix.rs
@@ -1,4 +1,4 @@
-use crate::ast::expression::integer_literal::IntegerLiteral;
+use crate::ast::expression::integer::IntegerLiteral;
 use crate::ast::expression::Expression;
 use crate::ast::statement::expression::ExpressionStatement;
 use crate::ast::NodeInterface;

diff --git a/src/ast/expression/string_literal.rs → src/ast/expression/string.rs b/src/ast/expression/string_literal.rs → src/ast/expression/string.rs
diff --git a/src/ast/statement/expression.rs b/src/ast/statement/expression.rs
@@ -1,4 +1,4 @@
-use crate::ast::expression::integer_literal::IntegerLiteral;
+use crate::ast::expression::integer::IntegerLiteral;
 use crate::ast::expression::Expression;
 use crate::ast::statement::Statement;
 use crate::ast::NodeInterface;

diff --git a/src/ast/statement/let_statement.rs b/src/ast/statement/let_statement.rs
@@ -1,4 +1,4 @@
-use crate::ast::expression::integer_literal::IntegerLiteral;
+use crate::ast::expression::integer::IntegerLiteral;
 use crate::ast::expression::Expression;
 use crate::ast::statement::Statement;
 use crate::ast::{Identifier, NodeInterface};

diff --git a/src/ast/statement/return_statement.rs b/src/ast/statement/return_statement.rs
@@ -1,4 +1,4 @@
-use crate::ast::expression::integer_literal::IntegerLiteral;
+use crate::ast::expression::integer::IntegerLiteral;
 use crate::ast::expression::Expression;
 use crate::ast::statement::Statement;
 use crate::ast::NodeInterface;

diff --git a/src/evaluator/mod.rs b/src/evaluator/mod.rs
@@ -1,4 +1,4 @@
-use crate::ast::expression::hash_literal::HashLiteral;
+use crate::ast::expression::hash::HashLiteral;
 use crate::ast::expression::if_expression::If;
 use crate::ast::expression::Expression;
 use crate::ast::statement::block::BlockStatement;

diff --git a/src/parser/mod.rs b/src/parser/mod.rs
@@ -3,17 +3,17 @@ pub mod parser_tracing;
 #[cfg(test)]
 mod tests;
 
-use crate::ast::expression::array_literal::ArrayLiteral;
+use crate::ast::expression::array::ArrayLiteral;
 use crate::ast::expression::boolean::Boolean;
-use crate::ast::expression::call_expression::Call;
-use crate::ast::expression::function_literal::FunctionLiteral;
-use crate::ast::expression::hash_literal::HashLiteral;
+use crate::ast::expression::call::Call;
+use crate::ast::expression::function::FunctionLiteral;
+use crate::ast::expression::hash::HashLiteral;
 use crate::ast::expression::if_expression::If;
-use crate::ast::expression::index_expression::Index;
-use crate::ast::expression::infix_expression::Infix;
-use crate::ast::expression::integer_literal::IntegerLiteral;
-use crate::ast::expression::prefix_expression::Prefix;
-use crate::ast::expression::string_literal::StringLiteral;
+use crate::ast::expression::index::Index;
+use crate::ast::expression::infix::Infix;
+use crate::ast::expression::integer::IntegerLiteral;
+use crate::ast::expression::prefix::Prefix;
+use crate::ast::expression::string::StringLiteral;
 use crate::ast::expression::Expression;
 use crate::ast::statement::block::BlockStatement;
 use crate::ast::statement::expression::ExpressionStatement;

diff --git a/src/parser/tests.rs b/src/parser/tests.rs
@@ -1,14 +1,14 @@
-use crate::ast::expression::array_literal::ArrayLiteral;
+use crate::ast::expression::array::ArrayLiteral;
 use crate::ast::expression::boolean::Boolean;
-use crate::ast::expression::call_expression::Call;
-use crate::ast::expression::function_literal::FunctionLiteral;
-use crate::ast::expression::hash_literal::HashLiteral;
+use crate::ast::expression::call::Call;
+use crate::ast::expression::function::FunctionLiteral;
+use crate::ast::expression::hash::HashLiteral;
 use crate::ast::expression::if_expression::If;
-use crate::ast::expression::index_expression::Index;
-use crate::ast::expression::infix_expression::Infix;
-use crate::ast::expression::integer_literal::IntegerLiteral;
-use crate::ast::expression::prefix_expression::Prefix;
-use crate::ast::expression::string_literal::StringLiteral;
+use crate::ast::expression::index::Index;
+use crate::ast::expression::infix::Infix;
+use crate::ast::expression::integer::IntegerLiteral;
+use crate::ast::expression::prefix::Prefix;
+use crate::ast::expression::string::StringLiteral;
 use crate::ast::expression::Expression;
 use crate::ast::statement::expression::ExpressionStatement;
 use crate::ast::statement::let_statement::LetStatement;