Various changes to make it compile with MicroHs. #1043

augustss · 2024-09-19T09:55:44Z

Mostly #ifdefs and some type signatures.

treeowl · 2024-09-19T12:06:22Z

Thank you! This is a very welcome development. I don't see any changes to CI. Could we at least compile the library on MicroHS in CI, even if dependencies don't yet let us compile the test suite?

augustss · 2024-09-19T13:23:40Z

Hmm. That's a good idea. I will have to look into how easy it is. Can CI compile other Hackage packages?

…

On Thu, Sep 19, 2024 at 2:06 PM David Feuer ***@***.***> wrote: Thank you! This is a very welcome development. I don't see any changes to CI. Could we at least compile the library on MicroHS in CI, even if dependencies don't yet let us compile the test suite? — Reply to this email directly, view it on GitHub <#1043 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABIARHUNDCBYRVTVWYG6S53ZXK45NAVCNFSM6AAAAABOPRDUIGVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDGNRQHAYDSOJSGA> . You are receiving this because you authored the thread.Message ID: ***@***.***>

treeowl · 2024-09-19T13:26:27Z

I imagine so, though I'm not at all an expert in the ways of haskell-ci.

containers/include/containers.h

meooow25 · 2024-09-19T14:28:34Z

What exactly are the differences between getting something to compile on GHC and MicroHs. It seems to be mostly about certain modules not available in MicroHs base?

And +1 on having a CI so we don't break this in the future.

containers/src/Data/IntMap/Internal.hs

meooow25 · 2024-09-19T14:35:56Z

By the way, I am having to manually approve these CI runs. It seems that this is the default for "first time contributors" and I don't see a way to change it. treeowl could you peek at the settings to see if we can change this (perhaps temporarily) to make things easier?

treeowl · 2024-09-19T14:38:26Z

I don't think I have the authority to change that. I think we'd need a haskell owner or something.

Co-authored-by: David Feuer <[email protected]>

augustss · 2024-09-19T14:41:35Z

Yes, getting it to run with MHS is mostly a matter of #ifdef-ing out things that base does not support (and cannot support right now, since it needs extensions like QualifiedConstraints).
There's also a semantics difference to the scoping of type variables in signatures. I might change that for easier porting.

treeowl · 2024-09-19T14:42:15Z

Would it make sense on MicroHs to have a local copyish of Control.Category to limit the CPP and offer that interface more universally?

augustss · 2024-09-19T14:43:45Z

I've added CI for MHS. It's a little clunky right now, but I hope to improve it.

augustss · 2024-09-19T14:55:28Z

I'll add Control.Category and update the PR.

containers/src/Data/IntMap/Internal.hs

meooow25

If QuantifiedConstraints is a problem, MicroHs could define the pre-QuantifiedConstraints versions of the classes (Eq1, Ord1, Bifoldable, etc). This would let us get rid of most of the CPP.

containers/src/Data/Map/Internal.hs

containers/src/Data/Graph.hs

augustss · 2024-09-19T15:31:59Z

Just for your amusement: containers has 25kloc of Haskell code and MHS has 11kloc. :)

augustss · 2024-09-20T23:09:08Z

I'm making the MHS base library more GHC compatible. The PR will be updated soon.

treeowl · 2024-09-20T23:28:22Z

Don't compromise your principles too much, but the less CPP we have to deal with the better.

augustss · 2024-09-23T11:07:19Z

I've made my changes. Please have a look again.

meooow25

Thanks for the updates, this is looking much nicer!

meooow25 · 2024-09-26T17:28:51Z

.github/workflows/mhs-ci.yml

+    - name: checkout mhs repo
+      uses: actions/checkout@v4
+      with:
+        repository: augustss/MicroHs


Should this check out a particular version?
We wouldn't want containers CI to break in there is an issue with MHS head.
We can update the version periodically, as we do for GHC.

meooow25 · 2024-09-26T17:33:52Z

containers/src/Data/IntMap/Internal.hs

 import Language.Haskell.TH.Syntax (Lift)
 -- See Note [ Template Haskell Dependencies ]
 import Language.Haskell.TH ()
 #endif
+import Text.Read


We should use #if defined(__GLASGOW_HASKELL__) || defined(__MHS__) for this, to reflect the Read instance.

meooow25 · 2024-09-26T17:35:42Z

containers/src/Data/Map/Internal.hs

 import Data.Coerce
 #endif
-
+import Text.Read hiding (lift)


meooow25 · 2024-09-26T17:36:48Z

containers/src/Data/Sequence/Internal.hs

+import Data.Coerce
+import qualified GHC.Exts
+#else
+import qualified Data.List
 #endif

 -- Array stuff, with GHC.Arr on GHC


Can import qualified GHC.Arr be moved back, to keep this comment valid?

meooow25 · 2024-09-26T17:37:59Z

containers/src/Data/Sequence/Internal.hs

+import Data.Coerce
+import qualified GHC.Exts
+#else
+import qualified Data.List


