[fine] Starting to work on generic parameters (yikes)

fine/src/semantics.rs

@@ -79,6 +79,8 @@ pub enum Type {
     String,
     Bool,
 
+    TypeArgument(TreeRef, Box<str>), // An un-bound type argument
+
     Function(Vec<Box<Type>>, Box<Type>),
 }
 
@@ -103,9 +105,19 @@ impl Type {
             (Type::Error, _) => true,
             (_, Type::Error) => true,
 
+            (Type::TypeArgument(a_id, ..), Type::TypeArgument(b_id, ..)) => a_id == b_id,
+
             (_, _) => false,
         }
     }
+
+    pub fn is_generic(&self) -> bool {
+        match self {
+            Type::TypeArgument(..) => true,
+            Type::Function(a, b) => a.iter().any(|t| t.is_generic()) || b.is_generic(),
+            _ => false,
+        }
+    }
 }
 
 impl fmt::Debug for Type {
@@ -125,8 +137,9 @@ impl fmt::Display for Type {
             String => write!(f, "string"),
             Bool => write!(f, "bool"),
             MagicPrintGarbage => write!(f, "MagicPrintGarbage"),
+            TypeArgument(_, id) => write!(f, "{id}"),
             Function(args, ret) => {
-                write!(f, "(")?;
+                write!(f, "fun (")?;
                 let mut first = true;
                 for arg in args.iter() {
                     if !first {
@@ -653,7 +666,7 @@ impl<'a> Semantics<'a> {
 
             TreeKind::FunctionDecl => self.type_of_function_decl(tree),
             TreeKind::ReturnType => self.type_of_return_type(tree),
-            TreeKind::Parameter => self.type_of_parameter(tree),
+            TreeKind::Parameter => self.type_of_parameter(t, tree),
 
             _ => self.internal_compiler_error(Some(t), "asking for a nonsense type"),
         };
@@ -1014,13 +1027,14 @@ impl<'a> Semantics<'a> {
         Some(Type::Function(parameter_types, return_type))
     }
 
-    fn type_of_parameter(&self, tree: &Tree) -> Option<Type> {
+    fn type_of_parameter(&self, t: TreeRef, tree: &Tree) -> Option<Type> {
         assert_eq!(tree.kind, TreeKind::Parameter);
         match tree.child_of_kind(self.syntax_tree, TreeKind::TypeExpression) {
             Some(t) => Some(self.type_of(t)),
             None => {
-                self.report_error_tree(tree, "generic parameters not yet supported");
-                Some(Type::Error)
+                // It must be a generic parameter! We'll name this one after the tree where it exists.
+                let name = tree.nth_token(0)?;
+                Some(Type::TypeArgument(t, format!("${}", name.as_str()).into()))
             }
         }
     }