Modular Features

key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionStrategy.java

@@ -5,7 +5,6 @@
 
 import java.util.ArrayList;
 
-import de.uka.ilkd.key.logic.JTerm;
 import de.uka.ilkd.key.proof.Goal;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.strategy.JavaCardDLStrategy;
@@ -85,7 +84,7 @@ private SymbolicExecutionStrategy(Proof proof, StrategyProperties sp) {
                 .equals(sp.get(StrategyProperties.SYMBOLIC_EXECUTION_ALIAS_CHECK_OPTIONS_KEY))) {
             // Make sure that an immediately alias check is performed by doing cuts of objects to
             // find out if they can be the same or not
-            RuleSetDispatchFeature instRsd = getInstantiationDispatcher();
+            RuleSetDispatchFeature instRsd = getDispatcher(StrategyAspect.Instantiation);
             enableInstantiate();
             final TermBuffer<Goal> buffer = new TermBuffer<>();
             Feature originalCut = instRsd.get(getHeuristic("cut"));
@@ -106,7 +105,7 @@ private SymbolicExecutionStrategy(Proof proof, StrategyProperties sp) {
      * {@inheritDoc}
      */
     @Override
-    protected Feature setupApprovalF() {
+    protected @NonNull Feature setupApprovalF() {
         Feature result = super.setupApprovalF();
         // Make sure that cuts are only applied if the cut term is not already part of the sequent.
         // This check is performed exactly before the rule is applied because the sequent might has
@@ -122,17 +121,17 @@ protected Feature setupApprovalF() {
      * {@inheritDoc}
      */
     @Override
-    protected Feature setupGlobalF(Feature dispatcher) {
+    protected @NonNull Feature setupGlobalF(@NonNull Feature dispatcher) {
         Feature globalF = super.setupGlobalF(dispatcher);
         // Make sure that modalities without symbolic execution label are executed first because
         // they might forbid rule application on modalities with symbolic execution label (see loop
         // body branches)
         globalF = add(globalF, ifZero(not(new BinaryFeature() {
             @Override
-            protected <Goal extends ProofGoal<@NonNull Goal>> boolean filter(RuleApp app,
-                    PosInOccurrence pos, Goal goal, MutableState mState) {
+            protected <GOAL extends ProofGoal<@NonNull GOAL>> boolean filter(RuleApp app,
+                    PosInOccurrence pos, GOAL goal, MutableState mState) {
                 return pos != null
-                        && SymbolicExecutionUtil.hasSymbolicExecutionLabel((JTerm) pos.subTerm());
+                        && SymbolicExecutionUtil.hasSymbolicExecutionLabel(pos.subTerm());
             }
         }), longConst(-3000)));
         // Make sure that the modality which executes a loop body is preferred against the
@@ -141,9 +140,9 @@ protected Feature setupGlobalF(Feature dispatcher) {
             add(globalF,
                 ifZero(add(new Feature() {
                     @Override
-                    public <Goal extends ProofGoal<@NonNull Goal>> RuleAppCost computeCost(
+                    public <GOAL extends ProofGoal<@NonNull GOAL>> RuleAppCost computeCost(
                             RuleApp app, PosInOccurrence pos,
-                            Goal goal, MutableState mState) {
+                            GOAL goal, MutableState mState) {
                         return pos != null ? cost(0) : TopRuleAppCost.INSTANCE;
                     }
                 },
@@ -302,7 +301,7 @@ public static class Factory implements StrategyFactory {
          * {@inheritDoc}
          */
         @Override
-        public StrategySettingsDefinition getSettingsDefinition() {
+        public @NonNull StrategySettingsDefinition getSettingsDefinition() {
             // Properties
             OneOfStrategyPropertyDefinition methodTreatment = new OneOfStrategyPropertyDefinition(
                 StrategyProperties.METHOD_OPTIONS_KEY, "Method Treatment",

key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionUtil.java

@@ -46,7 +46,7 @@
 import de.uka.ilkd.key.settings.StrategySettings;
 import de.uka.ilkd.key.speclang.Contract;
 import de.uka.ilkd.key.speclang.OperationContract;
-import de.uka.ilkd.key.strategy.JavaCardDLStrategyFactory;
+import de.uka.ilkd.key.strategy.ModularJavaDLStrategyFactory;
 import de.uka.ilkd.key.strategy.Strategy;
 import de.uka.ilkd.key.strategy.StrategyProperties;
 import de.uka.ilkd.key.symbolic_execution.ExecutionVariableExtractor;
@@ -4325,7 +4325,7 @@ public static void initializeStrategy(SymbolicExecutionTreeBuilder builder) {
                 new SymbolicExecutionStrategy.Factory().create(proof, strategyProperties));
         } else {
             proof.setActiveStrategy(
-                new JavaCardDLStrategyFactory().create(proof, strategyProperties));
+                new ModularJavaDLStrategyFactory().create(proof, strategyProperties));
         }
     }
 

key.core/src/main/java/de/uka/ilkd/key/informationflow/macros/SelfcompositionStateExpansionMacro.java

@@ -12,10 +12,7 @@
 import de.uka.ilkd.key.proof.Goal;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.init.ProofOblInput;
-import de.uka.ilkd.key.strategy.JavaCardDLStrategyFactory;
-import de.uka.ilkd.key.strategy.RuleAppCostCollector;
-import de.uka.ilkd.key.strategy.Strategy;
-import de.uka.ilkd.key.strategy.StrategyProperties;
+import de.uka.ilkd.key.strategy.*;
 
 import org.key_project.logic.Name;
 import org.key_project.prover.proof.ProofGoal;
@@ -136,10 +133,10 @@ public Name name() {
             String name = ruleApp.rule().name().toString();
             if ((admittedRuleNames.contains(name) || name.startsWith(INF_FLOW_UNFOLD_PREFIX))
                     && ruleApplicationInContextAllowed(ruleApp, pio, goal)) {
-                JavaCardDLStrategyFactory strategyFactory = new JavaCardDLStrategyFactory();
-                Strategy<@NonNull Goal> javaDlStrategy =
+                ModularJavaDLStrategyFactory strategyFactory = new ModularJavaDLStrategyFactory();
+                Strategy<@NonNull Goal> dlStrategy =
                     strategyFactory.create(goal.proof(), new StrategyProperties());
-                RuleAppCost costs = javaDlStrategy.computeCost(ruleApp, pio, goal, mState);
+                RuleAppCost costs = dlStrategy.computeCost(ruleApp, pio, goal, mState);
                 if ("orLeft".equals(name)) {
                     costs = costs.add(NumberRuleAppCost.create(100));
                 }

key.core/src/main/java/de/uka/ilkd/key/macros/AbstractPropositionalExpansionMacro.java

@@ -86,7 +86,6 @@ protected boolean ruleApplicationInContextAllowed(RuleApp ruleApp,
      * rejects everything else.
      */
     private static class PropExpansionStrategy implements Strategy<Goal> {
-
         private final Name NAME = new Name(PropExpansionStrategy.class.getSimpleName());
 
         private final Set<String> admittedRuleNames;
@@ -142,6 +141,5 @@ public void instantiateApp(RuleApp app, PosInOccurrence pio, Goal goal,
         public boolean isStopAtFirstNonCloseableGoal() {
             return false;
         }
-
     }
 }

key.core/src/main/java/de/uka/ilkd/key/macros/PrepareInfFlowContractPreBranchesMacro.java

@@ -137,17 +137,9 @@ private String getAppRuleName(Node parent) {
             return parentRuleName;
         }
 
-
-        @Override
-        protected RuleAppCost instantiateApp(RuleApp app, PosInOccurrence pio, Goal goal,
-                MutableState mState) {
-            return computeCost(app, pio, goal, mState);
-        }
-
         @Override
         public boolean isStopAtFirstNonCloseableGoal() {
             return false;
         }
     }
-
 }

key.core/src/main/java/de/uka/ilkd/key/nparser/KeyAst.java

@@ -5,7 +5,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -129,7 +129,7 @@ public static class File extends KeyAst<KeYParser.FileContext> {
 
         /// Returns the includes (possible empty but not null) computed from the underlying parse
         /// tree.
-        public Includes getIncludes(URL base) {
+        public Includes getIncludes(Path base) {
             IncludeFinder finder = new IncludeFinder(base);
             accept(finder);
             return finder.getIncludes();

key.core/src/main/java/de/uka/ilkd/key/nparser/ParsingFacade.java

@@ -6,6 +6,7 @@
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
@@ -70,7 +71,14 @@ public static List<KeyAst.File> parseFiles(URL url) throws IOException {
             reached.add(url);
             KeyAst.File ctx = parseFile(url);
             ctxs.add(ctx);
-            Collection<RuleSource> includes = ctx.getIncludes(url).getRuleSets();
+            Path path = null;
+            try {
+                path = Path.of(url.toURI());
+            } catch (URISyntaxException e) {
+                throw new IOException(e);
+            }
+            path = path.getParent();
+            Collection<RuleSource> includes = ctx.getIncludes(path).getRuleSets();
             for (RuleSource u : includes) {
                 if (!reached.contains(u.url())) {
                     queue.push(u.url());

key.core/src/main/java/de/uka/ilkd/key/nparser/builder/IncludeFinder.java

@@ -5,7 +5,9 @@
 
 import java.io.File;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
+import java.nio.file.Path;
 
 import de.uka.ilkd.key.nparser.KeYParser;
 import de.uka.ilkd.key.proof.init.Includes;
@@ -22,15 +24,12 @@
  * @see #getIncludes()
  */
 public class IncludeFinder extends AbstractBuilder<Void> {
-    private final URL base;
+    private final Path base;
     private final Includes includes = new Includes();
-    private final String basePath;
     private boolean ldt = false;
 
-    public IncludeFinder(URL base) {
+    public IncludeFinder(Path base) {
         this.base = base;
-        String a = base.getPath();
-        basePath = a.substring(0, a.lastIndexOf('/'));
     }
 
     @Override
@@ -44,29 +43,29 @@ public Void visitOne_include_statement(KeYParser.One_include_statementContext ct
     public Void visitOne_include(KeYParser.One_includeContext ctx) {
         String value = StringUtil.trim(ctx.getText(), "\"'");
         try {
-            addInclude(value, ctx.relfile != null);
+            addInclude(value);
         } catch (MalformedURLException e) {
             throw new BuildingException(ctx, e);
         }
         return null;
     }
 
-    private void addInclude(String filename, boolean relativePath) throws MalformedURLException {
+    private void addInclude(String filename) throws MalformedURLException {
         RuleSource source;
         if (!filename.endsWith(".key")) {
             filename += ".key";
         }
 
-        if (relativePath) {
-            filename = filename.replace('/', File.separatorChar); // Not required for Windows, but
-                                                                  // whatsoever
-            filename = filename.replace('\\', File.separatorChar); // Special handling for Linux
-            URL path = new URL(base.getProtocol(), base.getHost(), base.getPort(),
-                basePath + "/" + filename);
-            source = RuleSourceFactory.initRuleFile(path);
-        } else {
-            source = RuleSourceFactory.fromDefaultLocation(filename);
+        filename = filename.replace('/', File.separatorChar); // Not required for Windows, but
+        // whatsoever
+        filename = filename.replace('\\', File.separatorChar); // Special handling for Linux
+        var path = base.resolve(filename).normalize();
+        var uri = URI.create(path.toString());
+        if (uri.getScheme() == null) {
+            uri = URI.create("file:///" + path);
         }
+        URL url = uri.toURL();
+        source = RuleSourceFactory.initRuleFile(url);
         if (ldt) {
             includes.putLDT(filename, source);
         } else {

key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java

@@ -637,6 +637,11 @@ public ImmutableList<Goal> apply(@NonNull final RuleApp ruleApp) {
             removeLastAppliedRuleApp();
             node().setAppliedRuleApp(null);
             return null;
+        } catch (IndexOutOfBoundsException e) {
+            System.out.println(ruleApp.rule().displayName());
+            removeLastAppliedRuleApp();
+            node().setAppliedRuleApp(null);
+            return null;
         } finally {
             PERF_APP_EXECUTE.getAndAdd(System.nanoTime() - time);
         }

key.core/src/main/java/de/uka/ilkd/key/proof/init/JavaProfile.java

@@ -19,7 +19,7 @@
 import de.uka.ilkd.key.rule.label.TermLabelRefactoring;
 import de.uka.ilkd.key.rule.merge.MergeRule;
 import de.uka.ilkd.key.smt.newsmt2.DefinedSymbolsHandler;
-import de.uka.ilkd.key.strategy.JavaCardDLStrategyFactory;
+import de.uka.ilkd.key.strategy.ModularJavaDLStrategyFactory;
 import de.uka.ilkd.key.strategy.StrategyFactory;
 
 import org.key_project.prover.rules.RuleApp;
@@ -48,7 +48,7 @@ public class JavaProfile extends AbstractProfile {
     public static JavaProfile defaultInstance;
     public static JavaProfile defaultInstancePermissions;
 
-    public static final StrategyFactory DEFAULT = new JavaCardDLStrategyFactory();
+    public static final StrategyFactory DEFAULT = new ModularJavaDLStrategyFactory();
 
     private boolean permissions = false;
 

key.core/src/main/java/de/uka/ilkd/key/proof/io/KeYFile.java

@@ -219,7 +219,7 @@ public Includes readIncludes() throws ProofInputException {
         if (includes == null) {
             try {
                 KeyAst.File ctx = getParseContext();
-                includes = ctx.getIncludes(file.file().getParent().toUri().toURL());
+                includes = ctx.getIncludes(file.file().getParent());
             } catch (ParseCancellationException e) {
                 throw new ParseCancellationException(e);
             } catch (Exception e) {

key.core/src/main/java/de/uka/ilkd/key/proof/io/UrlRuleSource.java

@@ -61,10 +61,11 @@ public Path file() {
             try {
                 return Paths.get(uri);
             } catch (FileSystemNotFoundException e) {
-                URI rootFs = URI.create(StringUtil.takeUntil(uri.toString(), "!"));
-                String internal = StringUtil.takeAfter(uri.toString(), "!");
-                FileSystem zipfs = FileSystems.newFileSystem(rootFs, new HashMap<>());
-                return zipfs.getPath(internal);
+                URI rootFs = URI.create(StringUtil.takeUntil(uri.toString(), "\\!"));
+                String internal = StringUtil.takeAfter(uri.toString(), "\\!");
+                try (FileSystem zipfs = FileSystems.newFileSystem(rootFs, new HashMap<>())) {
+                    return zipfs.getPath(internal);
+                }
             }
         } catch (URISyntaxException | IOException e) {
             throw new RuntimeException(e);

key.core/src/main/java/de/uka/ilkd/key/rule/OneStepSimplifier.java

@@ -81,10 +81,11 @@ public static final class Protocol extends ArrayList<RuleApp> {
      * "evaluate_instanceof"; in any case there was a measurable slowdown. -- DB 03/06/14
      */
     private static final ImmutableList<String> ruleSets = ImmutableSLList.<String>nil()
-            .append("concrete").append("update_elim").append("update_apply_on_update")
+            .append("concrete").append("concrete_java").append("update_elim")
+            .append("update_apply_on_update")
             .append("update_apply").append("update_join").append("elimQuantifier");
 
-    private static final boolean[] bottomUp = { false, false, true, true, true, false };
+    private static final boolean[] bottomUp = { false, false, false, true, true, true, false };
     private final Map<SequentFormula, Boolean> applicabilityCache =
         new LRUCache<>(APPLICABILITY_CACHE_SIZE);
 
@@ -688,7 +689,6 @@ public Set<NoPosTacletApp> getCapturedTaclets() {
         return result;
     }
 
-
     // -------------------------------------------------------------------------
     // inner classes
     // -------------------------------------------------------------------------