Skip to content

Commit 7b97788

Browse files
committed
Post refactoring: remove Arity.allKeywordsOptional private field.
1 parent 3b593e8 commit 7b97788

File tree

1 file changed

+6
-8
lines changed
  • src/main/java/org/truffleruby/language/methods

1 file changed

+6
-8
lines changed

src/main/java/org/truffleruby/language/methods/Arity.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public final class Arity {
3030
private final int optional;
3131
private final boolean hasRest;
3232
private final int postRequired;
33-
private final boolean allKeywordsOptional;
3433
private final boolean hasKeywordsRest;
3534
private final String[] keywordArguments;
3635
private final int requiredKeywordArgumentsCount;
@@ -60,7 +59,6 @@ public Arity(
6059
// So we can specify them with only one `int` field (`requiredKeywordArgumentsCount`).
6160
this.keywordArguments = keywordArguments;
6261
this.requiredKeywordArgumentsCount = requiredKeywordArgumentsCount;
63-
this.allKeywordsOptional = requiredKeywordArgumentsCount == 0;
6462
this.hasKeywordsRest = hasKeywordsRest;
6563
this.arityNumber = computeArityNumber(false);
6664
this.procArityNumber = computeArityNumber(true);
@@ -121,22 +119,22 @@ public boolean hasKeywords() {
121119
return keywordArguments.length != 0;
122120
}
123121

124-
public boolean hasRequiredKeywords() {
125-
return !allKeywordsOptional;
126-
}
127-
128122
public boolean hasKeywordsRest() {
129123
return hasKeywordsRest;
130124
}
131125

126+
public boolean allKeywordsOptional() {
127+
return requiredKeywordArgumentsCount == 0;
128+
}
129+
132130
private int computeArityNumber(boolean isProc) {
133131
int count = getRequired();
134132

135-
if (acceptsKeywords() && !allKeywordsOptional) {
133+
if (acceptsKeywords() && !allKeywordsOptional()) {
136134
count++;
137135
}
138136

139-
if (hasRest || (!isProc && (optional > 0 || (acceptsKeywords() && allKeywordsOptional)))) {
137+
if (hasRest || (!isProc && (optional > 0 || (acceptsKeywords() && allKeywordsOptional())))) {
140138
count = -count - 1;
141139
}
142140

0 commit comments

Comments
 (0)