Universe Type Rules

.gitignore

@@ -51,6 +51,7 @@ bin/
 .settings
 .project
 .classpath
+.factorypath
 
 # Files generated by IntelliJ ANTLR plugin
 key.core/src/main/gen

key.core.infflow/src/main/java/de/uka/ilkd/key/informationflow/ProofObligationVars.java

@@ -7,6 +7,8 @@
 import de.uka.ilkd.key.java.JavaInfo;
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.java.ast.abstraction.KeYJavaType;
+import de.uka.ilkd.key.java.ast.reference.TypeRef;
+import de.uka.ilkd.key.java.ast.reference.TypeReference;
 import de.uka.ilkd.key.logic.JTerm;
 import de.uka.ilkd.key.logic.ProgramElementName;
 import de.uka.ilkd.key.logic.TermBuilder;
@@ -47,16 +49,15 @@ public class ProofObligationVars {
     private final TermBuilder tb;
 
 
-    public ProofObligationVars(IProgramMethod pm, KeYJavaType kjt, Services services) {
-        this.pre = StateVars.buildMethodContractPreVars(pm, kjt, services);
-        this.post = StateVars.buildMethodContractPostVars(this.pre, pm, kjt, services);
+    public ProofObligationVars(IProgramMethod pm, TypeReference typeRef, Services services) {
+        this.pre = StateVars.buildMethodContractPreVars(pm, typeRef, services);
+        this.post = StateVars.buildMethodContractPostVars(this.pre, pm, typeRef, services);
         this.tb = services.getTermBuilder();
         this.exceptionParameter = buildExceptionParameter(services);
         this.formalParams = buildFormalParamVars(services);
         this.postfix = "";
     }
 
-
     public ProofObligationVars(ProofObligationVars orig, String postfix, Services services) {
         this.pre = StateVars.buildInfFlowPreVars(orig.pre, postfix, services);
         this.post = StateVars.buildInfFlowPostVars(orig.pre, orig.post, pre, postfix, services);
@@ -66,7 +67,6 @@ public ProofObligationVars(ProofObligationVars orig, String postfix, Services se
         this.postfix = postfix;
     }
 
-
     public ProofObligationVars(StateVars pre, StateVars post, JTerm exceptionParameter,
             ImmutableList<JTerm> formalParams, Services services) {
         this.pre = pre;
@@ -114,7 +114,6 @@ public ProofObligationVars labelHeapAtPreAsAnonHeapFunc() {
         }
     }
 
-
     /**
      * Build variable for try statement.
      *
@@ -125,7 +124,7 @@ private JTerm buildExceptionParameter(Services services) {
         JavaInfo javaInfo = services.getJavaInfo();
         final KeYJavaType eType = javaInfo.getTypeByClassName("java.lang.Exception");
         final ProgramElementName ePEN = new ProgramElementName("e");
-        return tb.var(new LocationVariable(ePEN, eType));
+        return tb.var(new LocationVariable(ePEN, new TypeRef(eType)));
     }
 
     /**
@@ -139,7 +138,8 @@ private ImmutableList<JTerm> buildFormalParamVars(Services services)
         for (JTerm param : pre.localVars) {
             ProgramVariable paramVar = param.op(ProgramVariable.class);
             ProgramElementName pen = new ProgramElementName("_" + paramVar.name());
-            LocationVariable formalParamVar = new LocationVariable(pen, paramVar.getKeYJavaType());
+            LocationVariable formalParamVar =
+                new LocationVariable(pen, paramVar.getTypeReference());
             register(formalParamVar, services);
             JTerm formalParam = tb.var(formalParamVar);
             formalParamVars = formalParamVars.append(formalParam);

key.core.infflow/src/main/java/de/uka/ilkd/key/informationflow/po/InfFlowContractPO.java

@@ -12,6 +12,7 @@
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.java.ast.StatementBlock;
 import de.uka.ilkd.key.java.ast.abstraction.KeYJavaType;
+import de.uka.ilkd.key.java.ast.reference.TypeRef;
 import de.uka.ilkd.key.logic.JTerm;
 import de.uka.ilkd.key.logic.op.IProgramMethod;
 import de.uka.ilkd.key.logic.op.JModality;
@@ -50,7 +51,8 @@ public InfFlowContractPO(InitConfig initConfig, InformationFlowContract contract
 
         // generate proof obligation variables
         final IProgramMethod pm = contract.getTarget();
-        symbExecVars = new ProofObligationVars(pm, contract.getKJT(), environmentServices);
+        symbExecVars =
+            new ProofObligationVars(pm, new TypeRef(contract.getKJT()), environmentServices);
 
         assert (symbExecVars.pre.self == null) == (pm.isStatic());
         ifVars = new IFProofObligationVars(symbExecVars, environmentServices);

key.core.infflow/src/main/java/de/uka/ilkd/key/informationflow/proof/init/StateVars.java

@@ -6,7 +6,7 @@
 import java.util.Iterator;
 
 import de.uka.ilkd.key.java.Services;
-import de.uka.ilkd.key.java.ast.abstraction.KeYJavaType;
+import de.uka.ilkd.key.java.ast.reference.TypeReference;
 import de.uka.ilkd.key.ldt.HeapLDT;
 import de.uka.ilkd.key.ldt.JavaDLTheory;
 import de.uka.ilkd.key.logic.JTerm;
@@ -86,13 +86,11 @@ public StateVars(JTerm self, JTerm guard, ImmutableList<JTerm> localVars, JTerm
         paddedTermList = allTerms;
     }
 
-
     public StateVars(JTerm self, ImmutableList<JTerm> localVars, JTerm result, JTerm exception,
             JTerm heap, JTerm mbyAtPre) {
         this(self, null, localVars, result, exception, heap, mbyAtPre);
     }
 
-
     private ImmutableList<JTerm> appendIfNotNull(ImmutableList<JTerm> list, JTerm t) {
         if (t != null) {
             return list.append(t);
@@ -101,7 +99,6 @@ private ImmutableList<JTerm> appendIfNotNull(ImmutableList<JTerm> list, JTerm t)
         }
     }
 
-
     private ImmutableList<JTerm> appendIfNotNull(ImmutableList<JTerm> list,
             ImmutableList<JTerm> list2) {
         ImmutableList<JTerm> result = list;
@@ -111,30 +108,25 @@ private ImmutableList<JTerm> appendIfNotNull(ImmutableList<JTerm> list,
         return result;
     }
 
-
     public StateVars(JTerm self, JTerm guard, ImmutableList<JTerm> localVars, JTerm heap) {
         this(self, guard, localVars, null, null, heap, null);
     }
 
-
     public StateVars(JTerm self, JTerm guard, ImmutableList<JTerm> localVars, JTerm result,
             JTerm exception, JTerm heap) {
         this(self, guard, localVars, result, exception, heap, null);
     }
 
-
     public StateVars(@Nullable JTerm self, ImmutableList<JTerm> localVars,
             @Nullable JTerm result, @Nullable JTerm exception,
             JTerm heap) {
         this(self, localVars, result, exception, heap, null);
     }
 
-
     public StateVars(JTerm self, ImmutableList<JTerm> localVars, JTerm heap) {
         this(self, localVars, null, null, heap);
     }
 
-
     public StateVars(StateVars orig, String postfix, Services services) {
         this(copyVariable(orig.self, postfix, services),
             copyVariable(orig.guard, postfix, services),
@@ -145,7 +137,6 @@ public StateVars(StateVars orig, String postfix, Services services) {
             copyFunction(orig.mbyAtPre, postfix, services));
     }
 
-
     private static ImmutableList<JTerm> copyVariables(ImmutableList<JTerm> ts, String postfix,
             Services services) {
         ImmutableList<JTerm> result = ImmutableSLList.nil();
@@ -155,7 +146,6 @@ private static ImmutableList<JTerm> copyVariables(ImmutableList<JTerm> ts, Strin
         return result;
     }
 
-
     private static JTerm copyVariable(JTerm t, String postfix, Services services) {
         if (t != null) {
             final TermBuilder tb = services.getTermBuilder();
@@ -168,7 +158,6 @@ private static JTerm copyVariable(JTerm t, String postfix, Services services) {
         }
     }
 
-
     private static JTerm newVariable(JTerm t, String name, Services services) {
         if (t == null) {
             return null;
@@ -185,7 +174,6 @@ private static JTerm newVariable(JTerm t, String name, Services services) {
         return tb.var(newVar);
     }
 
-
     private static JTerm copyHeapSymbol(JTerm t, String postfix, Services services) {
         if (t != null) {
             final TermBuilder tb = services.getTermBuilder();
@@ -198,7 +186,6 @@ private static JTerm copyHeapSymbol(JTerm t, String postfix, Services services)
         }
     }
 
-
     private static JTerm newHeapSymbol(JTerm t, String name, Services services) {
         if (t == null) {
             return null;
@@ -216,7 +203,6 @@ private static JTerm newHeapSymbol(JTerm t, String name, Services services) {
         }
     }
 
-
     private static JTerm newFunction(JTerm t, String name, Services services) {
         if (t == null) {
             return null;
@@ -227,7 +213,6 @@ private static JTerm newFunction(JTerm t, String name, Services services) {
         return tb.func(newFunc);
     }
 
-
     private static JTerm copyFunction(JTerm t, String postfix, Services services) {
         if (t != null) {
             final TermBuilder tb = services.getTermBuilder();
@@ -240,33 +225,30 @@ private static JTerm copyFunction(JTerm t, String postfix, Services services) {
         }
     }
 
-
-    public static StateVars buildMethodContractPreVars(IProgramMethod pm, KeYJavaType kjt,
+    public static StateVars buildMethodContractPreVars(IProgramMethod pm, TypeReference typeRef,
             Services services) {
         ImmutableArray<TermLabel> heapLabels =
             new ImmutableArray<>(ParameterlessTermLabel.ANON_HEAP_LABEL);
-        return new StateVars(buildSelfVar(services, pm, kjt, ""), buildParamVars(services, "", pm),
+        return new StateVars(buildSelfVar(services, pm, typeRef, ""),
+            buildParamVars(services, "", pm),
             buildResultVar(pm, services, ""), buildExceptionVar(services, "", pm),
             buildHeapFunc("AtPre", heapLabels, services), buildMbyVar("", services));
     }
 
-
     public static StateVars buildMethodContractPostVars(StateVars preVars, IProgramMethod pm,
-            KeYJavaType kjt, Services services) {
+            TypeReference typeRef, Services services) {
         final String postfix = "AtPost";
         // preVars.localVars: no local out variables
-        return new StateVars(buildSelfVar(services, pm, kjt, postfix), preVars.localVars,
+        return new StateVars(buildSelfVar(services, pm, typeRef, postfix), preVars.localVars,
             buildResultVar(pm, services, postfix), buildExceptionVar(services, postfix, pm),
             buildHeapFunc(postfix, new ImmutableArray<>(), services), preVars.mbyAtPre);
     }
 
-
     public static StateVars buildInfFlowPreVars(StateVars origPreVars, String postfix,
             Services services) {
         return new StateVars(origPreVars, postfix, services);
     }
 
-
     public static StateVars buildInfFlowPostVars(StateVars origPreVars, StateVars origPostVars,
             StateVars preVars, String postfix, Services services) {
         // create new post vars if original pre and original post var differ;
@@ -297,19 +279,17 @@ public static StateVars buildInfFlowPostVars(StateVars origPreVars, StateVars or
         return new StateVars(self, guard, localPostVars, result, exception, heap, mbyAtPre);
     }
 
-
-    private static JTerm buildSelfVar(Services services, IProgramMethod pm, KeYJavaType kjt,
+    private static JTerm buildSelfVar(Services services, IProgramMethod pm, TypeReference typeRef,
             String postfix) {
         if (pm.isStatic()) {
             return null;
         }
         final TermBuilder tb = services.getTermBuilder();
-        JTerm selfVar = tb.var(tb.selfVar(pm, kjt, true, postfix));
+        JTerm selfVar = tb.var(tb.selfVar(pm, typeRef, true, postfix));
         register(selfVar.op(ProgramVariable.class), services);
         return selfVar;
     }
 
-
     private static ImmutableList<JTerm> buildParamVars(Services services, String postfix,
             IProgramMethod pm) {
         final TermBuilder tb = services.getTermBuilder();
@@ -318,7 +298,6 @@ private static ImmutableList<JTerm> buildParamVars(Services services, String pos
         return paramVars;
     }
 
-
     private static JTerm buildResultVar(IProgramMethod pm, Services services, String postfix) {
         if (pm.isVoid() || pm.isConstructor()) {
             return null;
@@ -329,7 +308,6 @@ private static JTerm buildResultVar(IProgramMethod pm, Services services, String
         return resultVar;
     }
 
-
     private static JTerm buildHeapFunc(String postfix, ImmutableArray<TermLabel> labels,
             Services services) {
         HeapLDT heapLDT = services.getTypeConverter().getHeapLDT();
@@ -345,15 +323,13 @@ private static JTerm buildHeapFunc(String postfix, ImmutableArray<TermLabel> lab
         }
     }
 
-
     private static JTerm buildExceptionVar(Services services, String postfix, IProgramMethod pm) {
         final TermBuilder tb = services.getTermBuilder();
         JTerm excVar = tb.var(tb.excVar("exc" + postfix, pm, true));
         register(excVar.op(ProgramVariable.class), services);
         return excVar;
     }
 
-
     private static JTerm buildMbyVar(String postfix, Services services) {
         final TermBuilder tb = services.getTermBuilder();
         final Sort intSort = services.getTypeConverter().getIntegerLDT().targetSort();
@@ -363,22 +339,19 @@ private static JTerm buildMbyVar(String postfix, Services services) {
         return tb.func(mbyAtPreFunc);
     }
 
-
     static void register(ProgramVariable pv, Services services) {
         Namespace<IProgramVariable> progVarNames = services.getNamespaces().programVariables();
         if (pv != null && progVarNames.lookup(pv.name()) == null) {
             progVarNames.addSafely(pv);
         }
     }
 
-
     static void register(ImmutableList<ProgramVariable> pvs, Services services) {
         for (ProgramVariable pv : pvs) {
             register(pv, services);
         }
     }
 
-
     static void register(Function f, Services services) {
         Namespace<Function> functionNames = services.getNamespaces().functions();
         if (f != null && functionNames.lookup(f.name()) == null) {
@@ -387,7 +360,6 @@ static void register(Function f, Services services) {
         }
     }
 
-
     static <T> ImmutableList<T> ops(ImmutableList<JTerm> terms, Class<T> opClass)
             throws IllegalArgumentException {
         ImmutableList<T> ops = ImmutableSLList.nil();
@@ -397,7 +369,6 @@ static <T> ImmutableList<T> ops(ImmutableList<JTerm> terms, Class<T> opClass)
         return ops;
     }
 
-
     @Override
     public String toString() {
         return termList.toString();

key.core.infflow/src/main/java/de/uka/ilkd/key/informationflow/rule/InfFlowBlockContractInternalRule.java

@@ -19,8 +19,8 @@
 import de.uka.ilkd.key.informationflow.proof.init.StateVars;
 import de.uka.ilkd.key.informationflow.rule.tacletbuilder.InfFlowBlockContractTacletBuilder;
 import de.uka.ilkd.key.java.Services;
-import de.uka.ilkd.key.java.ast.abstraction.KeYJavaType;
 import de.uka.ilkd.key.java.ast.reference.ExecutionContext;
+import de.uka.ilkd.key.java.ast.reference.TypeReference;
 import de.uka.ilkd.key.java.ast.statement.JavaStatement;
 import de.uka.ilkd.key.logic.JTerm;
 import de.uka.ilkd.key.logic.ProgramElementName;
@@ -192,7 +192,7 @@ protected void setUpValidityGoal(final ImmutableList<Goal> result,
         var app = (InfFlowBlockContractInternalBuiltInRuleApp) application;
 
         final ProgramVariable exceptionParameter =
-            createLocalVariable("e", variables.exception.getKeYJavaType(), services);
+            createLocalVariable("e", variables.exception.getTypeReference(), services);
         validityGoal.setBranchLabel("Information Flow Validity");
 
         // clear goal
@@ -403,7 +403,7 @@ protected static ImmutableSet<BlockContract> filterAppliedContracts(
         assert varTerm.op() instanceof LocationVariable;
 
         final TermBuilder tb = services.getTermBuilder();
-        KeYJavaType resultType = ((LocationVariable) varTerm.op()).getKeYJavaType();
+        TypeReference resultType = ((LocationVariable) varTerm.op()).getTypeReference();
         if (!suffix.equalsIgnoreCase("")) {
             suffix = "_" + suffix;
         }
@@ -426,7 +426,7 @@ protected static ImmutableList<JTerm> buildLocalOutsAtPre(ImmutableList<JTerm> v
         for (JTerm varTerm : varTerms) {
             assert varTerm.op() instanceof LocationVariable;
 
-            KeYJavaType resultType = ((LocationVariable) varTerm.op()).getKeYJavaType();
+            TypeReference resultType = ((LocationVariable) varTerm.op()).getTypeReference();
 
             String name = tb.newName(varTerm + "_Before");
             LocationVariable varAtPostVar =
@@ -448,7 +448,7 @@ protected static ImmutableList<JTerm> buildLocalOutsAtPost(ImmutableList<JTerm>
         for (JTerm varTerm : varTerms) {
             assert varTerm.op() instanceof LocationVariable;
 
-            KeYJavaType resultType = ((LocationVariable) varTerm.op()).getKeYJavaType();
+            TypeReference resultType = ((LocationVariable) varTerm.op()).getTypeReference();
 
             String name = tb.newName(varTerm + "_After");
             LocationVariable varAtPostVar =