scope bit-indexed modport binding

src/Convert/Interface.hs

@@ -222,7 +222,10 @@ convertDescription tops parts (Part att ext Module lif name ports items) =
                 then Nothing
                 else Just (portName, modportBinding)
             where
-                modportBinding = (substitutions, replaceBit modportE)
+                modportBinding =
+                    ( substitutions
+                    , scopeExprWithScopes modports $ replaceBit modportE
+                    )
                 substitutions =
                     genSubstitutions modports base instanceE modportE
                 maybeInfo =

src/Convert/Scoper.hs

@@ -38,6 +38,8 @@ module Convert.Scoper
     , replaceInExpr
     , scopeExpr
     , scopeType
+    , scopeExprWithScopes
+    , scopeTypeWithScopes
     , insertElem
     , removeElem
     , injectItem
@@ -209,6 +211,12 @@ scopeType = traverseNestedTypesM $ traverseTypeExprsM scopeExpr
 {-# INLINABLE scopeExpr #-}
 {-# INLINABLE scopeType #-}
 
+scopeExprWithScopes :: Scopes a -> Expr -> Expr
+scopeExprWithScopes scopes = flip evalState scopes . scopeExpr
+
+scopeTypeWithScopes :: Scopes a -> Type -> Type
+scopeTypeWithScopes scopes = flip evalState scopes . scopeType
+
 class ScopePath k where
     toTiers :: Scopes a -> k -> [Tier]