shithub: MicroHs

Info  •  Files  •  Log  •  Branches

Add Data.Tuple.Instances

--- a/Makefile

+++ b/Makefile

@@ -198,7 +198,7 @@

 MCABALBIN=$(MCABAL)/bin

 MDIST=dist-mcabal

 BASE=base-$(VERSION)

-BASEMODULES=Control.Applicative Control.Arrow Control.Category Control.DeepSeq Control.Error Control.Exception Control.Monad Control.Monad.Fail Control.Monad.Fix Control.Monad.IO.Class Control.Monad.ST Control.Monad.Zip Data.Array Data.Bifoldable Data.Bifunctor Data.Bitraversable Data.Bits Data.Bool Data.Bounded Data.ByteString Data.Char Data.Complex Data.Constraint Data.Data Data.Double Data.Dynamic Data.Either Data.Enum Data.Eq Data.Float Data.FloatW Data.Floating Data.Foldable Data.Foldable1 Data.Fractional Data.Function Data.Functor Data.Functor.Classes Data.Functor.Compose Data.Functor.Const Data.Functor.Contravariant Data.Functor.Identity Data.Functor.Product Data.Functor.Sum Data.IOArray Data.IORef Data.Int Data.Integer Data.Integral Data.Ix Data.Kind Data.List Data.List.NonEmpty Data.Maybe Data.Monoid Data.Num Data.Ord Data.Proxy Data.Ratio Data.Real Data.RealFloat Data.RealFrac Data.Records Data.STRef Data.Semigroup Data.String Data.Text Data.Time.Clock Data.Time.Format Data.Traversable Data.Tuple Data.Type.Equality Data.TypeLits Data.Typeable Data.Version Data.Void Data.Word Data.ZipList Debug.Trace Foreign.C.String Foreign.C.Types Foreign.ForeignPtr Foreign.Marshal.Alloc Foreign.Marshal.Array Foreign.Marshal.Utils Foreign.Ptr Foreign.Storable GHC.Stack GHC.Types Numeric Numeric.FormatFloat Numeric.Natural Prelude System.Cmd System.Compress System.Directory System.Environment System.Exit System.IO System.IO.Error System.IO.MD5 System.IO.PrintOrRun System.IO.Serialize System.IO.TimeMilli System.IO.Unsafe System.Info System.Process Text.Printf Text.ParserCombinators.ReadP Text.ParserCombinators.ReadPrec Text.Read Text.Read.Lex Text.Show TimeCompat Unsafe.Coerce

+BASEMODULES=Control.Applicative Control.Arrow Control.Category Control.DeepSeq Control.Error Control.Exception Control.Monad Control.Monad.Fail Control.Monad.Fix Control.Monad.IO.Class Control.Monad.ST Control.Monad.Zip Data.Array Data.Bifoldable Data.Bifunctor Data.Bitraversable Data.Bits Data.Bool Data.Bounded Data.ByteString Data.Char Data.Complex Data.Constraint Data.Data Data.Double Data.Dynamic Data.Either Data.Enum Data.Eq Data.Float Data.FloatW Data.Floating Data.Foldable Data.Foldable1 Data.Fractional Data.Function Data.Functor Data.Functor.Classes Data.Functor.Compose Data.Functor.Const Data.Functor.Contravariant Data.Functor.Identity Data.Functor.Product Data.Functor.Sum Data.IOArray Data.IORef Data.Int Data.Integer Data.Integral Data.Ix Data.Kind Data.List Data.List.NonEmpty Data.Maybe Data.Monoid Data.Num Data.Ord Data.Proxy Data.Ratio Data.Real Data.RealFloat Data.RealFrac Data.Records Data.STRef Data.Semigroup Data.String Data.Text Data.Time.Clock Data.Time.Format Data.Traversable Data.Tuple Data.Tuple.Instances Data.Type.Equality Data.TypeLits Data.Typeable Data.Version Data.Void Data.Word Data.ZipList Debug.Trace Foreign.C.String Foreign.C.Types Foreign.ForeignPtr Foreign.Marshal.Alloc Foreign.Marshal.Array Foreign.Marshal.Utils Foreign.Ptr Foreign.Storable GHC.Stack GHC.Types Numeric Numeric.FormatFloat Numeric.Natural Prelude System.Cmd System.Compress System.Directory System.Environment System.Exit System.IO System.IO.Error System.IO.MD5 System.IO.PrintOrRun System.IO.Serialize System.IO.TimeMilli System.IO.Unsafe System.Info System.Process Text.Printf Text.ParserCombinators.ReadP Text.ParserCombinators.ReadPrec Text.Read Text.Read.Lex Text.Show TimeCompat Unsafe.Coerce

 $(MCABALBIN)/mhs: bin/mhs

 	@mkdir -p $(MCABALBIN)

