Skip to content

Commit 2b52c88

Browse files
Suppress some warnings
1 parent ca8d081 commit 2b52c88

3 files changed

Lines changed: 14 additions & 6 deletions

File tree

src/main/java/net/marcellperger/mathexpr/SymbolInfo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public enum SymbolInfo {
3636
public final GroupingDirection groupingDirection;
3737
public final String infix;
3838

39+
@SuppressWarnings("unused") // useful later
3940
SymbolInfo(Class<? extends MathSymbol> cls, int precedence,
4041
GroupingDirection groupingDirection, @Nullable String infix) {
4142
this.precedence = precedence;

src/main/java/net/marcellperger/mathexpr/parser/Parser.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public MathSymbol parseInfixPrecedenceLevel(int level) throws ExprParseException
9090
Collectors.toUnmodifiableMap(
9191
si -> Objects.requireNonNull(si.infix, "null infix not allowed for parseInfixPrecedenceLevel"),
9292
Function.identity()));
93-
String[] infixesToFind = sortByLength(infixToSymbolInfo.keySet().toArray(String[]::new));
93+
String[] infixesToFind = sortedByLength(infixToSymbolInfo.keySet().toArray(String[]::new));
9494
MathSymbol left = parseInfixPrecedenceLevel(level - 1);
9595
String op;
9696

@@ -181,21 +181,26 @@ protected boolean matchesNext(@NotNull String expected) {
181181
return src.startsWith(expected, /*start*/idx);
182182
}
183183

184-
private @NotNull String @NotNull [] sortByLength(@NotNull String @NotNull[] arr) {
184+
private @NotNull String @NotNull [] sortedByLength(@NotNull String @NotNull[] arr) {
185185
return Arrays.stream(arr).sorted(Comparator.comparingInt(String::length).reversed()).toArray(String[]::new);
186186
}
187187
private @Nullable String matchesNextAny_optionsSorted(@NotNull String... expected) {
188188
return Arrays.stream(expected).filter(this::matchesNext).findFirst().orElse(null);
189189
}
190190
private @Nullable String discardMatchesNextAny_optionsSorted(@NotNull String... expected) {
191-
String s = Arrays.stream(expected).filter(this::matchesNext).findFirst().orElse(null);
191+
String s = matchesNextAny_optionsSorted(expected);
192192
if(s != null) discardN(s.length());
193193
return s;
194194
}
195+
@SuppressWarnings("unused")
195196
protected @Nullable String matchesNextAny(@NotNull String... expected) {
196197
// Try to longer ones first, then shorter ones.
197-
return matchesNextAny_optionsSorted(
198-
Arrays.stream(expected).sorted(Comparator.comparingInt(String::length).reversed()).toArray(String[]::new));
198+
return matchesNextAny_optionsSorted(sortedByLength(expected));
199+
}
200+
@SuppressWarnings("unused")
201+
protected @Nullable String discardMatchesNextAny(@NotNull String... expected) {
202+
// Try to longer ones first, then shorter ones.
203+
return discardMatchesNextAny_optionsSorted(sortedByLength(expected));
199204
}
200205
// endregion
201206
}

src/test/java/net/marcellperger/mathexpr/parser/ParserTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void assertInfixParsesTo(String src, int level, MathSymbol expected) {
3030
assertInfixParsesTo_inner(src, level, expected);
3131
}
3232
}
33-
void assertInfixParsesTo(ObjStringPair exprPair, int level) {
33+
void assertInfixParsesTo(ObjStringPair exprPair, @SuppressWarnings("SameParameterValue") int level) {
3434
assertInfixParsesTo(exprPair.str(), level, exprPair.obj());
3535
}
3636
void assertInfixParsesTo_inner(String src, int level, MathSymbol expected) {
@@ -171,6 +171,7 @@ static class WithNocache implements AutoCloseable {
171171
boolean doDisable;
172172
ParserTest inst;
173173

174+
@SuppressWarnings("unused")
174175
public WithNocache(ParserTest inst_) {
175176
this(inst_, true);
176177
}
@@ -201,6 +202,7 @@ static class WithSuppressingCache implements AutoCloseable {
201202
if(doStart) self.clearCache();
202203
return self;
203204
}
205+
@SuppressWarnings("unused")
204206
@Contract(" -> new")
205207
public static @NotNull WithSuppressingCache start() {
206208
return start(true);

0 commit comments

Comments
 (0)