Write moar

Author: suhr

src/types.rs

@@ -1,3 +1,4 @@
+use crate::UnknownError;
 use crate::Mexpr;
 
 #[derive(Debug, Clone, Copy, PartialEq)]
@@ -14,6 +15,7 @@ pub enum IntSize {
     I8 = 8,
 }
 
+#[derive(Debug, Clone, PartialEq)]
 pub enum SimpleType {
     Top,
     Bottom,
@@ -80,10 +82,18 @@ impl SimpleType {
     }
 }
 
+#[derive(Debug, Clone, PartialEq)]
 pub enum Type {
-    //
+    Simple(SimpleType),
+    Array(Box<Type>, Box<Type>),
+    String(Box<Type>),
+    Liquid(Box<Type>, Vec<Predicate>),
+
 }
 
+#[derive(Debug, Clone, PartialEq)]
+pub enum Predicate { }
+
 fn is_cmp_expr(head: &str) -> bool {
     ["lt", "le", "eq", "ge", "gt"].contains(&head)
 }
@@ -137,7 +147,7 @@ impl Refiner {
                     name: "arr".to_owned(),
                     body: vec![ty, body[0].clone()]
                 };
-                
+
                 *expr = val
             },
             Mexpr::Apply { name, body } if name == "size" => {
@@ -172,6 +182,28 @@ pub struct Meeter { }
 
 impl Meeter {
     pub fn resolve(&mut self, expr: &mut Mexpr) {
-        todo!()
+        match expr {
+            Mexpr::Apply { name, body } if name == "and" => {
+                let mut meet = body[0].clone();
+                for e in body {
+                    meet = self.meet(&meet, e)
+                }
+
+                *expr = meet
+            },
+            _ => todo!()
+        }
+    }
+
+    fn meet(&mut self, left: &Mexpr, right: &Mexpr) -> Mexpr {
+        match (left, right) {
+            (e, Mexpr::Name(n)) | (Mexpr::Name(n), e) if n == "_" => {
+                e.clone()
+            },
+            (_, Mexpr::Name(n)) | (Mexpr::Name(n), _) if n == "bottom" => {
+                SimpleType::Bottom.to_expr()
+            },
+            _ => todo!()
+        }
     }
 }