Update token_literal implementation for nodes in array.rs, `boolean…

….rs`, `call.rs`, `function.rs`, `hash.rs`, `if_expression.rs`, `index.rs`, `infix.rs`, `integer.rs`, `mod.rs`, `prefix.rs`, `string.rs`, `block.rs`, `expression.rs`, `let_statement.rs`, `mod.rs`, `return_statement.rs`, `array.rs`, `boolean.rs`, `built_in_function.rs`, `function.rs`, `hash.rs`, `integer.rs`, `quote.rs`, `mod.rs`, `null.rs`,`return_value.rs`, and `string.rs` files.
DaviRain-Su · Oct 23, 2023 · 9adbfa0 · 9adbfa0
1 parent a52454a
commit 9adbfa0
Show file tree

Hide file tree

Showing 30 changed files with 57 additions and 57 deletions.
diff --git a/src/ast/expression/array.rs b/src/ast/expression/array.rs
@@ -28,8 +28,8 @@ impl ArrayLiteral {
 }
 
 impl NodeInterface for ArrayLiteral {
-    fn token_literal(&self) -> String {
-        self.token.literal().into()
+    fn token_literal(&self) -> &str {
+        self.token.literal()
     }
 }
 

diff --git a/src/ast/expression/boolean.rs b/src/ast/expression/boolean.rs
@@ -32,8 +32,8 @@ impl Display for Boolean {
 }
 
 impl NodeInterface for Boolean {
-    fn token_literal(&self) -> String {
-        self.token.literal().into()
+    fn token_literal(&self) -> &str {
+        self.token.literal()
     }
 }
 

diff --git a/src/ast/expression/call.rs b/src/ast/expression/call.rs
@@ -50,8 +50,8 @@ impl Display for Call {
 }
 
 impl NodeInterface for Call {
-    fn token_literal(&self) -> String {
-        self.token.literal().into()
+    fn token_literal(&self) -> &str {
+        self.token.literal()
     }
 }
 

diff --git a/src/ast/expression/function.rs b/src/ast/expression/function.rs
@@ -52,7 +52,7 @@ impl Display for FunctionLiteral {
 }
 
 impl NodeInterface for FunctionLiteral {
-    fn token_literal(&self) -> String {
+    fn token_literal(&self) -> &str {
         self.token.literal().into()
     }
 }

diff --git a/src/ast/expression/hash.rs b/src/ast/expression/hash.rs
@@ -46,8 +46,8 @@ impl Display for HashLiteral {
 }
 
 impl NodeInterface for HashLiteral {
-    fn token_literal(&self) -> String {
-        self.token.literal().into()
+    fn token_literal(&self) -> &str {
+        self.token.literal()
     }
 }
 

diff --git a/src/ast/expression/if_expression.rs b/src/ast/expression/if_expression.rs
@@ -75,8 +75,8 @@ impl Display for If {
 }
 
 impl NodeInterface for If {
-    fn token_literal(&self) -> String {
-        self.token.literal().into()
+    fn token_literal(&self) -> &str {
+        self.token.literal()
     }
 }
 

diff --git a/src/ast/expression/index.rs b/src/ast/expression/index.rs
@@ -35,8 +35,8 @@ impl Index {
 }
 
 impl NodeInterface for Index {
-    fn token_literal(&self) -> String {
-        self.token.literal().into()
+    fn token_literal(&self) -> &str {
+        self.token.literal()
     }
 }
 

diff --git a/src/ast/expression/infix.rs b/src/ast/expression/infix.rs
@@ -59,8 +59,8 @@ impl Display for Infix {
 }
 
 impl NodeInterface for Infix {
-    fn token_literal(&self) -> String {
-        self.token.literal().into()
+    fn token_literal(&self) -> &str {
+        self.token.literal()
     }
 }
 

diff --git a/src/ast/expression/integer.rs b/src/ast/expression/integer.rs
@@ -39,8 +39,8 @@ impl Display for IntegerLiteral {
 }
 
 impl NodeInterface for IntegerLiteral {
-    fn token_literal(&self) -> String {
-        format!("{}", self.value)
+    fn token_literal(&self) -> &str {
+        "integer_literal"
     }
 }
 

diff --git a/src/ast/expression/mod.rs b/src/ast/expression/mod.rs
@@ -61,7 +61,7 @@ impl Display for Expression {
 }
 
 impl NodeInterface for Expression {
-    fn token_literal(&self) -> String {
+    fn token_literal(&self) -> &str {
         match self {
             Self::Prefix(pre_exp) => pre_exp.token_literal(),
             Self::Infix(infix_exp) => infix_exp.token_literal(),

diff --git a/src/ast/expression/prefix.rs b/src/ast/expression/prefix.rs
@@ -52,7 +52,7 @@ impl Display for Prefix {
 }
 
 impl NodeInterface for Prefix {
-    fn token_literal(&self) -> String {
+    fn token_literal(&self) -> &str {
         self.right.token_literal()
     }
 }

diff --git a/src/ast/expression/string.rs b/src/ast/expression/string.rs
@@ -27,8 +27,8 @@ impl Display for StringLiteral {
 }
 
 impl NodeInterface for StringLiteral {
-    fn token_literal(&self) -> String {
-        self.token.literal().into()
+    fn token_literal(&self) -> &str {
+        self.token.literal()
     }
 }
 

diff --git a/src/ast/mod.rs b/src/ast/mod.rs
@@ -79,7 +79,7 @@ impl Display for Node {
 pub trait NodeInterface: Debug + Display {
     /// 必须提供 TokenLiteral()方法，该方法返回与其
     /// 关联的词法单元的字面量
-    fn token_literal(&self) -> String;
+    fn token_literal(&self) -> &str;
 }
 
 /// 这个 Program 节点将成为语法分析器生成的每个 AST 的根节点。每个有效的
@@ -105,9 +105,9 @@ impl Program {
         Self::default()
     }
 
-    pub fn token_literal(&self) -> String {
+    pub fn token_literal(&self) -> &str {
         if self.statements.is_empty() {
-            String::new()
+            ""
         } else {
             self.statements
                 .first()
@@ -125,7 +125,7 @@ impl Program {
     }
 
     pub fn eval_program(&self, env: &mut Environment) -> anyhow::Result<Object> {
-        trace!("[eval_program]  program is ({})", self);
+        trace!("[eval_program]  program is ({self})");
         let null = crate::object::null::Null;
         let mut result: Object = null.into();
 
@@ -135,7 +135,7 @@ impl Program {
 
             match result {
                 Object::ReturnValue(value) => {
-                    trace!("[eval_statement] ReturnValue is ({:?})", value);
+                    trace!("[eval_statement] ReturnValue is ({value:?})");
                     return Ok(value.value().clone());
                 }
                 _ => continue,
@@ -147,7 +147,7 @@ impl Program {
 }
 
 impl NodeInterface for Program {
-    fn token_literal(&self) -> String {
+    fn token_literal(&self) -> &str {
         self.token_literal()
     }
 }
@@ -189,8 +189,8 @@ impl From<Boolean> for Identifier {
 }
 
 impl NodeInterface for Identifier {
-    fn token_literal(&self) -> String {
-        self.token.literal().into()
+    fn token_literal(&self) -> &str {
+        self.token.literal()
     }
 }
 

diff --git a/src/ast/statement/block.rs b/src/ast/statement/block.rs
@@ -51,7 +51,7 @@ impl Display for BlockStatement {
 }
 
 impl NodeInterface for BlockStatement {
-    fn token_literal(&self) -> String {
+    fn token_literal(&self) -> &str {
         self.token.literal().into()
     }
 }
diff --git a/src/ast/statement/expression.rs b/src/ast/statement/expression.rs
@@ -40,7 +40,7 @@ impl Display for ExpressionStatement {
 }
 
 impl NodeInterface for ExpressionStatement {
-    fn token_literal(&self) -> String {
+    fn token_literal(&self) -> &str {
         self.expression.token_literal()
     }
 }

diff --git a/src/ast/statement/let_statement.rs b/src/ast/statement/let_statement.rs
@@ -34,7 +34,7 @@ impl Default for LetStatement {
 }
 
 impl NodeInterface for LetStatement {
-    fn token_literal(&self) -> String {
+    fn token_literal(&self) -> &str {
         self.token.literal().into()
     }
 }

diff --git a/src/ast/statement/mod.rs b/src/ast/statement/mod.rs
@@ -21,7 +21,7 @@ pub enum Statement {
 }
 
 impl NodeInterface for Statement {
-    fn token_literal(&self) -> String {
+    fn token_literal(&self) -> &str {
         match self {
             Self::Expression(exp_s) => exp_s.token_literal(),
             Self::Let(let_s) => let_s.token_literal(),

diff --git a/src/ast/statement/return_statement.rs b/src/ast/statement/return_statement.rs
@@ -38,7 +38,7 @@ impl Display for ReturnStatement {
 }
 
 impl NodeInterface for ReturnStatement {
-    fn token_literal(&self) -> String {
+    fn token_literal(&self) -> &str {
         self.token.literal().into()
     }
 }

diff --git a/src/evaluator/mod.rs b/src/evaluator/mod.rs
@@ -48,9 +48,7 @@ impl Node {
                 Statement::Let(let_statement) => {
                     let val_node = Node::from(*let_statement.value.clone());
                     let val = val_node.eval(env)?;
-
                     env.store(let_statement.name.value.clone(), val);
-
                     Ok(Null.into())
                 }
                 Statement::Return(return_statement) => {
@@ -73,7 +71,6 @@ impl Node {
                     let left = left_node.eval(env)?;
                     let right_node = Node::from(infix.right().clone());
                     let right = right_node.eval(env)?;
-
                     left.eval_infix_expression(infix.operator(), right)
                 }
                 Expression::IntegerLiteral(integer) => Ok(Integer::new(integer.value()).into()),
@@ -85,11 +82,10 @@ impl Node {
                 Expression::FunctionLiteral(function) => {
                     let params = function.parameters().clone();
                     let body = function.body().clone();
-
                     Ok(Function::new(params, body, env.clone()).into())
                 }
                 Expression::Call(call_exp) => {
-                    if call_exp.function().token_literal() == *"quote" {
+                    if call_exp.function().token_literal() == "quote" {
                         return Node::from(call_exp.arguments()[0].clone()).quote();
                     }
                     let call_exp_node = Node::from(call_exp.function().clone());

diff --git a/src/object/array.rs b/src/object/array.rs
@@ -43,7 +43,7 @@ impl Array {
 }
 
 impl NodeInterface for Array {
-    fn token_literal(&self) -> String {
+    fn token_literal(&self) -> &str {
         ARRAY.into()
     }
 }

diff --git a/src/object/boolean.rs b/src/object/boolean.rs
@@ -35,8 +35,12 @@ impl Display for Boolean {
 }
 
 impl NodeInterface for Boolean {
-    fn token_literal(&self) -> String {
-        self.value.to_string()
+    fn token_literal(&self) -> &str {
+        if self.value {
+            "true"
+        } else {
+            "false"
+        }
     }
 }
 

diff --git a/src/object/built_in_function.rs b/src/object/built_in_function.rs
@@ -171,8 +171,8 @@ impl ObjectInterface for Builtin {
 }
 
 impl NodeInterface for Builtin {
-    fn token_literal(&self) -> String {
-        BUILD_FUNC.to_string()
+    fn token_literal(&self) -> &str {
+        BUILD_FUNC
     }
 }
 

diff --git a/src/object/function.rs b/src/object/function.rs
@@ -59,8 +59,8 @@ impl ObjectInterface for Function {
 }
 
 impl NodeInterface for Function {
-    fn token_literal(&self) -> String {
-        format!("{self}")
+    fn token_literal(&self) -> &str {
+        "function"
     }
 }
 

diff --git a/src/object/hash.rs b/src/object/hash.rs
@@ -55,7 +55,7 @@ impl ObjectInterface for Hash {
 }
 
 impl NodeInterface for Hash {
-    fn token_literal(&self) -> String {
+    fn token_literal(&self) -> &str {
         HASH.into()
     }
 }

diff --git a/src/object/integer.rs b/src/object/integer.rs
@@ -35,8 +35,8 @@ impl Display for Integer {
 }
 
 impl NodeInterface for Integer {
-    fn token_literal(&self) -> String {
-        self.value.to_string()
+    fn token_literal(&self) -> &str {
+        "integer"
     }
 }
 

diff --git a/src/object/macro/quote.rs b/src/object/macro/quote.rs
@@ -31,7 +31,7 @@ impl Display for Quote {
 }
 
 impl NodeInterface for Quote {
-    fn token_literal(&self) -> String {
+    fn token_literal(&self) -> &str {
         QUOTE.into()
     }
 }

diff --git a/src/object/mod.rs b/src/object/mod.rs
@@ -152,7 +152,7 @@ impl Display for Object {
 }
 
 impl NodeInterface for Object {
-    fn token_literal(&self) -> String {
+    fn token_literal(&self) -> &str {
         match self {
             Self::Boolean(value) => value.token_literal(),
             Self::Integer(value) => value.token_literal(),

diff --git a/src/object/null.rs b/src/object/null.rs
@@ -15,8 +15,8 @@ impl Display for Null {
 }
 
 impl NodeInterface for Null {
-    fn token_literal(&self) -> String {
-        format!("{self}")
+    fn token_literal(&self) -> &str {
+        NULL
     }
 }
 

diff --git a/src/object/return_value.rs b/src/object/return_value.rs
@@ -27,8 +27,8 @@ impl Display for ReturnValue {
 }
 
 impl NodeInterface for ReturnValue {
-    fn token_literal(&self) -> String {
-        format!("{}", self.value)
+    fn token_literal(&self) -> &str {
+        self.value.token_literal()
     }
 }
 

diff --git a/src/object/string.rs b/src/object/string.rs
@@ -35,8 +35,8 @@ impl ObjectInterface for StringObj {
 }
 
 impl NodeInterface for StringObj {
-    fn token_literal(&self) -> String {
-        self.value.clone()
+    fn token_literal(&self) -> &str {
+        &self.value
     }
 }