tseeker-pub/rust-crafting-interpreters-part-1
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Interpreter - Use string conversion for print

Browse source
This commit is contained in:
Emmanuel BENOîT 2023-01-19 19:07:00 +01:00
parent 22b284ffa3
commit c26ae0c053
1 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/interpreter/interpretable.rs
View file

@ -6,7 +6,6 @@ use crate::{
VariableExpr, VariableExpr,
}, },
errors::{ErrorKind, SloxError, SloxResult}, errors::{ErrorKind, SloxError, SloxResult},
interpreter::classes::PropertyCarrier,
resolver::ResolvedVariables, resolver::ResolvedVariables,
tokens::{Token, TokenType}, tokens::{Token, TokenType},
}; };
@ -152,7 +151,7 @@ impl Interpretable for StmtNode {
StmtNode::FunDecl(decl) => on_fun_decl(es, decl), StmtNode::FunDecl(decl) => on_fun_decl(es, decl),
StmtNode::ClassDecl(decl) => on_class_decl(es, decl), StmtNode::ClassDecl(decl) => on_class_decl(es, decl),
StmtNode::Expression(expr) => expr.interpret(es), StmtNode::Expression(expr) => expr.interpret(es),
StmtNode::Print(_, expr) => on_print(es, expr), StmtNode::Print(token, expr) => on_print(es, token, expr),
StmtNode::Block(statements) => on_block(es, statements), StmtNode::Block(statements) => on_block(es, statements),
StmtNode::If { StmtNode::If {
condition, condition,
@ -249,29 +248,9 @@ fn extract_members(
} }
/// Handle the `print` statement. /// Handle the `print` statement.
fn on_print(es: &mut InterpreterState, expr: &ExprNode) -> InterpreterResult { fn on_print(es: &mut InterpreterState, token: &Token, expr: &ExprNode) -> InterpreterResult {
let value = expr.interpret(es)?.result(); let value = expr.interpret(es)?.result();
let output = value.with_instance( println!("{}", value.convert_to_string(es, token)?);
|inst| {
let token = Token {
token_type: TokenType::Identifier("to_string".to_owned()),
lexeme: "to_string".to_owned(),
line: 0,
};
if let Ok(result) = inst.get(es, &token) {
result
.with_callable(
|callable| callable.call(es, vec![]),
|| error(&token, "to_string() isn't callable"),
)
.map(|r| r.to_string())
} else {
Ok(inst.borrow().to_string())
}
},
|| Ok(value.to_string()),
)?;
println!("{}", output);
Ok(InterpreterFlowControl::default()) Ok(InterpreterFlowControl::default())
} }