lib/builtins/main.hyd

@@ -4,5 +4,4 @@ comb reduce_or (
 	a: Logic
 	)
 	-> Logic<1> {
-	
 }

src/frontend.rs

@@ -1,6 +1,5 @@
 use std::cell::Cell;
 use std::collections::BTreeMap;
-use std::fmt::Write;
 
 use super::parser;
 use crate::rtlil;
@@ -94,11 +93,7 @@ impl Context {
             callables: BTreeMap::new(),
             signals: BTreeMap::new(),
             types: TypingContext::new(),
-            typenames: [
+            typenames: [("Logic".to_string(), tcx.primitives.logic)].into(),
-                ("Logic".to_string(), tcx.primitives.logic),
-                ("Num".to_string(), tcx.primitives.elabnum),
-            ]
-            .into(),
             ids: Counter::new(),
         }
     }
@@ -136,7 +131,7 @@ impl Context {
                     typ: signal.typ,
                 }
             }
-            Expression::Literal(_) => todo!("type literal"),
+            Expression::Literal(_) => todo!(),
             Expression::UnOp(op) => self.type_expression(&op.a)?,
             Expression::BinOp(op) => {
                 let (a, b) = (self.type_expression(&op.a)?, self.type_expression(&op.b)?);
@@ -146,7 +141,7 @@ impl Context {
                         called: typed_ir::DefId(99),
                         args: vec![a, b],
                     },
-                    typ: self.types.primitives.infer,
+                    typ: self.types.primitives.elabnum,
                 }
             }
             Expression::Call(call) => {
@@ -161,7 +156,7 @@ impl Context {
                         called: typed_ir::DefId(99),
                         args: args_resolved,
                     },
-                    typ: self.types.primitives.infer,
+                    typ: self.types.primitives.elabnum,
                 }
             }
         };
@@ -187,11 +182,20 @@ impl Context {
         }
 
         let ret_typename = &comb.ret.name;
-        let _ret_type = self.try_get_type(ret_typename.fragment())?;
+        let ret_type = self.try_get_type(ret_typename.fragment())?;
-        // TODO: use ret type
 
         let root_expr = self.type_expression(&comb.expr)?;
 
+        // TODO: more sophisticated type compat check
+        if root_expr.typ != ret_type {
+            let expected = ret_type;
+            let found = root_expr.typ;
+            return Err(CompileError::new(CompileErrorKind::TypeError {
+                expected,
+                found,
+            }));
+        }
+
         Ok(typed_ir::Block {
             signals,
             expr: root_expr,
@@ -202,8 +206,8 @@ impl Context {
         for item in module.items {
             let block = match &item {
                 parser::ModuleItem::Comb(comb) => self.type_comb(comb)?,
-                parser::ModuleItem::Proc(_) => todo!("proc block"),
+                parser::ModuleItem::Proc(_) => todo!(),
-                parser::ModuleItem::State(_) => todo!("state block"),
+                parser::ModuleItem::State(_) => todo!(),
             };
             return Ok(block);
         }
@@ -211,43 +215,4 @@ impl Context {
             "no blocks in module".to_string(),
         )))
     }
-
-    pub fn pretty_typed_block(
-        &self,
-        w: &mut dyn std::fmt::Write,
-        block: &typed_ir::Block,
-    ) -> std::fmt::Result {
-        for sig in &block.signals {
-            let mut typ_pretty = String::new();
-            self.types.pretty_type(&mut typ_pretty, sig.typ)?;
-            writeln!(w, "_{}: {}", sig.id.0, typ_pretty)?
-        }
-        self.pretty_typed_expr(w, &block.expr)?;
-        Ok(())
-    }
-
-    pub fn pretty_typed_expr(
-        &self,
-        w: &mut dyn std::fmt::Write,
-        expr: &typed_ir::Expr,
-    ) -> std::fmt::Result {
-        let expr_pretty = match &expr.kind {
-            typed_ir::ExprKind::Literal => todo!(),
-            typed_ir::ExprKind::Path(path) => format!("_{}", path.0),
-            typed_ir::ExprKind::Call { called, args } => {
-                let args = args
-                    .iter()
-                    .map(|arg| {
-                        self.pretty_typed_expr(w, arg)?;
-                        Ok(format!("_{}", arg.id.0))
-                    })
-                    .collect::<Result<Vec<_>, std::fmt::Error>>()?;
-                format!("_{}({})", called.0, args.join(", "))
-            }
-        };
-        let mut type_pretty = String::new();
-        self.types.pretty_type(&mut type_pretty, expr.typ)?;
-        writeln!(w, "let _{}: {} = {}", expr.id.0, type_pretty, expr_pretty)?;
-        Ok(())
-    }
 }

src/frontend/lowering.rs

@@ -121,7 +121,7 @@ fn desugar_unop<'a>(op: parser::expression::UnOp<'a>) -> parser::expression::Cal
     let a = desugar_expression(op.a);
     let op_func = match op.kind {
         parser::expression::UnOpKind::BitNot => "not",
-        parser::expression::UnOpKind::Not => todo!("bin not"),
+        parser::expression::UnOpKind::Not => todo!(),
     };
     parser::expression::Call {
         name: op_func.into(),
@@ -195,8 +195,8 @@ fn lower_expression(
             lit.span().fragment().parse().unwrap(),
             TODO_WIDTH,
         )),
