projects
/
matthijs
/
master-project
/
cλash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the globalNameTable from the VHDLState.
[matthijs/master-project/cλash.git]
/
VHDL.hs
diff --git
a/VHDL.hs
b/VHDL.hs
index 7073dbcd9b82d36115fc7dc11cf4b46438b0bfe5..636634e131eaccdcf808c9d4baa29bef2d9f3e7e 100644
(file)
--- a/
VHDL.hs
+++ b/
VHDL.hs
@@
-47,7
+47,7
@@
createDesignFiles binds =
map (Arrow.second $ AST.DesignFile full_context) units
where
map (Arrow.second $ AST.DesignFile full_context) units
where
- init_session = VHDLState Map.empty Map.empty Map.empty Map.empty
globalNameTable
+ init_session = VHDLState Map.empty Map.empty Map.empty Map.empty
(units, final_session) =
State.runState (createLibraryUnits binds) init_session
tyfun_decls = Map.elems (final_session ^.vsTypeFuns)
(units, final_session) =
State.runState (createLibraryUnits binds) init_session
tyfun_decls = Map.elems (final_session ^.vsTypeFuns)
@@
-294,9
+294,8
@@
mkConcSm (bndr, app@(CoreSyn.App _ _))= do
IdInfo.VanillaGlobal -> do
-- It's a global value imported from elsewhere. These can be builtin
-- functions.
IdInfo.VanillaGlobal -> do
-- It's a global value imported from elsewhere. These can be builtin
-- functions.
- funSignatures <- getA vsNameTable
signatures <- getA vsSignatures
signatures <- getA vsSignatures
- case (Map.lookup (varToString f)
funSignatures
) of
+ case (Map.lookup (varToString f)
globalNameTable
) of
Just (arg_count, builder) ->
if length valargs == arg_count then
case builder of
Just (arg_count, builder) ->
if length valargs == arg_count then
case builder of