+ -- (Note: this is now ghomStagedK in the API.)
ghomStaged :: forall r d. Data d =>
SYB.Stage
-> r
@@ -35,7 +36,7 @@
checkItemStage is from HaRe and can be found in the
-download.
+download.
On Hackage: sai-shape-syb @@ -80,7 +80,7 @@
This package supports a generic mapping which works over arbitrary recursive heterogeneous types. -It differs from existing generic fmap (SYB's gmapT, or Oleg's gmap), in that it allows you to obtain a homogeneous result in the type of your choice, rather than adhering to the original types. +It differs from existing generic fmap (SYB's gmapT, or Oleg's gmap), in that it allows you to obtain a homogeneous result in the type of your choice, rather than adhering to the original types. [Actually maybe Oleg's will do this.] Hence, this is not an fmap, it doesn't satisfy the laws. (It's a homomorphism.) It uses gfoldl, so fold-as-map. @@ -147,20 +147,20 @@ data TA = A1 | A2 TB TA TB data TB = B TA exprAB = A2 (B A1) A1 (B A1) --- ((())()(())) +-- ((*)*(*)) data TC = C1 Float (Int,Int) | C2 TD TC TD | C3 TC data TD = D TC exprCD = C2 (D (C1 1.1 (4,5))) (C3 (C1 2.2 (6,7))) (D (C1 3.3 (8,9))) --- (((()(()())))((()(()())))((()(()())))) +-- (((*(**)))((*(**)))((*(**)))) data TE = E1 String | E2 (Int,Int) TF data TF = F TE String exprEF = E2 (2,5) (F (E1 "foo") "bar") --- ((()(())())()()) -- with [Char] as a stop type, so String is treated as atomic +-- ((*(*)*)**) -- with [Char] as a stop type, so String is treated as atomic test_list = [[1,2],[3],[4,5,6::Int]] --- ((()(()()))((()())((()(()(()())))()))) +-- ((*(**))((**)((*(*(**)))*))) ----------------------------------------------- @@ -188,7 +188,7 @@ > showAsParens $ shapeOf test_list -((()(()()))((()())((()(()(()())))()))) +((*(**))((**)((*(*(**)))*))) > showAsParensBool $ ghom (mkQ False (odd::Int->Bool)) test_list @@ -358,15 +358,15 @@ > showAsParens $ shapeOf exprAB -((())()(())) +((*)*(*)) > showAsParens $ shapeOf exprCD -(((()(()())))((()(()())))((()(()())))) +(((*(**)))((*(**)))((*(**)))) > showAsParens $ shapeOf exprEF -((()())(((()(()(()()))))(()(()(()()))))) +((**)(((*(*(**))))(*(*(**))))) > show $ ( ( unGhomDyn $ ghomDyn exprEF ) :: TE ) @@ -565,107 +565,6 @@ ([[3],[4,5,6]], Nothing) (3, Just 3) (5, Just 5) - - -Testing abstract datatype: - -> show exprN - -fromList [("",1.1),("pdsfhp",3.3),("sfv",2.2)] - -> show $ Map.toList exprN - -[("",1.1),("pdsfhp",3.3),("sfv",2.2)] - -> showHomo $ shapeOf exprN - -() -| () -| | () -| | | () -| | | () -| | () -| | | () -| | | | () -| | | | | () -| | | | | () -| | | | | | () -| | | | | | () -| | | | | | | () -| | | | | | | () -| | | | | | | | () -| | | | | | | | () -| | | | | | | | | () -| | | | | | | | | () -| | | | | | | | | | () -| | | | | | | | | | () -| | | | () -| | | () -| | | | () -| | | | | () -| | | | | | () -| | | | | | () -| | | | | | | () -| | | | | | | () -| | | | | | | | () -| | | | | | | | () -| | | | | () -| | | | () - -> showAsParensEnriched $ shapeOf exprN - -(()(()(()(())(()))(()(()(()(())(()(())(()(())(()(())(()(())(()(())(())))))))(()))(()(()(()(())(()(())(()(())(()))))(()))(()))))) - -> showHomo $ ghom (mkQ 0.0 (\ (x::Float) -> x)) exprN - -0.0 -| 0.0 -| | 0.0 -| | | 0.0 -| | | 1.1 -| | 0.0 -| | | 0.0 -| | | | 0.0 -| | | | | 0.0 -| | | | | 0.0 -| | | | | | 0.0 -| | | | | | 0.0 -| | | | | | | 0.0 -| | | | | | | 0.0 -| | | | | | | | 0.0 -| | | | | | | | 0.0 -| | | | | | | | | 0.0 -| | | | | | | | | 0.0 -| | | | | | | | | | 0.0 -| | | | | | | | | | 0.0 -| | | | 3.3 -| | | 0.0 -| | | | 0.0 -| | | | | 0.0 -| | | | | | 0.0 -| | | | | | 0.0 -| | | | | | | 0.0 -| | | | | | | 0.0 -| | | | | | | | 0.0 -| | | | | | | | 0.0 -| | | | | 2.2 -| | | | 0.0 - -> showHomo $ filterHomo (>0.5) $ ghom (mkQ 0.0 (\ (x::Float) -> x)) exprN - -0.0 -| 1.1 -| 3.3 -| 2.2 - -> showHomo $ filterHomoM (>0.5) $ ghom (mkQ 0.0 (\ (x::Float) -> x)) exprN - -Nothing -| Nothing -| | Just 1.1 -| | Nothing -| | | Just 3.3 -| | | Just 2.2 diff --git a/sai-shape-syb.cabal b/sai-shape-syb.cabal --- a/sai-shape-syb.cabal +++ b/sai-shape-syb.cabal @@ -1,6 +1,6 @@ name: sai-shape-syb -version: 0.2.1 +version: 0.2.2 synopsis: Obtain homogeneous values from arbitrary values, tramsforming or culling data description: This package provides SYB shape support: generic mapping to diff --git a/src/SAI/Data/Generics/Shape.hs b/src/SAI/Data/Generics/Shape.hs --- a/src/SAI/Data/Generics/Shape.hs +++ b/src/SAI/Data/Generics/Shape.hs @@ -22,9 +22,6 @@ module SAI.Data.Generics.Shape ( - --- * Core SYB exports ---module SAI.Data.Generics , - -- * Generic shape module SAI.Data.Generics.Shape.SYB , @@ -34,11 +31,14 @@ -- * Generic shape, variants for handling GHC API staged types module SAI.Data.Generics.Shape.SYB.GHC , + --- * Core SYB exports (user will need mkQ at least) + module Data.Generics , + ) where ------------------------------------------------------------------------------ ---import Data.Generics +import Data.Generics import SAI.Data.Generics.Shape.SYB --import SAI.Data.Generics.Shape.SYB hiding ( R ) diff --git a/src/SAI/Data/Generics/Shape/SYB.hs b/src/SAI/Data/Generics/Shape/SYB.hs --- a/src/SAI/Data/Generics/Shape/SYB.hs +++ b/src/SAI/Data/Generics/Shape/SYB.hs @@ -400,7 +400,7 @@ ------------------------------------------------------------------------------- - -- | Compare two rose trees for shape equality. + -- | Compare two general polytypic values for shape equality. symmorphic :: forall d1 d2. (Data d1,Data d2) => d1 -> d2 -> Bool #if 1 symmorphic x y = shapeOf x == shapeOf y @@ -555,6 +555,7 @@ ------------------------------------------------------------------------------- showAsParens :: Homo r -> String + showAsParens (Node _ []) = "*" showAsParens (Node _ chs) = "(" ++ concatMap showAsParens chs ++ ")" showAsParensBool :: Homo Bool -> String diff --git a/src/SAI/Data/Generics/Shape/SYB/GHC.hs b/src/SAI/Data/Generics/Shape/SYB/GHC.hs --- a/src/SAI/Data/Generics/Shape/SYB/GHC.hs +++ b/src/SAI/Data/Generics/Shape/SYB/GHC.hs @@ -26,7 +26,7 @@ -- for more information. -- -- The present module provides support for staged GHC AST types. --- One you have a @'Homo' r@, 'Hetero', or @'Bi' r@, the rest of +-- Once you have a @'Homo' r@, 'Hetero', or @'Bi' r@, the rest of -- the API in "Shape.SYB" and "Shape.SYB.Filter" is applicable. -- ----------------------------------------------------------------------------- @@ -195,7 +195,7 @@ ------------------------------------------------------------------------------- - -- | Compare two rose trees for shape equality. + -- | Compare two GHC ASTs for shape equality. symmorphicStaged :: forall d1 d2. (Data d1,Data d2) => Stage -> d1 -> d2 -> Bool symmorphicStaged stage x y = shapeOfStaged stage x == shapeOfStaged stage y