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

Interpreter - Limited scope of some declarations

Browse source
This commit is contained in:
Emmanuel BENOîT 2023-01-05 07:21:43 +01:00
parent 754659ed12
commit d528ce8dc3
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/interpreter/interpretable.rs
View file

@ -9,7 +9,7 @@ use crate::{
}; };
/// Evaluate an interpretable, returning its value. /// Evaluate an interpretable, returning its value.
pub fn evaluate(ast: &dyn Interpretable, vars: ResolvedVariables) -> SloxResult<Value> { pub fn evaluate(ast: &ast::ProgramNode, vars: ResolvedVariables) -> SloxResult<Value> {
let env = Rc::new(RefCell::new(Environment::default())); let env = Rc::new(RefCell::new(Environment::default()));
ast.interpret(&env).map(|v| v.result()) ast.interpret(&env).map(|v| v.result())
} }
@ -21,7 +21,7 @@ pub fn evaluate(ast: &dyn Interpretable, vars: ResolvedVariables) -> SloxResult<
/// Interpreter flow control, which may be either a value, a loop break or a /// Interpreter flow control, which may be either a value, a loop break or a
/// loop continuation. /// loop continuation.
#[derive(Debug)] #[derive(Debug)]
pub enum InterpreterFlowControl { pub(super) enum InterpreterFlowControl {
Result(Value), Result(Value),
Break(Option<String>), Break(Option<String>),
Continue(Option<String>), Continue(Option<String>),
@ -31,7 +31,7 @@ pub enum InterpreterFlowControl {
impl InterpreterFlowControl { impl InterpreterFlowControl {
/// Return the result's value. If the flow control value does not represent /// Return the result's value. If the flow control value does not represent
/// a result, panic. /// a result, panic.
pub fn result(self) -> Value { pub(super) fn result(self) -> Value {
match self { match self {
Self::Result(v) => v, Self::Result(v) => v,
other => panic!("Result expected, {:?} found instead", other), other => panic!("Result expected, {:?} found instead", other),
@ -40,7 +40,7 @@ impl InterpreterFlowControl {
/// Check whether a flow control value contains actual flow control /// Check whether a flow control value contains actual flow control
/// information. /// information.
pub fn is_flow_control(&self) -> bool { fn is_flow_control(&self) -> bool {
matches!(self, Self::Break(_) | Self::Continue(_) | Self::Return(_)) matches!(self, Self::Break(_) | Self::Continue(_) | Self::Return(_))
} }
} }
@ -58,10 +58,10 @@ impl From<Value> for InterpreterFlowControl {
} }
/// A result returned by some part of the interpreter. /// A result returned by some part of the interpreter.
pub type InterpreterResult = SloxResult<InterpreterFlowControl>; pub(super) type InterpreterResult = SloxResult<InterpreterFlowControl>;
/// An Interpretable can be evaluated and will return a value. /// An Interpretable can be evaluated and will return a value.
pub trait Interpretable { pub(super) trait Interpretable {
fn interpret(&self, environment: &EnvironmentRef) -> InterpreterResult; fn interpret(&self, environment: &EnvironmentRef) -> InterpreterResult;
} }