wip

Author: wadoon

key.ncore.java/src/adt/java-ast.java

@@ -480,6 +480,8 @@ abstract class LoopStatement extends JavaStatement {
     IForUpdates updates;
     IGuard guard;
     Statement body;
+
+    @EqEx
     ImmutableList<TextualJMLConstruct> attachedJml;
 }
 

key.ncore.java/src/generated/java/org/key_project/java/ast/ArrayDeclaration.java

@@ -213,9 +213,11 @@ public Builder positionInfo(PositionInfo positionInfo) {
         }
 
         public Builder members(MemberDeclaration members) {
-            if (this.members == null)
-                this.members = new ArrayList<>();
-            this.members.add(members);
+            if (this.members == null) {
+                this.members = ImmutableList.of(members);
+                return this;
+            }
+            this.members = this.members.append(members);
             return this;
         }
     }

key.ncore.java/src/generated/java/org/key_project/java/ast/ArrayReference.java

@@ -111,9 +111,11 @@ public Builder positionInfo(PositionInfo positionInfo) {
         }
 
         public Builder inits(Expression inits) {
-            if (this.inits == null)
-                this.inits = new ArrayList<>();
-            this.inits.add(inits);
+            if (this.inits == null) {
+                this.inits = ImmutableList.of(inits);
+                return this;
+            }
+            this.inits = this.inits.append(inits);
             return this;
         }
     }

key.ncore.java/src/generated/java/org/key_project/java/ast/Case.java

@@ -111,9 +111,11 @@ public Builder positionInfo(PositionInfo positionInfo) {
         }
 
         public Builder body(Statement body) {
-            if (this.body == null)
-                this.body = new ArrayList<>();
-            this.body.add(body);
+            if (this.body == null) {
+                this.body = ImmutableList.of(body);
+                return this;
+            }
+            this.body = this.body.append(body);
             return this;
         }
     }

key.ncore.java/src/generated/java/org/key_project/java/ast/ClassDeclaration.java

@@ -333,9 +333,11 @@ public Builder positionInfo(PositionInfo positionInfo) {
         }
 
         public Builder members(MemberDeclaration members) {
-            if (this.members == null)
-                this.members = new ArrayList<>();
-            this.members.add(members);
+            if (this.members == null) {
+                this.members = ImmutableList.of(members);
+                return this;
+            }
+            this.members = this.members.append(members);
             return this;
         }
     }

key.ncore.java/src/generated/java/org/key_project/java/ast/CompilationUnit.java

@@ -137,16 +137,20 @@ public Builder positionInfo(PositionInfo positionInfo) {
         }
 
         public Builder imports(Import imports) {
-            if (this.imports == null)
-                this.imports = new ArrayList<>();
-            this.imports.add(imports);
+            if (this.imports == null) {
+                this.imports = ImmutableList.of(imports);
+                return this;
+            }
+            this.imports = this.imports.append(imports);
             return this;
         }
 
         public Builder typeDeclarations(TypeDeclaration typeDeclarations) {
-            if (this.typeDeclarations == null)
-                this.typeDeclarations = new ArrayList<>();
-            this.typeDeclarations.add(typeDeclarations);
+            if (this.typeDeclarations == null) {
+                this.typeDeclarations = ImmutableList.of(typeDeclarations);
+                return this;
+            }
+            this.typeDeclarations = this.typeDeclarations.append(typeDeclarations);
             return this;
         }
     }

key.ncore.java/src/generated/java/org/key_project/java/ast/ConstructorDeclaration.java

@@ -263,9 +263,11 @@ public Builder voidComments(Comment[] voidComments) {
         }
 
         public Builder parameters(ParameterDeclaration parameters) {
-            if (this.parameters == null)
-                this.parameters = new ArrayList<>();
-            this.parameters.add(parameters);
+            if (this.parameters == null) {
+                this.parameters = ImmutableList.of(parameters);
+                return this;
+            }
+            this.parameters = this.parameters.append(parameters);
             return this;
         }
     }

key.ncore.java/src/generated/java/org/key_project/java/ast/ContextStatementBlock.java

