removed provider dependency and unused imports

Author: llalexandru00

src/main/java/execution/Execution.java

@@ -5,7 +5,6 @@
 import ast.attr.IdASTAttr;
 import ast.attr.ParamASTAttr;
 import ast.enums.ParamType;
-import ast.expr.SymIDAST;
 import ast.stmt.FunctionDeclAST;
 import ast.type.DataTypeAST;
 import execution.exhaustive.EnvironmentMapper;
@@ -15,15 +14,12 @@
 import execution.parser.exceptions.UnwindException;
 import execution.state.ExecutionCloneContext;
 import execution.state.ExecutionState;
-import execution.state.function.DefinedFunctionCallState;
-import jdk.nashorn.internal.codegen.CompilerConstants;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.apache.commons.cli.HelpFormatter;
 import execution.parser.AlkParser;
 import execution.parser.constants.Constants;
 import execution.parser.exceptions.AlkException;
 import parser.ParseTreeGlobals;
-import symbolic.SymbolicValue;
 import util.*;
 import util.exception.AlkDebugTerminateException;
 import util.exception.InternalException;

src/main/java/execution/PreProcessing.java

@@ -2,7 +2,6 @@
 
 import execution.parser.exceptions.AlkSyntaxException;
 import grammar.alkParser;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
 import org.antlr.v4.runtime.tree.ParseTree;
 import execution.parser.AlkParser;
 import execution.parser.exceptions.AlkException;

src/main/java/visitor/SymbolicExpressionInterpreter.java

@@ -20,9 +20,9 @@
 import visitor.interpreter.SmallStepExpressionInterpreter;
 import visitor.interpreter.InterpreterHelper;
 
-import javax.xml.ws.Provider;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
 
 public class SymbolicExpressionInterpreter
 implements SmallStepExpressionInterpreter<SymbolicValueIface>
@@ -94,12 +94,15 @@ public SymbolicValueIface interpretCompositeInterval(Primitive primitive, Symbol
     }
 
     @Override
