Rename CLaSH to Clash (#125)

Fixes #76
clash-lang · Sep 15, 2017 · 15751f9 · 15751f9
1 parent 4fb8f78
commit 15751f9
Show file tree

Hide file tree

Showing 68 changed files with 883 additions and 883 deletions.
diff --git a/benchmarks/BenchBitVector.hs b/benchmarks/BenchBitVector.hs
@@ -6,8 +6,8 @@
 
 module BenchBitVector where
 
-import CLaSH.Sized.Internal.BitVector
-import CLaSH.Class.Num
+import Clash.Sized.Internal.BitVector
+import Clash.Class.Num
 import GHC.TypeLits                   (type (*))
 import Criterion                      (Benchmark, env, bench, nf)
 import Language.Haskell.TH.Syntax     (lift)

diff --git a/benchmarks/BenchFixed.hs b/benchmarks/BenchFixed.hs
@@ -6,9 +6,9 @@
 
 module BenchFixed where
 
-import CLaSH.Class.Num
-import CLaSH.Sized.Fixed
-import CLaSH.Sized.Unsigned
+import Clash.Class.Num
+import Clash.Sized.Fixed
+import Clash.Sized.Unsigned
 import Criterion                   (Benchmark, env, bench, nf)
 import Language.Haskell.TH.Syntax  (lift)
 

diff --git a/benchmarks/BenchSigned.hs b/benchmarks/BenchSigned.hs
@@ -6,8 +6,8 @@
 
 module BenchSigned where
 
-import CLaSH.Sized.BitVector
-import CLaSH.Sized.Internal.Signed
+import Clash.Sized.BitVector
+import Clash.Sized.Internal.Signed
 import Criterion                   (Benchmark, env, bench, nf)
 import Language.Haskell.TH.Syntax  (lift)
 

diff --git a/clash-prelude.cabal b/clash-prelude.cabal
@@ -30,17 +30,17 @@ Description:
   .
   To use the library:
   .
-  * Import "CLaSH.Prelude"
+  * Import "Clash.Prelude"
   .
   * Alternatively, if you want to explicitly route clock and reset ports,
     for more straightforward multi-clock designs, you can import the
-    "CLaSH.Explicit.Prelude" module. Note that you should not import
-    "CLaSH.Prelude" and "CLaSH.Explicit.Prelude" at the same time as they
+    "Clash.Explicit.Prelude" module. Note that you should not import
+    "Clash.Prelude" and "Clash.Explicit.Prelude" at the same time as they
     have overlapping definitions.
   .
-  A preliminary version of a tutorial can be found in "CLaSH.Tutorial", for a
-  general overview of the library you should however check out "CLaSH.Prelude".
-  Some circuit examples can be found in "CLaSH.Examples".
+  A preliminary version of a tutorial can be found in "Clash.Tutorial", for a
+  general overview of the library you should however check out "Clash.Prelude".
+  Some circuit examples can be found in "Clash.Examples".
 Homepage:             http://www.clash-lang.org/
 bug-reports:          http://github.com/clash-lang/clash-prelude/issues
 License:              BSD2
@@ -82,78 +82,78 @@ Library
   default-language:   Haskell2010
   ghc-options:        -Wall -fexpose-all-unfoldings -fno-worker-wrapper
 
-  Exposed-modules:    CLaSH.Annotations.TopEntity
-                      CLaSH.Annotations.Primitive
-
-                      CLaSH.Class.BitPack
-                      CLaSH.Class.Num
-                      CLaSH.Class.Resize
-
-                      CLaSH.Explicit.BlockRam
-                      CLaSH.Explicit.BlockRam.File
-                      CLaSH.Explicit.DDR
-                      CLaSH.Explicit.Mealy
-                      CLaSH.Explicit.Moore
-                      CLaSH.Explicit.RAM
-                      CLaSH.Explicit.ROM
-                      CLaSH.Explicit.ROM.File
-                      CLaSH.Explicit.Prelude
-                      CLaSH.Explicit.Prelude.Safe
-                      CLaSH.Explicit.Signal
-                      CLaSH.Explicit.Signal.Delayed
-                      CLaSH.Explicit.Synchronizer
-                      CLaSH.Explicit.Testbench
-
-                      CLaSH.Intel.ClockGen
-                      CLaSH.Intel.DDR
-
-                      CLaSH.NamedTypes
-
-                      CLaSH.Prelude
-                      CLaSH.Prelude.BitIndex
-                      CLaSH.Prelude.BitReduction
-                      CLaSH.Prelude.BlockRam
-                      CLaSH.Prelude.BlockRam.File
-                      CLaSH.Prelude.DataFlow
-                      CLaSH.Prelude.Mealy
-                      CLaSH.Prelude.Moore
-                      CLaSH.Prelude.RAM
-                      CLaSH.Prelude.ROM
-                      CLaSH.Prelude.ROM.File
-                      CLaSH.Prelude.Safe
-                      CLaSH.Prelude.Testbench
-
-                      CLaSH.Promoted.Nat
-                      CLaSH.Promoted.Nat.Literals
-                      CLaSH.Promoted.Nat.TH
-                      CLaSH.Promoted.Nat.Unsafe
-                      CLaSH.Promoted.Symbol
-
-                      CLaSH.Signal
-                      CLaSH.Signal.Bundle
-                      CLaSH.Signal.Delayed
-                      CLaSH.Signal.Internal
-
-                      CLaSH.Sized.BitVector
-                      CLaSH.Sized.Fixed
-                      CLaSH.Sized.Index
-                      CLaSH.Sized.RTree
-                      CLaSH.Sized.Signed
-                      CLaSH.Sized.Unsigned
-                      CLaSH.Sized.Vector
-
-                      CLaSH.Sized.Internal.BitVector
-                      CLaSH.Sized.Internal.Index
-                      CLaSH.Sized.Internal.Signed
-                      CLaSH.Sized.Internal.Unsigned
-
-                      CLaSH.XException
-
-                      CLaSH.Xilinx.ClockGen
-                      CLaSH.Xilinx.DDR
-
-                      CLaSH.Tutorial
-                      CLaSH.Examples
+  Exposed-modules:    Clash.Annotations.TopEntity
+                      Clash.Annotations.Primitive
+
+                      Clash.Class.BitPack
+                      Clash.Class.Num
+                      Clash.Class.Resize
+
+                      Clash.Explicit.BlockRam
+                      Clash.Explicit.BlockRam.File
+                      Clash.Explicit.DDR
+                      Clash.Explicit.Mealy
+                      Clash.Explicit.Moore
+                      Clash.Explicit.RAM
+                      Clash.Explicit.ROM
+                      Clash.Explicit.ROM.File
+                      Clash.Explicit.Prelude
+                      Clash.Explicit.Prelude.Safe
+                      Clash.Explicit.Signal
+                      Clash.Explicit.Signal.Delayed
+                      Clash.Explicit.Synchronizer
+                      Clash.Explicit.Testbench
+
+                      Clash.Intel.ClockGen
+                      Clash.Intel.DDR
+
+                      Clash.NamedTypes
+
+                      Clash.Prelude
+                      Clash.Prelude.BitIndex
+                      Clash.Prelude.BitReduction
+                      Clash.Prelude.BlockRam
+                      Clash.Prelude.BlockRam.File
+                      Clash.Prelude.DataFlow
+                      Clash.Prelude.Mealy
+                      Clash.Prelude.Moore
+                      Clash.Prelude.RAM
+                      Clash.Prelude.ROM
+                      Clash.Prelude.ROM.File
+                      Clash.Prelude.Safe
+                      Clash.Prelude.Testbench
+
+                      Clash.Promoted.Nat
+                      Clash.Promoted.Nat.Literals
+                      Clash.Promoted.Nat.TH
+                      Clash.Promoted.Nat.Unsafe
+                      Clash.Promoted.Symbol
+
+                      Clash.Signal
+                      Clash.Signal.Bundle
+                      Clash.Signal.Delayed
+                      Clash.Signal.Internal
+
+                      Clash.Sized.BitVector
+                      Clash.Sized.Fixed
+                      Clash.Sized.Index
+                      Clash.Sized.RTree
+                      Clash.Sized.Signed
+                      Clash.Sized.Unsigned
+                      Clash.Sized.Vector
+
+                      Clash.Sized.Internal.BitVector
+                      Clash.Sized.Internal.Index
+                      Clash.Sized.Internal.Signed
+                      Clash.Sized.Internal.Unsigned
+
+                      Clash.XException
+
+                      Clash.Xilinx.ClockGen
+                      Clash.Xilinx.DDR
+
+                      Clash.Tutorial
+                      Clash.Examples
 
   other-extensions:   CPP
                       BangPatterns

diff --git a/src/CLaSH/Annotations/Primitive.hs → src/Clash/Annotations/Primitive.hs b/src/CLaSH/Annotations/Primitive.hs → src/Clash/Annotations/Primitive.hs
@@ -10,7 +10,7 @@ Maintainer :  Christiaan Baaij <christiaan.baaij@gmail.com>
 
 {-# OPTIONS_HADDOCK show-extensions #-}
 
-module CLaSH.Annotations.Primitive where
+module Clash.Annotations.Primitive where
 
 import Data.Data
 

diff --git a/src/CLaSH/Annotations/TopEntity.hs → src/Clash/Annotations/TopEntity.hs b/src/CLaSH/Annotations/TopEntity.hs → src/Clash/Annotations/TopEntity.hs
@@ -54,8 +54,8 @@ For example, given the following specification:
 @
 module Blinker where
 
-import CLaSH.Prelude
-import CLaSH.Intel.ClockGen
+import Clash.Prelude
+import Clash.Intel.ClockGen
 
 type Dom50 = Dom \"System\" 20000
 
@@ -65,12 +65,12 @@ topEntity
   -> Signal Dom50 Bit
   -> Signal Dom50 (BitVector 8)
 topEntity clk rst key1 =
-    let  (pllOut,pllStable) = 'CLaSH.Intel.ClockGen.altpll' (SSymbol @ "altpll50") clk rst
-         rstSync            = 'CLaSH.Signal.resetSynchroniser' pllOut ('CLaSH.Signal.unsafeToAsyncReset' pllStable)
-    in   'CLaSH.Signal.withClockReset' pllOut rstSync leds
+    let  (pllOut,pllStable) = 'Clash.Intel.ClockGen.altpll' (SSymbol @ "altpll50") clk rst
+         rstSync            = 'Clash.Signal.resetSynchroniser' pllOut ('Clash.Signal.unsafeToAsyncReset' pllStable)
+    in   'Clash.Signal.withClockReset' pllOut rstSync leds
   where
-    key1R  = 'CLaSH.Prelude.isRising' 1 key1
-    leds   = 'CLaSH.Prelude.mealy' blinkerT (1,False,0) key1R
+    key1R  = 'Clash.Prelude.isRising' 1 key1
+    leds   = 'Clash.Prelude.mealy' blinkerT (1,False,0) key1R
 
 blinkerT (leds,mode,cntr) key1R = ((leds',mode',cntr'),leds)
   where
@@ -182,7 +182,7 @@ See the documentation of 'TopEntity' for the meaning of all its fields.
 
 {-# OPTIONS_HADDOCK show-extensions #-}
 
-module CLaSH.Annotations.TopEntity
+module Clash.Annotations.TopEntity
   ( -- * Data types
     TopEntity (..)
   , PortName (..)

diff --git a/src/CLaSH/Class/BitPack.hs → src/Clash/Class/BitPack.hs b/src/CLaSH/Class/BitPack.hs → src/Clash/Class/BitPack.hs
@@ -22,7 +22,7 @@ Maintainer :  Christiaan Baaij <christiaan.baaij@gmail.com>
 
 #include "MachDeps.h"
 
-module CLaSH.Class.BitPack
+module Clash.Class.BitPack
   ( BitPack (..)
   , bitCoerce
   , boolToBV
@@ -39,25 +39,25 @@ import Numeric.Half                   (Half (..))
 import GHC.Generics
 import Prelude                        hiding (map)
 
-import CLaSH.Class.Resize             (zeroExtend)
-import CLaSH.Sized.BitVector          (BitVector, (++#), high, low)
-import CLaSH.Sized.Internal.BitVector (unsafeToInteger, split#)
+import Clash.Class.Resize             (zeroExtend)
+import Clash.Sized.BitVector          (BitVector, (++#), high, low)
+import Clash.Sized.Internal.BitVector (unsafeToInteger, split#)
 
 {- $setup
 >>> :set -XDataKinds
->>> import CLaSH.Prelude
+>>> import Clash.Prelude
 -}
 
 -- | Convert to and from a 'BitVector'
 class BitPack a where
-  -- | Number of 'CLaSH.Sized.BitVector.Bit's needed to represents elements
+  -- | Number of 'Clash.Sized.BitVector.Bit's needed to represents elements
   -- of type @a@
   --
   -- Can be derived using `GHC.Generics`:
   --
   -- > {-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}
   -- >
-  -- > import CLaSH.Prelude
+  -- > import Clash.Prelude
   -- > import GHC.Generics
   -- >
   -- > data MyProductType = MyProductType { a :: Int, b :: Bool }

diff --git a/src/CLaSH/Class/Num.hs → src/Clash/Class/Num.hs b/src/CLaSH/Class/Num.hs → src/Clash/Class/Num.hs
@@ -12,7 +12,7 @@ Maintainer :  Christiaan Baaij <christiaan.baaij@gmail.com>
 
 {-# OPTIONS_HADDOCK show-extensions #-}
 
-module CLaSH.Class.Num
+module Clash.Class.Num
   ( -- * Arithmetic functions for arguments and results of different precision
     ExtendingNum (..)
     -- * Saturating arithmetic functions

diff --git a/src/CLaSH/Class/Resize.hs → src/Clash/Class/Resize.hs b/src/CLaSH/Class/Resize.hs → src/Clash/Class/Resize.hs
@@ -13,7 +13,7 @@ Maintainer :  Christiaan Baaij <christiaan.baaij@gmail.com>
 {-# OPTIONS_GHC -fplugin GHC.TypeLits.KnownNat.Solver #-}
 {-# OPTIONS_HADDOCK show-extensions #-}
 
-module CLaSH.Class.Resize where
+module Clash.Class.Resize where
 
 import GHC.TypeLits (Nat, KnownNat, type (+))
 

diff --git a/src/CLaSH/Examples.hs → src/Clash/Examples.hs b/src/CLaSH/Examples.hs → src/Clash/Examples.hs
@@ -13,7 +13,7 @@ Licence   : Creative Commons 4.0 (CC BY 4.0) (http://creativecommons.org/license
 {-# OPTIONS_GHC -fno-warn-missing-signatures #-}
 {-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
 
-module CLaSH.Examples (
+module Clash.Examples (
   -- * Decoders and Encoders
   -- $decoders_and_encoders
 
@@ -28,7 +28,7 @@ module CLaSH.Examples (
   )
 where
 
-import CLaSH.Prelude hiding (feedback)
+import Clash.Prelude hiding (feedback)
 import Control.Lens
 import Control.Monad
 import Control.Monad.Trans.State
@@ -277,7 +277,7 @@ uart ld_tx_data tx_data tx_enable rx_in uld_rx_data rx_enable =
 
 {- $setup
 >>> :set -XDataKinds
->>> import CLaSH.Prelude
+>>> import Clash.Prelude
 >>> import Test.QuickCheck
 -}
 
@@ -505,7 +505,7 @@ crc enable ld dIn = s
 {\-\# LANGUAGE RecordWildCards \#-\}
 module UART (uart) where
 
-import CLaSH.Prelude
+import Clash.Prelude
 import Control.Lens
 import Control.Monad
 import Control.Monad.Trans.State