pugs-DrIFT 2.2.3.2 → 2.2.3.20110925

raw patch · 13 files changed

+40/−39 lines, 13 filesdep +old-timedep +randomdep −haskell98PVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependencies added: old-time, random

Dependencies removed: haskell98

API changes (from Hackage documentation)

- DrIFT.Perl6Class: showMooseClassDef :: NamespaceMangler -> String -> String -> [(String, String, String)] -> String

- DrIFT.Perl6Class: showMooseRoleDef :: NamespaceMangler -> String -> String

- DrIFT.Perl6Class: showPerl6ClassDef :: NamespaceMangler -> String -> String -> [(String, String, String)] -> String

- DrIFT.Perl6Class: showPerl6RoleDef :: NamespaceMangler -> String -> String

- DrIFT.YAML: instance [incoherent] Typeable1 [::]

- DrIFT.YAML: instance [incoherent] YAML a => YAML [:a:]

+ DrIFT.Perl6Class: showPerl6ClassDef, showMooseClassDef :: NamespaceMangler -> String -> String -> [(String, String, String)] -> String

+ DrIFT.Perl6Class: showPerl6RoleDef, showMooseRoleDef :: NamespaceMangler -> String -> String

+ DrIFT.YAML: instance [incoherent] YAML a => YAML (Seq a)

Files

pugs-DrIFT.cabal +5/−5
src/ChaseImports.hs +3/−3
src/DataP.lhs +3/−3
src/DrIFT.hs +5/−5
src/DrIFT/YAML.hs +6/−7
src/GenUtil.hs +10/−8
src/GetOpt.hs +1/−1
src/ParseLib2.hs +2/−2
src/Rules/JSON.hs +1/−1
src/Rules/Perl5.hs +1/−1
src/Rules/Perl6Class.hs +1/−1
src/Rules/YAML.hs +1/−1
src/Unlit.hs +1/−1

pugs-DrIFT.cabal view

@@ -1,5 +1,5 @@ name:                pugs-DrIFT-version:             2.2.3.2+version:             2.2.3.20110925 synopsis:            DrIFT with pugs-specific rules. description:         DrIFT is a type sensitive preprocessor for Haskell. It extracts type declarations                      and directives from modules. The directives cause rules to be fired on the parsed@@ -33,9 +33,9 @@         src/Rules/YAML.hs  executable          pugs-DrIFT-    build-depends:       base >= 4 && < 5, haskell98, bytestring, utf8-string, pretty, containers, mtl < 2.0.0.0, stm, HsSyck+    build-depends:       base >= 4 && < 5, old-time, random, bytestring, utf8-string, pretty, containers, mtl < 2.0.0.0, stm, HsSyck     main-is:             DrIFT.hs-    ghc-options:         -fparr+    -- ghc-options:         -fparr     hs-source-dirs:      src     extensions:          ParallelListComp, ScopedTypeVariables,                          ImplicitParams, MagicHash, TypeSynonymInstances,@@ -44,9 +44,9 @@                          IncoherentInstances  library-    build-depends:       base >= 4 && < 5, haskell98, bytestring, utf8-string, pretty, containers, mtl < 2.0.0.0, stm, HsSyck+    build-depends:       base >= 4 && < 5, old-time, random, bytestring, utf8-string, pretty, containers, mtl < 2.0.0.0, stm, HsSyck     hs-source-dirs:      src-    ghc-options:         -fparr+    -- ghc-options:         -fparr     extensions:          ParallelListComp, ScopedTypeVariables,                          ImplicitParams, MagicHash, TypeSynonymInstances,                          OverlappingInstances, FlexibleContexts,

src/ChaseImports.hs view

@@ -24,10 +24,10 @@ import DataP import CommandP import ParseLib2-import System-import List+import System.Environment+import Data.List import qualified Unlit-import Monad+import Control.Monad import GenUtil  try x = catch (x >>= return . Right) (return . Left)

src/DataP.lhs view

@@ -10,9 +10,9 @@ >where  >import ParseLib2->import Char->import List->import Monad+>import Data.Char+>import Data.List+>import Control.Monad   >data Statement = DataStmt | NewTypeStmt deriving (Eq,Show)

src/DrIFT.hs view

@@ -7,17 +7,17 @@ import DataP import GenUtil import GetOpt-import Char-import IO hiding(try)-import List (partition,isSuffixOf,sort, groupBy, sortBy)-import Monad(unless)+import Data.Char+import System.IO+import Data.List (partition,isSuffixOf,sort, groupBy, sortBy)+import Control.Monad(unless) import PreludData(preludeData) import Pretty import RuleUtils (commentLine,texts) import RuleUtils(Rule,Tag) import Version import qualified Rules(rules)-import qualified System+import qualified System.Environment as System  data Op = OpList | OpDerive | OpVersion