-    public SymbolicValueIface interpretCompositeFilterSpec(Primitive primitive, String id, SymbolicValueIface fromExpr, Provider<SymbolicValueIface> suchThat) {
+    public SymbolicValueIface interpretCompositeFilterSpec(Primitive primitive, String id, SymbolicValueIface fromExpr, Function<SymbolicValueIface, Object> suchThat) {
         return null;
     }
 
     @Override
-    public SymbolicValueIface interpretCompositeSelectSpec(Primitive primitive, String id, SymbolicValueIface fromExpr, Provider<SymbolicValueIface> suchThat) {
+    public SymbolicValueIface interpretCompositeSelectSpec(Primitive primitive,
+                                                           String id,
+                                                           SymbolicValueIface fromExpr,
+                                                           Function<SymbolicValueIface, Object> suchThat) {
         return null;
     }
 

src/main/java/visitor/interpreter/ExpressionInterpreter.java

@@ -2,9 +2,9 @@
 
 import ast.enums.Primitive;
 import util.Pair;
-
-import javax.xml.ws.Provider;
 import java.util.List;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 public interface ExpressionInterpreter<T>
 {
@@ -13,7 +13,7 @@ public interface ExpressionInterpreter<T>
     T interpretPrimitive(Primitive primitive, String value);
     T interpretComposite(Primitive primitive, List<T> values);
     T interpretCompositeInterval(Primitive primitive, T left, T right);
-    T interpretCompositeFilterSpec(Primitive primitive, String id, T fromExpr, Provider<T> suchThat);
-    T interpretCompositeSelectSpec(Primitive primitive, String id, T fromExpr, Provider<T> suchThat);
+    T interpretCompositeFilterSpec(Primitive primitive, String id, T fromExpr, Function<T, Object> suchThat);
+    T interpretCompositeSelectSpec(Primitive primitive, String id, T fromExpr, Function<T, Object> suchThat);
     T interpretCompositeComponents(Primitive primitive, List<Pair<String, T>> comps);
 }

src/main/java/visitor/interpreter/base/BaseExpressionInterpreter.java

@@ -21,13 +21,13 @@
 import visitor.interpreter.InterpreterHelper;
 import visitor.interpreter.RequiresGenerator;
 
-import javax.xml.ws.Provider;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 
 public class BaseExpressionInterpreter
 implements SmallStepExpressionInterpreter<ConcreteValue>
@@ -175,7 +175,7 @@ public ConcreteValue interpretCompositeInterval(Primitive primitive, ConcreteVal
     public ConcreteValue interpretCompositeFilterSpec(Primitive primitive,
                                                       String id,
                                                       ConcreteValue x,
-                                                      Provider<ConcreteValue> suchThat)
+                                                      Function<ConcreteValue, Object> suchThat)
     {
         AlkIterableValue struct = InterpreterHelper.getIterableInstance(primitive);
         Storable fromExpr = x.toRValue();
@@ -197,7 +197,7 @@ public ConcreteValue interpretCompositeFilterSpec(Primitive primitive,
             for (Location loc : locs)
             {
                 proxy.addTempEntry(id, loc.toRValue().clone(locationGenerator));
-                Storable eval = suchThat.invoke(null).toRValue();
+                Storable eval = ((Storable) suchThat.apply(null)).toRValue();
 
                 if (!(eval instanceof AlkBool))
                     throw new AlkException("Second expression in filter specification must be a boolean");
@@ -217,7 +217,7 @@ public ConcreteValue interpretCompositeFilterSpec(Primitive primitive,
     }
 
     @Override
-    public ConcreteValue interpretCompositeSelectSpec(Primitive primitive, String id, ConcreteValue x, Provider<ConcreteValue> suchThat)
+    public ConcreteValue interpretCompositeSelectSpec(Primitive primitive, String id, ConcreteValue x, Function<ConcreteValue, Object> suchThat)
     {
         AlkIterableValue struct = InterpreterHelper.getIterableInstance(primitive);
         Storable fromExpr = x.toRValue();
@@ -237,7 +237,7 @@ public ConcreteValue interpretCompositeSelectSpec(Primitive primitive, String id
         for (Location loc : locs)
         {
             proxy.addTempEntry(id, loc.toRValue().clone(locationGenerator));
-            Storable eval = suchThat.invoke(null).toRValue();
+            Storable eval = ((Storable) suchThat.apply(null)).toRValue();
 
             if (!(eval instanceof AlkValue))
                 throw new InternalException("Can't use non-alkvalue in composite select spec");

src/main/java/visitor/interpreter/cp/CPExpressionInterpreter.java

@@ -18,12 +18,12 @@
 import visitor.interpreter.InterpreterHelper;
 import visitor.interpreter.base.BaseExpressionInterpreter;
 
-import javax.xml.ws.Provider;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 
 public class CPExpressionInterpreter
 implements SmallStepExpressionInterpreter<CPValue>
@@ -139,7 +139,7 @@ public CPValue interpretCompositeInterval(Primitive primitive, CPValue left, CPV
     }
 
     @Override
-    public CPValue interpretCompositeFilterSpec(Primitive primitive, String id, CPValue fromExpr, Provider<CPValue> suchThat)
+    public CPValue interpretCompositeFilterSpec(Primitive primitive, String id, CPValue fromExpr, Function<CPValue, Object> suchThat)
     {
         Storable fromValue = fromExpr.toRValue();
 
@@ -152,11 +152,11 @@ public CPValue interpretCompositeFilterSpec(Primitive primitive, String id, CPVa
         // TODO: provider may return CPValue
 
         return basicInterpreter.interpretCompositeFilterSpec(primitive, id, (ConcreteValue) fromValue, (request) ->
-                (ConcreteValue) suchThat.invoke(request));
+                (ConcreteValue) suchThat.apply(request));
     }
 
     @Override
-    public CPValue interpretCompositeSelectSpec(Primitive primitive, String id, CPValue fromExpr, Provider<CPValue> suchThat)
+    public CPValue interpretCompositeSelectSpec(Primitive primitive, String id, CPValue fromExpr, Function<CPValue, Object> suchThat)
     {
         Storable fromValue = fromExpr.toRValue();
 
@@ -169,7 +169,7 @@ public CPValue interpretCompositeSelectSpec(Primitive primitive, String id, CPVa
         // TODO: provider may return CPValue
 
         return basicInterpreter.interpretCompositeSelectSpec(primitive, id, (ConcreteValue) fromValue, (request) ->
-                (ConcreteValue) suchThat.invoke(request));
+                (ConcreteValue) suchThat.apply(request));
     }
 
     @Override