--- a/lib/AllOfLib.hs

+++ b/lib/AllOfLib.hs

@@ -76,6 +76,7 @@

 import Data.Text

 import Data.Traversable

 import Data.Tuple

+import Data.Tuple.Instances

 import Data.Typeable

 import Data.TypeLits

 import Data.Version

--- /dev/null

+++ b/lib/Data/Tuple/Instances.hs

@@ -1,0 +1,33 @@

+module Data.Tuple.Instances where

+

+-- Dubious instances for tuples

+

+instance Functor ((,) a1) where

+  fmap f (a1, a) = (a1, f a)

+

+instance Functor ((,,) a1 a2) where

+  fmap f (a1, a2, a) = (a1, a2, f a)

+

+instance Functor ((,,,) a1 a2 a3) where

+  fmap f (a1, a2, a3, a) = (a1, a2, a3, f a)

+

+instance (Monoid a1) => Applicative ((,) a1) where

+  pure a = (mempty, a)

+  (a1, f) <*> (a1', a) = (a1 <> a1', f a)

+

+instance (Monoid a1, Monoid a2) => Applicative ((,,) a1 a2) where

+  pure a = (mempty, mempty, a)

+  (a1, a2, f) <*> (a1', a2', a) = (a1 <> a1', a2 <> a2', f a)

+

+instance (Monoid a1, Monoid a2, Monoid a3) => Applicative ((,,,) a1 a2 a3) where

+  pure a = (mempty, mempty, mempty, a)

+  (a1, a2, a3, f) <*> (a1', a2', a3', a) = (a1 <> a1', a2 <> a2', a3 <> a3', f a)

+

+instance Monoid a1 => Monad ((,) a1) where

+  (a1, a) >>= k = case k a of (a1', b) -> (a1 <> a1', b)

+

+instance (Monoid a1, Monoid a2) => Monad ((,,) a1 a2) where

+  (a1, a2, a) >>= k = case k a of (a1', a2', b) -> (a1 <> a1', a2 <> a2', b)

+

+instance (Monoid a1, Monoid a2, Monoid a3) => Monad ((,,,) a1 a2 a3) where

+  (a1, a2, a3, a) >>= k = case k a of (a1', a2', a3', b) -> (a1 <> a1', a2 <> a2', a3 <> a3', b)

--- a/src/MicroHs/Expr.hs

+++ b/src/MicroHs/Expr.hs

@@ -720,7 +720,8 @@

     ppApp as f | raw = ppApply f as

     ppApp as (EVar i) | isOperChar cop, [a, b] <- as = parens $ ppE a <+> text op <+> ppExpr b

                       | isOperChar cop, [a] <- as    = parens $ ppE a <+> text op

-                      | cop == ','                   = ppE (ETuple as)

+                      | cop == ',' && length op + 1 == length as

+                                                     = ppE (ETuple as)

                       | op == "[]", length as == 1   = ppE (EListish (LList as))

                         where op = unIdent (unQualIdent i)

                               cop = head op

-- 

⑨