kansas-lava 0.2.4.2 → 0.2.4.3

raw patch · 10 files changed

+27/−13 lines, 10 filesdep ~basedep ~bytestringdep ~cmdargsPVP: minor bump suggested

API additions: PVP suggests at least a minor version bump

Dependency ranges changed: base, bytestring, cmdargs, containers, data-default, directory, dotgen, filepath, netlist, netlist-to-vhdl, process, random, strict, template-haskell

API changes (from Hackage documentation)

Files

• Language/KansasLava/Fabric.hs +2/−1
• Language/KansasLava/Optimization.hs +9/−2
• Language/KansasLava/Protocols/Patch.hs +1/−0
• Language/KansasLava/RTL.hs +1/−0
• Language/KansasLava/Rep.hs +1/−1
• Language/KansasLava/Signal.hs +1/−0
• Language/KansasLava/Stream.hs +1/−1
• Language/KansasLava/Test.hs +2/−1
• Language/KansasLava/Types.hs +3/−1
• kansas-lava.cabal +6/−6

@@ -34,6 +34,7 @@ import qualified Data.Map as Map import Data.Map(Map) import Data.Ord(comparing)+import Prelude -- https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysTheimportof...isredundant  import Language.KansasLava.Rep import Language.KansasLava.Signal@@ -43,7 +44,7 @@ -- The '_' will disappear soon from these names. -- | A Pad represents the type of a top-level input/output port. data Pad = StdLogic (Seq Bool)-         | forall a x . (Size (W a), Show a, Rep a)+         | forall a . (Size (W a), Show a, Rep a)                 => StdLogicVector (Seq a) --         | TypedPad (...)          | GenericPad Integer

@@ -9,7 +9,9 @@  import Language.KansasLava.Types import Data.Reify+import Control.Applicative import Control.Monad+import Prelude -- https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysTheimportof...isredundant  import Data.List import Data.Default@@ -61,6 +63,13 @@ -- some metric based on the optimization... data Opt a = Opt a Int -- [String] +instance Functor Opt where+    fmap f (Opt x n) = Opt (f x) n++instance Applicative Opt where+    pure x = Opt x 0+    (Opt f n) <*> (Opt x m) = Opt (f x) (n + m)+ instance Monad Opt where     return a = Opt a 0     (Opt a n) >>= k = case k a of@@ -251,5 +260,3 @@ 	       , ("copy",copyElimCircuit) 	       , ("dce",dceCircuit) 	       ]--

@@ -28,6 +28,7 @@ import qualified Data.ByteString.Lazy as B import Control.Applicative import Control.Monad.Fix+import Prelude -- https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysTheimportof...isredundant  --------------------------------------------------------------------------- -- The Patch.

@@ -25,6 +25,7 @@ import Data.STRef import Data.List as L import Control.Monad.ST.Unsafe (unsafeInterleaveST)+import Prelude -- https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysTheimportof...isredundant  --import Debug.Trace 

@@ -26,6 +26,7 @@ --import qualified Data.Maybe as Maybe import Data.Traversable(sequenceA) import qualified Data.Sized.Sampled as Sampled+import Prelude hiding (sequenceA) -- https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysTheimportof...isredundant  import Language.KansasLava.Rep.TH import Language.KansasLava.Rep.Class@@ -340,4 +341,3 @@ 	toRep (XSampled (Just a))   = RepValue $ fmap Just $ M.toList $ Sampled.toMatrix a 	fromRep r = optX (liftM (Sampled.fromMatrix . M.fromList) $ getValidRepValue r) 	showRep = showRepDefault-

@@ -13,6 +13,7 @@ import Control.Monad (liftM, liftM2, liftM3) import Data.List as List import Data.Bits+import Prelude -- https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysTheimportof...isredundant  import Data.Sized.Ix import Data.Sized.Matrix as M

@@ -8,8 +8,8 @@ import qualified Data.Foldable as F import Control.Applicative import Control.Monad-import Prelude hiding (zipWith,zipWith3, repeat) import Data.Monoid+import Prelude hiding (zipWith,zipWith3, repeat) import qualified Data.List as List import Data.Dynamic import Debug.Trace

@@ -40,8 +40,9 @@ import Data.Maybe as Maybe import Data.Default --import Data.Sized.Unsigned+import Prelude -- https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysTheimportof...isredundant -import System.Cmd+import System.Process import System.Console.CmdArgs hiding (Default,def,name,summary,opt) import System.Directory import System.Environment

@@ -67,7 +67,8 @@ import Data.Ratio import qualified Data.Traversable as T import Data.Sized.Ix-import GHC.Exts( IsString(..) )+import Data.String ( IsString(..) )+import Prelude -- https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysTheimportof...isredundant  ------------------------------------------------------------------------- -- | Type captures HDL-representable types.@@ -497,6 +498,7 @@ instance (Size w) => Num (BitPat w) where     (+) = error "(+) undefined for BitPat"     (*) = error "(*) undefined for BitPat"+    negate = error "negate undefined for BitPat"     abs = error "abs undefined for BitPat"     signum = error "signum undefined for BitPat"     fromInteger n

@@ -1,5 +1,5 @@ Name:               kansas-lava-Version:            0.2.4.2+Version:            0.2.4.3 Synopsis:           Kansas Lava is a hardware simulator and VHDL generator.  Description: @@ -91,7 +91,7 @@        Paths_kansas_lava  -- need a module refactor to address the orphan warnings-  Ghc-Options: -Wall  -fno-warn-orphans+  Ghc-Options: -Wall  -fno-warn-orphans -fno-warn-tabs   default-language:    Haskell2010  --  Ghc-Prof-options:  -auto-all@@ -123,7 +123,7 @@       buildable: False     Main-Is:        Main.hs     Hs-Source-Dirs: ., tests-    Ghc-Options: -Wall +    Ghc-Options: -Wall -fno-warn-tabs                  -fno-warn-orphans -fcontext-stack=256                  -threaded -rtsopts     default-language:    Haskell2010@@ -154,7 +154,7 @@       buildable: False     Main-Is:        GenReport.hs     Hs-Source-Dirs:  ., tests-    Ghc-Options: -Wall  -fno-warn-incomplete-patterns+    Ghc-Options: -Wall -fno-warn-tabs -fno-warn-incomplete-patterns                  -fno-warn-orphans -fcontext-stack=256     default-language:    Haskell2010 @@ -183,7 +183,7 @@       buildable: False     Main-Is:        TBF2VCD.hs     Hs-Source-Dirs: ., tools-    Ghc-Options: -Wall  -fno-warn-orphans+    Ghc-Options: -Wall -fno-warn-tabs -fno-warn-orphans     default-language:    Haskell2010  source-repository head@@ -194,4 +194,4 @@   type:     git   location: git://github.com/ku-fpg/kansas-lava.git   branch:   kansas-lava-0.2.4-  tag:	    0.2.4.2+  tag:	    0.2.4.3