Lookup input port names for instantiations in the session.

This replaces the previously hardcoded portnames.

diff --git a/Translator.hs b/Translator.hs
index b18a86fd1cd939b6850a246a45f7feec49c2a651..f16f40f2d6f63f4a42f4f73f86480cc312896715 100644 (file)
--- a/Translator.hs
+++ b/Translator.hs
@@ -146,10 +146,10 @@ getInstantiations sess args outs binds app@(App expr arg) =
                hwfunc = Maybe.fromMaybe
                        (error $ "Function " ++ compname ++ "is unknown")
                        (lookup compname (funcs sess))
-               HWFunction inports outports = hwfunc
+               HWFunction (Args inports) outport = hwfunc
                ports = 
-                       zipWith (getPortMapEntry binds) [Port "portin0", Port "portin1"] fargs
-                 ++ mapOutputPorts outports outs
+                       zipWith (getPortMapEntry binds) inports fargs
+                 ++ mapOutputPorts outport outs
 
 getInstantiations sess args outs binds expr = 
        error $ "Unsupported expression" ++ (showSDoc $ ppr $ expr)