From 48391d13a49db8df45cfb19ea4691fca44b0aa7c Mon Sep 17 00:00:00 2001 From: Nathaniel Yazdani Date: Thu, 8 Oct 2015 11:55:30 -0700 Subject: [PATCH] Upgrade to JPL7 bindings This change performs a very basic mapping of JPL 3.x APIs to the new JPL7 API in accordance with the JPL7 release notes. --- .../AGEvalSwipl/AGDebugger.java | 11 ++++---- .../AGEvalSwipl/AGEvaluatorSwipl.java | 19 ++++++------- .../AGEvalSwipl/AbstractGenerator.java | 13 ++++----- .../AGEvalSwipl/Backend.java | 9 +++--- .../AGEvalSwipl/CppGenerator.java | 13 ++++----- .../AGEvalSwipl/CppParserGenerator.java | 1 + .../AGEvalSwipl/FlatCppGenerator.java | 9 +++--- .../AGEvalSwipl/Generator.java | 14 +++++----- .../AGEvalSwipl/Html5Generator.java | 9 +++--- .../AGEvalSwipl/JSON.java | 2 +- .../AGEvalSwipl/LoopRecoverer.java | 7 ++--- .../AGEvalSwipl/OpenCLGenerator.java | 9 +++--- .../AGEvalSwipl/RustGenerator.java | 8 +++--- .../AGEvalSwipl/Sanitizer.java | 8 +++--- .../AGEvalSwipl/TestSwiplJpl.java | 28 +++++++++---------- .../AGEvalSwipl/Tests.java | 2 +- .../AGEvalSwipl/WebCLGenerator.java | 9 +++--- .../AGEvalSwipl/algorithm.tokens | 2 +- .../AGEvalSwipl/algorithmFixed.tokens | 2 +- 19 files changed, 83 insertions(+), 92 deletions(-) diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/AGDebugger.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/AGDebugger.java index 347f1e7..0f61757 100644 --- 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 binding = (Hashtable) rem.nextSolution(); + Map 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 index 31f036e..68ee375 100644 --- 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 binding = (Hashtable) schedules.nextSolution(); + Map 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 binding = null; + public Map binding = null; public Vector> buSubInorderBuIn = null; public Vector> 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 moveNext () { + Map moveNext () { time = -System.currentTimeMillis(); - binding = (Hashtable) 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 index 7405d62..ba72e4a 100644 --- 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 visit ( public String visits( AGEvaluator aleg, LoopRecoverer ir, - Hashtable binding, HashMap> childOrder, + Map binding, HashMap> childOrder, HashMap classMap, HashMap exprToCall, HashMap exprPrinter, @@ -849,7 +848,7 @@ public Schedule synthesizeAll(String alePath, String outputDir, String resourceD //////////////////////////////////////////////////////////////// - Hashtable binding = null; + Map 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 binding = null; + Map 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 nextBinding = sched.moveNext(); +// Map 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 index d15ba2a..62f9cab 100644 --- 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 binding) throws InvalidGrammarException; + public String printCurrentPipelineBuild (Map 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 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 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 index 93c2dce..744b204 100644 --- 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 binding) throws InvalidGrammarException { +public String printCurrentPipelineHeaders (Map binding) throws InvalidGrammarException { String res = ""; int pass = 0; int lockC = 0; @@ -953,7 +952,7 @@ public String printCurrentPipelineHeaders (Hashtable binding) th return res; } -public String printCurrentPipelineBuild (Hashtable binding) throws InvalidGrammarException { +public String printCurrentPipelineBuild (Map binding) throws InvalidGrammarException { String res = ""; int pass = 0; int lockC = 0; @@ -1032,7 +1031,7 @@ public String printCurrentPipelineBuild (Hashtable binding) thro return res; } -public String printCurrentPipelineDelayedBuild (Hashtable binding) throws InvalidGrammarException { +public String printCurrentPipelineDelayedBuild (Map 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 binding, AGEvaluator aleg) + boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Map 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 index cf55e8a..631b3a1 100644 --- 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 index a275f43..26da365 100644 --- 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 binding, + boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Map 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 binding) throws InvalidGrammarException { + public String printCurrentPipelineBuild(Map 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 index a804f8f..56017bb 100644 --- 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 visit ( public String visits( AGEvaluator aleg, - Hashtable binding, HashMap> childOrder, + Map binding, + HashMap> childOrder, HashMap classMap, HashMap exprToCall, HashMap exprPrinter, @@ -905,7 +905,7 @@ public Schedule synthesizeAll(String alePath, String outputDir, String resourceD //////////////////////////////////////////////////////////////// - Hashtable binding = null; + Map 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 binding = null; + Map 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 nextBinding = sched.moveNext(); +// Map 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 index 0e544c2..797922a 100644 --- 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 binding) throws InvalidGrammarException { + public String printCurrentPipelineBuild (Map 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 binding, AGEvaluator aleg) throws IOException, + boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Map 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 index 0d6b9d2..a61476d 100644 --- 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){ } -} \ No newline at end of file +} diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/LoopRecoverer.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/LoopRecoverer.java index e5dcffb..ecd4b4c 100644 --- 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 binding; + public final Map binding; public final HashMap> childOrders; private final HashMap > visitsRaw; public final HashMap > visitsClean; diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/OpenCLGenerator.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/OpenCLGenerator.java index 79dec23..2145d93 100644 --- a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/OpenCLGenerator.java +++ b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/OpenCLGenerator.java @@ -10,11 +10,10 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.HashSet; -import java.util.Hashtable; +import java.util.Map; import java.util.Vector; -import jpl.Term; -import jpl.Variable; +import org.jpl7.Term; import AGEval.AGEvaluator; import AGEval.Class; import AGEval.InvalidGrammarException; @@ -113,7 +112,7 @@ public void generateParseFiles(ALEParser ast, Schedule sched, String output_dir, // TODO: Just write out visitDispatched argument rather than calling visitDispatchers() in postVisits() @Override public String output(String baseName, String visitOut, String visitDispatches, String outputDir, boolean write, - boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Hashtable binding, + boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Map binding, AGEvaluator aleg) throws IOException, InvalidGrammarException { if (write) { // Write out CLRunner's visitor header @@ -262,7 +261,7 @@ public String toAcc(String lhsRaw, Class c) { } @Override - public String printCurrentPipelineBuild(Hashtable binding) throws InvalidGrammarException { + public String printCurrentPipelineBuild(Map binding) throws InvalidGrammarException { return "// No pipeline build needed in OpenCL"; } diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/RustGenerator.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/RustGenerator.java index 92313a9..32ad1f6 100644 --- a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/RustGenerator.java +++ b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/RustGenerator.java @@ -6,6 +6,7 @@ import java.util.HashSet; import java.util.Hashtable; import java.util.ArrayList; +import java.util.Map; import java.util.Map.Entry; //import org.antlr.runtime.RecognitionException; @@ -17,8 +18,7 @@ import AGEval.InvalidGrammarException; import AGEvalSwipl.AGEvaluatorSwipl.Schedule; -import jpl.Term; -import jpl.Variable; +import org.jpl7.Term; public class RustGenerator extends BackendBase implements Backend { @@ -313,7 +313,7 @@ public String closeChildLoop(ALEParser.LoopOrdering loopVar) { } - public String printCurrentPipelineBuild (Hashtable binding) throws InvalidGrammarException { + public String printCurrentPipelineBuild (Map binding) throws InvalidGrammarException { String res = "pub fn layout (root: &mut FtlNode) {\n"; int pass = 0; for (Term visit : binding.get("P").toTermArray()) { @@ -658,7 +658,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 binding, AGEvaluator aleg) throws IOException, + boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Map binding, AGEvaluator aleg) throws IOException, InvalidGrammarException { String res = "#[feature(globs)]\n" + "use layout::ftl_lib::*;\n" + diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/Sanitizer.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/Sanitizer.java index cee63c1..f3fbb4f 100644 --- a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/Sanitizer.java +++ b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/Sanitizer.java @@ -11,10 +11,10 @@ import AGEval.InvalidGrammarException; -import jpl.Atom; -import jpl.Compound; -import jpl.Query; -import jpl.Term; +import org.jpl7.Atom; +import org.jpl7.Compound; +import org.jpl7.Query; +import org.jpl7.Term; public class Sanitizer { public boolean anyFailed = false; diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/TestSwiplJpl.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/TestSwiplJpl.java index 20c145b..3426532 100644 --- a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/TestSwiplJpl.java +++ b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/TestSwiplJpl.java @@ -1,28 +1,28 @@ package AGEvalSwipl; -import java.util.Hashtable; +import java.util.Map; -import jpl.Compound; -import jpl.Query; -import jpl.Term; -import jpl.Variable; +import org.jpl7.Compound; +import org.jpl7.Query; +import org.jpl7.Term; +import org.jpl7.Variable; public class TestSwiplJpl { public static boolean testExternalCallAst () { Variable N = new Variable("N"); - jpl.Integer One = new jpl.Integer(1); - jpl.Integer Thirteen = new jpl.Integer(13); + org.jpl7.Integer One = new org.jpl7.Integer(1); + org.jpl7.Integer Thirteen = new org.jpl7.Integer(13); Query q = new Query( new Compound(";", new Term[]{ new Compound("succ", new Term[] { Thirteen, N}), new Compound("succ", new Term[] { One, N})})); int sum = 0; - while (q.hasMoreSolutions()) { + while (q.hasNext()) { @SuppressWarnings("unchecked") - Hashtable binding = (Hashtable) q.nextSolution(); - sum += ((jpl.Integer) binding.get("N")).intValue(); + Map binding = q.next(); + sum += ((org.jpl7.Integer) binding.get("N")).intValue(); } return sum == (14 + 2); } @@ -30,10 +30,10 @@ public static boolean testExternalCallAst () { public static boolean testExternalCallString () { Query q = new Query("succ(13, N) ; succ(1, N)"); int sum = 0; - while (q.hasMoreElements()) { + while (q.hasNext()) { @SuppressWarnings("unchecked") - Hashtable binding = (Hashtable) q.nextElement(); - sum += ((jpl.Integer) binding.get("N")).intValue(); + Map binding = q.next(); + sum += ((org.jpl7.Integer) binding.get("N")).intValue(); } return sum == (14 + 2); } @@ -53,4 +53,4 @@ public static void main(String[] args) { System.err.println("Cannot compute in PL (string)"); } } -} \ No newline at end of file +} diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/Tests.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/Tests.java index 3d16251..1cab74c 100644 --- a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/Tests.java +++ b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/Tests.java @@ -7,7 +7,7 @@ import AGEval.InvalidGrammarException; import AGEvalSwipl.AGEvaluatorSwipl.Schedule; -import jpl.Term; +import org.jpl7.Term; public class Tests { diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/WebCLGenerator.java b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/WebCLGenerator.java index 9e88de2..3f611f5 100644 --- a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/WebCLGenerator.java +++ b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/WebCLGenerator.java @@ -9,8 +9,7 @@ import AGEval.InvalidGrammarException; import AGEvalSwipl.AGEvaluatorSwipl.Schedule; import aleGrammar.ALEParser; -import jpl.Term; -import jpl.Variable; +import org.jpl7.Term; import java.io.File; import java.io.IOException; @@ -298,7 +297,7 @@ public void generateParseFiles(ALEParser ast, Schedule sched, String output_dir, // TODO: Just write out visitDispatched argument rather than calling visitDispatchers() in postVisits() @Override public String output(String baseName, String visitOut, String visitDispatches, String outputDir, boolean write, - boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Hashtable binding, + boolean verbose, ALEParser ast, Schedule sched, String fHeaders, Map binding, AGEvaluator aleg) throws IOException, InvalidGrammarException { if (write) { //Javascript stuff @@ -332,7 +331,7 @@ public String output(String baseName, String visitOut, String visitDispatches, S return "(no OpenCL out)"; } - public String printCurrentPipelineBuild (Hashtable binding) throws InvalidGrammarException { + public String printCurrentPipelineBuild (Map binding) throws InvalidGrammarException { StringBuilder contents = new StringBuilder(); contents.append("this._gen_getKernels = function() {\n"); int pass = 0; @@ -464,4 +463,4 @@ public static void main(String[] args) throws NumberFormatException, Exception { } } -} \ No newline at end of file +} diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/algorithm.tokens b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/algorithm.tokens index f505663..ecf35d4 100644 --- a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/algorithm.tokens +++ b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/algorithm.tokens @@ -73,4 +73,4 @@ "topDownMissingAssumeSub", "topDownMissingPostAssume", "topDownPostAssume", -"unreadyAtNthChildSub", \ No newline at end of file +"unreadyAtNthChildSub", diff --git a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/algorithmFixed.tokens b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/algorithmFixed.tokens index 551c4cb..1807557 100644 --- a/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/algorithmFixed.tokens +++ b/compiler/attrib-gram-evaluator-swipl/AGEvalSwipl/algorithmFixed.tokens @@ -9,4 +9,4 @@ "classField", "interfaceField", "assignment", -"classAttribute", \ No newline at end of file +"classAttribute",