add sugared terms & pretty printing

Cargo.toml

@@ -4,3 +4,8 @@ edition = "2018"
 name = "laddertypes"
 version = "0.1.0"
 
+[dependencies]
+tiny-ansi = { version = "0.1.0", optional = true }
+
+[features]
+pretty = ["dep:tiny-ansi"]

src/dict.rs

@@ -1,7 +1,4 @@
-use crate::{
-    bimap::Bimap,
-    sugar::SUGARID_LIMIT
-};
+use crate::bimap::Bimap;
 
 //<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>\\
 
@@ -23,19 +20,11 @@ pub struct TypeDict {
 
 impl TypeDict {
     pub fn new() -> Self {
-        let mut dict = TypeDict {
+        TypeDict {
             typenames: Bimap::new(),
             type_lit_counter: 0,
             type_var_counter: 0,
-        };
-
-        dict.add_typename("Seq".into());
-        dict.add_typename("Enum".into());
-        dict.add_typename("Struct".into());
-
-        assert_eq!( dict.type_lit_counter, SUGARID_LIMIT );
-
-        dict
+        }
     }
 
     pub fn add_varname(&mut self, tn: String) -> TypeID {
@@ -65,6 +54,10 @@ impl TypeDict {
     pub fn get_typeid(&self, tn: &String) -> Option<TypeID> {
         self.typenames.mλ.get(tn).cloned()
     }
+
+    pub fn get_varname(&self, var_id: u64) -> Option<String> {
+        self.typenames.my.get(&TypeID::Var(var_id)).cloned()
+    }
 }
 
 //<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>

src/lexer.rs

@@ -6,9 +6,9 @@ pub enum LadderTypeToken {
     Symbol( String ),
     Char( char ),
     Num( i64 ),
-    Open, OpenSeq, OpenStruct,
-    Close, CloseSeq, CloseStruct,
-    Ladder, Enum
+    Open,
+    Close,
+    Ladder,
 }
 
 #[derive(PartialEq, Eq, Clone, Debug)]
@@ -75,11 +75,6 @@ where It: Iterator<Item = char>
                     match c {
                         '<' => { self.chars.next(); return Some(Ok(LadderTypeToken::Open)); },
                         '>' => { self.chars.next(); return Some(Ok(LadderTypeToken::Close)); },
-                        '[' => { self.chars.next(); return Some(Ok(LadderTypeToken::OpenSeq)); },
-                        ']' => { self.chars.next(); return Some(Ok(LadderTypeToken::CloseSeq)); },
-                        '{' => { self.chars.next(); return Some(Ok(LadderTypeToken::OpenStruct)); },
-                        '}' => { self.chars.next(); return Some(Ok(LadderTypeToken::CloseStruct)); },
-                        '|' => { self.chars.next(); return Some(Ok(LadderTypeToken::Enum)); },
                         '~' => { self.chars.next(); return Some(Ok(LadderTypeToken::Ladder)); },
                         '\'' => { self.chars.next(); state = LexerState::Char(None); },
                         c => {

src/lib.rs

@@ -5,8 +5,8 @@ pub mod term;
 pub mod lexer;
 pub mod parser;
 pub mod unparser;
-pub mod curry;
 pub mod sugar;
+pub mod curry;
 pub mod lnf;
 pub mod subtype;
 pub mod unification;
@@ -14,9 +14,12 @@ pub mod unification;
 #[cfg(test)]
 mod test;
 
+#[cfg(feature = "pretty")]
+mod pretty;
+
 pub use {
     dict::*,
     term::*,
-    unification::*
+    sugar::*,
+    unification::*,
 };
-

src/parser.rs

@@ -3,7 +3,6 @@ use {
     crate::{
         dict::*,
         term::*,
-        sugar::*,
         lexer::*
     }
 };
@@ -22,7 +21,7 @@ pub enum ParseError {
 //<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>\\
 
 impl TypeDict {
-    pub fn parse(&mut self, s: &str) -> Result<SugaredTypeTerm, ParseError> {
+    pub fn parse(&mut self, s: &str) -> Result<TypeTerm, ParseError> {
         let mut tokens = LadderTypeLexer::from(s.chars()).peekable();
 
         match self.parse_ladder(&mut tokens) {
@@ -37,7 +36,7 @@ impl TypeDict {
         }
     }
 
-    fn parse_app<It>(&mut self, tokens: &mut Peekable<LadderTypeLexer<It>>) -> Result<SugaredTypeTerm, ParseError>
+    fn parse_app<It>(&mut self, tokens: &mut Peekable<LadderTypeLexer<It>>) -> Result<TypeTerm, ParseError>
     where It: Iterator<Item = char>
     {
         let mut args = Vec::new();
@@ -45,11 +44,7 @@ impl TypeDict {
             match tok {
                 Ok(LadderTypeToken::Close) => {
                     tokens.next();
-                    return Ok(SugaredTypeTerm::App(args));
-                }
-                Ok(LadderTypeToken::CloseSeq) |
-                Ok(LadderTypeToken::CloseStruct) => {
-                    return Err(ParseError::UnexpectedToken)
+                    return Ok(TypeTerm::App(args));
                 }
                 _ => {
                     match self.parse_ladder(tokens) {
@@ -62,59 +57,29 @@ impl TypeDict {
         Err(ParseError::UnexpectedEnd)
     }
 
-    fn parse_seq<It>(&mut self, tokens: &mut Peekable<LadderTypeLexer<It>>) -> Result<SugaredTypeTerm, ParseError>
-    where It: Iterator<Item = char>
-    {
-        let mut pattern = Vec::new();
-        while let Some(tok) = tokens.peek() {
-            match tok {
-                Ok(LadderTypeToken::CloseSeq) => {
-                    tokens.next();
-                    return Ok(SugaredTypeTerm::Seq(pattern));
-                }
-                Ok(LadderTypeToken::Close) |
-                Ok(LadderTypeToken::CloseStruct) => {
-                    return Err(ParseError::UnexpectedToken)
-                }
-                _ => {
-                    match self.parse_ladder(tokens) {
-                        Ok(a) => { pattern.push(a); }
-                        Err(err) => { return Err(err); }
-                    }
-                }
-            }
-        }
-        Err(ParseError::UnexpectedEnd)
-    }
-
-    fn parse_rung<It>(&mut self, tokens: &mut Peekable<LadderTypeLexer<It>>) -> Result<SugaredTypeTerm, ParseError>
+    fn parse_rung<It>(&mut self, tokens: &mut Peekable<LadderTypeLexer<It>>) -> Result<TypeTerm, ParseError>
     where It: Iterator<Item = char>
     {
         match tokens.next() {
             Some(Ok(LadderTypeToken::Open)) => self.parse_app(tokens),
-            Some(Ok(LadderTypeToken::OpenSeq)) => self.parse_app(tokens),
-            Some(Ok(LadderTypeToken::OpenStruct)) => self.parse_app(tokens),
-            Some(Ok(LadderTypeToken::Enum)) => self.parse_app(tokens),
             Some(Ok(LadderTypeToken::Close)) => Err(ParseError::UnexpectedClose),
-            Some(Ok(LadderTypeToken::CloseStruct)) => Err(ParseError::UnexpectedToken),
-            Some(Ok(LadderTypeToken::CloseSeq)) => Err(ParseError::UnexpectedToken),
             Some(Ok(LadderTypeToken::Ladder)) => Err(ParseError::UnexpectedLadder),
             Some(Ok(LadderTypeToken::Symbol(s))) =>
-                Ok(SugaredTypeTerm::TypeID(
+                Ok(TypeTerm::TypeID(
                     if let Some(tyid) = self.get_typeid(&s) {
                         tyid
                     } else {
                         self.add_typename(s)
                     }
                 )),
-            Some(Ok(LadderTypeToken::Char(c))) => Ok(SugaredTypeTerm::Char(c)),
-            Some(Ok(LadderTypeToken::Num(n))) => Ok(SugaredTypeTerm::Num(n)),
+            Some(Ok(LadderTypeToken::Char(c))) => Ok(TypeTerm::Char(c)),
+            Some(Ok(LadderTypeToken::Num(n))) => Ok(TypeTerm::Num(n)),
             Some(Err(err)) => Err(ParseError::LexError(err)),
             None => Err(ParseError::UnexpectedEnd)
         }
     }
 
-    fn parse_ladder<It>(&mut self, tokens: &mut Peekable<LadderTypeLexer<It>>) -> Result<SugaredTypeTerm, ParseError>
+    fn parse_ladder<It>(&mut self, tokens: &mut Peekable<LadderTypeLexer<It>>) -> Result<TypeTerm, ParseError>
     where It: Iterator<Item = char>
     {
         let mut rungs = Vec::new();
@@ -150,7 +115,7 @@ impl TypeDict {
         match rungs.len() {
             0 => Err(ParseError::UnexpectedEnd),
             1 => Ok(rungs[0].clone()),
-            _ => Ok(SugaredTypeTerm::Ladder(rungs)),
+            _ => Ok(TypeTerm::Ladder(rungs)),
         }
     }
 }

src/pretty.rs

@@ -0,0 +1,148 @@
+use {
+    crate::TypeDict,
+    crate::sugar::SugaredTypeTerm,
+    tiny_ansi::TinyAnsi
+};
+
+impl SugaredTypeTerm {
+    pub fn pretty(&self, dict: &TypeDict, indent: u64) -> String {
+        let indent_width = 4;
+        match self {
+            SugaredTypeTerm::TypeID(id) => {
+                format!("{}", dict.get_typename(id).unwrap_or("??".bright_red())).bright_blue()
+            },
+
+            SugaredTypeTerm::Num(n) => {
+                format!("{}", n).bright_cyan()
+            }
+
+            SugaredTypeTerm::Char(c) => {
+                format!("'{}'", c)
+            }
+
+            SugaredTypeTerm::Univ(t) => {
+                format!("{} {} . {}",
+                    "∀".yellow().bold(),
+                    dict.get_varname(0).unwrap_or("??".into()).bright_blue(),
+                    t.pretty(dict,indent)
+                )
+            }
+
+            SugaredTypeTerm::Spec(args) => {
+                let mut s = String::new();
+                s.push_str(&"<".yellow().bold());
+                for i in 0..args.len() {
+                    let arg = &args[i];
+                    if i > 0 {
+                        s.push(' ');
+                    }
+                    s.push_str( &arg.pretty(dict,indent+1) );
+                }
+                s.push_str(&">".yellow().bold());
+                s
+            }
+
+            SugaredTypeTerm::Struct(args) => {
+                let mut s = String::new();
+                s.push_str(&"{".yellow().bold());
+                for arg in args {
+                    s.push('\n');
+                    for x in 0..(indent+1)*indent_width {
+                        s.push(' ');
+                    }
+                    s.push_str(&arg.pretty(dict, indent + 1));
+                    s.push_str(&";\n".bright_yellow());
+                }
+
+                s.push('\n');
+                for x in 0..indent*indent_width {
+                    s.push(' ');
+                }
+                s.push_str(&"}".yellow().bold());
+                s
+            }
+
+            SugaredTypeTerm::Enum(args) => {
+                let mut s = String::new();
+                s.push_str(&"(".yellow().bold());
+                for i in 0..args.len() {
+                    let arg = &args[i];
+                    s.push('\n');
+                    for x in 0..(indent+1)*indent_width {
+                        s.push(' ');
+                    }
+                    if i > 0 {
+                        s.push_str(&"| ".yellow().bold());
+                    }
+                    s.push_str(&arg.pretty(dict, indent + 1));
+                }
+
+                s.push('\n');
+                for x in 0..indent*indent_width {
+                    s.push(' ');
+                }
+                s.push_str(&")".yellow().bold());
+                s
+            }
+
+            SugaredTypeTerm::Seq(args) => {
+                let mut s = String::new();
+                s.push_str(&"[ ".yellow().bold());
+                for i in 0..args.len() {
+                    let arg = &args[i];
+                    if i > 0 {
+                        s.push(' ');
+                    }
+                    s.push_str(&arg.pretty(dict, indent+1));
+                }
+                s.push_str(&" ]".yellow().bold());
+                s
+            }
+
+            SugaredTypeTerm::Morph(args) => {
+                let mut s = String::new();
+                for arg in args {
+                    s.push_str(&"  ~~morph~~>  ".bright_yellow());
+                    s.push_str(&arg.pretty(dict, indent));
+                }
+                s
+            }
+
+            SugaredTypeTerm::Func(args) => {
+                let mut s = String::new();
+                for i in 0..args.len() {
+                    let arg = &args[i];
+                    if i > 0{
+                        s.push('\n');
+                        for x in 0..(indent*indent_width) {
+                            s.push(' ');
+                        }                
+                        s.push_str(&"-->  ".bright_yellow());
+                    } else {
+//                        s.push_str("   ");
+                    }
+                    s.push_str(&arg.pretty(dict, indent));
+                }
+                s
+            }
+
+            SugaredTypeTerm::Ladder(rungs) => {
+                let mut s = String::new();
+                for i in 0..rungs.len() {
+                    let rung = &rungs[i];
+                    if i > 0{
+                        s.push('\n');
+                        for x in 0..(indent*indent_width) {
+                            s.push(' ');
+                        }
+                        s.push_str(&"~ ".yellow());
+                    }
+                    s.push_str(&rung.pretty(dict, indent));
+                }
+                s
+            }
+        }
+    }
+}
+
+

src/sugar.rs

@@ -1,134 +1,95 @@
-use crate::{
-    TypeTerm,
-    TypeID
+use {
+    crate::{TypeTerm, TypeID}
 };
 
-pub const SEQ_SUGARID : TypeID = TypeID::Fun(0);
-pub const ENUM_SUGARID : TypeID = TypeID::Fun(1);
-pub const STRUCT_SUGARID : TypeID = TypeID::Fun(2);
-pub const SUGARID_LIMIT : u64 = 3;
-
-#[derive(Clone)]
-pub enum SugaredTypeTerm { 
-    /* Atomic Terms */
-
-    // Base types from dictionary
+pub enum SugaredTypeTerm {
     TypeID(TypeID),
-
-    // Literals
     Num(i64),
     Char(char),
-
-    
-
-    /* Complex Terms */
-
-    // Type Parameters
-    // avoid currying to save space & indirection
-    App(Vec< SugaredTypeTerm >),
-
-    // Type Ladders
+    Univ(Box< SugaredTypeTerm >),
+    Spec(Vec< SugaredTypeTerm >),
+    Func(Vec< SugaredTypeTerm >),
+    Morph(Vec< SugaredTypeTerm >),
     Ladder(Vec< SugaredTypeTerm >),
-
-
-    /* Sugar Terms */
-    Seq( Vec<SugaredTypeTerm> ),
-    Enum( Vec<SugaredTypeTerm> ),
-    Struct( Vec<SugaredTypeTerm> )
-}
-
-
-#[derive(Clone)]
-struct TypeAssignment {
-    id: Option<String>,
-    ty: TypeTerm,
-}
-
-#[derive(Clone)]
-struct LayoutSugar {
-    Seq( Vec<TypeAssignment> ),
-    Enum( Vec<TypeAssignment> ),
-    Struct( Vec<TypeAssignment> )
-}
-
-
-
-impl SugaredTypeTerm {
-    pub fn desugar(self) -> TypeTerm {
-        match self {
-            SugaredTypeTerm::TypeID(id) => TypeTerm::TypeID(id),
-            SugaredTypeTerm::Num(n) => TypeTerm::Num(n),
-            SugaredTypeTerm::Char(c) => TypeTerm::Char(c),
-            SugaredTypeTerm::App(params) => TypeTerm::App(params.into_iter().map(|p| p.desugar()).collect()),
-            SugaredTypeTerm::Ladder(rungs) => TypeTerm::Ladder(rungs.into_iter().map(|p| p.desugar()).collect()),
-            SugaredTypeTerm::Seq(pattern) => {
-                let mut params : Vec<TypeTerm> = pattern.into_iter().map(|p| p.desugar()).collect();
-                params.insert(0, TypeTerm::TypeID(SEQ_SUGARID));
-                TypeTerm::App(params)
-            }
-            SugaredTypeTerm::Enum(options) => {
-                let mut params : Vec<TypeTerm> = options.into_iter().map(|o| o.desugar()).collect();
-                params.insert(0, TypeTerm::TypeID(ENUM_SUGARID));
-                TypeTerm::App(params)
-            }
-            SugaredTypeTerm::Struct(members) => {
-                let mut params : Vec<TypeTerm> = members.into_iter().map(|m| m.desugar()).collect();
-                params.insert(0, TypeTerm::TypeID(STRUCT_SUGARID));
-                TypeTerm::App(params)
-            }
-        }
-    }
-
-    // normalize any unsugared parts into sugared form
-    pub fn sugar(self) -> SugaredTypeTerm {
-        // todo: optimize
-        self.desugar().sugar()
-    }
+    Struct(Vec< SugaredTypeTerm >),
+    Enum(Vec< SugaredTypeTerm >),
+    Seq(Vec< SugaredTypeTerm >)
 }
 
 impl TypeTerm {
-    pub fn sugar(self) -> SugaredTypeTerm {
+    pub fn sugar(self: TypeTerm, dict: &mut crate::TypeDict) -> SugaredTypeTerm {
         match self {
             TypeTerm::TypeID(id) => SugaredTypeTerm::TypeID(id),
             TypeTerm::Num(n) => SugaredTypeTerm::Num(n),
             TypeTerm::Char(c) => SugaredTypeTerm::Char(c),
-            TypeTerm::App(mut params) => {
-                if params.len() > 0 {
-                    let prim = params.remove(0);
-                    match prim {
-                        TypeTerm::TypeID( SEQ_SUGARID ) =>
-                            SugaredTypeTerm::Seq(
-                                params
-                                    .into_iter()
-                                    .map(|p| p.sugar())
-                                    .collect()
-                            ),
-
-                        TypeTerm::TypeID( ENUM_SUGARID ) =>
-                            SugaredTypeTerm::Enum(
-                                params
-                                    .into_iter()
-                                    .map(|p| p.sugar())
-                                    .collect()
-                            ),
-                        TypeTerm::TypeID( STRUCT_SUGARID ) =>
-                            SugaredTypeTerm::Struct(
-                                params
-                                    .into_iter()
-                                    .map(|p| p.sugar())
-                                    .collect()
-                            ),
-                        other => SugaredTypeTerm::App(
-                            params.into_iter().map(|p| p.sugar()).collect()
-                        )
-                    }
-                } else {
-                    SugaredTypeTerm::App(vec![])
+            TypeTerm::App(args) => if let Some(first) = args.first() {
+                if first == &dict.parse("Func").unwrap() {
+                    SugaredTypeTerm::Func( args[1..].into_iter().map(|t| t.clone().sugar(dict)).collect() )
                 }
+                else if first == &dict.parse("Morph").unwrap() {
+                    SugaredTypeTerm::Morph( args[1..].into_iter().map(|t| t.clone().sugar(dict)).collect() )
+                }
+                else if first == &dict.parse("Struct").unwrap() {
+                    SugaredTypeTerm::Struct( args[1..].into_iter().map(|t| t.clone().sugar(dict)).collect() )
+                }
+                else if first == &dict.parse("Enum").unwrap() {
+                    SugaredTypeTerm::Enum( args[1..].into_iter().map(|t| t.clone().sugar(dict)).collect() )
+                }
+                else if first == &dict.parse("Seq").unwrap() {
+                    SugaredTypeTerm::Seq( args[1..].into_iter().map(|t| t.clone().sugar(dict)).collect() )
+                }
+                else if first == &dict.parse("Spec").unwrap() {
+                    SugaredTypeTerm::Spec( args[1..].into_iter().map(|t| t.clone().sugar(dict)).collect() )
+                }
+                else if first == &dict.parse("Univ").unwrap() {
+                    SugaredTypeTerm::Univ(Box::new(
+                        SugaredTypeTerm::Spec(
+                            args[1..].into_iter().map(|t| t.clone().sugar(dict)).collect()
+                        )
+                    ))
+                }
+                else {
+                    SugaredTypeTerm::Spec(args.into_iter().map(|t| t.sugar(dict)).collect())
+                }
+            } else {
+                SugaredTypeTerm::Spec(args.into_iter().map(|t| t.sugar(dict)).collect())
             },
-            TypeTerm::Ladder(rungs) => {
-                SugaredTypeTerm::Ladder(rungs.into_iter().map(|r| r.sugar()).collect())
-            }
+            TypeTerm::Ladder(rungs) =>            
+               SugaredTypeTerm::Ladder(rungs.into_iter().map(|t| t.sugar(dict)).collect())
         }
     }
 }
+
+impl SugaredTypeTerm {
+    pub fn desugar(self, dict: &mut crate::TypeDict) -> TypeTerm {
+        match self {
+            SugaredTypeTerm::TypeID(id) => TypeTerm::TypeID(id),
+            SugaredTypeTerm::Num(n) => TypeTerm::Num(n),
+            SugaredTypeTerm::Char(c) => TypeTerm::Char(c),
+            SugaredTypeTerm::Univ(t) => t.desugar(dict),
+            SugaredTypeTerm::Spec(ts) => TypeTerm::App(ts.into_iter().map(|t| t.desugar(dict)).collect()),
+            SugaredTypeTerm::Ladder(ts) => TypeTerm::Ladder(ts.into_iter().map(|t|t.desugar(dict)).collect()),
+            SugaredTypeTerm::Func(ts) => TypeTerm::App(
+                std::iter::once( dict.parse("Func").unwrap() ).chain(
+                    ts.into_iter().map(|t| t.desugar(dict))
+                ).collect()),
+            SugaredTypeTerm::Morph(ts) => TypeTerm::App(
+                std::iter::once( dict.parse("Morph").unwrap() ).chain(
+                    ts.into_iter().map(|t| t.desugar(dict))
+                ).collect()),
+            SugaredTypeTerm::Struct(ts) => TypeTerm::App(
+                std::iter::once( dict.parse("Struct").unwrap() ).chain(
+                    ts.into_iter().map(|t| t.desugar(dict))
+                ).collect()),
+            SugaredTypeTerm::Enum(ts) => TypeTerm::App(
+                std::iter::once( dict.parse("Enum").unwrap() ).chain(
+                    ts.into_iter().map(|t| t.desugar(dict))
+                ).collect()),
+            SugaredTypeTerm::Seq(ts) => TypeTerm::App(
+                std::iter::once( dict.parse("Seq").unwrap() ).chain(
+                    ts.into_iter().map(|t| t.desugar(dict))
+                ).collect()),
+        }
+    }
+}
+

src/term.rs

@@ -57,7 +57,7 @@ impl TypeTerm {
     pub fn repr_as(&mut self, t: impl Into<TypeTerm>) -> &mut Self {
         match self {
             TypeTerm::Ladder(rungs) => {
-                rungs.push(t.into());                
+                rungs.push(t.into());
             }
 
             _ => {

src/test/mod.rs

@@ -2,7 +2,6 @@
 pub mod lexer;
 pub mod parser;
 pub mod curry;
-pub mod sugar;
 pub mod lnf;
 pub mod subtype;
 pub mod substitution;

src/test/parser.rs

@@ -1,6 +1,6 @@
 
 use {
-    crate::{term::*, dict::*, parser::*, sugar::SUGARID_LIMIT}
+    crate::{term::*, dict::*, parser::*}
 };
 
 //<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>\\
@@ -17,7 +17,7 @@ fn test_parser_id() {
     );
 
     assert_eq!(
-        Ok(TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+0))),
+        Ok(TypeTerm::TypeID(TypeID::Fun(0))),
         dict.parse("A")
     );
 }
@@ -43,16 +43,16 @@ fn test_parser_app() {
     assert_eq!(
         TypeDict::new().parse("<A B>"),
         Ok(TypeTerm::App(vec![
-            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+0)),
-            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+1)),
+            TypeTerm::TypeID(TypeID::Fun(0)),
+            TypeTerm::TypeID(TypeID::Fun(1)),
         ]))
     );
     assert_eq!(
         TypeDict::new().parse("<A B C>"),
         Ok(TypeTerm::App(vec![
-            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+0)),
-            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+1)),
-            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+2)),
+            TypeTerm::TypeID(TypeID::Fun(0)),
+            TypeTerm::TypeID(TypeID::Fun(1)),
+            TypeTerm::TypeID(TypeID::Fun(2)),
         ]))
     );
 }
@@ -78,16 +78,16 @@ fn test_parser_ladder() {
     assert_eq!(
         TypeDict::new().parse("A~B"),
         Ok(TypeTerm::Ladder(vec![
-            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+0)),
-            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+1)),
+            TypeTerm::TypeID(TypeID::Fun(0)),
+            TypeTerm::TypeID(TypeID::Fun(1)),
         ]))
     );
     assert_eq!(
         TypeDict::new().parse("A~B~C"),
         Ok(TypeTerm::Ladder(vec![
-            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+0)),
-            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+1)),
-            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+2)),
+            TypeTerm::TypeID(TypeID::Fun(0)),
+            TypeTerm::TypeID(TypeID::Fun(1)),
+            TypeTerm::TypeID(TypeID::Fun(2)),
         ]))
     );
 }
@@ -98,12 +98,12 @@ fn test_parser_ladder_outside() {
         TypeDict::new().parse("<A B>~C"),
         Ok(TypeTerm::Ladder(vec![
             TypeTerm::App(vec![
-                TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+0)),
-                TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+1)),
+                TypeTerm::TypeID(TypeID::Fun(0)),
+                TypeTerm::TypeID(TypeID::Fun(1)),
             ]),
-            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+2)),
+            TypeTerm::TypeID(TypeID::Fun(2)),
         ]))
