remove any

DaviRain-Su · Oct 10, 2023 · 2ed5449 · 2ed5449
1 parent 9ab0620
commit 2ed5449
Show file tree

Hide file tree

Showing 30 changed files with 8 additions and 222 deletions.
diff --git a/src/ast/expression/array_literal.rs b/src/ast/expression/array_literal.rs
@@ -2,7 +2,6 @@ use crate::ast::expression::Expression;
 use crate::ast::NodeInterface;
 use crate::error::Error;
 use crate::token::Token;
-use std::any::Any;
 use std::fmt::{Display, Formatter};
 
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -32,10 +31,6 @@ impl NodeInterface for ArrayLiteral {
     fn token_literal(&self) -> String {
         self.token.literal().into()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl Display for ArrayLiteral {

diff --git a/src/ast/expression/boolean.rs b/src/ast/expression/boolean.rs
@@ -3,7 +3,6 @@ use crate::ast::NodeInterface;
 use crate::error::Error;
 use crate::token::Token;
 use log::trace;
-use std::any::Any;
 use std::fmt::{Display, Formatter};
 
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -36,10 +35,6 @@ impl NodeInterface for Boolean {
     fn token_literal(&self) -> String {
         self.token.literal().into()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl TryFrom<Expression> for Boolean {

diff --git a/src/ast/expression/call_expression.rs b/src/ast/expression/call_expression.rs
@@ -2,7 +2,6 @@ use crate::ast::expression::Expression;
 use crate::ast::NodeInterface;
 use crate::error::Error;
 use crate::token::Token;
-use std::any::Any;
 use std::fmt::{Display, Formatter};
 
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -54,10 +53,6 @@ impl NodeInterface for Call {
     fn token_literal(&self) -> String {
         self.token.literal().into()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl TryFrom<Expression> for Call {

diff --git a/src/ast/expression/function_literal.rs b/src/ast/expression/function_literal.rs
@@ -3,7 +3,6 @@ use crate::ast::statement::block_statement::BlockStatement;
 use crate::ast::{Identifier, NodeInterface};
 use crate::error::Error;
 use crate::token::Token;
-use std::any::Any;
 use std::fmt::{Display, Formatter};
 
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -56,10 +55,6 @@ impl NodeInterface for FunctionLiteral {
     fn token_literal(&self) -> String {
         self.token.literal().into()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl TryFrom<Expression> for FunctionLiteral {

diff --git a/src/ast/expression/hash_literal.rs b/src/ast/expression/hash_literal.rs
@@ -2,7 +2,6 @@ use crate::ast::expression::Expression;
 use crate::ast::NodeInterface;
 use crate::error::Error;
 use crate::token::Token;
-use std::any::Any;
 use std::collections::BTreeMap;
 use std::fmt::{Display, Formatter};
 use std::hash::Hash;
@@ -50,10 +49,6 @@ impl NodeInterface for HashLiteral {
     fn token_literal(&self) -> String {
         self.token.literal().into()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl TryFrom<Expression> for HashLiteral {

diff --git a/src/ast/expression/if_expression.rs b/src/ast/expression/if_expression.rs
@@ -4,7 +4,6 @@ use crate::ast::statement::block_statement::BlockStatement;
 use crate::ast::NodeInterface;
 use crate::error::Error;
 use crate::token::Token;
-use std::any::Any;
 use std::fmt::{Display, Formatter};
 
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -79,10 +78,6 @@ impl NodeInterface for If {
     fn token_literal(&self) -> String {
         self.token.literal().into()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl TryFrom<Expression> for If {

diff --git a/src/ast/expression/index_expression.rs b/src/ast/expression/index_expression.rs
@@ -3,7 +3,6 @@ use crate::ast::Identifier;
 use crate::ast::NodeInterface;
 use crate::error::Error;
 use crate::token::Token;
-use std::any::Any;
 use std::fmt::{Display, Formatter};
 
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -39,10 +38,6 @@ impl NodeInterface for Index {
     fn token_literal(&self) -> String {
         self.token.literal().into()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl Display for Index {

diff --git a/src/ast/expression/infix_expression.rs b/src/ast/expression/infix_expression.rs
@@ -4,7 +4,6 @@ use crate::ast::statement::expression_statement::ExpressionStatement;
 use crate::ast::NodeInterface;
 use crate::error::Error;
 use crate::token::Token;
-use std::any::Any;
 use std::fmt::{Display, Formatter};
 
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -63,10 +62,6 @@ impl NodeInterface for Infix {
     fn token_literal(&self) -> String {
         self.token.literal().into()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl TryFrom<ExpressionStatement> for Infix {

diff --git a/src/ast/expression/integer_literal.rs b/src/ast/expression/integer_literal.rs
@@ -3,7 +3,6 @@ use crate::ast::statement::expression_statement::ExpressionStatement;
 use crate::ast::{Identifier, NodeInterface};
 use crate::error::Error;
 use crate::token::Token;
-use std::any::Any;
 use std::fmt::{Debug, Display, Formatter};
 
 #[derive(Debug, Default, Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -43,10 +42,6 @@ impl NodeInterface for IntegerLiteral {
     fn token_literal(&self) -> String {
         format!("{}", self.value)
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl TryFrom<ExpressionStatement> for IntegerLiteral {

diff --git a/src/ast/expression/mod.rs b/src/ast/expression/mod.rs
@@ -9,8 +9,8 @@ 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::{Identifier, NodeInterface};
-use std::any::Any;
+use crate::ast::Identifier;
+use crate::ast::NodeInterface;
 use std::fmt::{Display, Formatter};
 
 pub mod array_literal;
@@ -77,10 +77,6 @@ impl NodeInterface for Expression {
             Self::HashLiteral(hash_literal) => hash_literal.token_literal(),
         }
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl From<Prefix> for Expression {

diff --git a/src/ast/expression/prefix_expression.rs b/src/ast/expression/prefix_expression.rs
@@ -4,7 +4,6 @@ use crate::ast::statement::expression_statement::ExpressionStatement;
 use crate::ast::NodeInterface;
 use crate::error::Error;
 use crate::token::Token;
-use std::any::Any;
 use std::fmt::{Display, Formatter};
 
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -56,10 +55,6 @@ impl NodeInterface for Prefix {
     fn token_literal(&self) -> String {
         self.right.token_literal()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl TryFrom<ExpressionStatement> for Prefix {

diff --git a/src/ast/expression/string_literal.rs b/src/ast/expression/string_literal.rs
@@ -2,7 +2,6 @@ use crate::ast::expression::Expression;
 use crate::ast::NodeInterface;
 use crate::error::Error;
 use crate::token::Token;
-use std::any::Any;
 use std::fmt::{Display, Formatter};
 
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -31,10 +30,6 @@ impl NodeInterface for StringLiteral {
     fn token_literal(&self) -> String {
         self.token.literal().into()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl TryFrom<Expression> for StringLiteral {

diff --git a/src/ast/mod.rs b/src/ast/mod.rs
@@ -10,7 +10,6 @@ use crate::ast::statement::Statement;
 use crate::object::Object;
 use crate::token::Token;
 use log::trace;
-use std::any::Any;
 use std::fmt::{Debug, Display, Formatter};
 
 #[derive(Debug, Clone, PartialOrd, PartialEq, Eq, Ord, Hash)]
@@ -60,8 +59,6 @@ pub trait NodeInterface: Debug + Display {
     /// 必须提供 TokenLiteral()方法，该方法返回与其
     /// 关联的词法单元的字面量
     fn token_literal(&self) -> String;
-
-    fn as_any(&self) -> &dyn Any;
 }
 
 /// 这个 Program 节点将成为语法分析器生成的每个 AST 的根节点。每个有效的
@@ -111,10 +108,6 @@ impl NodeInterface for Program {
     fn token_literal(&self) -> String {
         self.token_literal()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 #[derive(Debug, Default, Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -157,10 +150,6 @@ impl NodeInterface for Identifier {
     fn token_literal(&self) -> String {
         self.token.literal().into()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl TryFrom<Expression> for Identifier {

diff --git a/src/ast/statement/block_statement.rs b/src/ast/statement/block_statement.rs
@@ -1,7 +1,6 @@
 use crate::ast::statement::Statement;
 use crate::ast::NodeInterface;
 use crate::token::Token;
-use std::any::Any;
 use std::fmt::{Debug, Display, Formatter};
 
 #[derive(Debug, Clone, Default, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -23,8 +22,4 @@ impl NodeInterface for BlockStatement {
     fn token_literal(&self) -> String {
         self.token.literal().into()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
diff --git a/src/ast/statement/expression_statement.rs b/src/ast/statement/expression_statement.rs
@@ -4,7 +4,6 @@ use crate::ast::statement::Statement;
 use crate::ast::NodeInterface;
 use crate::error::Error;
 use crate::token::Token;
-use std::any::Any;
 use std::fmt::{Display, Formatter};
 
 /// expression statement
@@ -44,10 +43,6 @@ impl NodeInterface for ExpressionStatement {
     fn token_literal(&self) -> String {
         self.expression.token_literal()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl TryFrom<Statement> for ExpressionStatement {

diff --git a/src/ast/statement/let_statement.rs b/src/ast/statement/let_statement.rs
@@ -4,7 +4,6 @@ use crate::ast::statement::Statement;
 use crate::ast::{Identifier, NodeInterface};
 use crate::error::Error;
 use crate::token::Token;
-use std::any::Any;
 use std::fmt::{Display, Formatter};
 
 /// let statement
@@ -38,10 +37,6 @@ impl NodeInterface for LetStatement {
     fn token_literal(&self) -> String {
         self.token.literal().into()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl Display for LetStatement {

diff --git a/src/ast/statement/mod.rs b/src/ast/statement/mod.rs
@@ -8,7 +8,6 @@ use crate::ast::statement::expression_statement::ExpressionStatement;
 use crate::ast::statement::let_statement::LetStatement;
 use crate::ast::statement::return_statement::ReturnStatement;
 use crate::ast::NodeInterface;
-use std::any::Any;
 use std::fmt::{Debug, Display, Formatter};
 
 use super::Node;
@@ -30,10 +29,6 @@ impl NodeInterface for Statement {
             Self::BlockStatement(block) => block.token_literal(),
         }
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl Display for Statement {

diff --git a/src/ast/statement/return_statement.rs b/src/ast/statement/return_statement.rs
@@ -4,7 +4,6 @@ use crate::ast::statement::Statement;
 use crate::ast::NodeInterface;
 use crate::error::Error;
 use crate::token::Token;
-use std::any::Any;
 use std::fmt::{Display, Formatter};
 
 /// return statement
@@ -42,10 +41,6 @@ impl NodeInterface for ReturnStatement {
     fn token_literal(&self) -> String {
         self.token.literal().into()
     }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 impl TryFrom<Statement> for ReturnStatement {

diff --git a/src/evaluator/mod.rs b/src/evaluator/mod.rs
@@ -3,7 +3,8 @@ use crate::ast::expression::if_expression::If;
 use crate::ast::expression::Expression;
 use crate::ast::statement::block_statement::BlockStatement;
 use crate::ast::statement::Statement;
-use crate::ast::{Identifier, Node, NodeInterface, Program};
+use crate::ast::NodeInterface;
+use crate::ast::{Identifier, Node, Program};
 use crate::error::Error;
 use crate::evaluator::builtins::lookup_builtin;
 use crate::object::array::Array;