From 412bde5a6066e5f83be71824b0747ed9cfa6e22c Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 15 Jun 2021 13:04:43 -0700 Subject: [PATCH] Rename an option variable. Document that others are not interesting. --- .../checker/mustcall/MustCallChecker.java | 10 +++++----- .../mustcall/MustCallNoCreatesMustCallForChecker.java | 2 +- .../checker/mustcall/MustCallTransfer.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/checker/src/main/java/org/checkerframework/checker/mustcall/MustCallChecker.java b/checker/src/main/java/org/checkerframework/checker/mustcall/MustCallChecker.java index d074976e69f..6bb855911c3 100644 --- a/checker/src/main/java/org/checkerframework/checker/mustcall/MustCallChecker.java +++ b/checker/src/main/java/org/checkerframework/checker/mustcall/MustCallChecker.java @@ -15,18 +15,18 @@ "SocketCreatesMustCallFor.astub", }) @SupportedOptions({ - MustCallChecker.NO_CREATES_OBLIGATION, + MustCallChecker.NO_CREATES_MUSTCALLFOR, MustCallChecker.NO_LIGHTWEIGHT_OWNERSHIP, MustCallChecker.NO_RESOURCE_ALIASES }) public class MustCallChecker extends BaseTypeChecker { - /** Disables @CreatesMustCallFor support. */ - public static final String NO_CREATES_OBLIGATION = "noCreatesMustCallFor"; + /** Disables @CreatesMustCallFor support. Not of interest to most users. */ + public static final String NO_CREATES_MUSTCALLFOR = "noCreatesMustCallFor"; - /** Disables @Owning/@NotOwning support. */ + /** Disables @Owning/@NotOwning support. Not of interest to most users. */ public static final String NO_LIGHTWEIGHT_OWNERSHIP = "noLightweightOwnership"; - /** Disables @MustCallAlias support. */ + /** Disables @MustCallAlias support. Not of interest to most users. */ public static final String NO_RESOURCE_ALIASES = "noResourceAliases"; } diff --git a/checker/src/main/java/org/checkerframework/checker/mustcall/MustCallNoCreatesMustCallForChecker.java b/checker/src/main/java/org/checkerframework/checker/mustcall/MustCallNoCreatesMustCallForChecker.java index 9bb01c25520..5f77be65d26 100644 --- a/checker/src/main/java/org/checkerframework/checker/mustcall/MustCallNoCreatesMustCallForChecker.java +++ b/checker/src/main/java/org/checkerframework/checker/mustcall/MustCallNoCreatesMustCallForChecker.java @@ -13,5 +13,5 @@ "JavaEE.astub", "Reflection.astub", }) -@SupportedOptions({MustCallChecker.NO_CREATES_OBLIGATION}) +@SupportedOptions({MustCallChecker.NO_CREATES_MUSTCALLFOR}) public class MustCallNoCreatesMustCallForChecker extends MustCallChecker {} diff --git a/checker/src/main/java/org/checkerframework/checker/mustcall/MustCallTransfer.java b/checker/src/main/java/org/checkerframework/checker/mustcall/MustCallTransfer.java index f9843c84feb..c290dbc55de 100644 --- a/checker/src/main/java/org/checkerframework/checker/mustcall/MustCallTransfer.java +++ b/checker/src/main/java/org/checkerframework/checker/mustcall/MustCallTransfer.java @@ -100,7 +100,7 @@ public TransferResult visitMethodInvocation( TransferResult result = super.visitMethodInvocation(n, in); updateStoreWithTempVar(result, n); - if (!atypeFactory.getChecker().hasOption(MustCallChecker.NO_CREATES_OBLIGATION)) { + if (!atypeFactory.getChecker().hasOption(MustCallChecker.NO_CREATES_MUSTCALLFOR)) { List targetExprs = CreatesMustCallForElementSupplier.getCreatesMustCallForExpressions( n, atypeFactory, atypeFactory);