Skip to content
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

Apply bindings before returning unification mismatch error #1972

Merged
merged 2 commits into from
Jun 23, 2024
Merged

Apply bindings before returning unification mismatch error #1972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d54ddb4
apply bindings before returning unification mismatch error
byorgey Jun 22, 2024
39ebdd4
Merge branch 'main' into push-tnoyvzunsuxx
mergify[bot] Jun 23, 2024
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
17 changes: 16 additions & 1 deletion src/swarm-lang/Swarm/Language/Typecheck.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,19 @@ type Sourced a = (Source, a)

-- | A "join" where an expected thing meets an actual thing.
newtype Join a = Join (Source -> a)
deriving (Functor)

instance Foldable Join where
foldMap :: Monoid m => (a -> m) -> Join a -> m
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this used anywhere?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not directly, but Foldable is a prerequisite of Traversable.

foldMap f j = f a1 <> f a2
where
(a1, a2) = getJoin j

instance Traversable Join where
traverse :: Applicative f => (a -> f b) -> Join a -> f (Join b)
traverse f j = joined <$> f a1 <*> f a2
where
(a1, a2) = getJoin j

instance (Show a) => Show (Join a) where
show (getJoin -> (e, a)) = "(expected: " <> show e <> ", actual: " <> show a <> ")"
Expand Down Expand Up @@ -313,7 +326,9 @@ unify ::
unify ms j = do
res <- expected =:= actual
case res of
Left _ -> throwTypeErr NoLoc $ Mismatch ms j
Left _ -> do
j' <- traverse U.applyBindings j
throwTypeErr NoLoc $ Mismatch ms j'
Right ty -> return ty
where
(expected, actual) = getJoin j
Expand Down
10 changes: 8 additions & 2 deletions test/unit/TestLanguagePipeline.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ testLanguagePipeline =
"applying a pair"
( process
"(1,2) \"hi\""
"1:1: Type mismatch:\n From context, expected `(1, 2)` to be a function,\n but it is actually a pair"
"1:1: Type mismatch:\n From context, expected `(1, 2)` to be a function,\n but it actually has type `Int * Int`"
)
, testCase
"providing a pair as an argument"
Expand Down Expand Up @@ -520,6 +520,12 @@ testLanguagePipeline =
"1 + (\\x. \\y. 3)"
"1:5: Type mismatch:\n From context, expected `\\x. \\y. 3` to have type `Int`,\n but it is actually a function\n"
)
, testCase
"apply HOF to int - #1888"
( process
"(\\f. f 3) 2"
"1:11: Type mismatch:\n From context, expected `2` to have a type like `Int -> _`"
)
]
, testGroup
"generalize top-level binds #351 #1501"
Expand Down Expand Up @@ -644,7 +650,7 @@ testLanguagePipeline =
"def at non-cmd type"
( process
"def x = 3 end; x + 2"
"1:16: Type mismatch:\n From context, expected `x + 2` to have a type like"
"1:16: Type mismatch:\n From context, expected `x + 2` to be a command"
)
, testCase
"def at cmd type"
Expand Down