mutual function definitions

7 files changed, 473 insertions, 16 deletions

diff --git a/testdata/language-features/recursion/mutualConst.lc b/testdata/language-features/recursion/mutualConst.lc
index c7f83f18..526a14a7 100644
--- a/testdata/language-features/recursion/mutualConst.lc
+++ b/testdata/language-features/recursion/mutualConst.lc
@@ -1,9 +1,14 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+import Internals
 
-xy = (\x y -> ((1 :: Int): y, 1: x)) (fst xy) (snd xy)
+fst (x, y) = x
+snd (x, y) = y
+
+xy = (\x y -> (False: y, True: x)) (fst xy) (snd xy)
 
 (x, y) = xy
 
 main = case x of
-    1: 1: 1: _ -> True
+    False: True: False: _ -> True
 
 
diff --git a/testdata/language-features/recursion/mutualConst.out b/testdata/language-features/recursion/mutualConst.out
index 4791ed55..34d37bc7 100644
--- a/testdata/language-features/recursion/mutualConst.out
+++ b/testdata/language-features/recursion/mutualConst.out
@@ -1 +1,194 @@
-True
\ No newline at end of file
+main :: Bool
+main = True
+------------ desugared source code
+fst
+  = _lhs
+    fst
+    \(a :: _) -> hlistConsCase
+      _
+      (\(b :: _) (c :: _) -> hlistConsCase
+        _
+        (\(_ :: _) (d :: _) -> hlistNilCase _ (_rhs b) d)
+        c)
+      a
+
+snd
+  = _lhs
+    snd
+    \(a :: _) -> hlistConsCase
+      _
+      (\(_ :: _) (b :: _) -> hlistConsCase
+        _
+        (\(c :: _) (d :: _) -> hlistNilCase _ (_rhs c) d)
+        b)
+      a
+
+xy
+  = primFix
+    \(a :: _) -> _lhs
+      xy
+      (_rhs ((\(b :: _) (c :: _) -> (False : c, True : b)) (fst a) (snd a)))
+
+_y_x = _lhs _y_x (_rhs xy)
+
+y
+  = _lhs
+    y
+    (_rhs
+      ((\(a :: _) -> hlistConsCase
+          _
+          (\(_ :: _) (b :: _) -> hlistConsCase
+            _
+            (\(c :: _) (d :: _) -> hlistNilCase _ c d)
+            b)
+          a)
+        _y_x))
+
+x
+  = _lhs
+    x
+    (_rhs
+      ((\(a :: _) -> hlistConsCase
+          _
+          (\(b :: _) (c :: _) -> hlistConsCase
+            _
+            (\(_ :: _) (d :: _) -> hlistNilCase _ b d)
+            c)
+          a)
+        _y_x))
+
+main
+  = _lhs
+    main
+    (_rhs
+      ((\(a :: _) -> case'List
+          (\(_ :: _) -> _)
+          undefined
+          (\(b :: _) (c :: _) -> case'Bool
+            (\(_ :: _) -> _)
+            (case'List
+              (\(_ :: _) -> _)
+              undefined
+              (\(d :: _) (e :: _) -> case'Bool
+                (\(_ :: _) -> _)
+                undefined
+                (case'List
+                  (\(_ :: _) -> _)
+                  undefined
+                  (\(f :: _) (_ :: _) -> case'Bool (\(_ :: _) -> _) True undefined f)
+                  e)
+                d)
+              c)
+            undefined
+            b)
+          a)
+        x))
+------------ core code
+_y_x :: ([Bool], [Bool])
+_y_x = _rhs (False : snd xy, True : fst xy)
+
+fst :: forall a b . (a, b) -> a
+fst
+  = \a b c -> hlistConsCase
+    a
+    [b]
+    a
+    (\d e -> hlistConsCase b [] a (\_ f -> hlistNilCase a (_rhs d) f) e)
+    c
+
+main :: Bool
+main = _rhs True
+
+snd :: forall a b . (a, b) -> b
+snd
+  = \a b c -> hlistConsCase
+    a
+    [b]
+    b
+    (\_ d -> hlistConsCase b [] b (\e f -> hlistNilCase b (_rhs e) f) d)
+    c
+
+x :: [Bool]
+x = _rhs (False : snd xy)
+
+xy :: ([Bool], [Bool])
+xy = primFix _ \a -> _rhs (False : snd a, True : fst a)
+
+y :: [Bool]
+y = _rhs (True : fst xy)
+------------ tooltips
+testdata/language-features/recursion/mutualConst.lc 4:1-4:4
+    forall a b . (a, b) -> a
+testdata/language-features/recursion/mutualConst.lc 4:14-4:15
+    _k | _h | _d
+testdata/language-features/recursion/mutualConst.lc 5:1-5:4
+    forall a b . (a, b) -> b
+testdata/language-features/recursion/mutualConst.lc 5:14-5:15
+    _f | _c | _c
+testdata/language-features/recursion/mutualConst.lc 7:1-7:3
+    ([Bool], [Bool])
+testdata/language-features/recursion/mutualConst.lc 7:6-7:44
+    [Bool] -> ([Bool], [Bool])
+testdata/language-features/recursion/mutualConst.lc 7:6-7:53
+    ([Bool], [Bool])
+testdata/language-features/recursion/mutualConst.lc 7:15-7:34
+    ([Bool], [Bool])
+testdata/language-features/recursion/mutualConst.lc 7:16-7:21
+    Bool
+testdata/language-features/recursion/mutualConst.lc 7:16-7:22
+    [Bool] -> [Bool]
+testdata/language-features/recursion/mutualConst.lc 7:16-7:24
+    [Bool]
+testdata/language-features/recursion/mutualConst.lc 7:21-7:22
+    forall a . a -> [a] -> [a]
+testdata/language-features/recursion/mutualConst.lc 7:23-7:24
+    _c
+testdata/language-features/recursion/mutualConst.lc 7:26-7:30
+    Bool
+testdata/language-features/recursion/mutualConst.lc 7:26-7:31
+    [Bool] -> [Bool]
+testdata/language-features/recursion/mutualConst.lc 7:26-7:33
+    [Bool] | (([Bool]))
+testdata/language-features/recursion/mutualConst.lc 7:30-7:31
+    forall a . a -> [a] -> [a]
+testdata/language-features/recursion/mutualConst.lc 7:32-7:33
+    _e
+testdata/language-features/recursion/mutualConst.lc 7:37-7:40
+    forall a b . (a, b) -> a
+testdata/language-features/recursion/mutualConst.lc 7:37-7:43
+    _b
+testdata/language-features/recursion/mutualConst.lc 7:41-7:43
+    _d
+testdata/language-features/recursion/mutualConst.lc 7:46-7:49
+    forall a b . (a, b) -> b
+testdata/language-features/recursion/mutualConst.lc 7:46-7:52
+    [Bool]
+testdata/language-features/recursion/mutualConst.lc 7:50-7:52
+    ([Bool], [Bool])
+testdata/language-features/recursion/mutualConst.lc 9:2-9:3
+    _k | _h | _d | [Bool]
+testdata/language-features/recursion/mutualConst.lc 9:2-9:6
+    ([Bool], [Bool]) | ([Bool], [Bool]) | ([Bool], [Bool])
+testdata/language-features/recursion/mutualConst.lc 9:5-9:6
+    _f | _c | _c | [Bool]
+testdata/language-features/recursion/mutualConst.lc 9:10-9:12
+    ([Bool], [Bool])
+testdata/language-features/recursion/mutualConst.lc 11:1-11:5
+    Bool
+testdata/language-features/recursion/mutualConst.lc 11:8-12:34
+    Bool
+testdata/language-features/recursion/mutualConst.lc 11:13-11:14
+    [Bool]
+testdata/language-features/recursion/mutualConst.lc 12:30-12:34
+    Bool | Bool | Bool | Bool | Bool | Bool
+------------ warnings
+Uncovered pattern(s) at testdata/language-features/recursion/mutualConst.lc:11:13:
+main = case x of
+            ^
+Missing case(s):
+     []
+     [False]
+     (False : False : _)
+     [False, True]
+     (False : True : True : _)
+     (True : _)
\ No newline at end of file
diff --git a/testdata/language-features/recursion/mutualFunc.lc b/testdata/language-features/recursion/mutualFunc.lc
new file mode 100644
index 00000000..2f3a524e
--- /dev/null
+++ b/testdata/language-features/recursion/mutualFunc.lc
@@ -0,0 +1,11 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+import Internals
+
+f True = g False
+f False = g True
+
+g True = True
+g x = f x
+
+main = f True
+
diff --git a/testdata/language-features/recursion/mutualFunc.out b/testdata/language-features/recursion/mutualFunc.out
new file mode 100644
index 00000000..6dd3f158
--- /dev/null
+++ b/testdata/language-features/recursion/mutualFunc.out
@@ -0,0 +1,107 @@
+main :: Bool
+main = True
+------------ desugared source code
+_g_f
+  = primFix
+    \(a :: _) -> let
+      b = a;
+      c
+        = (\(e :: _) -> hlistConsCase
+            _
+            (\(_ :: _) (f :: _) -> hlistConsCase
+              _
+              (\(g :: _) (h :: _) -> hlistNilCase _ g h)
+              f)
+            e)
+          b;
+      d
+        = (\(i :: _) -> hlistConsCase
+            _
+            (\(j :: _) (k :: _) -> hlistConsCase
+              _
+              (\(_ :: _) (l :: _) -> hlistNilCase _ j l)
+              k)
+            i)
+          b
+      in (_lhs g \(m :: _) -> case'Bool (\(_ :: _) -> _) (_rhs (c m)) (_rhs True) m
+    , _lhs
+      f
+      \(n :: _) -> case'Bool (\(_ :: _) -> _) (_rhs (d True)) (_rhs (d False)) n)
+
+_f_g = _g_f
+
+f
+  = (\(a :: _) -> hlistConsCase
+      _
+      (\(_ :: _) (b :: _) -> hlistConsCase
+        _
+        (\(c :: _) (d :: _) -> hlistNilCase _ c d)
+        b)
+      a)
+    _f_g
+
+g
+  = (\(a :: _) -> hlistConsCase
+      _
+      (\(b :: _) (c :: _) -> hlistConsCase
+        _
+        (\(_ :: _) (d :: _) -> hlistNilCase _ b d)
+        c)
+      a)
+    _f_g
+
+main = _lhs main (_rhs (f True))
+------------ core code
+_f_g :: (Bool -> Bool, Bool -> Bool)
+_f_g = primFix _ \a -> <<1st constructor of 'HList>>
+
+_g_f :: (Bool -> Bool, Bool -> Bool)
+_g_f = primFix _ \a -> <<1st constructor of 'HList>>
+
+f :: Bool -> Bool
+f = \a -> case'Bool (\_ -> 'Bool) (_rhs True) (_rhs True) a
+
+g :: Bool -> Bool
+g = \a -> case'Bool (\_ -> 'Bool) (_rhs (f a)) (_rhs True) a
+
+main :: Bool
+main = _rhs True
+------------ tooltips
+testdata/language-features/recursion/mutualFunc.lc 4:1-4:2
+    _f | _c | _c | _f | _c | _c | Bool -> Bool
+testdata/language-features/recursion/mutualFunc.lc 4:1-7:2
+    _b | _e | (_e, _d) | (Bool -> Bool, Bool -> Bool) | (Bool -> Bool
+    , Bool -> Bool) | (Bool -> Bool, Bool -> Bool) | (Bool -> Bool
+    , Bool -> Bool) | (Bool -> Bool, Bool -> Bool)
+testdata/language-features/recursion/mutualFunc.lc 4:10-4:11
+    Bool -> _a
+testdata/language-features/recursion/mutualFunc.lc 4:10-4:17
+    _a
+testdata/language-features/recursion/mutualFunc.lc 4:10-5:17
+    Bool -> _a | ((Bool -> _a))
+testdata/language-features/recursion/mutualFunc.lc 4:10-8:10
+    (Bool -> Bool, Bool -> _a)
+testdata/language-features/recursion/mutualFunc.lc 4:12-4:17
+    Bool
+testdata/language-features/recursion/mutualFunc.lc 5:11-5:12
+    _i
+testdata/language-features/recursion/mutualFunc.lc 5:13-5:17
+    Bool
+testdata/language-features/recursion/mutualFunc.lc 7:1-7:2
+    _k | _h | _d | _k | _h | _d | Bool -> Bool
+testdata/language-features/recursion/mutualFunc.lc 7:10-7:14
+    Bool
+testdata/language-features/recursion/mutualFunc.lc 7:10-8:10
+    Bool -> Bool
+testdata/language-features/recursion/mutualFunc.lc 8:7-8:8
+    _h
+testdata/language-features/recursion/mutualFunc.lc 8:9-8:10
+    _f
+testdata/language-features/recursion/mutualFunc.lc 10:1-10:5
+    Bool
+testdata/language-features/recursion/mutualFunc.lc 10:8-10:9
+    Bool -> Bool
+testdata/language-features/recursion/mutualFunc.lc 10:8-10:14
+    Bool
+testdata/language-features/recursion/mutualFunc.lc 10:10-10:14
+    Bool
\ No newline at end of file
diff --git a/testdata/language-features/recursion/mutualRec.lc b/testdata/language-features/recursion/mutualRec.lc
index c9ae6135..9a9422de 100644
--- a/testdata/language-features/recursion/mutualRec.lc
+++ b/testdata/language-features/recursion/mutualRec.lc
@@ -1,8 +1,10 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+import Internals
 
