unison-merge-0.0.0

Safe Haskell	Safe-Inferred
Language	Haskell2010

Unison.Merge.Mergeblob

Documentation

data Mergeblob libdep Source #

Constructors

Mergeblob
Fields conflicts :: TwoWay (DefnsF (Map Name) TermReferenceId TypeReferenceId) typecheckedFile :: Maybe (TypecheckedUnisonFile Symbol Ann) unconflictedDefns :: DefnsF (Map Name) Referent TypeReference uniqueTypeGuids :: TwoWay (Map Name Text) unparsedFile :: Pretty ColorText unparsedSoloFiles :: ThreeWay (Pretty ColorText)

data MergeblobError Source #

Constructors

MergeblobError'ConflictedAlias (EitherWay (Defn (Name, Name) (Name, Name)))
MergeblobError'ConflictedBuiltin (Defn Name Name)

makeMergeblob :: Monad m => (ThreeWay (DefnsF Set TermReferenceId TypeReferenceId) -> m (Defns (Map TermReferenceId (Term Symbol Ann, Type Symbol Ann)) (Map TypeReferenceId (Decl Symbol Ann)))) -> (DefnsF Set TermReferenceId TypeReferenceId -> Set Reference -> m (DefnsF Set TermReferenceId TypeReferenceId)) -> m (Updated Names) -> (DefnsF Set TermReference TypeReference -> m (TypeLookup Symbol Ann)) -> Diffblob libdep -> TwoWay Text -> m (Either MergeblobError (Mergeblob libdep)) Source #