3 files changed, 13 insertions, 9 deletions

diff --git a/lc/Prelude.lc b/lc/Prelude.lc
index 11cfc4ab..aa065096 100644
--- a/lc/Prelude.lc
+++ b/lc/Prelude.lc
@@ -129,8 +129,8 @@ data RecordC (xs :: [RecItem])
 isKeyC _ _ [] = 'Empty ""
 isKeyC s t (RecItem s' t': ss) = if s == s' then t ~ t' else isKeyC s t ss
 
-fstTup (HCons a _) = a
-sndTup (HCons _ a) = a
+fstTup = hlistConsCase _ (\a _ -> a)
+sndTup = hlistConsCase _ (\_ a -> a)
 
 -- todo: don't use unsafeCoerce
 project :: forall a (xs :: [RecItem]) . forall (s :: String) -> isKeyC s a xs => RecordC xs -> a
diff --git a/src/LambdaCube/Compiler/Parser.hs b/src/LambdaCube/Compiler/Parser.hs
index 90e576d6..9b50ff0d 100644
--- a/src/LambdaCube/Compiler/Parser.hs
+++ b/src/LambdaCube/Compiler/Parser.hs
@@ -1159,7 +1159,7 @@ mkDesugarInfo :: [Stmt] -> DesugarInfo
 mkDesugarInfo ss =
     ( Map.fromList $ ("'EqCTt", (Infix, -1)): [(s, f) | PrecDef (_, s) f <- ss]
     , Map.fromList $
-        [hackHList (cn, Left ((caseName t, pars ty), (snd *** pars) <$> cs)) | Data (_, t) ps ty _ cs <- ss, ((_, cn), ct) <- cs]
+        [(cn, Left ((caseName t, pars ty), (snd *** pars) <$> cs)) | Data (_, t) ps ty _ cs <- ss, ((_, cn), ct) <- cs]
      ++ [(t, Right $ pars $ UncurryS ps ty) | Data (_, t) ps ty _ _ <- ss]
 --     ++ [(t, Right $ length xs) | Let (_, t) _ (Just ty) xs _ <- ss]
      ++ [("'Type", Right 0)]
@@ -1167,10 +1167,6 @@ mkDesugarInfo ss =
   where
     pars (UncurryS l _) = length $ filter ((== Visible) . fst) l -- todo
 
-    hackHList ("HCons", _) = ("HCons", Left (("hlistConsCase", -1), [("HCons", 2)]))
-    hackHList ("HNil", _) = ("HNil", Left (("hlistNilCase", -1), [("HNil", 0)]))
-    hackHList x = x
-
 -------------------------------------------------------------------------------- module exports
 
 data Export = ExportModule SIName | ExportId SIName
diff --git a/testdata/Prelude.out b/testdata/Prelude.out
index f1faf875..0e7d4e05 100644
--- a/testdata/Prelude.out
+++ b/testdata/Prelude.out
@@ -479,9 +479,17 @@ testdata/Prelude.lc 130:69-130:70  String
 testdata/Prelude.lc 130:71-130:72  Type
 testdata/Prelude.lc 130:73-130:75  List V8
 testdata/Prelude.lc 132:1-132:7  {a} -> {b : List Type} -> HList ('Cons a b) -> a
-testdata/Prelude.lc 132:22-132:23  HList V2 -> V2 | V2 -> HList V2 -> V2 | V4
+testdata/Prelude.lc 132:10-132:23  {a} -> {b : List Type} -> c:Type -> (a -> HList b -> c) -> HList ('Cons a b) -> c
+testdata/Prelude.lc 132:10-132:25  (V2 -> HList V2 -> V2) -> HList ('Cons V3 V2) -> V2
+testdata/Prelude.lc 132:10-132:37  HList ('Cons V1 V0) -> V2
+testdata/Prelude.lc 132:27-132:36  V2 -> HList V2 -> V2
+testdata/Prelude.lc 132:35-132:36  HList V2 -> V2 | V4
 testdata/Prelude.lc 133:1-133:7  {a} -> {b : List Type} -> HList ('Cons a b) -> HList b
-testdata/Prelude.lc 133:22-133:23  HList V2 -> V2 | HList V3 | V2 -> HList V2 -> V2
+testdata/Prelude.lc 133:10-133:23  {a} -> {b : List Type} -> c:Type -> (a -> HList b -> c) -> HList ('Cons a b) -> c
+testdata/Prelude.lc 133:10-133:25  (V2 -> HList V2 -> V2) -> HList ('Cons V3 V2) -> V2
+testdata/Prelude.lc 133:10-133:37  HList ('Cons V1 V0) -> HList V1
+testdata/Prelude.lc 133:27-133:36  V2 -> HList V2 -> V2
+testdata/Prelude.lc 133:35-133:36  HList V2 -> V2 | HList V3
 testdata/Prelude.lc 136:12-138:181  V0->V1 | {a} -> {b : List RecItem} -> c:String -> {d : 'isKeyC c a b} -> RecordC b -> a
 testdata/Prelude.lc 136:28-136:37  Type
 testdata/Prelude.lc 136:28-136:97  Type