-    );
+    );    
 }
 
 #[test]
@@ -111,10 +111,10 @@ fn test_parser_ladder_inside() {
     assert_eq!(
         TypeDict::new().parse("<A B~C>"),
         Ok(TypeTerm::App(vec![
-            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+0)),
+            TypeTerm::TypeID(TypeID::Fun(0)),
             TypeTerm::Ladder(vec![
-                TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+1)),
-                TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+2)),
+                TypeTerm::TypeID(TypeID::Fun(1)),
+                TypeTerm::TypeID(TypeID::Fun(2)),
             ])
         ]))
     );    
@@ -125,12 +125,12 @@ fn test_parser_ladder_between() {
     assert_eq!(
         TypeDict::new().parse("<A B~<C D>>"),
         Ok(TypeTerm::App(vec![
-            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+0)),
+            TypeTerm::TypeID(TypeID::Fun(0)),
             TypeTerm::Ladder(vec![
-                TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+1)),
+                TypeTerm::TypeID(TypeID::Fun(1)),
                 TypeTerm::App(vec![
-                    TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+2)),
-                    TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+3)),
+                    TypeTerm::TypeID(TypeID::Fun(2)),
+                    TypeTerm::TypeID(TypeID::Fun(3)),
                 ])
             ])
         ]))
