Output fussing

dang.cabal

@@ -51,6 +51,7 @@ executable dang
   build-depends:       base >=4.8 && <5,
                        containers,
                        text,
+                       pretty-show,
                        dang
   hs-source-dirs:      dang
   default-language:    Haskell2010

dang/Main.hs

@@ -19,6 +19,7 @@ import qualified Data.Text as S
 import qualified Data.Text.IO as S
 import           System.Exit (exitFailure)
 import           System.Environment (getArgs)
+import           Text.Show.Pretty (pPrint)
 
 
 main :: IO ()
@@ -40,12 +41,13 @@ main  = runDang $
               $ F.toList ms
 
      (mbMod,ms) <- collectMessages $ try $
-       do pMod  <- parseModule interactive txt
+       do pMod  <- parseModule (S.pack file) txt
           rnMod <- renameModule pMod
+          -- KC.checkModule rnMod
+          return rnMod
 
-          io (print rnMod)
+     io (pPrint mbMod)
 
-          KC.checkModule rnMod
-
-     dumpMessages ms
-     io (print mbMod)
+     if null ms
+        then io (putStrLn "No messages")
+        else dumpMessages ms

src/Dang/ModuleSystem/Rename.hs

@@ -128,9 +128,10 @@ withModuleScope lpname body =
      return a
 
 -- | A local scope, introduced by a declaration.
-withDeclScope :: RN a -> RN a
-withDeclScope body =
-  do RN (sets_ (\ rw -> pushScope (declScope (view currentScope rw)) rw))
+withDeclScope :: Bind Parsed -> RN a -> RN a
+withDeclScope bind body =
+  do introBind bind
+     RN (sets_ (\ rw -> pushScope (declScope (view currentScope rw)) rw))
      a <- body
      RN (sets_ popScope)
      return a
@@ -295,9 +296,8 @@ introBind Bind { .. } =
 rnBind :: Rename Bind
 rnBind b =
   withLoc (bMeta b) $
-  withDeclScope $
-    do introBind b
-       n'  <- rnValueName (bName b)
+  withDeclScope b $
+    do n'  <- rnValueName (bName b)
        ps' <- traverse (rnPat n') (bParams b)
        b'  <- rnExpr (bBody b)
        return Bind { bName = n', bMeta = bMeta b, bParams = ps', bBody = b' }