X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=c%CE%BBash%2FCLasH%2FVHDL.hs;h=21671adedef95da3bccd4f64e204486e43b620b0;hb=eab16fafe7a623b5ea669023b91ddee4b1983526;hp=762a0f43f4facc8e142d45537c55beb21df96fb7;hpb=466f80bdde9511508c38e951d208a2a52c90c7da;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git "a/c\316\273ash/CLasH/VHDL.hs" "b/c\316\273ash/CLasH/VHDL.hs" index 762a0f4..21671ad 100644 --- "a/c\316\273ash/CLasH/VHDL.hs" +++ "b/c\316\273ash/CLasH/VHDL.hs" @@ -11,7 +11,7 @@ import qualified Control.Arrow as Arrow import qualified Control.Monad.Trans.State as State import qualified Data.Monoid as Monoid import Data.Accessor -import Data.Accessor.MonadState as MonadState +import Data.Accessor.Monad.Trans.State as MonadState import Debug.Trace -- ForSyDe @@ -82,9 +82,9 @@ createTypesPackage :: -- ^ The id and content of the types package createTypesPackage = do - tyfuns <- getA (tsType .> tsTypeFuns) + tyfuns <- MonadState.get (tsType .> tsTypeFuns) let tyfun_decls = mkBuiltInShow ++ (map snd $ Map.elems tyfuns) - ty_decls_maybes <- getA (tsType .> tsTypeDecls) + ty_decls_maybes <- MonadState.get (tsType .> tsTypeDecls) let ty_decls = Maybe.catMaybes ty_decls_maybes let subProgSpecs = map (\(AST.SubProgBody spec _ _) -> AST.PDISS spec) tyfun_decls let type_package_dec = AST.LUPackageDec $ AST.PackageDec (mkVHDLBasicId "types") ([tfvec_index_decl] ++ ty_decls ++ subProgSpecs)