diff options
Diffstat (limited to 'base/src/main/java/bjc/utils/patterns')
5 files changed, 19 insertions, 19 deletions
diff --git a/base/src/main/java/bjc/utils/patterns/ComplexPattern.java b/base/src/main/java/bjc/utils/patterns/ComplexPattern.java index e9035df..c6d72ec 100644 --- a/base/src/main/java/bjc/utils/patterns/ComplexPattern.java +++ b/base/src/main/java/bjc/utils/patterns/ComplexPattern.java @@ -23,7 +23,7 @@ public interface ComplexPattern<ReturnType, PredType, InputType> { * @return Whether or not this pattern is matched, as well as a state value * that will get passed to the pattern if it did match. */ - IPair<Boolean, PredType> matches(InputType input); + Pair<Boolean, PredType> matches(InputType input); /** * Apply this pattern, once it has matched. @@ -50,7 +50,7 @@ public interface ComplexPattern<ReturnType, PredType, InputType> { * @return A pattern composed from the passed in functions. */ static <RetType, PreType, InpType> ComplexPattern<RetType, PreType, InpType> from( - Function<InpType, IPair<Boolean, PreType>> matcher, + Function<InpType, Pair<Boolean, PreType>> matcher, BiFunction<InpType, PreType, RetType> accepter) { return new FunctionalPattern<>(matcher, accepter); @@ -74,7 +74,7 @@ public interface ComplexPattern<ReturnType, PredType, InputType> { Function<ClassType, RetType> action) { return from( - (input) -> IPair.pair(clasz.isInstance(input), null), + (input) -> Pair.pair(clasz.isInstance(input), null), (input, ignored) -> action.apply((ClassType)input) ); } @@ -96,7 +96,7 @@ public interface ComplexPattern<ReturnType, PredType, InputType> { ) { return from( - (input) -> IPair.pair(obj.equals(input), null), + (input) -> Pair.pair(obj.equals(input), null), (input, ignored) -> action.apply(input) ); } @@ -120,10 +120,10 @@ public interface ComplexPattern<ReturnType, PredType, InputType> { BiFunction<InpType, String, RetType> action ) { - Function<InpType, IPair<Boolean, String>> matcher = (input) -> { + Function<InpType, Pair<Boolean, String>> matcher = (input) -> { String objString = input.toString(); - return IPair.pair(pattern.equals(objString), objString); + return Pair.pair(pattern.equals(objString), objString); }; return from( @@ -152,13 +152,13 @@ public interface ComplexPattern<ReturnType, PredType, InputType> { { java.util.regex.Pattern regexPat = java.util.regex.Pattern.compile(regex); - Function<InpType, IPair<Boolean, Matcher>> matcher = (input) -> { + Function<InpType, Pair<Boolean, Matcher>> matcher = (input) -> { String inpString = input.toString(); Matcher mat = regexPat.matcher(inpString); - if (cond.test(mat)) return IPair.pair(true, mat); - else return IPair.pair(false, null); + if (cond.test(mat)) return Pair.pair(true, mat); + else return Pair.pair(false, null); }; return from( @@ -186,7 +186,7 @@ public interface ComplexPattern<ReturnType, PredType, InputType> { ) { return from( - (input) -> IPair.pair(true, null), + (input) -> Pair.pair(true, null), (input, ignored) -> action.apply(input) ); } @@ -211,12 +211,12 @@ public interface ComplexPattern<ReturnType, PredType, InputType> { String objString = input.toString(); if (objString.startsWith(pattern)) { - return IPair.pair( + return Pair.pair( true, objString.substring( pattern.length())); } else { - return IPair.pair(false, null); + return Pair.pair(false, null); } }, (ignored, input) -> action.apply(input)); } diff --git a/base/src/main/java/bjc/utils/patterns/FunctionalPattern.java b/base/src/main/java/bjc/utils/patterns/FunctionalPattern.java index e4b4a3d..1e9dbab 100644 --- a/base/src/main/java/bjc/utils/patterns/FunctionalPattern.java +++ b/base/src/main/java/bjc/utils/patterns/FunctionalPattern.java @@ -7,11 +7,11 @@ import bjc.data.*; class FunctionalPattern<ReturnType, PredType, InputType> implements ComplexPattern<ReturnType, PredType, InputType> { - private final Function<InputType, IPair<Boolean, PredType>> matcher; + private final Function<InputType, Pair<Boolean, PredType>> matcher; private final BiFunction<InputType, PredType, ReturnType> accepter; FunctionalPattern( - Function<InputType, IPair<Boolean, PredType>> matcher, + Function<InputType, Pair<Boolean, PredType>> matcher, BiFunction<InputType, PredType, ReturnType> accepter) { super(); this.matcher = matcher; @@ -19,7 +19,7 @@ class FunctionalPattern<ReturnType, PredType, InputType> } @Override - public IPair<Boolean, PredType> matches(InputType input) { + public Pair<Boolean, PredType> matches(InputType input) { return matcher.apply(input); } diff --git a/base/src/main/java/bjc/utils/patterns/MutablePatternMatcher.java b/base/src/main/java/bjc/utils/patterns/MutablePatternMatcher.java index 8e040fe..17de37a 100644 --- a/base/src/main/java/bjc/utils/patterns/MutablePatternMatcher.java +++ b/base/src/main/java/bjc/utils/patterns/MutablePatternMatcher.java @@ -50,7 +50,7 @@ public class MutablePatternMatcher<ReturnType, InputType> while(iterator.hasNext()) { ComplexPattern<ReturnType, Object, InputType> pattern = iterator.next(); - IPair<Boolean, Object> matches = pattern.matches(input); + Pair<Boolean, Object> matches = pattern.matches(input); matches.doWith((bool, obj) -> { if (bool) pattern.apply(input, obj); diff --git a/base/src/main/java/bjc/utils/patterns/PatternMatcher.java b/base/src/main/java/bjc/utils/patterns/PatternMatcher.java index e2ae9f6..f144d36 100644 --- a/base/src/main/java/bjc/utils/patterns/PatternMatcher.java +++ b/base/src/main/java/bjc/utils/patterns/PatternMatcher.java @@ -30,7 +30,7 @@ public class PatternMatcher<ReturnType, InputType> @Override public ReturnType matchFor(InputType input) throws NonExhaustiveMatch { for (ComplexPattern<ReturnType, Object, InputType> pattern : patterns) { - IPair<Boolean, Object> matches = pattern.matches(input); + Pair<Boolean, Object> matches = pattern.matches(input); if (matches.getLeft()) { pattern.apply(input, matches.getRight()); } diff --git a/base/src/main/java/bjc/utils/patterns/SimplePatttern.java b/base/src/main/java/bjc/utils/patterns/SimplePatttern.java index 1601894..db53287 100644 --- a/base/src/main/java/bjc/utils/patterns/SimplePatttern.java +++ b/base/src/main/java/bjc/utils/patterns/SimplePatttern.java @@ -34,7 +34,7 @@ public interface SimplePatttern<ReturnType> extends Pattern<ReturnType, Void> { } @Override - default IPair<Boolean, Void> matches(Object input) { - return new Pair<>(doesMatch(input), null); + default Pair<Boolean, Void> matches(Object input) { + return new SimplePair<>(doesMatch(input), null); } }
\ No newline at end of file |