From 3edac649118dff4a48d7218dc31a727f13537fea Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Sun, 15 Mar 2020 03:04:03 +0100 Subject: [fixes #2386] [checkerframework] Now generating checkerframework `@Pure` instead of `@SideEffectFree` where appropriate. --- test/transform/resource/after-delombok/CheckerFrameworkBasic.java | 6 +++--- .../resource/after-delombok/CheckerFrameworkSuperBuilder.java | 8 ++++---- test/transform/resource/after-ecj/CheckerFrameworkBasic.java | 6 +++--- .../resource/after-ecj/CheckerFrameworkSuperBuilder.java | 8 ++++---- test/transform/resource/before/CheckerFrameworkBasic.java | 2 +- test/transform/resource/before/CheckerFrameworkBuilder.java | 2 +- test/transform/resource/before/CheckerFrameworkSuperBuilder.java | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) (limited to 'test/transform') diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBasic.java b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java index b9d4e0fa..3077728c 100644 --- a/test/transform/resource/after-delombok/CheckerFrameworkBasic.java +++ b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java @@ -8,12 +8,12 @@ class CheckerFrameworkBasic { this.x = x; this.y = y; } - @org.checkerframework.dataflow.qual.SideEffectFree + @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") public int getX() { return this.x; } - @org.checkerframework.dataflow.qual.SideEffectFree + @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") public int getY() { return this.y; @@ -42,7 +42,7 @@ class CheckerFrameworkBasic { if (this.getZ() != other.getZ()) return false; return true; } - @org.checkerframework.dataflow.qual.SideEffectFree + @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") protected boolean canEqual(final java.lang.Object other) { return other instanceof CheckerFrameworkBasic; diff --git a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java index b6e0ff3c..0f7f8997 100644 --- a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java @@ -23,7 +23,7 @@ class CheckerFrameworkSuperBuilder { @java.lang.SuppressWarnings("all") private java.util.ArrayList names; @org.checkerframework.checker.builder.qual.ReturnsReceiver - @org.checkerframework.dataflow.qual.SideEffectFree + @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") protected abstract B self(); @org.checkerframework.dataflow.qual.SideEffectFree @@ -86,7 +86,7 @@ class CheckerFrameworkSuperBuilder { } @java.lang.Override @org.checkerframework.checker.builder.qual.ReturnsReceiver - @org.checkerframework.dataflow.qual.SideEffectFree + @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") protected CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl self() { return this; @@ -141,7 +141,7 @@ class CheckerFrameworkSuperBuilder { private int b; @java.lang.Override @org.checkerframework.checker.builder.qual.ReturnsReceiver - @org.checkerframework.dataflow.qual.SideEffectFree + @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") protected abstract B self(); @org.checkerframework.dataflow.qual.SideEffectFree @@ -176,7 +176,7 @@ class CheckerFrameworkSuperBuilder { } @java.lang.Override @org.checkerframework.checker.builder.qual.ReturnsReceiver - @org.checkerframework.dataflow.qual.SideEffectFree + @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") protected CheckerFrameworkSuperBuilder.Child.ChildBuilderImpl self() { return this; diff --git a/test/transform/resource/after-ecj/CheckerFrameworkBasic.java b/test/transform/resource/after-ecj/CheckerFrameworkBasic.java index 25b28c4b..ce4d11f8 100644 --- a/test/transform/resource/after-ecj/CheckerFrameworkBasic.java +++ b/test/transform/resource/after-ecj/CheckerFrameworkBasic.java @@ -8,10 +8,10 @@ import lombok.With; public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkBasic withX(final int x) { return ((this.x == x) ? this : new CheckerFrameworkBasic(x, this.y, this.z)); } - public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") int getX() { + public @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") int getX() { return this.x; } - public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") int getY() { + public @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") int getY() { return this.y; } public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") int getZ() { @@ -37,7 +37,7 @@ import lombok.With; return false; return true; } - protected @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { return (other instanceof CheckerFrameworkBasic); } public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") int hashCode() { diff --git a/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java index 163e9d68..5bd4e1b3 100644 --- a/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java @@ -10,7 +10,7 @@ class CheckerFrameworkSuperBuilder { private @java.lang.SuppressWarnings("all") java.util.ArrayList names; public ParentBuilder() { } - protected abstract @org.checkerframework.checker.builder.qual.ReturnsReceiver @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") B self(); + protected abstract @org.checkerframework.checker.builder.qual.ReturnsReceiver @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") B self(); public abstract @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") C build(final @org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) CheckerFrameworkSuperBuilder.Parent.ParentBuilder this); public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") B x(final @org.checkerframework.checker.builder.qual.NotCalledMethods("x") CheckerFrameworkSuperBuilder.Parent.ParentBuilder this, final int x) { this.x$value = x; @@ -53,7 +53,7 @@ class CheckerFrameworkSuperBuilder { private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends CheckerFrameworkSuperBuilder.Parent.ParentBuilder { private ParentBuilderImpl() { } - protected @java.lang.Override @org.checkerframework.checker.builder.qual.ReturnsReceiver @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @org.checkerframework.checker.builder.qual.ReturnsReceiver @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl self() { return this; } public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.Parent build(final @org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl this) { @@ -99,7 +99,7 @@ class CheckerFrameworkSuperBuilder { private @java.lang.SuppressWarnings("all") int b; public ChildBuilder() { } - protected abstract @java.lang.Override @org.checkerframework.checker.builder.qual.ReturnsReceiver @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") B self(); + protected abstract @java.lang.Override @org.checkerframework.checker.builder.qual.ReturnsReceiver @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") B self(); public abstract @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") C build(final @org.checkerframework.checker.builder.qual.CalledMethods("b") CheckerFrameworkSuperBuilder.Child.ChildBuilder this); public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") B a(final @org.checkerframework.checker.builder.qual.NotCalledMethods("a") CheckerFrameworkSuperBuilder.Child.ChildBuilder this, final int a) { this.a$value = a; @@ -117,7 +117,7 @@ class CheckerFrameworkSuperBuilder { private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends CheckerFrameworkSuperBuilder.Child.ChildBuilder { private ChildBuilderImpl() { } - protected @java.lang.Override @org.checkerframework.checker.builder.qual.ReturnsReceiver @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.Child.ChildBuilderImpl self() { + protected @java.lang.Override @org.checkerframework.checker.builder.qual.ReturnsReceiver @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.Child.ChildBuilderImpl self() { return this; } public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.Child build(final @org.checkerframework.checker.builder.qual.CalledMethods("b") CheckerFrameworkSuperBuilder.Child.ChildBuilderImpl this) { diff --git a/test/transform/resource/before/CheckerFrameworkBasic.java b/test/transform/resource/before/CheckerFrameworkBasic.java index 7dd40b54..8a0bd118 100644 --- a/test/transform/resource/before/CheckerFrameworkBasic.java +++ b/test/transform/resource/before/CheckerFrameworkBasic.java @@ -1,4 +1,4 @@ -//CONF: checkerframework = 3.0 +//CONF: checkerframework = 4.0 import lombok.Data; import lombok.experimental.Accessors; import lombok.With; diff --git a/test/transform/resource/before/CheckerFrameworkBuilder.java b/test/transform/resource/before/CheckerFrameworkBuilder.java index 4b501ab8..440b80e9 100644 --- a/test/transform/resource/before/CheckerFrameworkBuilder.java +++ b/test/transform/resource/before/CheckerFrameworkBuilder.java @@ -1,4 +1,4 @@ -//CONF: checkerframework = true +//CONF: checkerframework = 4.0 import java.util.List; import lombok.Builder; import lombok.Singular; diff --git a/test/transform/resource/before/CheckerFrameworkSuperBuilder.java b/test/transform/resource/before/CheckerFrameworkSuperBuilder.java index 74d50ef1..54aefb37 100644 --- a/test/transform/resource/before/CheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/before/CheckerFrameworkSuperBuilder.java @@ -1,4 +1,4 @@ -//CONF: checkerframework = true +//CONF: checkerframework = 4.0 import java.util.List; import lombok.Singular; -- cgit