@@ -139,9 +139,11 @@ public Builder statement(ImmutableList<Statement> statement) {
         }
 
         public Builder statement(Statement statement) {
-            if (this.statement == null)
-                this.statement = new ArrayList<>();
-            this.statement.add(statement);
+            if (this.statement == null) {
+                this.statement = ImmutableList.of(statement);
+                return this;
+            }
+            this.statement = this.statement.append(statement);
             return this;
         }
     }

key.ncore.java/src/generated/java/org/key_project/java/ast/Default.java

@@ -87,9 +87,11 @@ public Builder positionInfo(PositionInfo positionInfo) {
         }
 
         public Builder body(Statement body) {
-            if (this.body == null)
-                this.body = new ArrayList<>();
-            this.body.add(body);
+            if (this.body == null) {
+                this.body = ImmutableList.of(body);
+                return this;
+            }
+            this.body = this.body.append(body);
             return this;
         }
     }

key.ncore.java/src/generated/java/org/key_project/java/ast/Do.java

@@ -14,6 +14,7 @@
 @NullMarked()
 public final class Do extends JavaSourceElement implements LoopStatement {
 
+    @EqEx
     private final ImmutableList<TextualJMLConstruct> attachedJml;
 
     private final Statement body;
@@ -59,7 +60,7 @@ public IForUpdates updates() {
         return updates;
     }
 
-    public Do(ImmutableList<TextualJMLConstruct> attachedJml, Statement body, IGuard guard, ILoopInit inits, @EqEx @Nullable PositionInfo positionInfo, IForUpdates updates) {
+    public Do(@EqEx ImmutableList<TextualJMLConstruct> attachedJml, Statement body, IGuard guard, ILoopInit inits, @EqEx @Nullable PositionInfo positionInfo, IForUpdates updates) {
         this.attachedJml = Objects.requireNonNull(attachedJml);
         this.body = Objects.requireNonNull(body);
         this.guard = Objects.requireNonNull(guard);
@@ -68,7 +69,7 @@ public Do(ImmutableList<TextualJMLConstruct> attachedJml, Statement body, IGuard
         this.updates = Objects.requireNonNull(updates);
     }
 
-    public Do(ImmutableList<TextualJMLConstruct> attachedJml, Statement body, IGuard guard, ILoopInit inits, IForUpdates updates) {
+    public Do(@EqEx ImmutableList<TextualJMLConstruct> attachedJml, Statement body, IGuard guard, ILoopInit inits, IForUpdates updates) {
         this.attachedJml = Objects.requireNonNull(attachedJml);
         this.body = Objects.requireNonNull(body);
         this.guard = Objects.requireNonNull(guard);
@@ -86,10 +87,6 @@ public Do(Do other) {
     public MatchConditions match(java.lang.Object o, MatchConditions cond) {
         if (!(o instanceof Do other))
             return null;
-        cond = MatchHelper.match(attachedJml, other.attachedJml, cond);
-        if (cond == null) {
-            return null;
-        }
         cond = MatchHelper.match(body, other.body, cond);
         if (cond == null) {
             return null;
@@ -188,9 +185,11 @@ public Builder updates(IForUpdates updates) {
         }
 
         public Builder attachedJml(TextualJMLConstruct attachedJml) {
-            if (this.attachedJml == null)
-                this.attachedJml = new ArrayList<>();
-            this.attachedJml.add(attachedJml);
+            if (this.attachedJml == null) {
+                this.attachedJml = ImmutableList.of(attachedJml);
+                return this;
+            }
+            this.attachedJml = this.attachedJml.append(attachedJml);
             return this;
         }
     }
@@ -212,7 +211,7 @@ public boolean equals(java.lang.Object o) {
             return true;
         if (!(o instanceof Do that))
             return false;
-        return Objects.equals(attachedJml, that.attachedJml) && Objects.equals(body, that.body) && Objects.equals(guard, that.guard) && Objects.equals(inits, that.inits) && Objects.equals(updates, that.updates);
+        return Objects.equals(body, that.body) && Objects.equals(guard, that.guard) && Objects.equals(inits, that.inits) && Objects.equals(updates, that.updates);
     }
 
     @Override()
@@ -228,7 +227,7 @@ public String toString() {
     @Override()
     public int hashCode() {
         if (hashCode == null)
-            hashCode = Objects.hash(attachedJml, body, guard, inits, updates);
+            hashCode = Objects.hash(body, guard, inits, updates);
         return hashCode;
     }