-        Expression::UnOp(_) => todo!("unary op"),
+        Expression::UnOp(_) => todo!(),
-        Expression::BinOp(_) => todo!("binary op"),
+        Expression::BinOp(_) => todo!(),
     }
 }
 

src/frontend/typed_ir.rs

@@ -1,24 +1,11 @@
 use super::types::Type;
-use std::fmt::Debug;
 
 /// ID of a definition (e.g. variable, block, function)
-#[derive(Clone, Copy)]
+#[derive(Debug, Clone, Copy)]
 pub struct DefId(pub u32);
-#[derive(Clone, Copy)]
+#[derive(Debug, Clone, Copy)]
 pub struct ExprId(pub u32);
 
-// more compact Debug impl
-impl Debug for DefId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "DefId({})", self.0)
-    }
-}
-impl Debug for ExprId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "ExprId({})", self.0)
-    }
-}
-
 /// an abstract element that performs some kind of computation on inputs
 #[derive(Debug, Clone)]
 pub struct Expr {

src/frontend/types.rs

@@ -4,16 +4,9 @@ use std::fmt::Debug;
 /// easier
 pub type Type = InternedType;
 
-#[derive(Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq)]
 pub struct InternedType(usize);
 
-impl Debug for InternedType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "Type({})", self.0)
-    }
-}
-
-#[derive(Debug)]
 pub struct TypeStruct {
     kind: TypeKind,
 }
@@ -28,12 +21,10 @@ enum TypeKind {
     UInt(ElabData),
     /// Callable
     Callable,
-    /// A type that was not given and needs to be inferred
-    Infer,
 }
 
 #[derive(Debug)]
-pub struct ElabData {
+struct ElabData {
     typ: Type,
     value: ElabValue,
 }
@@ -62,7 +53,6 @@ enum ElabKind {
 pub struct PrimitiveTypes {
     pub elabnum: Type,
     pub logic: Type,
-    pub infer: Type,
 }
 
 pub struct TypingContext {
@@ -75,23 +65,14 @@ impl TypingContext {
         let primitives = PrimitiveTypes {
             elabnum: InternedType(0),
             logic: InternedType(1),
-            infer: InternedType(2),
         };
         Self {
-            types: vec![
+            types: vec![TypeStruct {
-                TypeStruct {
-                    kind: TypeKind::ElabType(ElabKind::Num),
-                },
-                TypeStruct {
                 kind: TypeKind::Logic(ElabData {
                     typ: primitives.elabnum,
                     value: ElabValue::Infer,
                 }),
-                },
+            }],
-                TypeStruct {
-                    kind: TypeKind::Infer,
-                },
-            ],
             primitives,
         }
     }
@@ -106,25 +87,12 @@ impl TypingContext {
         &self.types[typ.0]
     }
 
-    pub fn pretty_value(&self, w: &mut dyn std::fmt::Write, data: &ElabData) -> std::fmt::Result {
-        match data.value {
-            ElabValue::Infer => write!(w, "?: ")?,
-            ElabValue::Concrete(_) => todo!("concrete type value"),
-        }
-        self.pretty_type(w, data.typ)
-    }
-
     pub fn pretty_type(&self, w: &mut dyn std::fmt::Write, typ: Type) -> std::fmt::Result {
         match &self.get(typ).kind {
-            TypeKind::ElabType(val) => write!(w, "{:?}", val),
+            TypeKind::ElabType(val) => write!(w, "{{{:?}}}", val),
-            TypeKind::Logic(val) => {
+            TypeKind::Logic(_) => todo!(),
-                let mut width = String::new();
+            TypeKind::UInt(_) => todo!(),
-                self.pretty_value(&mut width, val)?;
+            TypeKind::Callable => todo!(),
-                write!(w, "Logic<{}>", width)
-            }
-            TypeKind::Infer => write!(w, "?"),
-            TypeKind::UInt(_) => todo!("print uint"),
-            TypeKind::Callable => todo!("print callable"),
         }
     }
 }

src/main.rs

@@ -61,14 +61,7 @@ fn main() {
             let mut frontendcontext = crate::frontend::Context::new();
             let typed = frontendcontext.type_module(res.1);
             if opt.debug {
-                println!("{:#?}", &typed);
+                println!("{:#?}", typed);
-                let mut pretty_block = String::new();
-                if let Ok(block) = typed {
-                    frontendcontext
-                        .pretty_typed_block(&mut pretty_block, &block)
-                        .unwrap();
-                }
-                println!("{}", &pretty_block);
             }
             /*
             match lowered {

src/parser/declaration.rs

@@ -15,9 +15,9 @@ pub fn typename(input: TokenSpan) -> IResult<TokenSpan, TypeName> {
             token(tk::Ident),
             opt(delimited(token(tk::LAngle), expression, token(tk::RAngle))),
         )),
-        |(ident, params)| TypeName {
+        |(ident, _)| TypeName {
             name: ident.span(),
-            generics: params,
+            generics: (),
         },
     )(input)
 }
@@ -25,7 +25,7 @@ pub fn typename(input: TokenSpan) -> IResult<TokenSpan, TypeName> {
 #[derive(Debug)]
 pub struct TypeName<'a> {
     pub name: Span<'a>,
-    pub generics: Option<Expression<'a>>,
+    pub generics: (),
 }
 
 #[derive(Debug)]