diff options
Diffstat (limited to 'src/lisp/expr.rs')
-rw-r--r-- | src/lisp/expr.rs | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/src/lisp/expr.rs b/src/lisp/expr.rs index adacc1c..651e41f 100644 --- a/src/lisp/expr.rs +++ b/src/lisp/expr.rs | |||
@@ -1,7 +1,30 @@ | |||
1 | use std::fmt; | 1 | use std::fmt; |
2 | 2 | ||
3 | use crate::app::AppState; | 3 | use crate::app::AppState; |
4 | use crate::lisp::{error::LispError, number::LispNumber}; | 4 | use crate::lisp::{error::LispError, number::LispNumber, Environment}; |
5 | |||
6 | #[derive(Clone)] | ||
7 | pub struct PrimitiveFunc { | ||
8 | pub arity: Option<usize>, // minimim arity | ||
9 | pub closure: fn(&[LispExpr], &mut AppState) -> Result<LispExpr, LispError>, | ||
10 | } | ||
11 | |||
12 | impl PrimitiveFunc { | ||
13 | pub fn call(&self, args: &[LispExpr], app: &mut AppState) -> Result<LispExpr, LispError> { | ||
14 | if let Some(arity) = self.arity { | ||
15 | if args.len() < arity { | ||
16 | return Err(LispError::EvalError); | ||
17 | } | ||
18 | } | ||
19 | (self.closure)(args, app) | ||
20 | } | ||
21 | } | ||
22 | |||
23 | #[derive(Clone)] | ||
24 | pub struct LispFunction { | ||
25 | pub params: Vec<String>, | ||
26 | pub body: Vec<LispExpr>, | ||
27 | } | ||
5 | 28 | ||
6 | #[derive(Clone)] | 29 | #[derive(Clone)] |
7 | pub enum LispExpr { | 30 | pub enum LispExpr { |
@@ -21,23 +44,6 @@ pub enum LispExpr { | |||
21 | Quote(Box<LispExpr>, u32), | 44 | Quote(Box<LispExpr>, u32), |
22 | } | 45 | } |
23 | 46 | ||
24 | #[derive(Clone)] | ||
25 | pub struct PrimitiveFunc { | ||
26 | pub arity: Option<usize>, | ||
27 | pub closure: fn(&[LispExpr], &mut AppState) -> Result<LispExpr, LispError>, | ||
28 | } | ||
29 | |||
30 | impl PrimitiveFunc { | ||
31 | pub fn call(&self, args: &[LispExpr], app: &mut AppState) -> Result<LispExpr, LispError> { | ||
32 | if let Some(arity) = self.arity { | ||
33 | if args.len() < arity { | ||
34 | return Err(LispError::EvalError); | ||
35 | } | ||
36 | } | ||
37 | (self.closure)(args, app) | ||
38 | } | ||
39 | } | ||
40 | |||
41 | impl LispExpr { | 47 | impl LispExpr { |
42 | pub fn comma(self, n: u32) -> LispExpr { | 48 | pub fn comma(self, n: u32) -> LispExpr { |
43 | match self { | 49 | match self { |
@@ -83,7 +89,7 @@ impl fmt::Display for LispExpr { | |||
83 | write!(f, " {} ", expr)? | 89 | write!(f, " {} ", expr)? |
84 | } | 90 | } |
85 | } | 91 | } |
86 | LispExpr::StringLit(s) => write!(f, "{:?}", s)?, | 92 | LispExpr::StringLit(s) => write!(f, "{}", s)?, |
87 | LispExpr::BoolLit(b) => { | 93 | LispExpr::BoolLit(b) => { |
88 | if *b { | 94 | if *b { |
89 | write!(f, "#t")? | 95 | write!(f, "#t")? |
@@ -93,7 +99,7 @@ impl fmt::Display for LispExpr { | |||
93 | } | 99 | } |
94 | LispExpr::Ident(s) => write!(f, "{}", s)?, | 100 | LispExpr::Ident(s) => write!(f, "{}", s)?, |
95 | LispExpr::PrimitiveFunc(_) => write!(f, "<#primitive>")?, | 101 | LispExpr::PrimitiveFunc(_) => write!(f, "<#primitive>")?, |
96 | LispExpr::Function(_) => write!(f, "<#procedure>")?, | 102 | LispExpr::Function(func) => write!(f, "<#lambda {}>", func.params.join(" "))?, |
97 | LispExpr::Quasiquote(val, depth) => { | 103 | LispExpr::Quasiquote(val, depth) => { |
98 | write!(f, "{}{}", "`".repeat(*depth as usize), val)? | 104 | write!(f, "{}{}", "`".repeat(*depth as usize), val)? |
99 | } | 105 | } |
@@ -104,6 +110,3 @@ impl fmt::Display for LispExpr { | |||
104 | Ok(()) | 110 | Ok(()) |
105 | } | 111 | } |
106 | } | 112 | } |
107 | |||
108 | #[derive(Debug, PartialEq, Clone)] | ||
109 | enum LispFunction {} | ||