language-ats 1.2.0.7 → 1.2.0.8

raw patch · 5 files changed

+12/−20 lines, 5 filesdep +lensdep +recursion-schemesdep −micro-recursion-schemesdep −microlensdep −microlens-thPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependencies added: lens, recursion-schemes

Dependencies removed: micro-recursion-schemes, microlens, microlens-th

API changes (from Hackage documentation)

+ Language.ATS: type Fix = Either Int String

- Language.ATS: constructorUniversals :: forall a_aL4H. Lens' (Leaf a_aL4H) [Universal a_aL4H]

+ Language.ATS: constructorUniversals :: forall a_aRXN. Lens' (Leaf a_aRXN) [Universal a_aRXN]

- Language.ATS: expression :: forall a_aL4k. Lens' (PreFunction a_aL4k) (Maybe (Expression a_aL4k))

+ Language.ATS: expression :: forall a_aRXq. Lens' (PreFunction a_aRXq) (Maybe (Expression a_aRXq))

- Language.ATS: fun :: forall a_aL4F. Traversal' (Declaration a_aL4F) (Function a_aL4F)

+ Language.ATS: fun :: forall a_aRXL. Traversal' (Declaration a_aRXL) (Function a_aRXL)

- Language.ATS: leaves :: forall a_aL4F. Traversal' (Declaration a_aL4F) [Leaf a_aL4F]

+ Language.ATS: leaves :: forall a_aRXL. Traversal' (Declaration a_aRXL) [Leaf a_aRXL]

- Language.ATS: preF :: forall a_aL4m a_a119N. Lens (Function a_aL4m) (Function a_a119N) (PreFunction a_aL4m) (PreFunction a_a119N)

+ Language.ATS: preF :: forall a_aRXs a_a17Xb. Lens (Function a_aRXs) (Function a_a17Xb) (PreFunction a_aRXs) (PreFunction a_a17Xb)

- Language.ATS: typeCall :: forall a_aL4C. Traversal' (Type a_aL4C) (Name a_aL4C)

+ Language.ATS: typeCall :: forall a_aRXI. Traversal' (Type a_aRXI) (Name a_aRXI)

- Language.ATS: typeCallArgs :: forall a_aL4C. Traversal' (Type a_aL4C) [Type a_aL4C]

+ Language.ATS: typeCallArgs :: forall a_aRXI. Traversal' (Type a_aRXI) [Type a_aRXI]

language-ats.cabal view

@@ -1,6 +1,6 @@ cabal-version: 1.18 name: language-ats-version: 1.2.0.7+version: 1.2.0.8 license: BSD3 license-file: LICENSE copyright: Copyright: (c) 2018 Vanessa McHale@@ -43,11 +43,10 @@     build-depends:         base >=4.10 && <5,         array -any,-        microlens -any,-        microlens-th -any,+        recursion-schemes >= 5.0.1,+        lens,         deepseq -any,         ansi-wl-pprint >=0.6.8,-        micro-recursion-schemes >=5.0.1,         composition-prelude -any,         containers -any,         transformers -any

src/Language/ATS.hs view

@@ -41,6 +41,7 @@                     , SortArg (..)                     , Sort (..)                     , SortArgs+                    , Fix                     -- * Parser State                     , FixityState                     -- * Lexical types@@ -59,6 +60,7 @@                     , typeCallArgs                     ) where +import           Control.Lens import           Control.Monad import           Control.Monad.IO.Class import           Control.Monad.Trans.State@@ -67,7 +69,6 @@ import           Language.ATS.Parser import           Language.ATS.PrettyPrint import           Language.ATS.Types-import           Lens.Micro import           Text.PrettyPrint.ANSI.Leijen hiding ((<$>))  rewriteATS' :: Eq a => (ATS a, FixityState a) -> ATS a

src/Language/ATS/Parser.y view

@@ -23,7 +23,7 @@  import Control.Composition import Control.DeepSeq (NFData)-import Lens.Micro (over, _head)+import Control.Lens (over, _head) import qualified Data.Map as M import Control.Monad.Trans.Class import Control.Monad.Trans.State

src/Language/ATS/PrettyPrint.hs view

@@ -15,9 +15,9 @@                                 ) where  import           Control.Composition          hiding ((&))+import           Control.Lens                 hiding (op, pre) import           Data.Functor.Foldable        (cata) import           Language.ATS.Types-import           Lens.Micro import           Prelude                      hiding ((<$>)) import           Text.PrettyPrint.ANSI.Leijen hiding (bool)

src/Language/ATS/Types.hs view

@@ -49,6 +49,7 @@     , SortArgs     , DataSortLeaf (..)     , FixityState+    , Fix     -- * Rewrites     , rewriteDecl     -- * Helper functions@@ -66,6 +67,8 @@  import           Control.Composition import           Control.DeepSeq          (NFData)+import           Control.Lens+import           Control.Monad import           Data.Function            (on) import           Data.Functor.Foldable    (ListF (Cons), ana, cata, embed, project) import           Data.Functor.Foldable.TH (makeBaseFunctor)@@ -74,8 +77,6 @@ import           Data.Semigroup           (Semigroup) import           GHC.Generics             (Generic) import           Language.ATS.Lexer       (Addendum (..))-import           Lens.Micro-import           Lens.Micro.TH  type Fix = Either Int String @@ -380,17 +381,8 @@                           }                           deriving (Show, Eq, Generic, NFData) -makeBaseFunctor ''Pattern-makeBaseFunctor ''Expression-makeBaseFunctor ''StaticExpression-makeBaseFunctor ''Type-makeLenses ''Leaf-makeLenses ''Declaration-makeLenses ''PreFunction-makeLenses ''Implementation-makeLenses ''DataPropLeaf-makeLenses ''Function-makeLenses ''Type+join <$> traverse makeBaseFunctor [''Pattern, ''Expression, ''StaticExpression, ''Type]+join <$> traverse makeLenses [''Leaf, ''Declaration, ''PreFunction, ''Implementation, ''DataPropLeaf, ''Function, ''Type]  exprLens :: Eq a => FixityState a -> ASetter s t (Expression a) (Expression a) -> s -> t exprLens st = flip over (rewriteATS st)