diff --git a/Plugin/Pl/Rules.hs b/Plugin/Pl/Rules.hs --- a/Plugin/Pl/Rules.hs +++ b/Plugin/Pl/Rules.hs @@ -224,7 +224,7 @@ crossE = Quote $ Var Inf "***" firstE = Quote $ Var Pref "first" secondE = Quote $ Var Pref "second" -chainE = Quote $ Var Inf ">>" +interE = Quote $ Var Pref "inter" andE = Quote $ Var Pref "and" orE = Quote $ Var Pref "or" allE = Quote $ Var Pref "all" @@ -714,13 +714,8 @@ rr (flipE `a` extE) (bindE), - -- \f g x -> g x - -- f >> g - {--(>>) :: - (c -> a) -> (c -> b) -> (c -> b)--} - -- flip (>=>) --> <=< - Hard $ rr (flipE `a` fishE) + rr (flipE `a` fishE) (kliesliE), -- (.) . (=<<) --> <=< diff --git a/pointfree-fancy.cabal b/pointfree-fancy.cabal --- a/pointfree-fancy.cabal +++ b/pointfree-fancy.cabal @@ -1,79 +1,78 @@ -Cabal-Version: >= 1.8 - -Name: pointfree-fancy -Version: 1.1.1.4 -Category: Tool -Synopsis: Tool for refactoring expressions into pointfree form - -Description: +cabal-version: >=1.8 +name: pointfree-fancy +version: 1.1.1.5 +license: BSD3 +license-file: LICENSE +maintainer: Vanessa McHale +author: Thomas Jäger +tested-with: ghc ==8.0.1 ghc ==8.2.2 ghc ==8.4.1 ghc ==7.10.3 +synopsis: Tool for refactoring expressions into pointfree form +description: The pointfree tool is a standalone command-line version of the pl - plugin for lambdabot. This fork extends it to include several functions for - higher-order composition not in the prelude. - -Author: Thomas Jäger -Maintainer: Vanessa McHale -License: OtherLicense -License-file: LICENSE - -Extra-source-files: ChangeLog README test/Test.hs - -Build-type: Simple -Tested-with: GHC == 8.0.1 - -Source-repository head - type: git - location: git://github.com/benmachine/pointfree.git - -Library - Exposed-modules: Pointfree - - Build-depends: base >= 4.5 && < 5.0, - array >= 0.3 && < 0.6, - containers >= 0.4 && < 0.6, - haskell-src-exts >= 1.18 && < 1.20, - transformers < 0.6 - Other-modules: Plugin.Pl.Common - Plugin.Pl.Parser - Plugin.Pl.PrettyPrinter - Plugin.Pl.Optimize - Plugin.Pl.Rules - Plugin.Pl.Transform - GHC-options: -W - -Executable pointfree - Main-is: Main.hs - GHC-options: -W - Build-depends: base >= 4.3 && < 5.0, - array >= 0.3 && < 0.6, - containers >= 0.4 && < 0.6, - haskell-src-exts >= 1.18 && < 1.20, - transformers < 0.6 - Other-modules: Plugin.Pl.Common - Plugin.Pl.Parser - Plugin.Pl.PrettyPrinter - Plugin.Pl.Optimize - Plugin.Pl.Rules - Plugin.Pl.Transform + plugin for lambdabot. +category: Tool +build-type: Simple +extra-source-files: + ChangeLog + README + test/Test.hs -Test-suite tests - Type: exitcode-stdio-1.0 +source-repository head + type: git + location: git://github.com/benmachine/pointfree.git - Main-is: Test.hs - Other-modules: Plugin.Pl.Common - Plugin.Pl.Parser - Plugin.Pl.PrettyPrinter - Plugin.Pl.Optimize - Plugin.Pl.Rules - Plugin.Pl.Transform +library + exposed-modules: + Pointfree + other-modules: + Plugin.Pl.Common + Plugin.Pl.Parser + Plugin.Pl.PrettyPrinter + Plugin.Pl.Optimize + Plugin.Pl.Rules + Plugin.Pl.Transform + ghc-options: -W + build-depends: + base >=4.5 && <5.0, + array >=0.3 && <0.6, + containers >=0.4 && <0.6, + haskell-src-exts >=1.18 && <1.21, + transformers <0.6 - Build-depends: - array >= 0.3 && < 0.6, - base < 5, - containers >= 0.3 && < 0.6, - haskell-src-exts >= 1.18 && < 1.20, - HUnit >= 1.1 && < 1.7, - QuickCheck >= 2.1 && < 2.11, - transformers < 0.6 +executable pointfree + main-is: Main.hs + other-modules: + Plugin.Pl.Common + Plugin.Pl.Parser + Plugin.Pl.PrettyPrinter + Plugin.Pl.Optimize + Plugin.Pl.Rules + Plugin.Pl.Transform + ghc-options: -W + build-depends: + base >=4.3 && <5.0, + array >=0.3 && <0.6, + containers >=0.4 && <0.6, + haskell-src-exts >=1.18 && <1.21, + transformers <0.6 - GHC-Options: -W - Hs-source-dirs: . test +test-suite tests + type: exitcode-stdio-1.0 + main-is: Test.hs + hs-source-dirs: . test + other-modules: + Plugin.Pl.Common + Plugin.Pl.Parser + Plugin.Pl.PrettyPrinter + Plugin.Pl.Optimize + Plugin.Pl.Rules + Plugin.Pl.Transform + ghc-options: -W + build-depends: + array >=0.3 && <0.6, + base <5, + containers >=0.3 && <0.6, + haskell-src-exts >=1.18 && <1.20, + HUnit >=1.1 && <1.7, + QuickCheck >=2.1 && <2.11, + transformers <0.6 diff --git a/test/Test.hs b/test/Test.hs --- a/test/Test.hs +++ b/test/Test.hs @@ -110,16 +110,14 @@ unitTest "all id" ["and"], unitTest "\\x y -> g (f x y) y" ["f >=> g"], unitTest "any id" ["or"], - unitTest "liftA2 (||) x y" ["x <||> y"], - unitTest "flip (.)" ["(<&>)"], + unitTest "flip (.)" ["(-.)"], unitTest "flip (<$)" ["($>)"], - -- unitTest "zipWith ($) functions (repeat x)" ["fmap (x &) functions"], unitTest "fmap . const" ["(<$)"], unitTest "(.) . const" ["(<$)"], -- unitTest "\\x y -> h (f x) y" ["(argument %~ f) h"], -- unitTest "(mapped.argument %~ f) h x y" ["f -.* h"], + -- unitTest "fmap (<> a)" ["mapping <>= a"], unitTest "and . map f" ["all f"], - unitTest "flip (<=)" ["(>)"], unitTest "(f =<<) . g" ["f <=< g"], unitTest "or . map f" ["any f"], unitTest "\\x y -> f (x == y)" ["f .* (==)"], @@ -132,7 +130,6 @@ unitTest "concat ([concat (map h (k a))])" ["h =<< k a"], unitTest "uncurry (const f)" ["f . snd"], unitTest "uncurry const" ["fst"], - -- unitTest "\\f g x -> g x" ["f >> g"], unitTest "uncurry (const . f)" ["f . fst"], unitTest "\\a b -> a >>= \\x -> b >>= \\y -> return (x,y)" ["liftM2 (,)"], unitTest "\\b a -> a >>= \\x -> b >>= \\y -> return (x,y)" ["flip liftM2 (,)"], @@ -141,7 +138,6 @@ unitTest "\\x -> f x x" ["join f"], unitTest "join (+) 1" ["2"], unitTest "fmap f g x" ["f (g x)"], - unitTest "concatMap" ["(=<<)"], unitTest "liftM2 (+) f g 0" ["f 0 + g 0", "g 0 + f 0"], unitTest "return 1 x" ["x"], unitTest "f =<< return x" ["f x"],