From c807c20292e794d64e756deb6f859ede6ae731aa Mon Sep 17 00:00:00 2001
From: greg <greg.shuflin@protonmail.com>
Date: Thu, 1 Mar 2018 03:35:09 -0800
Subject: [PATCH] Use UVars in type signatures of functions

---
 src/schala_lang/typechecking.rs | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/schala_lang/typechecking.rs b/src/schala_lang/typechecking.rs
index 203a2c9..fbc1967 100644
--- a/src/schala_lang/typechecking.rs
+++ b/src/schala_lang/typechecking.rs
@@ -1,5 +1,6 @@
 use std::rc::Rc;
 use std::collections::HashMap;
+use std::char;
 
 use schala_lang::parsing;
 
@@ -12,10 +13,27 @@ pub struct TypeContext {
 pub enum Type {
   Const(TConst),
   Func(Box<Type>, Box<Type>),
-  TVar(u64),
+  UVar(String),
+  EVar(u64),
   Void
 }
 
+#[derive(Default)]
+struct UVarGenerator {
+  n: u32,
+}
+impl UVarGenerator {
+  fn new() -> UVarGenerator {
+    UVarGenerator::default()
+  }
+  fn next(&mut self) -> Type {
+    //TODO handle this in the case where someone wants to make a function with more than 26 variables
+    let s = format!("{}", unsafe { char::from_u32_unchecked(self.n + ('a' as u32)) });
+    self.n += 1;
+    Type::UVar(s)
+  }
+}
+
 #[derive(Debug, PartialEq, Clone)]
 pub enum TConst {
   Unit,
@@ -55,7 +73,7 @@ impl TypeContext {
   pub fn fresh(&mut self) -> Type {
     let ret = self.type_var_count;
     self.type_var_count += 1;
-    Type::TVar(ret)
+    Type::EVar(ret)
   }
 }
 
@@ -68,11 +86,10 @@ impl TypeContext {
       if let &self::parsing::Statement::Declaration(ref decl) = statement {
         match decl {
           &FuncSig(ref signature) | &FuncDecl(ref signature, _) => {
-            //TODO this needs to be a type variable, not Void
-            let mut ty: Type = signature.type_anno.as_ref().map(|name: &TypeName| name.to_type()).unwrap_or(Ok(Void))?;
-
-            for &(_, ref type_name) in signature.params.iter() {
-              let arg_type = type_name.as_ref().map(|name| name.to_type()).unwrap_or(Ok(Void))?;
+            let mut uvar_gen = UVarGenerator::new();
+            let mut ty: Type = signature.type_anno.as_ref().map(|name: &TypeName| name.to_type()).unwrap_or_else(|| {Ok(uvar_gen.next())} )?;
+            for &(_, ref type_name) in signature.params.iter().rev() {
+              let arg_type = type_name.as_ref().map(|name| name.to_type()).unwrap_or_else(|| {Ok(uvar_gen.next())} )?;
               ty = Func(bx!(arg_type), bx!(ty));
             }
             self.bindings.insert(signature.name.clone(), ty);