1 files changed, 17 insertions, 3 deletions
diff --git a/instr-to-kodkod/src/VHDLModel.java b/instr-to-kodkod/src/VHDLModel.java
index bdb5e4b..ed448c4 100644
--- a/instr-to-kodkod/src/VHDLModel.java
+++ b/instr-to-kodkod/src/VHDLModel.java
@@ -178,7 +178,10 @@ public class VHDLModel
          return false;
       }
 
-      t.add_member(cmd[2]);
+      if (t.is_used())
+      {
+         t.add_member(cmd[2]);
+      }
 
       return true;
    }
@@ -230,6 +233,11 @@ public class VHDLModel
          return false;
       }
 
+      if (!p.is_used())
+      {
+         return true;
+      }
+
       if (params.length != p.get_arity())
       {
          System.err.println
@@ -293,12 +301,18 @@ public class VHDLModel
    {
       for (final VHDLType t: types.values())
       {
-         t.add_to_bounds(b, f);
+         if (t.is_used())
+         {
+            t.add_to_bounds(b, f);
+         }
       }
 
       for (final VHDLPredicate p: predicates.values())
       {
-         p.add_to_bounds(b, f);
+         if (p.is_used())
+         {
+            p.add_to_bounds(b, f);
+         }
       }
    }