Is this import used somewhere?

meooow25 · 2024-09-26T17:39:43Z

containers/src/Data/Tree.hs

@@ -233,7 +234,7 @@ instance Foldable Tree where
    product = foldlMap1' id (*)
    {-# INLINABLE product #-}

-#if MIN_VERSION_base(4,18,0)
+#if MIN_VERSION_base(4,18,0) && (defined(__GLASGOW_HASKELL__) || defined(__MHS__))


We can drop the compiler checks here. Let's assume Foldable1 will be around, or we'd be doing the same for Eq1, Ord1, etc.

meooow25 · 2024-09-26T17:41:04Z

containers/src/Utils/Containers/Internal/Prelude.hs

 -- | This hideous module lets us avoid dealing with the fact that
 -- @liftA2@ and @foldl'@ were not previously exported from the standard prelude.
 module Utils.Containers.Internal.Prelude
  ( module Prelude
  , Applicative (..)
  , Foldable (..)
+#ifdef __MHS__
+  , Traversable(..)
+  , NonEmpty


NonEmpty seems a little odd, is it required?

meooow25 · 2024-09-26T17:41:44Z

containers/src/Data/IntMap/Internal.hs

@@ -2112,6 +2114,7 @@ mergeA
      EQL -> binA p1 (go l1 l2) (go r1 r2)
      NOM -> linkA (unPrefix p1) (g1t t1) (unPrefix p2) (g2t t2)

+    subsingletonBy :: Functor f => (Key -> a -> f (Maybe c)) -> Key -> a -> f (IntMap c)


Is the signature required for MHS?

Various changes to make it compile with MicroHs.

89860fc

Mostly #ifdefs and some type signatures.

treeowl reviewed Sep 19, 2024

View reviewed changes

containers/include/containers.h Outdated Show resolved Hide resolved

treeowl reviewed Sep 19, 2024

View reviewed changes

containers/src/Data/IntMap/Internal.hs Show resolved Hide resolved

Add CI for MicroHs compilation.

e9651ef

augustss force-pushed the master branch from 08753f9 to e9651ef Compare September 19, 2024 14:36

Update containers/include/containers.h

4d8fe61

Co-authored-by: David Feuer <[email protected]>

Get rid of #ifdef for Control.Category

393076b

treeowl reviewed Sep 19, 2024

View reviewed changes

containers/src/Data/IntMap/Internal.hs Outdated Show resolved Hide resolved

meooow25 reviewed Sep 19, 2024

View reviewed changes

containers/src/Data/Map/Internal.hs Outdated Show resolved Hide resolved

containers/src/Data/Graph.hs Outdated Show resolved Hide resolved

augustss added 6 commits September 23, 2024 01:04

Remove some MHS stuff

e7b38be

More GHC compatibility.

b07386e

More GHC compat.

7699dce

Merge branch 'haskell:master' into master

fb05d9c

A few more GHC compat fixes.

a7e6f04

Fix build error.

ee28edc

meooow25 requested changes Sep 26, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Various changes to make it compile with MicroHs. #1043

Various changes to make it compile with MicroHs. #1043

augustss commented Sep 19, 2024

treeowl commented Sep 19, 2024

augustss commented Sep 19, 2024 via email

treeowl commented Sep 19, 2024

meooow25 commented Sep 19, 2024

meooow25 commented Sep 19, 2024

treeowl commented Sep 19, 2024

augustss commented Sep 19, 2024

treeowl commented Sep 19, 2024

augustss commented Sep 19, 2024

augustss commented Sep 19, 2024

meooow25 left a comment

augustss commented Sep 19, 2024 •

edited

Loading

augustss commented Sep 20, 2024

treeowl commented Sep 20, 2024

augustss commented Sep 23, 2024

meooow25 left a comment

meooow25 Sep 26, 2024

meooow25 Sep 26, 2024

meooow25 Sep 26, 2024

meooow25 Sep 26, 2024

meooow25 Sep 26, 2024

meooow25 Sep 26, 2024

meooow25 Sep 26, 2024

meooow25 Sep 26, 2024

Various changes to make it compile with MicroHs. #1043

Are you sure you want to change the base?

Various changes to make it compile with MicroHs. #1043

Conversation

augustss commented Sep 19, 2024

treeowl commented Sep 19, 2024

augustss commented Sep 19, 2024 via email

treeowl commented Sep 19, 2024

meooow25 commented Sep 19, 2024

meooow25 commented Sep 19, 2024

treeowl commented Sep 19, 2024

augustss commented Sep 19, 2024

treeowl commented Sep 19, 2024

augustss commented Sep 19, 2024

augustss commented Sep 19, 2024

meooow25 left a comment

Choose a reason for hiding this comment

augustss commented Sep 19, 2024 • edited Loading

augustss commented Sep 20, 2024

treeowl commented Sep 20, 2024

augustss commented Sep 23, 2024

meooow25 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

augustss commented Sep 19, 2024 •

edited

Loading