From 5e21737b0a8a903d2e37e821a96a739eb7429fcd Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Tue, 29 Aug 2023 12:05:08 +0200 Subject: refactor: rename invalidNumberOfContainers Use a simplified name invalidContainer, since this pattern may match even if there is a sufficient number of ERROR containers. --- .../src/main/java/tools/refinery/language/utils/BuiltinSymbols.java | 2 +- .../main/java/tools/refinery/language/utils/ProblemDesugarer.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'subprojects/language/src/main/java') diff --git a/subprojects/language/src/main/java/tools/refinery/language/utils/BuiltinSymbols.java b/subprojects/language/src/main/java/tools/refinery/language/utils/BuiltinSymbols.java index 70a86b51..c87fa044 100644 --- a/subprojects/language/src/main/java/tools/refinery/language/utils/BuiltinSymbols.java +++ b/subprojects/language/src/main/java/tools/refinery/language/utils/BuiltinSymbols.java @@ -9,5 +9,5 @@ import tools.refinery.language.model.problem.*; public record BuiltinSymbols(Problem problem, ClassDeclaration node, PredicateDefinition equals, PredicateDefinition exists, ClassDeclaration contained, PredicateDefinition contains, - PredicateDefinition invalidNumberOfContainers) { + PredicateDefinition invalidContainer) { } diff --git a/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemDesugarer.java b/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemDesugarer.java index 9f08654c..59e26561 100644 --- a/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemDesugarer.java +++ b/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemDesugarer.java @@ -43,9 +43,8 @@ public class ProblemDesugarer { var exists = doGetDeclaration(builtin, PredicateDefinition.class, "exists"); var contained = doGetDeclaration(builtin, ClassDeclaration.class, "contained"); var contains = doGetDeclaration(builtin, PredicateDefinition.class, "contains"); - var invalidNumberOfContainers = doGetDeclaration(builtin, PredicateDefinition.class, - "invalidNumberOfContainers"); - return new BuiltinSymbols(builtin, node, equals, exists, contained, contains, invalidNumberOfContainers); + var invalidContainer = doGetDeclaration(builtin, PredicateDefinition.class, "invalidContainer"); + return new BuiltinSymbols(builtin, node, equals, exists, contained, contains, invalidContainer); } private T doGetDeclaration(Problem builtin, Class type, String name) { -- cgit v1.2.3-54-g00ecf