Skip to content

fix bug in UnisonFile.constructorsId - effects were treated as decls #5999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 17, 2025
Merged

fix bug in UnisonFile.constructorsId - effects were treated as decls #5999

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions parser-typechecker/src/Unison/UnisonFile.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ where
import Control.Lens
import Data.List qualified as List
import Data.Map qualified as Map
import Data.Map.Merge.Strict qualified as Map
import Data.Set qualified as Set
import Data.Vector qualified as Vector
import Unison.ABT qualified as ABT
Expand Down Expand Up @@ -407,28 +408,37 @@ nonEmpty uf =
|| any (not . null) (topLevelComponents' uf)
|| any (not . null) (watchComponents uf)

hashConstructors ::
forall v a. (Ord v) => TypecheckedUnisonFile v a -> Map v Referent.Id
hashConstructors :: forall v a. (Ord v, Show v) => TypecheckedUnisonFile v a -> Map v Referent.Id
hashConstructors file =
Map.union
(Map.map (\(ref, _) -> Referent.ConId ref CT.Data) (hashDataConstructors file))
(Map.map (\(ref, _) -> Referent.ConId ref CT.Effect) (hashEffectConstructors file))

constructorsId :: (Ord v) => TypecheckedUnisonFile v a -> Map v (ConstructorReferenceId, Decl v a)
Map.merge
(Map.mapMissing \_ (ref, _) -> Referent.ConId ref CT.Data)
(Map.mapMissing \_ (ref, _) -> Referent.ConId ref CT.Effect)
(Map.zipWithMatched \v _ _ -> error (show v ++ " is a decl and an effect?"))
(hashDataConstructors file)
(hashEffectConstructors file)

constructorsId :: (Ord v, Show v) => TypecheckedUnisonFile v a -> Map v (ConstructorReferenceId, Decl v a)
constructorsId file =
Map.union
(Map.map (\(ref, decl) -> (ref, Right decl)) (hashDataConstructors file))
(Map.map (\(ref, decl) -> (ref, Right decl)) (hashEffectConstructors file))
Map.merge
(Map.mapMissing \_ (ref, dataDecl) -> (ref, Right dataDecl))
(Map.mapMissing \_ (ref, effectDecl) -> (ref, Left effectDecl))
(Map.zipWithMatched \v _ _ -> error (show v ++ " is a decl and an effect?"))
(hashDataConstructors file)
(hashEffectConstructors file)

hashDataConstructors ::
forall v a. (Ord v) => TypecheckedUnisonFile v a -> Map v (ConstructorReferenceId, DataDeclaration v a)
hashDataConstructors =
Map.foldl' stepHashConstructors Map.empty . dataDeclarationsId'

hashEffectConstructors ::
forall v a. (Ord v) => TypecheckedUnisonFile v a -> Map v (ConstructorReferenceId, DataDeclaration v a)
forall v a. (Ord v) => TypecheckedUnisonFile v a -> Map v (ConstructorReferenceId, EffectDeclaration v a)
hashEffectConstructors =
List.foldl' stepHashConstructors Map.empty . over (mapped . _2) DD.toDataDecl . Map.elems . effectDeclarationsId'
coerce @(Map v (ConstructorReferenceId, DataDeclaration v a)) @(Map v (ConstructorReferenceId, EffectDeclaration v a))
. List.foldl' stepHashConstructors Map.empty
. coerce @[(TypeReferenceId, EffectDeclaration v a)] @[(TypeReferenceId, DataDeclaration v a)]
. Map.elems
. effectDeclarationsId'

stepHashConstructors ::
forall a v.
Expand Down