src/DrIFT/YAML.hs view

@@ -12,6 +12,8 @@ import System.IO.Unsafe import Data.IORef import Data.Bits+import Data.Sequence (Seq)+import Data.Foldable (toList) import Data.List	( foldl' ) import Data.Int		( Int32, Int64 ) import Codec.Binary.UTF8.String (encodeString, decodeString)@@ -22,6 +24,7 @@ import qualified Data.ByteString as BS import qualified Data.ByteString.Char8 as S import qualified Data.ByteString.Lazy.Char8 as L+import qualified Data.Sequence as Seq  type Buf = S.ByteString @@ -208,11 +211,11 @@     fromYAMLElem (ESeq s) = mapM fromYAML s     fromYAMLElem e = fail $ "no parse: " ++ show e ++ ", expecting list of " ++ show (typeOf (undefined :: a)) -instance (YAML a) => YAML [:a:] where+instance (YAML a) => YAML (Seq a) where     asYAML xs = do -- asYAMLanchor xs $ do-        xs' <- mapM asYAML (fromP xs)+        xs' <- mapM asYAML $ toList xs         (return . mkNode . ESeq) xs'-    fromYAMLElem (ESeq s) = fmap toP (mapM fromYAML s)+    fromYAMLElem (ESeq s) = fmap Seq.fromList (mapM fromYAML s)     fromYAMLElem e = fail $ "no parse: " ++ show e ++ ", expecting array of " ++ show (typeOf (undefined :: a))  instance (YAML a, YAML b) => YAML (a, b) where@@ -429,7 +432,3 @@         where         r :: Int64         r = fromIntegral a * fromIntegral b--instance Typeable1 [::] where-    typeOf1 _ = mkTyConApp (mkTyCon "[::]") []-

src/GenUtil.hs view

@@ -91,14 +91,16 @@     UniqueProducer(..)     ) where -import Char(isAlphaNum, isSpace, toLower,  ord)-import List(group,sort)-import List(intersperse, sortBy, groupBy)-import Monad-import qualified IO-import qualified System-import Random(StdGen, newStdGen, Random(randomR))-import Time+import Data.Char(isAlphaNum, isSpace, toLower,  ord)+import Data.List(group,sort)+import Data.List(intersperse, sortBy, groupBy)+import Control.Monad (join, liftM, MonadPlus(..))+import qualified System.IO as IO+import qualified System.IO.Error as IO+import qualified System.Environment as System+import qualified System.Exit as System+import System.Random(StdGen, newStdGen, Random(randomR))+import System.Time  {-# SPECIALIZE snub :: [String] -> [String] #-} {-# SPECIALIZE snub :: [Int] -> [Int] #-}

src/GetOpt.hs view

@@ -21,7 +21,7 @@    ArgOrder(..), OptDescr(..), ArgDescr(..), usageInfo, getOpt    ) where -import List(isPrefixOf)+import Data.List(isPrefixOf)  data ArgOrder a                        -- what to do with options following non-options:    = RequireOrder                      --    no option processing after first non-option

src/ParseLib2.hs view

@@ -31,8 +31,8 @@     many1_offside,many_offside,off,     opt, skipUntil, skipUntilOff,skipUntilParse,skipNest) where -import Char-import Monad+import Data.Char+import Control.Monad  infixr 5 +++

src/Rules/JSON.hs view

@@ -1,7 +1,7 @@ module Rules.JSON (rules) where  import RuleUtils-import List +import Data.List  import GenUtil  rules = [

src/Rules/Perl5.hs view

@@ -1,7 +1,7 @@ module Rules.Perl5 (rules) where  import RuleUtils-import List +import Data.List  import GenUtil  rules = [

src/Rules/Perl6Class.hs view

@@ -1,7 +1,7 @@ module Rules.Perl6Class (rules) where  import RuleUtils-import List +import Data.List  import GenUtil  type AlwaysPositional = Bool

src/Rules/YAML.hs view

@@ -1,7 +1,7 @@ module Rules.YAML (rules) where  import RuleUtils-import List +import Data.List  import GenUtil  type AlwaysPositional = Bool

src/Unlit.hs view

@@ -5,7 +5,7 @@ --   version 1.2, appendix C.  -import Char+import Data.Char  data Classified = Program String | Blank | Comment                 | Include Int String | Pre String