@@ -156,48 +156,48 @@ fn test_parser_ladder_large() {
         Ok(
             TypeTerm::Ladder(vec![
                 TypeTerm::App(vec![
-                    TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+0)),
+                    TypeTerm::TypeID(TypeID::Fun(0)),
                     TypeTerm::Ladder(vec![
-                        TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+1)),
+                        TypeTerm::TypeID(TypeID::Fun(1)),
                         TypeTerm::App(vec![
-                            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+2)),
-                            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+3))
+                            TypeTerm::TypeID(TypeID::Fun(2)),
+                            TypeTerm::TypeID(TypeID::Fun(3))
                         ]),
                         TypeTerm::App(vec![
-                            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+4)),
-                            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+5))
+                            TypeTerm::TypeID(TypeID::Fun(4)),
+                            TypeTerm::TypeID(TypeID::Fun(5))
                         ]),
-                        TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+6)),
+                        TypeTerm::TypeID(TypeID::Fun(6)),
                         TypeTerm::App(vec![
-                            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+7)),
+                            TypeTerm::TypeID(TypeID::Fun(7)),
                             TypeTerm::Num(10),
-                            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+8))
+                            TypeTerm::TypeID(TypeID::Fun(8))
                         ]),
                         TypeTerm::App(vec![
-                            TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+0)),
+                            TypeTerm::TypeID(TypeID::Fun(0)),
                             TypeTerm::Ladder(vec![
                                 TypeTerm::App(vec![
-                                    TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+9)),
+                                    TypeTerm::TypeID(TypeID::Fun(9)),
                                     TypeTerm::Num(10)
                                 ]),
