Finer imports.

9 files changed, 70 insertions, 49 deletions

diff --git a/instr-to-kodkod/parser/PropertyParser.g4 b/instr-to-kodkod/parser/PropertyParser.g4
index 8ac7b03..986ad3b 100644
--- a/instr-to-kodkod/parser/PropertyParser.g4
+++ b/instr-to-kodkod/parser/PropertyParser.g4
@@ -7,12 +7,12 @@ options
 
 @header
 {
-   /* FIXME: Finer imports */
-   import kodkod.ast.*;
-
-   import kodkod.engine.*;
-
-   import kodkod.instance.*;
+   import kodkod.ast.Formula;
+   import kodkod.ast.Variable;
+   import kodkod.ast.Relation;
+   import kodkod.ast.Expression;
+   import kodkod.ast.IntExpression;
+   import kodkod.ast.IntConstant;
 }
 
 @members
diff --git a/instr-to-kodkod/src/Main.java b/instr-to-kodkod/src/Main.java
index 214e84c..d6528cd 100644
--- a/instr-to-kodkod/src/Main.java
+++ b/instr-to-kodkod/src/Main.java
@@ -1,15 +1,17 @@
-/* FIXME: Finer imports */
-import kodkod.ast.*;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 
-import kodkod.engine.*;
-import kodkod.engine.config.*;
-import kodkod.engine.satlab.*;
+import java.util.Iterator;
 
-import kodkod.instance.*;
+import kodkod.ast.Formula;
 
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.util.Iterator;
+import kodkod.engine.Solution;
+import kodkod.engine.Solver;
+import kodkod.engine.satlab.SATFactory;
+
+import kodkod.instance.Bounds;
+import kodkod.instance.TupleFactory;
+import kodkod.instance.Universe;
 
 public class Main
 {
diff --git a/instr-to-kodkod/src/QuickParser.java b/instr-to-kodkod/src/QuickParser.java
index 7a63c43..6a75106 100644
--- a/instr-to-kodkod/src/QuickParser.java
+++ b/instr-to-kodkod/src/QuickParser.java
@@ -1,7 +1,13 @@
-/* FIXME: Finer imports */
-import java.io.*;
-import java.util.regex.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class QuickParser
 {
@@ -16,6 +22,7 @@ public class QuickParser
             "\\(([a-z_0-9\\->]+ .*)\\)"
          );
    }
+
    public QuickParser (final String filename)
    throws FileNotFoundException
    {
diff --git a/instr-to-kodkod/src/VHDLLevel.java b/instr-to-kodkod/src/VHDLLevel.java
index 57bb8c4..4375ce7 100644
--- a/instr-to-kodkod/src/VHDLLevel.java
+++ b/instr-to-kodkod/src/VHDLLevel.java
@@ -1,7 +1,5 @@
-/* FIXME: Finer imports */
-import java.util.*;
-
-import java.io.*;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 
 public class VHDLLevel
 {
diff --git a/instr-to-kodkod/src/VHDLModel.java b/instr-to-kodkod/src/VHDLModel.java
index b1086f1..5a628e7 100644
--- a/instr-to-kodkod/src/VHDLModel.java
+++ b/instr-to-kodkod/src/VHDLModel.java
@@ -1,10 +1,16 @@
-/* FIXME: Finer imports */
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.io.*;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 
-import kodkod.ast.*;
-import kodkod.instance.*;
+import kodkod.ast.Relation;
+
+import kodkod.instance.Bounds;
+import kodkod.instance.TupleFactory;
 
 public class VHDLModel
 {
diff --git a/instr-to-kodkod/src/VHDLPredicate.java b/instr-to-kodkod/src/VHDLPredicate.java
index 0ff388b..821a044 100644
--- a/instr-to-kodkod/src/VHDLPredicate.java
+++ b/instr-to-kodkod/src/VHDLPredicate.java
@@ -1,11 +1,11 @@
-/* FIXME: Finer imports */
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
 
-import kodkod.ast.*;
-import kodkod.ast.operator.*;
-
-import kodkod.instance.*;
+import kodkod.ast.Relation;
 
+import kodkod.instance.Bounds;
+import kodkod.instance.TupleFactory;
+import kodkod.instance.TupleSet;
 
 public class VHDLPredicate
 {
diff --git a/instr-to-kodkod/src/VHDLProperty.java b/instr-to-kodkod/src/VHDLProperty.java
index f74aae4..2d6f40a 100644
--- a/instr-to-kodkod/src/VHDLProperty.java
+++ b/instr-to-kodkod/src/VHDLProperty.java
@@ -1,10 +1,9 @@
-/* FIXME: Finer imports */
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
 
-import kodkod.ast.*;
+import kodkod.ast.Formula;
 
-import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
 
 public class VHDLProperty
 {
diff --git a/instr-to-kodkod/src/VHDLType.java b/instr-to-kodkod/src/VHDLType.java
index 46d7cd9..d8ae9ed 100644
--- a/instr-to-kodkod/src/VHDLType.java
+++ b/instr-to-kodkod/src/VHDLType.java
@@ -1,10 +1,14 @@
-/* FIXME: Finer imports */
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 
-import kodkod.ast.*;
-import kodkod.ast.operator.*;
+import kodkod.ast.Relation;
+import kodkod.ast.Formula;
 
-import kodkod.instance.*;
+import kodkod.instance.Bounds;
+import kodkod.instance.TupleFactory;
 
 
 public class VHDLType
diff --git a/instr-to-kodkod/src/VariableManager.java b/instr-to-kodkod/src/VariableManager.java
index bbef943..cf7229e 100644
--- a/instr-to-kodkod/src/VariableManager.java
+++ b/instr-to-kodkod/src/VariableManager.java
@@ -1,9 +1,14 @@
-/* FIXME: finer imports. */
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
-import kodkod.ast.*;
+import kodkod.ast.Expression;
+import kodkod.ast.Formula;
+import kodkod.ast.Relation;
+import kodkod.ast.Variable;
 
-import kodkod.instance.*;
+import kodkod.instance.Bounds;
+import kodkod.instance.TupleFactory;
+import kodkod.instance.TupleSet;
 
 public class VariableManager
 {
@@ -146,7 +151,7 @@ public class VariableManager
 
    public void print_solution (final Map<Relation, TupleSet> solution)
    {
-      System.out.print("(");
+      System.out.print("(solution");
 
       for (final TaggedVariable tg: tagged_variables.values())
       {