Rename CLaSH to Clash (#254)

Fixes clash-lang/clash-prelude#76
clash-lang · Sep 15, 2017 · 2a609a5 · 2a609a5
1 parent ca60a2f
commit 2a609a5
Show file tree

Hide file tree

Showing 268 changed files with 1,846 additions and 1,846 deletions.
diff --git a/CLaSH.hs → Clash.hs b/CLaSH.hs → Clash.hs
@@ -3,16 +3,16 @@
 #include "MachDeps.h"
 #define HDLSYN Other
 
-import CLaSH.Driver
-import CLaSH.Driver.Types
-import CLaSH.GHC.Evaluator
-import CLaSH.GHC.GenerateBindings
-import CLaSH.GHC.NetlistTypes
-import CLaSH.Backend
-import CLaSH.Backend.SystemVerilog
-import CLaSH.Backend.VHDL
-import CLaSH.Backend.Verilog
-import CLaSH.Netlist.BlackBox.Types
+import Clash.Driver
+import Clash.Driver.Types
+import Clash.GHC.Evaluator
+import Clash.GHC.GenerateBindings
+import Clash.GHC.NetlistTypes
+import Clash.Backend
+import Clash.Backend.SystemVerilog
+import Clash.Backend.VHDL
+import Clash.Backend.Verilog
+import Clash.Netlist.BlackBox.Types
 
 import Control.DeepSeq
 import qualified Data.Time.Clock as Clock
@@ -41,7 +41,7 @@ doHDL b src = do
   let prepStartDiff = Clock.diffUTCTime prepTime startTime
   putStrLn $ "Loading dependencies took " ++ show prepStartDiff
   generateHDL bindingsMap (Just b) primMap tcm tupTcm (ghcTypeToHWType WORD_SIZE_IN_BITS True) reduceConstant topEntities
-    (CLaSHOpts 20 20 15 0 DebugFinal True WORD_SIZE_IN_BITS Nothing HDLSYN True True False ["."] True) (startTime,prepTime)
+    (ClashOpts 20 20 15 0 DebugFinal True WORD_SIZE_IN_BITS Nothing HDLSYN True True False ["."] True) (startTime,prepTime)
 
 main :: IO ()
 main = genVHDL "./examples/FIR.hs"
diff --git a/clash-dev b/clash-dev
@@ -1,2 +1,2 @@
 #!/bin/sh
-stack exec -- ghci -fobject-code -optP-include -optP./clash-lib/$(stack exec -- printenv HASKELL_DIST_DIR)/build/autogen/cabal_macros.h -iclash-lib/src -iclash-ghc/src-ghc -package ghc -Wall -Werror CLaSH.hs
+stack exec -- ghci -fobject-code -optP-include -optP./clash-lib/$(stack exec -- printenv HASKELL_DIST_DIR)/build/autogen/cabal_macros.h -iclash-lib/src -iclash-ghc/src-ghc -package ghc -Wall -Werror Clash.hs
diff --git a/clash-ghc/clash-ghc.cabal b/clash-ghc/clash-ghc.cabal
@@ -45,7 +45,7 @@ Extra-source-files:   README.md,
                       CHANGELOG.md,
                       LICENSE_GHC,
                       cbits/PosixSource.h,
-                      src-bin/CLaSH/GHCi/HsVersions.h
+                      src-bin/Clash/GHCi/HsVersions.h
 
 Cabal-version:        >=1.10
 
@@ -130,17 +130,17 @@ library
   Include-dirs:       cbits
   C-Sources:          cbits/hschooks.c
 
-  Exposed-Modules:    CLaSH.Main
-  Other-Modules:      CLaSH.GHCi.UI
-                      CLaSH.GHCi.UI.Info
-                      CLaSH.GHCi.UI.Monad
-                      CLaSH.GHCi.UI.Tags
+  Exposed-Modules:    Clash.Main
+  Other-Modules:      Clash.GHCi.UI
+                      Clash.GHCi.UI.Info
+                      Clash.GHCi.UI.Monad
+                      Clash.GHCi.UI.Tags
 
-                      CLaSH.GHC.CLaSHFlags
-                      CLaSH.GHC.Evaluator
-                      CLaSH.GHC.GenerateBindings
-                      CLaSH.GHC.GHC2Core
-                      CLaSH.GHC.LoadInterfaceFiles
-                      CLaSH.GHC.LoadModules
-                      CLaSH.GHC.NetlistTypes
+                      Clash.GHC.ClashFlags
+                      Clash.GHC.Evaluator
+                      Clash.GHC.GenerateBindings
+                      Clash.GHC.GHC2Core
+                      Clash.GHC.LoadInterfaceFiles
+                      Clash.GHC.LoadModules
+                      Clash.GHC.NetlistTypes
                       Paths_clash_ghc
diff --git a/clash-ghc/src-bin/CLaSH/GHCi/HsVersions.h → clash-ghc/src-bin/Clash/GHCi/HsVersions.h b/clash-ghc/src-bin/CLaSH/GHCi/HsVersions.h → clash-ghc/src-bin/Clash/GHCi/HsVersions.h
diff --git a/clash-ghc/src-bin/CLaSH/GHCi/UI.hs → clash-ghc/src-bin/Clash/GHCi/UI.hs b/clash-ghc/src-bin/CLaSH/GHCi/UI.hs → clash-ghc/src-bin/Clash/GHCi/UI.hs
@@ -20,7 +20,7 @@
 --
 -----------------------------------------------------------------------------
 
-module CLaSH.GHCi.UI (
+module Clash.GHCi.UI (
         interactiveUI,
         GhciSettings(..),
         defaultGhciSettings,
@@ -32,10 +32,10 @@ module CLaSH.GHCi.UI (
 #include "HsVersions.h"
 
 -- GHCi
-import qualified CLaSH.GHCi.UI.Monad as GhciMonad ( args, runStmt, runDecls )
-import CLaSH.GHCi.UI.Monad hiding ( args, runStmt, runDecls )
-import CLaSH.GHCi.UI.Tags
-import CLaSH.GHCi.UI.Info
+import qualified Clash.GHCi.UI.Monad as GhciMonad ( args, runStmt, runDecls )
+import Clash.GHCi.UI.Monad hiding ( args, runStmt, runDecls )
+import Clash.GHCi.UI.Tags
+import Clash.GHCi.UI.Info
 import Debugger
 
 -- The GHC interface
@@ -133,17 +133,17 @@ import GHC.IO.Handle ( hFlushAll )
 import GHC.TopHandler ( topHandler )
 
 -- clash additions
-import qualified CLaSH.Backend
-import           CLaSH.Backend.SystemVerilog (SystemVerilogState)
-import           CLaSH.Backend.VHDL (VHDLState)
-import           CLaSH.Backend.Verilog (VerilogState)
-import qualified CLaSH.Driver
-import           CLaSH.Driver.Types (CLaSHOpts(..))
-import           CLaSH.GHC.Evaluator
-import           CLaSH.GHC.GenerateBindings
-import           CLaSH.GHC.NetlistTypes
-import           CLaSH.Netlist.BlackBox.Types (HdlSyn)
-import           CLaSH.Util (clashLibVersion)
+import qualified Clash.Backend
+import           Clash.Backend.SystemVerilog (SystemVerilogState)
+import           Clash.Backend.VHDL (VHDLState)
+import           Clash.Backend.Verilog (VerilogState)
+import qualified Clash.Driver
+import           Clash.Driver.Types (ClashOpts(..))
+import           Clash.GHC.Evaluator
+import           Clash.GHC.GenerateBindings
+import           Clash.GHC.NetlistTypes
+import           Clash.Netlist.BlackBox.Types (HdlSyn)
+import           Clash.Util (clashLibVersion)
 import qualified Data.Time.Clock as Clock
 import qualified Paths_clash_ghc
 
@@ -157,7 +157,7 @@ data GhciSettings = GhciSettings {
         defPromptCont     :: PromptFunction
     }
 
-defaultGhciSettings :: IORef CLaSHOpts -> GhciSettings
+defaultGhciSettings :: IORef ClashOpts -> GhciSettings
 defaultGhciSettings opts =
     GhciSettings {
         availableCommands = ghciCommands opts,
@@ -172,7 +172,7 @@ ghciWelcomeMsg = "CLaSHi, version " ++ Data.Version.showVersion Paths_clash_ghc.
                  " (using clash-lib, version " ++ Data.Version.showVersion clashLibVersion ++
                  "):\nhttp://www.clash-lang.org/  :? for help"
 
-ghciCommands :: IORef CLaSHOpts -> [Command]
+ghciCommands :: IORef ClashOpts -> [Command]
 ghciCommands opts = map mkCmd [
   -- Hugs users are accustomed to :e, so make sure it doesn't overlap
   ("?",         keepGoing help,                 noCompletion),
@@ -575,7 +575,7 @@ runGHCi paths maybe_exprs = do
                 -- Also, let the user silence the message with -v0
                 -- (the default verbosity in GHCi is 1).
                 when (isNothing maybe_exprs && verbosity dflags > 0) $
-                  liftIO $ putStrLn ("Loaded CLaSHi configuration from " ++ file)
+                  liftIO $ putStrLn ("Loaded Clashi configuration from " ++ file)
 
   --
 
@@ -639,7 +639,7 @@ runGHCi paths maybe_exprs = do
                 return ()
 
   -- and finally, exit
-  liftIO $ when (verbosity dflags > 0) $ putStrLn "Leaving CLaSHi."
+  liftIO $ when (verbosity dflags > 0) $ putStrLn "Leaving Clashi."
 
 runGHCiInput :: InputT GHCi a -> GHCi a
 runGHCiInput f = do
@@ -1863,9 +1863,9 @@ runExceptGhcMonad act = handleSourceError GHC.printException $
 exceptT :: Applicative m => Either e a -> ExceptT e m a
 exceptT = ExceptT . pure
 
-makeHDL' :: CLaSH.Backend.Backend backend
+makeHDL' :: Clash.Backend.Backend backend
          => (Int -> HdlSyn -> backend)
-         -> IORef CLaSHOpts
+         -> IORef ClashOpts
          -> [FilePath]
          -> InputT GHCi ()
 makeHDL' backend opts lst = makeHDL backend opts =<< case lst of
@@ -1878,9 +1878,9 @@ makeHDL' backend opts lst = makeHDL backend opts =<< case lst of
       _                      -> []
 
 makeHDL :: GHC.GhcMonad m
-        => CLaSH.Backend.Backend backend
+        => Clash.Backend.Backend backend
         => (Int -> HdlSyn -> backend)
-        -> IORef CLaSHOpts
+        -> IORef ClashOpts
         -> [FilePath]
         -> m ()
 makeHDL backend optsRef srcs = do
@@ -1902,24 +1902,24 @@ makeHDL backend optsRef srcs = do
                   opts' = opts {opt_hdlDir = maybe outputDir Just (opt_hdlDir opts)
                                ,opt_importPaths = idirs}
                   backend' = backend iw syn
-              primDir <- CLaSH.Backend.primDir backend'
+              primDir <- Clash.Backend.primDir backend'
               forM_ srcs $ \src -> do
                 (bindingsMap,tcm,tupTcm,topEntities,primMap) <-
-                  generateBindings (opt_errorInvalidCoercions opts') primDir idirs (CLaSH.Backend.hdlKind backend') src (Just dflags)
+                  generateBindings (opt_errorInvalidCoercions opts') primDir idirs (Clash.Backend.hdlKind backend') src (Just dflags)
                 prepTime <- startTime `deepseq` bindingsMap `deepseq` tcm `deepseq` Clock.getCurrentTime
                 let prepStartDiff = Clock.diffUTCTime prepTime startTime
                 putStrLn $ "Loading dependencies took " ++ show prepStartDiff
-                CLaSH.Driver.generateHDL bindingsMap (Just backend') primMap tcm
+                Clash.Driver.generateHDL bindingsMap (Just backend') primMap tcm
                   tupTcm (ghcTypeToHWType iw fp) reduceConstant topEntities opts' (startTime,prepTime)
 
-makeVHDL :: IORef CLaSHOpts -> [FilePath] -> InputT GHCi ()
-makeVHDL = makeHDL' (CLaSH.Backend.initBackend :: Int -> HdlSyn -> VHDLState)
+makeVHDL :: IORef ClashOpts -> [FilePath] -> InputT GHCi ()
+makeVHDL = makeHDL' (Clash.Backend.initBackend :: Int -> HdlSyn -> VHDLState)
 
-makeVerilog :: IORef CLaSHOpts -> [FilePath] -> InputT GHCi ()
-makeVerilog = makeHDL' (CLaSH.Backend.initBackend :: Int -> HdlSyn -> VerilogState)
+makeVerilog :: IORef ClashOpts -> [FilePath] -> InputT GHCi ()
+makeVerilog = makeHDL' (Clash.Backend.initBackend :: Int -> HdlSyn -> VerilogState)
 
-makeSystemVerilog :: IORef CLaSHOpts -> [FilePath] -> InputT GHCi ()
-makeSystemVerilog = makeHDL' (CLaSH.Backend.initBackend :: Int -> HdlSyn -> SystemVerilogState)
+makeSystemVerilog :: IORef ClashOpts -> [FilePath] -> InputT GHCi ()
+makeSystemVerilog = makeHDL' (Clash.Backend.initBackend :: Int -> HdlSyn -> SystemVerilogState)
 
 -----------------------------------------------------------------------------
 -- | @:type@ command. See also Note [TcRnExprMode] in TcRnDriver.
@@ -2465,7 +2465,7 @@ iiModuleName (IIModule m) = m
 iiModuleName (IIDecl d)   = unLoc (ideclName d)
 
 preludeModuleName :: ModuleName
-preludeModuleName = GHC.mkModuleName "CLaSH.Prelude"
+preludeModuleName = GHC.mkModuleName "Clash.Prelude"
 
 sameImpModule :: ImportDecl RdrName -> InteractiveImport -> Bool
 sameImpModule _ (IIModule _) = False -- we only care about imports here

diff --git a/clash-ghc/src-bin/CLaSH/GHCi/UI/Info.hs → clash-ghc/src-bin/Clash/GHCi/UI/Info.hs b/clash-ghc/src-bin/CLaSH/GHCi/UI/Info.hs → clash-ghc/src-bin/Clash/GHCi/UI/Info.hs
@@ -4,7 +4,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 
 -- | Get information on modules, expreesions, and identifiers
-module CLaSH.GHCi.UI.Info
+module Clash.GHCi.UI.Info
     ( ModInfo(..)
     , SpanInfo(..)
     , spanInfoFromRealSrcSpan

diff --git a/clash-ghc/src-bin/CLaSH/GHCi/UI/Monad.hs → clash-ghc/src-bin/Clash/GHCi/UI/Monad.hs b/clash-ghc/src-bin/CLaSH/GHCi/UI/Monad.hs → clash-ghc/src-bin/Clash/GHCi/UI/Monad.hs
@@ -10,7 +10,7 @@
 --
 -----------------------------------------------------------------------------
 
-module CLaSH.GHCi.UI.Monad (
+module Clash.GHCi.UI.Monad (
         GHCi(..), startGHCi,
         GHCiState(..), setGHCiState, getGHCiState, modifyGHCiState,
         GHCiOption(..), isOptionSet, setOption, unsetOption,
@@ -32,7 +32,7 @@ module CLaSH.GHCi.UI.Monad (
 
 #include "../HsVersions.h"
 
-import CLaSH.GHCi.UI.Info (ModInfo)
+import Clash.GHCi.UI.Info (ModInfo)
 import qualified GHC
 import GhcMonad         hiding (liftIO)
 import Outputable       hiding (printForUser, printForUserPartWay)

diff --git a/clash-ghc/src-bin/CLaSH/GHCi/UI/Tags.hs → clash-ghc/src-bin/Clash/GHCi/UI/Tags.hs b/clash-ghc/src-bin/CLaSH/GHCi/UI/Tags.hs → clash-ghc/src-bin/Clash/GHCi/UI/Tags.hs
@@ -7,15 +7,15 @@
 -----------------------------------------------------------------------------
 
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
-module CLaSH.GHCi.UI.Tags (
+module Clash.GHCi.UI.Tags (
   createCTagsWithLineNumbersCmd,
   createCTagsWithRegExesCmd,
   createETagsFileCmd
 ) where
 
 import Exception
 import GHC
-import CLaSH.GHCi.UI.Monad
+import Clash.GHCi.UI.Monad
 import Outputable
 
 -- ToDo: figure out whether we need these, and put something appropriate