-                                TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+10))
+                                TypeTerm::TypeID(TypeID::Fun(10))
                             ])
                         ])
                     ])
                 ]),
                 TypeTerm::App(vec![
-                    TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+11)),
-                    TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+10)),
+                    TypeTerm::TypeID(TypeID::Fun(11)),
+                    TypeTerm::TypeID(TypeID::Fun(10)),
                     TypeTerm::Char(':')
                 ]),
                 TypeTerm::App(vec![
-                    TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+0)),
-                    TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+10))
+                    TypeTerm::TypeID(TypeID::Fun(0)),
+                    TypeTerm::TypeID(TypeID::Fun(10))
                 ]),
-                TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+12)),
+                TypeTerm::TypeID(TypeID::Fun(12)),
                 TypeTerm::App(vec![
-                    TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+0)),
-                    TypeTerm::TypeID(TypeID::Fun(SUGARID_LIMIT+13))
+                    TypeTerm::TypeID(TypeID::Fun(0)),
+                    TypeTerm::TypeID(TypeID::Fun(13))
                 ])
             ])
         )

src/test/sugar.rs

@@ -1,10 +0,0 @@
-
-#[test]
-fn test_sugar() {
-
-    let mut dict = crate::TypeDict::new();
-
-    
-}
-
-

src/test/unification.rs

@@ -13,8 +13,8 @@ fn test_unify(ts1: &str, ts2: &str, expect_unificator: bool) {
     dict.add_varname(String::from("V"));
     dict.add_varname(String::from("W"));
 
-    let mut t1 = dict.parse(ts1).unwrap().desugar();
-    let mut t2 = dict.parse(ts2).unwrap().desugar();
+    let mut t1 = dict.parse(ts1).unwrap();
+    let mut t2 = dict.parse(ts2).unwrap();
     let σ = crate::unify( &t1, &t2 );
 
     if expect_unificator {