removal of TextualJMLConstruct

# Conflicts:
#	key.core/src/main/java/de/uka/ilkd/key/speclang/jml/pretranslation/TextualJMLConstruct.java

Author: wadoon

key.core/src/main/java/de/uka/ilkd/key/java/ast/ProgramElement.java

@@ -4,8 +4,8 @@
 package de.uka.ilkd.key.java.ast;
 
 
+import com.github.javaparser.ast.jml.clauses.JmlContract;
 import de.uka.ilkd.key.rule.MatchConditions;
-import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
 
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSLList;
@@ -27,7 +27,7 @@ public interface ProgramElement extends SourceElement, ModelElement {
     Comment[] getComments();
 
     ///
-    default ImmutableList<TextualJMLConstruct> getAttachedJml() {
+    default ImmutableList<JmlContract> getAttachedJml() {
         return ImmutableSLList.nil();
     }
 

key.core/src/main/java/de/uka/ilkd/key/java/ast/StatementBlock.java

@@ -16,7 +16,6 @@
 import de.uka.ilkd.key.java.visitor.Visitor;
 import de.uka.ilkd.key.logic.PosInProgram;
 import de.uka.ilkd.key.logic.ProgramPrefix;
-import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
 import de.uka.ilkd.key.util.Debug;
 
 import org.key_project.util.ExtList;

key.core/src/main/java/de/uka/ilkd/key/java/ast/declaration/ClassDeclaration.java

@@ -12,7 +12,6 @@
 import de.uka.ilkd.key.java.ast.abstraction.KeYJavaType;
 import de.uka.ilkd.key.java.visitor.Visitor;
 import de.uka.ilkd.key.logic.ProgramElementName;
-import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
 
 import org.key_project.util.ExtList;
 import org.key_project.util.collection.ImmutableArray;

key.core/src/main/java/de/uka/ilkd/key/java/ast/declaration/ConstructorDeclaration.java

@@ -5,14 +5,14 @@
 
 import java.util.List;
 
+import com.github.javaparser.ast.jml.clauses.JmlContract;
 import de.uka.ilkd.key.java.ast.Comment;
 import de.uka.ilkd.key.java.ast.PositionInfo;
 import de.uka.ilkd.key.java.ast.StatementBlock;
 import de.uka.ilkd.key.java.ast.abstraction.Constructor;
 import de.uka.ilkd.key.java.ast.reference.TypeReference;
 import de.uka.ilkd.key.java.visitor.Visitor;
 import de.uka.ilkd.key.logic.ProgramElementName;
-import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
 
 import org.key_project.util.ExtList;
 import org.key_project.util.collection.ImmutableArray;
@@ -63,7 +63,7 @@ public ConstructorDeclaration(PositionInfo pi, List<Comment> c, ImmutableArray<M
             TypeReference o, Comment[] comments, ProgramElementName name,
             ImmutableArray<ParameterDeclaration> map1,
             Throws exceptions, StatementBlock body, boolean parentIsInterfaceDeclaration,
-            List<TextualJMLConstruct> specs) {
+            List<JmlContract> specs) {
         super(pi, c, map, o, comments, name, map1, exceptions, body, parentIsInterfaceDeclaration,
             ImmutableList.fromList(specs));
     }

key.core/src/main/java/de/uka/ilkd/key/java/ast/declaration/InterfaceDeclaration.java

@@ -24,7 +24,6 @@
 import de.uka.ilkd.key.java.ast.abstraction.KeYJavaType;
 import de.uka.ilkd.key.java.visitor.Visitor;
 import de.uka.ilkd.key.logic.ProgramElementName;
-import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
 
 import org.key_project.util.ExtList;
 import org.key_project.util.collection.ImmutableArray;

key.core/src/main/java/de/uka/ilkd/key/java/ast/declaration/JavaDeclaration.java

@@ -18,12 +18,12 @@
 
 import java.util.List;
 
+import com.github.javaparser.ast.jml.clauses.JmlContract;
 import de.uka.ilkd.key.java.ast.Comment;
 import de.uka.ilkd.key.java.ast.Declaration;
 import de.uka.ilkd.key.java.ast.JavaNonTerminalProgramElement;
 import de.uka.ilkd.key.java.ast.PositionInfo;
 import de.uka.ilkd.key.java.ast.declaration.modifier.*;
-import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
 
 import org.key_project.util.ExtList;
 import org.key_project.util.collection.ImmutableArray;
@@ -39,7 +39,7 @@
 
 public abstract class JavaDeclaration extends JavaNonTerminalProgramElement implements Declaration {
 
-    protected final ImmutableList<TextualJMLConstruct> attachedJml;
+    protected final ImmutableList<JmlContract> attachedJml;
 
 
     /**
@@ -53,7 +53,7 @@ public abstract class JavaDeclaration extends JavaNonTerminalProgramElement impl
 
     public JavaDeclaration(PositionInfo pi, List<Comment> comments,
             @NonNull ImmutableArray<Modifier> modArray,
-            ImmutableList<TextualJMLConstruct> attachedJml) {
+            ImmutableList<JmlContract> attachedJml) {
         super(pi, comments);
         this.modArray = modArray;
         this.attachedJml = attachedJml;
@@ -89,7 +89,7 @@ public JavaDeclaration(ExtList children) {
         super(children);
         modArray = new ImmutableArray<>(children.collect(Modifier.class));
         this.attachedJml =
-            ImmutableList.fromList(List.of(children.collect(TextualJMLConstruct.class)));
+            ImmutableList.fromList(List.of(children.collect(JmlContract.class)));
     }
 
 
@@ -115,7 +115,7 @@ public VisibilityModifier getVisibilityModifier() {
 
 
     @Override
-    public ImmutableList<TextualJMLConstruct> getAttachedJml() {
+    public ImmutableList<JmlContract> getAttachedJml() {
         return attachedJml;
     }
 

key.core/src/main/java/de/uka/ilkd/key/java/ast/declaration/MethodDeclaration.java

@@ -5,6 +5,7 @@
 
 import java.util.List;
 
+import com.github.javaparser.ast.jml.clauses.JmlContract;
 import de.uka.ilkd.key.java.ast.*;
 import de.uka.ilkd.key.java.ast.abstraction.KeYJavaType;
 import de.uka.ilkd.key.java.ast.abstraction.Method;
@@ -13,7 +14,6 @@
 import de.uka.ilkd.key.java.visitor.Visitor;
 import de.uka.ilkd.key.logic.ProgramElementName;
 import de.uka.ilkd.key.speclang.jml.JMLInfoExtractor;
-import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
 import de.uka.ilkd.key.speclang.njml.SpecMathMode;
 
 import org.key_project.util.ExtList;
@@ -94,7 +94,7 @@ public MethodDeclaration(
             Comment[] voidComments, ProgramElementName name,
             ImmutableArray<ParameterDeclaration> parameters, Throws exceptions,
             StatementBlock body, boolean parentIsInterfaceDeclaration,
-            ImmutableList<TextualJMLConstruct> attachedJml) {
+            ImmutableList<JmlContract> attachedJml) {
         super(pi, comments, modArray, attachedJml);
         this.returnType = returnType;
         this.voidComments = voidComments;

key.core/src/main/java/de/uka/ilkd/key/java/ast/declaration/TypeDeclaration.java

@@ -12,7 +12,6 @@
 import de.uka.ilkd.key.java.ast.expression.literal.NullLiteral;
 import de.uka.ilkd.key.logic.ProgramElementName;
 import de.uka.ilkd.key.speclang.jml.JMLInfoExtractor;
-import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
 import de.uka.ilkd.key.speclang.njml.SpecMathMode;
 
 import org.key_project.util.ExtList;

key.core/src/main/java/de/uka/ilkd/key/java/ast/statement/Do.java

@@ -8,7 +8,6 @@
 import de.uka.ilkd.key.java.ast.*;
 import de.uka.ilkd.key.java.ast.expression.Expression;
 import de.uka.ilkd.key.java.visitor.Visitor;
-import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
 
 import org.key_project.util.ExtList;
 import org.key_project.util.collection.ImmutableList;

key.core/src/main/java/de/uka/ilkd/key/java/ast/statement/EnhancedFor.java

@@ -9,7 +9,6 @@
 import de.uka.ilkd.key.java.ast.declaration.LocalVariableDeclaration;
 import de.uka.ilkd.key.java.visitor.CreatingASTVisitor;
 import de.uka.ilkd.key.java.visitor.Visitor;
-import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
 
 import org.key_project.util.ExtList;
 import org.key_project.util.collection.ImmutableList;