Reflect API changes of clash in clash-nolibdir

diff --git a/cλash-nolibdir/CLasH/Translator.hs b/cλash-nolibdir/CLasH/Translator.hs
index 77c1fe3f3dc65b2c351b95e8bbcaab6c23576806..45c0ccaa961ced60c6c9df31a9f61b3d8b773ee6 100644 (file)
--- a/cλash-nolibdir/CLasH/Translator.hs
+++ b/cλash-nolibdir/CLasH/Translator.hs
@@ -1,24 +1,27 @@
 module CLasH.Translator where
 
 import qualified GHC.Paths
-import qualified "clash" CLasH.Translator as Original (makeVHDL, makeVHDLAnn, listBindings, listBind)
+import qualified "clash" CLasH.Translator as Original (makeVHDLStrings, makeVHDLAnnotations)
 
-makeVHDL :: String -> String -> Bool -> IO ()
-makeVHDL filename name stateful = do
+-- | Turn Haskell to VHDL, Usings Strings to indicate the Top Entity, Initial
+--   State and Test Inputs.
+makeVHDLStrings ::
+  -> [FilePath] -- ^ The FileNames
+  -> String     -- ^ The TopEntity
+  -> String     -- ^ The InitState
+  -> String     -- ^ The TestInput
+  -> Bool       -- ^ Is it stateful? (in case InitState is empty)
+  -> IO ()
+makeVHDLStrings filenames topentity initstate testinput stateful = do
   let libdir = GHC.Paths.libdir
-  Original.makeVHDL libdir filename name stateful
+  Original.makeVHDLStrings libdir filenames topentity initstate testinput stateful
   
-makeVHDLAnn :: String -> IO ()
-makeVHDLAnn filename = do
+-- | Turn Haskell to VHDL, Using the Annotations for Top Entity, Initial State
+--   and Test Inputs found in the Files. 
+makeVHDLAnnotations ::
+  -> [FilePath] -- ^ The FileNames
+  -> Bool       -- ^ Is it stateful? (in case InitState is not specified)
+  -> IO ()
+makeVHDLAnnotations libdir filenames stateful = do
   let libdir = GHC.Paths.libdir
-  Original.makeVHDLAnn libdir filename
-
-listBindings :: String -> IO [()]
-listBindings filename = do
-  let libdir = GHC.Paths.libdir
-  Original.listBindings libdir filename
-  
-listBind :: String -> String -> IO ()
-listBind filename name = do
-  let libdir = GHC.Paths.libdir
-  Original.listBind libdir filename name
+  Original.makeVHDLAnnotations libdir filenames stateful

diff --git a/cλash-nolibdir/CLasH/Utils.hs b/cλash-nolibdir/CLasH/Utils.hs
new file mode 100644 (file)
index 0000000..14b1857
--- /dev/null
+++ b/cλash-nolibdir/CLasH/Utils.hs
@@ -0,0 +1,16 @@
+module CLasH.Utils where
+  
+import qualified GHC.Paths
+import qualified "clash" CLasH.Utils as Original (listBindings, listBind)
+
+-- | Show the core structure of all the binds in the given file.
+listBindings :: [FilePath] -> IO [()]
+listBindings filenames = do
+  let libdir = GHC.Paths.libdir
+  Original.listBindings libdir filename
+
+-- | Show the core structure of the given binds in the given file.  
+listBind :: [FilePath] -> String -> IO ()
+listBind filename name = do
+  let libdir = GHC.Paths.libdir
+  Original.listBind libdir filename name
\ No newline at end of file

diff --git a/cλash-nolibdir/clash-nolibdir.cabal b/cλash-nolibdir/clash-nolibdir.cabal
index 7ed083841f11d37c6057eadae492f3f9e0cead48..18deb67bc94c0311a555b6a169d2fc382816db70 100644 (file)
--- a/cλash-nolibdir/clash-nolibdir.cabal
+++ b/cλash-nolibdir/clash-nolibdir.cabal
@@ -20,4 +20,5 @@ Library
   build-depends:    base > 4, clash, ghc-paths
   extensions:       PackageImports          
   exposed-modules:  CLasH.Translator
+                    CLasH.Utils