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

Add nicer handle_builtin method

Browse Source
This commit is contained in:
greg 2017-01-05 04:12:05 -08:00
parent 6741787852
commit 154839979b
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/eval.rs
View File

@ -5,6 +5,9 @@ use std::collections::VecDeque;
use parser::{AST, Statement, Expression, Function}; use parser::{AST, Statement, Expression, Function};
use std::rc::Rc; use std::rc::Rc;
use parser::Expression::*;
use parser::Statement::*;
type Reduction<T> = (T, Option<SideEffect>); type Reduction<T> = (T, Option<SideEffect>);
#[derive(Debug)] #[derive(Debug)]
@ -70,7 +73,6 @@ trait Evaluable {
impl Evaluable for Statement { impl Evaluable for Statement {
fn is_reducible(&self) -> bool { fn is_reducible(&self) -> bool {
use parser::Statement::*;
match self { match self {
&ExprNode(ref expr) => expr.is_reducible(), &ExprNode(ref expr) => expr.is_reducible(),
&FuncDefNode(_) => true, &FuncDefNode(_) => true,
@ -80,7 +82,6 @@ impl Evaluable for Statement {
impl Evaluable for Expression { impl Evaluable for Expression {
fn is_reducible(&self) -> bool { fn is_reducible(&self) -> bool {
use parser::Expression::*;
match *self { match *self {
Null => false, Null => false,
StringLiteral(_) => false, StringLiteral(_) => false,
@ -93,7 +94,6 @@ impl Evaluable for Expression {
impl Expression { impl Expression {
fn is_truthy(&self) -> bool { fn is_truthy(&self) -> bool {
use parser::Expression::*;
match *self { match *self {
Null => false, Null => false,
StringLiteral(ref s) if **s == "" => false, StringLiteral(ref s) if **s == "" => false,
@ -136,7 +136,6 @@ impl<'a> Evaluator<'a> {
} }
fn reduce_astnode(&mut self, node: Statement) -> Reduction<Statement> { fn reduce_astnode(&mut self, node: Statement) -> Reduction<Statement> {
use parser::Statement::*;
match node { match node {
ExprNode(expr) => { ExprNode(expr) => {
if expr.is_reducible() { if expr.is_reducible() {
@ -154,7 +153,6 @@ impl<'a> Evaluator<'a> {
} }
fn reduce_expr(&mut self, expression: Expression) -> Reduction<Expression> { fn reduce_expr(&mut self, expression: Expression) -> Reduction<Expression> {
use parser::Expression::*;
match expression { match expression {
Null => (Null, None), Null => (Null, None),
e @ StringLiteral(_) => (e, None), e @ StringLiteral(_) => (e, None),
@ -251,7 +249,6 @@ impl<'a> Evaluator<'a> {
} }
fn reduce_binop(&mut self, op: Rc<String>, left: Expression, right: Expression) -> Expression { fn reduce_binop(&mut self, op: Rc<String>, left: Expression, right: Expression) -> Expression {
use parser::Expression::*;
let truthy = Number(1.0); let truthy = Number(1.0);
let falsy = Null; let falsy = Null;
match (&op[..], left, right) { match (&op[..], left, right) {
@ -274,16 +271,8 @@ impl<'a> Evaluator<'a> {
} }
fn reduce_call(&mut self, name: Rc<String>, arguments: Vec<Expression>) -> Reduction<Expression> { fn reduce_call(&mut self, name: Rc<String>, arguments: Vec<Expression>) -> Reduction<Expression> {
use parser::Expression::*; if let Some(res) = handle_builtin(&*name, &arguments) {
use parser::Statement::*; return res;
// ugly hack for now
if *name == "print" {
let mut s = String::new();
for arg in arguments {
s.push_str(&format!("{} ", arg));
}
return (Null, Some(SideEffect::Print(s)));
} }
let function = match self.lookup_function(&*name) { let function = match self.lookup_function(&*name) {
@ -313,3 +302,16 @@ impl<'a> Evaluator<'a> {
} }
} }
} }
fn handle_builtin(name: &str, arguments: &Vec<Expression>) -> Option<Reduction<Expression>> {
match name {
"print" => {
let mut s = String::new();
for arg in arguments {
s.push_str(&format!("{} ", arg));
}
return Some((Null, Some(SideEffect::Print(s))));
},
_ => None
}
}