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

Name change

Browse Source 
builtin -> primitive
This commit is contained in:
greg 2017-12-29 04:51:14 -08:00
parent ea24ae1bb5
commit 5d9fa6679b
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/rukka_lang/mod.rs
View File

@ -11,18 +11,18 @@ pub struct EvaluatorState {
impl EvaluatorState { impl EvaluatorState {
fn new() -> EvaluatorState { fn new() -> EvaluatorState {
use self::Sexp::Builtin; use self::Sexp::Primitive;
use self::BuiltinFn::*; use self::PrimitiveFn::*;
let mut default_map = HashMap::new(); let mut default_map = HashMap::new();
default_map.insert(format!("+"), Builtin(Plus)); default_map.insert(format!("+"), Primitive(Plus));
default_map.insert(format!("-"), Builtin(Minus)); default_map.insert(format!("-"), Primitive(Minus));
default_map.insert(format!("*"), Builtin(Mult)); default_map.insert(format!("*"), Primitive(Mult));
default_map.insert(format!("/"), Builtin(Div)); default_map.insert(format!("/"), Primitive(Div));
default_map.insert(format!("%"), Builtin(Mod)); default_map.insert(format!("%"), Primitive(Mod));
default_map.insert(format!(">"), Builtin(Greater)); default_map.insert(format!(">"), Primitive(Greater));
default_map.insert(format!("<"), Builtin(Less)); default_map.insert(format!("<"), Primitive(Less));
default_map.insert(format!("<="), Builtin(LessThanOrEqual)); default_map.insert(format!("<="), Primitive(LessThanOrEqual));
default_map.insert(format!(">="), Builtin(GreaterThanOrEqual)); default_map.insert(format!(">="), Primitive(GreaterThanOrEqual));
EvaluatorState { EvaluatorState {
binding_stack: vec![default_map], binding_stack: vec![default_map],
@ -94,7 +94,7 @@ impl EvaluatorState {
Ok(match expr { Ok(match expr {
SymbolAtom(ref sym) => { SymbolAtom(ref sym) => {
if let Some(op) = get_builtin(sym) { if let Some(op) = get_builtin(sym) {
Builtin(op) Primitive(op)
} else { } else {
match self.get_var(sym) { match self.get_var(sym) {
Some(ref sexp) => { Some(ref sexp) => {
@ -105,7 +105,7 @@ impl EvaluatorState {
} }
} }
}, },
expr @ Builtin(_) => expr, expr @ Primitive(_) => expr,
expr @ FnLiteral { .. } => expr, expr @ FnLiteral { .. } => expr,
expr @ StringAtom(_) => expr, expr @ StringAtom(_) => expr,
expr @ NumberAtom(_) => expr, expr @ NumberAtom(_) => expr,
@ -228,14 +228,14 @@ impl EvaluatorState {
self.pop_env(); self.pop_env();
result result
}, },
Builtin(builtin) => self.apply_builtin(builtin, operands), Primitive(builtin) => self.apply_primitive(builtin, operands),
_ => return Err(format!("Bad type to apply")), _ => return Err(format!("Bad type to apply")),
} }
} }
fn apply_builtin(&mut self, op: BuiltinFn, operands: Sexp) -> Result<Sexp, String> { fn apply_primitive(&mut self, op: PrimitiveFn, operands: Sexp) -> Result<Sexp, String> {
use self::Sexp::*; use self::Sexp::*;
use self::BuiltinFn::*; use self::PrimitiveFn::*;
let mut evaled_operands = Vec::new(); let mut evaled_operands = Vec::new();
let mut cur_operand = operands; let mut cur_operand = operands;
@ -266,7 +266,7 @@ impl EvaluatorState {
} }
NumberAtom(result) NumberAtom(result)
}, },
op => return Err(format!("Builtin op {:?} not implemented", op)), op => return Err(format!("Primitive op {:?} not implemented", op)),
}) })
} }
} }
@ -305,16 +305,16 @@ enum Sexp {
formal_params: Vec<String>, formal_params: Vec<String>,
body: Box<Sexp> body: Box<Sexp>
}, },
Builtin(BuiltinFn) Primitive(PrimitiveFn)
} }
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
enum BuiltinFn { enum PrimitiveFn {
Plus, Minus, Mult, Div, Mod, Greater, Less, GreaterThanOrEqual, LessThanOrEqual Plus, Minus, Mult, Div, Mod, Greater, Less, GreaterThanOrEqual, LessThanOrEqual
} }
fn get_builtin(sym: &String) -> Option<BuiltinFn> { fn get_builtin(sym: &String) -> Option<PrimitiveFn> {
use self::BuiltinFn::*; use self::PrimitiveFn::*;
Some(match &sym[..] { Some(match &sym[..] {
"+" => Plus, "-" => Minus, "*" => Mult, "/" => Div, "%" => Mod, "+" => Plus, "-" => Minus, "*" => Mult, "/" => Div, "%" => Mod,
">" => Greater, "<" => Less, ">=" => GreaterThanOrEqual, "<=" => LessThanOrEqual, ">" => Greater, "<" => Less, ">=" => GreaterThanOrEqual, "<=" => LessThanOrEqual,
@ -334,7 +334,7 @@ impl Sexp {
&Cons(ref car, ref cdr) => format!("({} . {})", car.print(), cdr.print()), &Cons(ref car, ref cdr) => format!("({} . {})", car.print(), cdr.print()),
&Nil => format!("()"), &Nil => format!("()"),
&FnLiteral { ref formal_params, .. } => format!("<lambda {:?}>", formal_params), &FnLiteral { ref formal_params, .. } => format!("<lambda {:?}>", formal_params),
&Builtin(ref sym) => format!("<builtin \"{:?}\">", sym), &Primitive(ref sym) => format!("<builtin \"{:?}\">", sym),
} }
} }