2 files changed, 12 insertions, 11 deletions

diff --git a/src/LambdaCube/Compiler/Patterns.hs b/src/LambdaCube/Compiler/Patterns.hs
index 856de00d..3056b132 100644
--- a/src/LambdaCube/Compiler/Patterns.hs
+++ b/src/LambdaCube/Compiler/Patterns.hs
@@ -85,20 +85,20 @@ pattern PConSimp    n ps = ParPat [PCon    n ps]
 pattern ViewPatSimp e p  = ParPat [ViewPat e p]
 pattern PatTypeSimp p t  = ParPat [PatType p t]
 
-pBuiltin_ n ci ps = PConSimp (n, left (second $ map $ first f) ci) ps
-  where
-    f n = SIName (debugSI $ "pattern_" ++ n) n
-pBuiltin n = pBuiltin_ (SIName (debugSI $ "Constructor_" ++ n) n)
+pBuiltin_ n ci ps = PConSimp (n, ci) ps
+pBuiltin n = pBuiltin_ (consName n)
+
+consName n = SIName (debugSI $ "Constructor_" ++ n) n
 
-cTrue = pBuiltin "True" (Left ((CaseName "'Bool", 0), [("False", 0), ("True", 0)])) []
-cZero = pBuiltin "Zero" (Left ((CaseName "'Nat", 0), [("Zero", 0), ("Succ", 1)])) []
-cNil  = pBuiltin "Nil"  (Left ((CaseName "'List", 0), [("Nil", 0), (":", 2)])) []
-cHNil = pBuiltin "HNil" (Left (("hlistNilCase", -1), [("HNil", 0)])) []
+cTrue = pBuiltin "True" (Left ((CaseName "'Bool", 0), [(consName "False", 0), (consName "True", 0)])) []
+cZero = pBuiltin "Zero" (Left ((CaseName "'Nat", 0), [(consName "Zero", 0), (consName "Succ", 1)])) []
+cNil  = pBuiltin "Nil"  (Left ((CaseName "'List", 0), [(consName "Nil", 0), (ConsName, 2)])) []
+cHNil = pBuiltin "HNil" (Left (("hlistNilCase", -1), [(consName "HNil", 0)])) []
 cList  a = pBuiltin "'List" (Right 1) [a]
 cHList a = pBuiltin "'HList" (Right 1) [a]
-cSucc  a = pBuiltin "Succ" (Left ((CaseName "'Nat", 0), [("Zero", 0), ("Succ", 1)])) [a]
-cCons  a b = pBuiltin_ ConsName (Left ((CaseName "'List", 0), [("Nil", 0), (":", 2)])) [a, b]
-cHCons a b = pBuiltin "HCons" (Left (("hlistConsCase", -1), [("HCons", 2)])) [a, b]
+cSucc  a = pBuiltin "Succ" (Left ((CaseName "'Nat", 0), [(consName "Zero", 0), (consName "Succ", 1)])) [a]
+cCons  a b = pBuiltin_ ConsName (Left ((CaseName "'List", 0), [(consName "Nil", 0), (ConsName, 2)])) [a, b]
+cHCons a b = pBuiltin "HCons" (Left (("hlistConsCase", -1), [(consName "HCons", 2)])) [a, b]
 
 pattern PParens p = ViewPatSimp (SBuiltin "parens") p
 
diff --git a/src/LambdaCube/Compiler/Pretty.hs b/src/LambdaCube/Compiler/Pretty.hs
index e7047a7e..6a80da1f 100644
--- a/src/LambdaCube/Compiler/Pretty.hs
+++ b/src/LambdaCube/Compiler/Pretty.hs
@@ -198,6 +198,7 @@ renderDoc
     render = snd . render'
       where
         render' = \case
+            DText "Nil" -> rtext "[]"
             DAtom x -> renderA x
             DFormat c x -> second c $ render' x
             DDocOp f d -> (('\0', '\0'), f $ render <$> d)