-x = 2: y
-y = 1: x
+x = False: y
+y = True: x
 
-main = case (x :: [Int]) of
-    2: 1: 2: _ -> True
+main = case x of
+    False: True: False: _ -> True
 
 
diff --git a/testdata/language-features/recursion/mutualRec.out b/testdata/language-features/recursion/mutualRec.out
index 4791ed55..885bd1ba 100644
--- a/testdata/language-features/recursion/mutualRec.out
+++ b/testdata/language-features/recursion/mutualRec.out
@@ -1 +1,139 @@
-True
\ No newline at end of file
+main :: Bool
+main = True
+------------ desugared source code
+_y_x
+  = primFix
+    \(a :: _) -> let
+      b = a;
+      c
+        = (\(e :: _) -> hlistConsCase
+            _
+            (\(_ :: _) (f :: _) -> hlistConsCase
+              _
+              (\(g :: _) (h :: _) -> hlistNilCase _ g h)
+              f)
+            e)
+          b;
+      d
+        = (\(i :: _) -> hlistConsCase
+            _
+            (\(j :: _) (k :: _) -> hlistConsCase
+              _
+              (\(_ :: _) (l :: _) -> hlistNilCase _ j l)
+              k)
+            i)
+          b
+      in (_lhs y (_rhs (True : c)), _lhs x (_rhs (False : d)))
+
+_x_y = _y_x
+
+x
+  = (\(a :: _) -> hlistConsCase
+      _
+      (\(_ :: _) (b :: _) -> hlistConsCase
+        _
+        (\(c :: _) (d :: _) -> hlistNilCase _ c d)
+        b)
+      a)
+    _x_y
+
+y
+  = (\(a :: _) -> hlistConsCase
+      _
+      (\(b :: _) (c :: _) -> hlistConsCase
+        _
+        (\(_ :: _) (d :: _) -> hlistNilCase _ b d)
+        c)
+      a)
+    _x_y
+
+main
+  = _lhs
+    main
+    (_rhs
+      ((\(a :: _) -> case'List
+          (\(_ :: _) -> _)
+          undefined
+          (\(b :: _) (c :: _) -> case'Bool
+            (\(_ :: _) -> _)
+            (case'List
+              (\(_ :: _) -> _)
+              undefined
+              (\(d :: _) (e :: _) -> case'Bool
+                (\(_ :: _) -> _)
+                undefined
+                (case'List
+                  (\(_ :: _) -> _)
+                  undefined
+                  (\(f :: _) (_ :: _) -> case'Bool (\(_ :: _) -> _) True undefined f)
+                  e)
+                d)
+              c)
+            undefined
+            b)
+          a)
+        x))
+------------ core code
+_x_y :: ([Bool], [Bool])
+_x_y = primFix _ \a -> <<1st constructor of 'HList>>
+
+_y_x :: ([Bool], [Bool])
+_y_x = primFix _ \a -> <<1st constructor of 'HList>>
+
+main :: Bool
+main = _rhs True
+
+x :: [Bool]
+x = _rhs (False : y)
+
+y :: [Bool]
+y = _rhs (True : x)
+------------ tooltips
+testdata/language-features/recursion/mutualRec.lc 4:1-4:2
+    _f | _c | _c | _f | _c | _c | [Bool]
+testdata/language-features/recursion/mutualRec.lc 4:1-5:2
+    _b | _e | (_e, _d) | ([Bool], [Bool]) | ([Bool], [Bool]) | ([Bool]
+    , [Bool]) | ([Bool], [Bool]) | ([Bool], [Bool])
+testdata/language-features/recursion/mutualRec.lc 4:5-4:10
+    Bool
+testdata/language-features/recursion/mutualRec.lc 4:5-4:11
+    [Bool] -> [Bool]
+testdata/language-features/recursion/mutualRec.lc 4:5-4:13
+    [Bool] | (([Bool]))
+testdata/language-features/recursion/mutualRec.lc 4:5-5:12
+    ([Bool], [Bool])
+testdata/language-features/recursion/mutualRec.lc 4:10-4:11
+    forall a . a -> [a] -> [a]
+testdata/language-features/recursion/mutualRec.lc 4:12-4:13
+    _e
+testdata/language-features/recursion/mutualRec.lc 5:1-5:2
+    _k | _h | _d | _k | _h | _d | [Bool]
+testdata/language-features/recursion/mutualRec.lc 5:5-5:9
+    Bool
+testdata/language-features/recursion/mutualRec.lc 5:5-5:10
+    [Bool] -> [Bool]
+testdata/language-features/recursion/mutualRec.lc 5:5-5:12
+    [Bool]
+testdata/language-features/recursion/mutualRec.lc 5:9-5:10
+    forall a . a -> [a] -> [a]
+testdata/language-features/recursion/mutualRec.lc 5:11-5:12
+    _d
+testdata/language-features/recursion/mutualRec.lc 7:1-7:5
+    Bool
+testdata/language-features/recursion/mutualRec.lc 7:8-8:34
+    Bool
+testdata/language-features/recursion/mutualRec.lc 7:13-7:14
+    [Bool]
+testdata/language-features/recursion/mutualRec.lc 8:30-8:34
+    Bool | Bool | Bool | Bool | Bool | Bool
+------------ warnings
+Uncovered pattern(s) at testdata/language-features/recursion/mutualRec.lc:7:13:
+main = case x of
+            ^
+Missing case(s):
+     []
+     [False]
+     (False : False : _)
+     [False, True]
+     (False : True : True : _)
+     (True : _)
\ No newline at end of file
diff --git a/testdata/language-features/recursion/simplerec01.out b/testdata/language-features/recursion/simplerec01.out
index 736caa77..823d544e 100644
--- a/testdata/language-features/recursion/simplerec01.out
+++ b/testdata/language-features/recursion/simplerec01.out
@@ -1,18 +1,19 @@
 main is not found
 ------------ desugared source code
 fun
-  = _lhs
-    fun
-    \(a :: _) -> case'Bool
-      (\(_ :: _) -> _)
-      (_rhs (fun (fromInt 0)))
-      (_rhs 'a')
-      (fromInt 0 == a)
+  = primFix
+    \(a :: _) -> _lhs
+      fun
+      \(b :: _) -> case'Bool
+        (\(_ :: _) -> _)
+        (_rhs (a (fromInt 0)))
+        (_rhs 'a')
+        (fromInt 0 == b)
 ------------ core code
 fun :: forall a . (Num a, Eq a, Num a) => a -> Char
 fun
   = \a b c d -> primFix
-    (a -> 'Char)
+    _
     \e f -> case'Bool
       (\_ -> 'Char)
       (_rhs (e (fromInt a b 0)))