jeff/dust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up

Browse Source
This commit is contained in:
Jeff 2023-11-28 19:34:30 -05:00
parent fc898e28e2
commit 5ffb797b5f
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/evaluator.rs
View File

@ -2,8 +2,6 @@
//! //!
//! You can use this library externally by calling either of the "eval" //! You can use this library externally by calling either of the "eval"
//! functions or by constructing your own Evaluator. //! functions or by constructing your own Evaluator.
use std::fmt::{self, Debug, Formatter};
use tree_sitter::{Parser, Tree as TSTree}; use tree_sitter::{Parser, Tree as TSTree};
use crate::{language, AbstractTree, Map, Result, Statement, Value}; use crate::{language, AbstractTree, Map, Result, Statement, Value};
@ -55,10 +53,7 @@ pub fn evaluate_with_context(source: &str, context: &mut Map) -> Result<Value> {
Evaluator::new(parser, context, source).run() Evaluator::new(parser, context, source).run()
} }
/// A collection of statements and comments interpreted from a syntax tree. /// A source code interpreter for the Dust language.
///
/// The Evaluator turns a tree sitter concrete syntax tree into a vector of
/// abstract trees called [Item][]s that can be run to execute the source code.
pub struct Evaluator<'c, 's> { pub struct Evaluator<'c, 's> {
_parser: Parser, _parser: Parser,
context: &'c mut Map, context: &'c mut Map,
@ -66,12 +61,6 @@ pub struct Evaluator<'c, 's> {
syntax_tree: TSTree, syntax_tree: TSTree,
} }
impl Debug for Evaluator<'_, '_> {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
write!(f, "Evaluator context: {}", self.context)
}
}
impl<'c, 's> Evaluator<'c, 's> { impl<'c, 's> Evaluator<'c, 's> {
pub fn new(mut parser: Parser, context: &'c mut Map, source: &'s str) -> Self { pub fn new(mut parser: Parser, context: &'c mut Map, source: &'s str) -> Self {
let syntax_tree = parser.parse(source, None).unwrap(); let syntax_tree = parser.parse(source, None).unwrap();
@ -86,17 +75,16 @@ impl<'c, 's> Evaluator<'c, 's> {
pub fn run(self) -> Result<Value> { pub fn run(self) -> Result<Value> {
let root_node = self.syntax_tree.root_node(); let root_node = self.syntax_tree.root_node();
let mut value = Value::Empty;
let mut prev_result = Value::Empty;
for index in 0..root_node.child_count() { for index in 0..root_node.child_count() {
let statement_node = root_node.child(index).unwrap(); let statement_node = root_node.child(index).unwrap();
let statement = Statement::from_syntax_node(self.source, statement_node)?; let statement = Statement::from_syntax_node(self.source, statement_node)?;
prev_result = statement.run(self.source, self.context)?; value = statement.run(self.source, self.context)?;
} }
Ok(prev_result) Ok(value)
} }
pub fn syntax_tree(&self) -> String { pub fn syntax_tree(&self) -> String {