greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename methods

Browse Source 
make reduce() the entry point to evaluation
This commit is contained in:
greg 2016-01-23 01:49:53 -08:00
parent 29d4cb53a4
commit 6bb227d052
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/eval.rs
View File

@ -52,7 +52,7 @@ impl Evaluator {
pub fn run(&mut self, ast: AST) -> Vec<String> { pub fn run(&mut self, ast: AST) -> Vec<String> {
ast.into_iter().map(|astnode| { ast.into_iter().map(|astnode| {
self.reduce_node(astnode) self.reduce(astnode)
}).collect() }).collect()
} }
} }
@ -84,7 +84,7 @@ impl Evaluable for Expression {
} }
impl Evaluator { impl Evaluator {
fn reduce_node(&mut self, mut node: ASTNode) -> String { fn reduce(&mut self, mut node: ASTNode) -> String {
loop { loop {
node = self.step(node); node = self.step(node);
if !node.is_reducible() { if !node.is_reducible() {
@ -96,10 +96,10 @@ impl Evaluator {
} }
fn step(&mut self, node: ASTNode) -> ASTNode { fn step(&mut self, node: ASTNode) -> ASTNode {
self.reduce(node) self.reduce_astnode(node)
} }
fn reduce(&mut self, node: ASTNode) -> ASTNode { //TODO swap the names of this and reduce_node fn reduce_astnode(&mut self, node: ASTNode) -> ASTNode {
use parser::ASTNode::*; use parser::ASTNode::*;
match node { match node {
ExprNode(expr) => { ExprNode(expr) => {