diff options
Diffstat (limited to 'src/type')
| -rw-r--r-- | src/type/check.rs | 31 | ||||
| -rw-r--r-- | src/type/display.rs | 6 | ||||
| -rw-r--r-- | src/type/mod.rs | 7 | ||||
| -rw-r--r-- | src/type/subst.rs | 2 |
4 files changed, 41 insertions, 5 deletions
diff --git a/src/type/check.rs b/src/type/check.rs index 9369d97..e9917c7 100644 --- a/src/type/check.rs +++ b/src/type/check.rs @@ -16,6 +16,7 @@ impl SExp { /// }; /// /// assert_eq!(Atom(Int(1)).type_check(), Ok(Integer)); + /// assert_eq!(Atom(False).type_check(), Ok(Boolean)); /// ``` /// /// Quotes are given list types: @@ -26,8 +27,8 @@ impl SExp { /// }; /// /// assert_eq!( - /// scons(Quote, scons(1, scons(2, Nil))).type_check(), - /// Ok(List(vec![Integer, Integer])) + /// scons(Quote, scons(1, scons(False, Nil))).type_check(), + /// Ok(List(vec![Integer, Boolean])) /// ); /// ``` /// Though so is Nil given too: @@ -54,6 +55,16 @@ impl SExp { /// assert_eq!(Atom(Mul).type_check(), Ok(arr(List(vec![Integer, Integer]), Integer))); /// assert_eq!(Atom(Sub).type_check(), Ok(arr(List(vec![Integer, Integer]), Integer))); /// assert_eq!(Atom(Div).type_check(), Ok(arr(List(vec![Integer, Integer]), Integer))); + /// assert_eq!(Atom(Eq) .type_check(), Ok(arr(List(vec![Integer, Integer]), Boolean))); + /// assert_eq!(Atom(Neq).type_check(), Ok(arr(List(vec![Integer, Integer]), Boolean))); + /// assert_eq!(Atom(Gt) .type_check(), Ok(arr(List(vec![Integer, Integer]), Boolean))); + /// assert_eq!(Atom(Lt) .type_check(), Ok(arr(List(vec![Integer, Integer]), Boolean))); + /// assert_eq!(Atom(Ge) .type_check(), Ok(arr(List(vec![Integer, Integer]), Boolean))); + /// assert_eq!(Atom(Le) .type_check(), Ok(arr(List(vec![Integer, Integer]), Boolean))); + /// assert_eq!(Atom(And).type_check(), Ok(arr(List(vec![Boolean, Boolean]), Boolean))); + /// assert_eq!(Atom(Or) .type_check(), Ok(arr(List(vec![Boolean, Boolean]), Boolean))); + /// assert_eq!(Atom(Xor).type_check(), Ok(arr(List(vec![Boolean, Boolean]), Boolean))); + /// assert_eq!(Atom(Not).type_check(), Ok(arr(Boolean, Boolean))); /// ``` /// /// Though perhaps the most important task of the type system @@ -94,6 +105,10 @@ impl SExp { /// "passing '-' as an argument to '+' should return in InvalidArgList error" /// ), /// }; + /// + /// assert!(scons(And, scons(1, scons(Atom(True), Nil))).type_check().is_err()); + /// assert!(scons(Mul, scons(1, scons(Atom(True), Nil))).type_check().is_err()); + /// assert!(scons(Not, scons(1, Nil)).type_check().is_err()); /// ``` /// /// Also, free variables should result in an error @@ -121,6 +136,8 @@ impl SExp { match self { Atom(Int(_)) => Ok(Integer), + Atom(True) => todo!(), + Atom(False) => todo!(), Atom(Var(name)) => ctx.get(name) .ok_or(UndefinedVariable(name.to_string())) .cloned(), @@ -128,6 +145,16 @@ impl SExp { Atom(Mul) => Ok(arr(List(vec![Integer, Integer]), Integer)), // TODO varlen Atom(Sub) => Ok(arr(List(vec![Integer, Integer]), Integer)), Atom(Div) => Ok(arr(List(vec![Integer, Integer]), Integer)), + Atom(Eq) => todo!(), + Atom(Neq) => todo!(), + Atom(Lt) => todo!(), + Atom(Gt) => todo!(), + Atom(Le) => todo!(), + Atom(Ge) => todo!(), + Atom(Or) => todo!(), + Atom(And) => todo!(), + Atom(Xor) => todo!(), + Atom(Not) => todo!(), Atom(Nil) => Ok(List(vec![])), Atom(Quote) => Ok(arr( VarType("T".to_string()), diff --git a/src/type/display.rs b/src/type/display.rs index 2fca5f9..832b289 100644 --- a/src/type/display.rs +++ b/src/type/display.rs @@ -11,8 +11,9 @@ impl fmt::Display for Type { /// ```rust /// use myslip::r#type::{Type::*, util::*}; /// assert_eq!(Integer.to_string(), "Int".to_string()); - /// assert_eq!(arr(Integer, Integer).to_string(), "(Int -> Int)".to_string()); - /// assert_eq!(List(vec![Integer, Integer, Integer]).to_string(), "(Int Int Int)".to_string()); + /// assert_eq!(Boolean.to_string(), "Bool".to_string()); + /// assert_eq!(arr(Integer, Boolean).to_string(), "(Int -> Bool)".to_string()); + /// assert_eq!(List(vec![Integer, Boolean, Integer]).to_string(), "(Int Bool Int)".to_string()); /// ``` fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { @@ -27,6 +28,7 @@ impl fmt::Display for Type { .join(" ") ), VarType(name) => write!(f, "{}", name), + Boolean => todo!(), } } } diff --git a/src/type/mod.rs b/src/type/mod.rs index 8761cee..8977d85 100644 --- a/src/type/mod.rs +++ b/src/type/mod.rs @@ -14,6 +14,8 @@ pub enum Type { Integer, + Boolean, + Arrow(Box<Type>, Box<Type>), List(Vec<Type>), @@ -63,19 +65,21 @@ impl Type { /// use myslip::r#type::{*, Type::*, TypeError::*, util::*}; /// /// assert_eq!(Integer.is_concrete(), Ok(())); + /// assert_eq!(Boolean.is_concrete(), Ok(())); /// assert_eq!( /// VarType("a".to_string()).is_concrete(), /// Err("a".to_string()) /// ); /// /// assert_eq!(arr(Integer, Integer).is_concrete(), Ok(())); + /// assert_eq!(arr(Integer, Boolean).is_concrete(), Ok(())); /// assert_eq!( /// arr(VarType("b".to_string()), Integer).is_concrete(), /// Err("b".to_string()) /// ); /// /// assert_eq!( - /// List(vec![Integer, Integer, arr(Integer, Integer)]).is_concrete(), + /// List(vec![Integer, Boolean, arr(Integer, Integer)]).is_concrete(), /// Ok(()) /// ); /// assert_eq!( @@ -87,6 +91,7 @@ impl Type { pub fn is_concrete(&self) -> Result<(), String> { match self { Integer => Ok(()), + Boolean => todo!(), Arrow(a, b) => b.is_concrete().and_then(|_ok| a.is_concrete()), List(v) => { let mut res = Ok(()); diff --git a/src/type/subst.rs b/src/type/subst.rs index 1774770..79c5fe1 100644 --- a/src/type/subst.rs +++ b/src/type/subst.rs @@ -39,6 +39,8 @@ impl Type { Integer => Integer, + Boolean => Boolean, + } } } |