1 files changed, 18 insertions, 23 deletions
diff --git a/src/AST/Pretty.hs b/src/AST/Pretty.hs
index 4f637f2..fb5e138 100644
--- a/src/AST/Pretty.hs
+++ b/src/AST/Pretty.hs
@@ -7,7 +7,7 @@
 {-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeOperators #-}
-module AST.Pretty (pprintExpr, ppExpr, ppSTy, ppTy, PrettyX(..)) where
+module AST.Pretty (pprintExpr, ppExpr, ppSTy, PrettyX(..)) where
 
 import Control.Monad (ap)
 import Data.List (intersperse, intercalate)
@@ -159,13 +159,14 @@ ppExpr' d val expr = case expr of
     a' <- ppExpr' 11 val a
     name <- genNameIfUsedIn' "i" (tTup (sreplicate n tIx)) IZ b
     e' <- ppExpr' 0 (Const name `SCons` val) b
+    let primName = ppString ("build" ++ intSubscript (fromSNat n))
     return $ ppParen (d > 0) $
       group $ flatAlt
         (hang 2 $
-           annotate AHighlight (ppString "build") <> ppX expr <+> a'
+           annotate AHighlight primName <> ppX expr <+> a'
            <+> ppString "$" <+> ppString "\\" <> ppString name <+> ppString "->"
            <> hardline <> e')
-        (ppApp (annotate AHighlight (ppString "build") <> ppX expr) [a', ppLam [ppString name] e'])
+        (ppApp (annotate AHighlight primName <> ppX expr) [a', ppLam [ppString name] e'])
 
   EFold1Inner _ cm a b c -> do
     name1 <- genNameIfUsedIn (typeOf a) (IS IZ) a
@@ -354,28 +355,22 @@ operator OIDiv{} = (Infix, "`div`")
 operator OMod{} = (Infix, "`mod`")
 
 ppSTy :: Int -> STy t -> String
-ppSTy d ty = ppTy d (unSTy ty)
+ppSTy d ty = render $ ppSTy' d ty
 
 ppSTy' :: Int -> STy t -> Doc q
-ppSTy' d ty = ppTy' d (unSTy ty)
-
-ppTy :: Int -> Ty -> String
-ppTy d ty = render $ ppTy' d ty
-
-ppTy' :: Int -> Ty -> Doc q
-ppTy' _ TNil = ppString "1"
-ppTy' d (TPair a b) = ppParen (d > 7) $ ppTy' 8 a <> ppString " * " <> ppTy' 8 b
-ppTy' d (TEither a b) = ppParen (d > 6) $ ppTy' 7 a <> ppString " + " <> ppTy' 7 b
-ppTy' d (TMaybe t) = ppParen (d > 10) $ ppString "Maybe " <> ppTy' 11 t
-ppTy' d (TArr n t) = ppParen (d > 10) $
-  ppString "Arr " <> ppString (show (fromNat n)) <> ppString " " <> ppTy' 11 t
-ppTy' _ (TScal sty) = ppString $ case sty of
-  TI32 -> "i32"
-  TI64 -> "i64"
-  TF32 -> "f32"
-  TF64 -> "f64"
-  TBool -> "bool"
-ppTy' d (TAccum t) = ppParen (d > 10) $ ppString "Accum " <> ppTy' 11 t
+ppSTy' _ STNil = ppString "1"
+ppSTy' d (STPair a b) = ppParen (d > 7) $ ppSTy' 8 a <> ppString " * " <> ppSTy' 8 b
+ppSTy' d (STEither a b) = ppParen (d > 6) $ ppSTy' 7 a <> ppString " + " <> ppSTy' 7 b
+ppSTy' d (STMaybe t) = ppParen (d > 10) $ ppString "Maybe " <> ppSTy' 11 t
+ppSTy' d (STArr n t) = ppParen (d > 10) $
+  ppString "Arr " <> ppString (show (fromSNat n)) <> ppString " " <> ppSTy' 11 t
+ppSTy' _ (STScal sty) = ppString $ case sty of
+  STI32 -> "i32"
+  STI64 -> "i64"
+  STF32 -> "f32"
+  STF64 -> "f64"
+  STBool -> "bool"
+ppSTy' d (STAccum t) = ppParen (d > 10) $ ppString "Accum " <> ppSTy' 11 t
 
 ppString :: String -> Doc x
 ppString = fromString