Limits the creation of atom-relations to "String".

The need for those relations is limited to the access of their atom in
the formula. As, with the exception of String elements, the formula
cannot directly reference an atom, only String atoms require their own
relation. Going even further, only the String element referenced in the
formula need their own relation.

1 files changed, 9 insertions, 3 deletions

diff --git a/instr-to-kodkod/src/VHDLType.java b/instr-to-kodkod/src/VHDLType.java
index e38af5e..4057803 100644
--- a/instr-to-kodkod/src/VHDLType.java
+++ b/instr-to-kodkod/src/VHDLType.java
@@ -90,11 +90,17 @@ public class VHDLType
 
       members_as_set = members.entrySet();
 
-      for (final Map.Entry<String, Relation> member: members_as_set)
+      if (name.toLowerCase().equals("string"))
       {
-         b.boundExactly(member.getValue(), f.setOf(member.getKey()));
+         /* Other types do not require direct access to a member. */
+         /* TODO: only bound the strings that are actually mentionned in the
+          * formula.
+          */
+         for (final Map.Entry<String, Relation> member: members_as_set)
+         {
+            b.boundExactly(member.getValue(), f.setOf(member.getKey()));
+         }
       }
-
       /*
        * the toArray() is required to avoid the collection being considered as
        * a single atom.