eric93 · nateyazdani · Oct 8, 2015
diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/AGDebugger.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/AGDebugger.java
@@ -1,10 +1,9 @@
 package AGEvalSwipl;
 
-import java.util.Hashtable;
+import java.util.Map;
 
-import jpl.Query;
-import jpl.Term;
-import jpl.Variable;
+import org.jpl7.Query;
+import org.jpl7.Term;
 import AGEval.InvalidGrammarException;
 //import aleGrammar.AleFrontend;
 
@@ -14,9 +13,9 @@ public String getError () {
 		String error = "Unsolvable: \n";		
 		Query rem = new Query("countSteps(N, Remaining), member([C, [RefName, Attrib, RefNameType]], Remaining)");
 		String nSteps = "0";
-		while (rem.hasMoreSolutions()) {
+		while (rem.hasNext()) {
 			@SuppressWarnings("unchecked")
-			Hashtable<Variable, Term> binding = (Hashtable<Variable, Term>) rem.nextSolution();
+			Map<String, Term> binding = rem.next();
 			nSteps = binding.get("N").toString(); //FIXME do just once
 			error += "  Cannot solve for class '" + binding.get("C") + "': " + binding.get("RefName") + "." + binding.get("Attrib") + "\n";
 		}

diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/AGEvaluatorSwipl.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/AGEvaluatorSwipl.java
@@ -5,9 +5,9 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Map;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Vector;
 
 import aleGrammar.ALEParser;
@@ -16,9 +16,8 @@
 import aleGrammar.AleFrontend;
 import aleGrammar.GenSym;
 
-import jpl.Query;
-import jpl.Term;
-import jpl.Variable;
+import org.jpl7.Query;
+import org.jpl7.Term;
 
 import AGEval.AGEvaluator;
 import AGEval.InvalidGrammarException;
@@ -868,14 +867,14 @@ public ScheduleSketch (boolean isFixedOrder) {
 			if (verbose) System.out.println("Loaded query (" + queryTime + "ms)");
 			if (verbose) System.out.println("Using fixed (first) ordering of children: " + isFixedOrder);			
 		}
-		boolean hasNext () { return schedules.hasMoreSolutions(); }
+		boolean hasNext () { return schedules.hasNext(); }
 
 		String printNext () {
 			String res = "";
 
 			long time = -System.currentTimeMillis();
 			@SuppressWarnings("unchecked")
-			Hashtable<Variable, Term> binding = (Hashtable<Variable, Term>) schedules.nextSolution();
+			Map<String, Term> binding = schedules.next();
 			time += System.currentTimeMillis();
 
 			res += "Solution (" + time + "ms): \n";
@@ -921,7 +920,7 @@ public class Schedule{
 
 		//most recently iterated schedule
 		public long time = 0;
-		public Hashtable<Variable, Term> binding = null;
+		public Map<String, Term> binding = null;
 		public Vector<HashSet<AGEval.Class>> buSubInorderBuIn = null;
 		public Vector<HashSet<AGEval.Class>> buSubInorderBus = null; 
 
@@ -962,12 +961,12 @@ public Schedule (Reductions reducts, boolean isFixedOrder, boolean isExhaustive,
 
 		}
 
-		boolean hasNext () { return schedules.hasMoreSolutions(); }
+		boolean hasNext () { return schedules.hasNext(); }
 
 		@SuppressWarnings("unchecked")
-		Hashtable<Variable, Term>  moveNext () {
+		Map<String, Term> moveNext () {
 			time = -System.currentTimeMillis();
-			binding = (Hashtable<Variable, Term>) schedules.nextSolution();
+			binding = schedules.next();
 			time += System.currentTimeMillis();
 			return binding;
 		}

diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/AbstractGenerator.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/AbstractGenerator.java
@@ -5,12 +5,11 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Vector;
 
-import jpl.Term;
-import jpl.Variable;
+import org.jpl7.Term;
 import AGEval.AGEvaluator;
 import AGEval.Function;
 import AGEval.InvalidGrammarException;
@@ -547,7 +546,7 @@ public HashMap<AGEval.Class, String> visit (
 	public String visits(
 			AGEvaluator aleg,
 			LoopRecoverer ir,
-			Hashtable<Variable, Term> binding, HashMap<AGEval.Class, ArrayList<String>> childOrder,
+			Map<String, Term> binding, HashMap<AGEval.Class, ArrayList<String>> childOrder,
 			HashMap<String, AGEval.Class> classMap,
 			HashMap<String, String> exprToCall,
 			HashMap<String, String> exprPrinter,
@@ -849,7 +848,7 @@ public Schedule synthesizeAll(String alePath, String outputDir, String resourceD
 
 		////////////////////////////////////////////////////////////////
 
-		Hashtable<Variable, Term> binding = null;
+		Map<String, Term> binding = null;
 		int round = 0;		
 		(new File(outputDir + File.separator + "variants")).mkdir();
 
@@ -934,7 +933,7 @@ public Schedule synthesize(String alePath, String outputDir, String resourceDir,
 
 		////////////////////////////////////////////////////////////////
 
-		Hashtable<Variable, Term> binding = null;
+		Map<String, Term> binding = null;
 		//int vlen =  0;
 
 		if (true) {
@@ -956,7 +955,7 @@ public Schedule synthesize(String alePath, String outputDir, String resourceDir,
 		} //else {
 //
 //			while (sched.hasNext()) {
-//				Hashtable<Variable, Term> nextBinding = sched.moveNext(); 
+//				Map<String, Term> nextBinding = sched.moveNext(); 
 //				int nextLen = sched.binding.get("P").toTermArray().length;
 //				if (binding == null || nextLen < vlen) {
 //					binding = nextBinding;

diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/Backend.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/Backend.java
@@ -1,10 +1,9 @@
 package AGEvalSwipl;
 
 import java.io.IOException;
+import java.util.Map;
 import java.util.HashSet;
-import java.util.Hashtable;
-import jpl.Term;
-import jpl.Variable;
+import org.jpl7.Term;
 import AGEval.AGEvaluator;
 import AGEval.Class;
 import AGEval.InvalidGrammarException;
@@ -22,7 +21,7 @@ public interface Backend {
 	  //same, but prints w/NULL check on string addresses...
 	  public String logStmtVar(int indentSrc, int indentOut, String msg, ALEParser ast, AGEval.Class cls, String rhs, String rhsAddress) throws InvalidGrammarException;
 	  //public String logExpr(int indentSrc, int indentOut, String msg, String rhs);
-	  public String printCurrentPipelineBuild (Hashtable<Variable, Term> binding) throws InvalidGrammarException;
+	  public String printCurrentPipelineBuild (Map<String, Term> binding) throws InvalidGrammarException;
 	  public String functionHeader(ALEParser.Assignment assign, ALEParser ast) throws InvalidGrammarException;
       public String visitBlockHeader(Class cls, ALEParser ast) throws InvalidGrammarException;
       public String visitBlockFooter(Class cls, ALEParser ast) throws InvalidGrammarException;
@@ -38,7 +37,7 @@ public interface Backend {
 	  public void generateParseFiles(ALEParser ast, Schedule sched, String outputDir, boolean verbose, String functionHeaders) throws InvalidGrammarException;
 	  public String preVisits (AGEvaluator aleg, Schedule sched);
 	  public String postVisits (AGEvaluator aleg, Schedule sched) throws InvalidGrammarException;
-	  public String output (String baseName, String visitOut, String visitDispatches, String outputDir, boolean write, boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Hashtable<Variable, Term> binding, AGEvaluator aleg) throws IOException, InvalidGrammarException;
+	  public String output (String baseName, String visitOut, String visitDispatches, String outputDir, boolean write, boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Map<String, Term> binding, AGEvaluator aleg) throws IOException, InvalidGrammarException;
 	  public String replaceTypeVals(String body, ALEParser ast);
 
 }
diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/CppGenerator.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/CppGenerator.java
@@ -4,14 +4,13 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Map;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Map.Entry;
 import java.util.Vector;
 
-import jpl.Term;
-import jpl.Variable;
+import org.jpl7.Term;
 
 import aleGrammar.ALEParser;
 import aleGrammar.ALEParser.ExtendedVertex;
@@ -874,7 +873,7 @@ public static String printCurrentPipelineDelayedBatch (Schedule schedule2) throw
 	return res;
 }
 
-public String printCurrentPipelineHeaders (Hashtable<Variable, Term> binding) throws InvalidGrammarException {
+public String printCurrentPipelineHeaders (Map<String, Term> binding) throws InvalidGrammarException {
 	String res = "";
 	int pass = 0;
 	int lockC = 0;
@@ -953,7 +952,7 @@ public String printCurrentPipelineHeaders (Hashtable<Variable, Term> binding) th
 	return res;		
 }
 
-public String printCurrentPipelineBuild (Hashtable<Variable, Term> binding) throws InvalidGrammarException {
+public String printCurrentPipelineBuild (Map<String, Term> binding) throws InvalidGrammarException {
 	String res = "";
 	int pass = 0;
 	int lockC = 0;
@@ -1032,7 +1031,7 @@ public String printCurrentPipelineBuild (Hashtable<Variable, Term> binding) thro
 	return res;
 }
 
-public String printCurrentPipelineDelayedBuild (Hashtable<Variable, Term> binding) throws InvalidGrammarException {
+public String printCurrentPipelineDelayedBuild (Map<String, Term> binding) throws InvalidGrammarException {
 	String res = "";
 	int pass = 0;
 	int lockC = 0;
@@ -1520,7 +1519,7 @@ public static void main(String[] args) throws Exception {
 }
 
 public String output(String baseName, String visitOut, String visitDispatches, String outputDir, boolean write,
-		boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Hashtable<Variable, Term> binding, AGEvaluator aleg)
+		boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Map<String, Term> binding, AGEvaluator aleg)
 		throws IOException, InvalidGrammarException {
 
 	if (write) {

diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/CppParserGenerator.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/CppParserGenerator.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Map;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;

diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/FlatCppGenerator.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/FlatCppGenerator.java
@@ -4,14 +4,13 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Map;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Map.Entry;
 import java.util.Vector;
 
-import jpl.Term;
-import jpl.Variable;
+import org.jpl7.Term;
 import AGEval.AGEvaluator;
 import AGEval.Class;
 import AGEval.InvalidGrammarException;
@@ -96,7 +95,7 @@ public void generateParseFiles(ALEParser ast, Schedule sched, String outputDir,
 
 	@Override
 	public String output(String baseName, String visitOut, String visitDispatches, String outputDir, boolean write,
-			boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Hashtable<Variable, Term> binding,
+			boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Map<String, Term> binding,
 			AGEvaluator aleg) throws IOException, InvalidGrammarException {
 		if (write) {
 			AGEvaluatorSwipl.writeFile(outputDir + File.separator + visit_header_filename,
@@ -247,7 +246,7 @@ public String logStmtVar(int indentSrc, int indentOut, String msg, ALEParser ast
 	}
 
 	@Override
-	public String printCurrentPipelineBuild(Hashtable<Variable, Term> binding) throws InvalidGrammarException {
+	public String printCurrentPipelineBuild(Map<String, Term> binding) throws InvalidGrammarException {
 		return "[printCurrentPipelineBuild]";
 	}
 

diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/Generator.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/Generator.java
@@ -5,12 +5,11 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Vector;
 
-import jpl.Term;
-import jpl.Variable;
+import org.jpl7.Term;
 import AGEval.AGEvaluator;
 import AGEval.Function;
 import AGEval.InvalidGrammarException;
@@ -511,7 +510,8 @@ public HashMap<AGEval.Class, String> visit (
 
 	public String visits(
 			AGEvaluator aleg,
-			Hashtable<Variable, Term> binding, HashMap<AGEval.Class, ArrayList<String>> childOrder,
+			Map<String, Term> binding,
+			HashMap<AGEval.Class, ArrayList<String>> childOrder,
 			HashMap<String, AGEval.Class> classMap,
 			HashMap<String, String> exprToCall,
 			HashMap<String, String> exprPrinter,
@@ -905,7 +905,7 @@ public Schedule synthesizeAll(String alePath, String outputDir, String resourceD
 
 		////////////////////////////////////////////////////////////////
 
-		Hashtable<Variable, Term> binding = null;
+		Map<String, Term> binding = null;
 		int round = 0;		
 		(new File(outputDir + File.separator + "variants")).mkdir();
 
@@ -1002,7 +1002,7 @@ public Schedule synthesize(String alePath, String outputDir, String resourceDir,
 
 		////////////////////////////////////////////////////////////////
 
-		Hashtable<Variable, Term> binding = null;
+		Map<String, Term> binding = null;
 		//int vlen =  0;
 
 		if (true) {
@@ -1024,7 +1024,7 @@ public Schedule synthesize(String alePath, String outputDir, String resourceDir,
 		} //else {
 //
 //			while (sched.hasNext()) {
-//				Hashtable<Variable, Term> nextBinding = sched.moveNext(); 
+//				Map<String, Term> nextBinding = sched.moveNext(); 
 //				int nextLen = sched.binding.get("P").toTermArray().length;
 //				if (binding == null || nextLen < vlen) {
 //					binding = nextBinding;

diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/Html5Generator.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/Html5Generator.java
@@ -3,7 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.HashSet;
-import java.util.Hashtable;
+import java.util.Map;
 import java.util.Map.Entry;
 
 //import org.antlr.runtime.RecognitionException;
@@ -14,8 +14,7 @@
 import AGEval.InvalidGrammarException;
 import AGEvalSwipl.AGEvaluatorSwipl.Schedule;
 
-import jpl.Term;
-import jpl.Variable;
+import org.jpl7.Term;
 
 public class Html5Generator extends BackendBase implements Backend {	
 
@@ -84,7 +83,7 @@ public String closeChildLoop(ALEParser.LoopOrdering loopVar) {
 	}
 
 
-	public String printCurrentPipelineBuild (Hashtable<Variable, Term> binding) throws InvalidGrammarException {
+	public String printCurrentPipelineBuild (Map<String, Term> binding) throws InvalidGrammarException {
 		String res = "function layout (root) {\n";
 		int pass = 0;
 		for (Term visit : binding.get("P").toTermArray()) {
@@ -441,7 +440,7 @@ public String postVisits(AGEvaluator aleg, Schedule sched) {
 	}
 
 	public String output(String baseName, String visitOut, String visitDispatches, String outputDir, boolean write,
-			boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Hashtable<Variable, Term> binding, AGEvaluator aleg) throws IOException,
+			boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Map<String, Term> binding, AGEvaluator aleg) throws IOException,
 			InvalidGrammarException {
 		String res = "";
 		res += fHeaders;		

diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/JSON.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/JSON.java
@@ -145,4 +145,4 @@ public String getJSON(String tab, String indent){
 	}
 
 
-}
+}
diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/LoopRecoverer.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/LoopRecoverer.java
@@ -5,20 +5,19 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Map;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Vector;
 
-import jpl.Term;
-import jpl.Variable;
+import org.jpl7.Term;
 
 import AGEvalSwipl.AGEvaluatorSwipl.Schedule;
 import aleGrammar.ALEParser;
 
 public class LoopRecoverer {
 	public final ALEParser ast;	
-	public final Hashtable<Variable, Term> binding;
+	public final Map<String, Term> binding;
 	public final HashMap<AGEval.Class, ArrayList<String>> childOrders;	
 	private final HashMap<AGEval.Class, Vector<SingleVisitRaw> > visitsRaw;
 	public final HashMap<AGEval.Class, Vector<SingleVisitClean> > visitsClean;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -145,4 +145,4 @@ public String getJSON(String tab, String indent){
		}


		}
		}