X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=c%CE%BBash%2FCLasH%2FTranslator.hs;h=16158d24df07fbbf441688a313cf3863cf47a9a5;hb=a97a53c406ca4da95059a95a4f3d6452eb87b018;hp=e2993d260548ad4a83bd9938c8f53b49a678c803;hpb=a54863feb7304aa6a843efc15d29f017c45407f4;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git "a/c\316\273ash/CLasH/Translator.hs" "b/c\316\273ash/CLasH/Translator.hs" index e2993d2..16158d2 100644 --- "a/c\316\273ash/CLasH/Translator.hs" +++ "b/c\316\273ash/CLasH/Translator.hs" @@ -10,7 +10,7 @@ import qualified Monad import qualified System.FilePath as FilePath import qualified Control.Monad.Trans.State as State import Text.PrettyPrint.HughesPJ (render) -import Data.Accessor +import Data.Accessor.Monad.Trans.State import qualified Data.Map as Map import Debug.Trace @@ -33,6 +33,7 @@ import CLasH.Utils import CLasH.Utils.Core.CoreTools import CLasH.Utils.GhcTools import CLasH.VHDL +import CLasH.VHDL.VHDLTools import CLasH.VHDL.Testbench -- | Turn Haskell to VHDL, Usings Strings to indicate the Top Entity, Initial @@ -128,7 +129,7 @@ runTranslatorSession env session = do -- on the compiler dir of ghc suggests that 'z' is not used to generate -- a unique supply anywhere. uniqSupply <- UniqSupply.mkSplitUniqSupply 'z' - let init_typestate = TypeState Map.empty [] Map.empty Map.empty env + let init_typestate = TypeState builtin_types [] Map.empty Map.empty env let init_state = TranslatorState uniqSupply init_typestate Map.empty Map.empty 0 Map.empty Map.empty Map.empty return $ State.evalState session init_state