diff options
author | Kristóf Marussy <kristof@marussy.com> | 2023-08-29 12:05:08 +0200 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2023-08-29 12:05:08 +0200 |
commit | 5e21737b0a8a903d2e37e821a96a739eb7429fcd (patch) | |
tree | a6080f1daddb96d161f139aee7d92a47c021a9ed /subprojects/language/src | |
parent | chore(deps): bump frontend dependencies (diff) | |
download | refinery-5e21737b0a8a903d2e37e821a96a739eb7429fcd.tar.gz refinery-5e21737b0a8a903d2e37e821a96a739eb7429fcd.tar.zst refinery-5e21737b0a8a903d2e37e821a96a739eb7429fcd.zip |
refactor: rename invalidNumberOfContainers
Use a simplified name invalidContainer, since this pattern may match even if
there is a sufficient number of ERROR containers.
Diffstat (limited to 'subprojects/language/src')
3 files changed, 4 insertions, 5 deletions
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.*; | |||
9 | 9 | ||
10 | public record BuiltinSymbols(Problem problem, ClassDeclaration node, PredicateDefinition equals, | 10 | public record BuiltinSymbols(Problem problem, ClassDeclaration node, PredicateDefinition equals, |
11 | PredicateDefinition exists, ClassDeclaration contained, PredicateDefinition contains, | 11 | PredicateDefinition exists, ClassDeclaration contained, PredicateDefinition contains, |
12 | PredicateDefinition invalidNumberOfContainers) { | 12 | PredicateDefinition invalidContainer) { |
13 | } | 13 | } |
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 { | |||
43 | var exists = doGetDeclaration(builtin, PredicateDefinition.class, "exists"); | 43 | var exists = doGetDeclaration(builtin, PredicateDefinition.class, "exists"); |
44 | var contained = doGetDeclaration(builtin, ClassDeclaration.class, "contained"); | 44 | var contained = doGetDeclaration(builtin, ClassDeclaration.class, "contained"); |
45 | var contains = doGetDeclaration(builtin, PredicateDefinition.class, "contains"); | 45 | var contains = doGetDeclaration(builtin, PredicateDefinition.class, "contains"); |
46 | var invalidNumberOfContainers = doGetDeclaration(builtin, PredicateDefinition.class, | 46 | var invalidContainer = doGetDeclaration(builtin, PredicateDefinition.class, "invalidContainer"); |
47 | "invalidNumberOfContainers"); | 47 | return new BuiltinSymbols(builtin, node, equals, exists, contained, contains, invalidContainer); |
48 | return new BuiltinSymbols(builtin, node, equals, exists, contained, contains, invalidNumberOfContainers); | ||
49 | } | 48 | } |
50 | 49 | ||
51 | private <T extends Statement & NamedElement> T doGetDeclaration(Problem builtin, Class<T> type, String name) { | 50 | private <T extends Statement & NamedElement> T doGetDeclaration(Problem builtin, Class<T> type, String name) { |
diff --git a/subprojects/language/src/main/resources/tools/refinery/language/builtin.problem b/subprojects/language/src/main/resources/tools/refinery/language/builtin.problem index 8570e363..022c3167 100644 --- a/subprojects/language/src/main/resources/tools/refinery/language/builtin.problem +++ b/subprojects/language/src/main/resources/tools/refinery/language/builtin.problem | |||
@@ -13,4 +13,4 @@ abstract class contained extends node. | |||
13 | 13 | ||
14 | pred contains(container, contained contained). | 14 | pred contains(container, contained contained). |
15 | 15 | ||
16 | error invalidNumberOfContainers(contained contained). | 16 | error invalidContainer(contained contained). |