unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-10-05 06:07:21 +03:00
Code Issues Projects Releases Wiki Activity

we were including builtins in the TypecheckedUnisonFile, + formatting

Browse Source
This commit is contained in:
Arya Irani 2018-11-02 16:59:13 -04:00
parent d00cea34be
commit 289334938d
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
parser-typechecker/src/Unison/Codebase/CommandLine.hs
View File

@ -28,6 +28,7 @@ import System.FilePath (FilePath)
import qualified Text.Read as Read
import qualified Unison.Reference as Reference
import System.IO.Error (isEOFError)
import qualified Unison.Builtin as B
import Unison.Codebase (Codebase)
import qualified Unison.Codebase as Codebase
import Unison.Codebase.Branch (Branch)
@ -187,7 +188,7 @@ main dir currentBranchName initialFile startRuntime codebase = do
putStrLn
$ "✅ "
++ [emoticons !! n]
++ " Found and typechecked the following definitions:\n"
++ " Found and typechecked the following definitions in " ++ filePath ++ ":\n"
let uf = UF.discardTerm unisonFile
writeIORef lastTypechecked (Just filePath, uf, errorEnv)
putStrLn . show . Color.renderText $ prettyTypecheckedFile
@ -213,7 +214,7 @@ main dir currentBranchName initialFile startRuntime codebase = do
Console.clearScreen
Console.setCursorPosition 0 0
names <- Codebase.branchToNames codebase branch
handleUnisonFile runtime names filePath text
handleUnisonFile runtime (names <> B.names) filePath text
go branch name
UnisonBranchChanged branches -> if Set.member name branches
then do

2
parser-typechecker/src/Unison/FileParsers.hs
View File

@ -147,7 +147,7 @@ synthesizeFile builtinNames unisonFile = do
doTdnrInComponent (v, t, tp) = (\t -> (v, t, tp)) <$> doTdnr t
t <- doTdnr tdnrTerm
tdnredTlcs <- (traverse . traverse) doTdnrInComponent topLevelComponents
pure (UF.TypecheckedUnisonFile' datas effects tdnredTlcs t typ)
pure (UF.TypecheckedUnisonFile' dds0 eds0 tdnredTlcs t typ)
where
applyTdnrDecisions
:: [Context.InfoNote v Ann] -> Names v Ann -> Term v -> Result' v (Term v)

2
parser-typechecker/src/Unison/PrintError.hs
View File

@ -130,7 +130,7 @@ prettyTypecheckedFile' file env = (sortOn fst types, sortOn fst terms)
(v, mconcat [s, renderVar v, " : ", renderType' env typ])
renderDecl :: AnnotatedText Color -> (v, (r, DD.DataDeclaration' v loc)) -> (v, AnnotatedText Color)
renderDecl s (v, (_, decl)) = (v, mconcat
[s, renderVar v, intercalateMap " " renderVar $ DD.bound decl])
[s, renderVar v, " ", intercalateMap " " renderVar $ DD.bound decl])
renderEffect :: AnnotatedText Color -> (v, (r, DD.EffectDeclaration' v loc)) -> (v, AnnotatedText Color)
renderEffect s (v, (r, decl)) = renderDecl (s <> style AbilityKeyword "ability ") (v, (r, DD.toDataDecl decl))