<one less ABT> #3113
Merged
<one less ABT> #3113
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Replace with re-exports from U.Core.ABT
aryairani
reviewed
Jun 14, 2022
| @@ -104,7 +90,7 @@ visit f t = flip fromMaybe (f t) $ case out t of | |||
|
|
|||
| -- | Apply an effectful function to an ABT tree top down, sequencing the results. | |||
| visit' :: | |||
| (Traversable f, Applicative g, Monad g, Ord v) => | |||
| (Traversable f, Monad g, Ord v) => | |||
12 tasks
pchiusano
approved these changes
Jul 5, 2022
ChrisPenner
reviewed
Jul 7, 2022
| Var v -> showParen (p >= 9) $ \x -> "Var " ++ show v ++ x | ||
| Cycle body -> ("Cycle " ++) . showsPrec p body | ||
| Abs v body -> showParen True $ (show v ++) . showString ". " . showsPrec p body | ||
| Tm f -> showsPrec p f | ||
|
|
||
| amap :: (Functor f, Foldable f) => (a -> a') -> Term f v a -> Term f v a' |
There was a problem hiding this comment.
This was here before, but does this really require Foldable to do an fmap?
ChrisPenner
reviewed
Jul 7, 2022
| @@ -162,10 +199,82 @@ pattern Cycle' vs t <- Term _ _ (Cycle (AbsN' vs t)) | |||
| pattern AbsN' :: [v] -> Term f v a -> Term f v a | |||
| pattern AbsN' vs body <- (unabs -> (vs, body)) | |||
|
|
|||
| {-# COMPLETE AbsN' #-} | |||
There was a problem hiding this comment.
If this is COMPLETE, should it be a two-way pattern instead (using abs in the other direction)?
There was a problem hiding this comment.
It could be bidirectional, yeah; I made it COMPLETE to satisfy GHC, I think
ChrisPenner
reviewed
Jul 7, 2022
ChrisPenner
approved these changes
Jul 7, 2022
|
Oops I merged this before pushing those fixes |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
This PR eliminates the second copy of the
ABTtype (and associated types likeABT.Term,ABT.Var), and deletes the conversions between "v1" ABT <-> "v2" ABT (now there's just one ABT defined inU.Core.ABT). Also, a few equivalent helper functions were deleted along the way.Now
Unison.ABTre-exports all ofU.Core.ABT. It's not totally clear to me what the difference is (or should be) between these modules, but now at least there's less duplication ;)