Merge branch 'master' of https://github.com/bculkin2442/bjc-utils2

1 files changed, 8 insertions, 7 deletions

diff --git a/base/src/main/java/bjc/utils/patterns/MutablePatternMatcher.java b/base/src/main/java/bjc/utils/patterns/MutablePatternMatcher.java
index 7900262..28e9cd7 100644
--- a/base/src/main/java/bjc/utils/patterns/MutablePatternMatcher.java
+++ b/base/src/main/java/bjc/utils/patterns/MutablePatternMatcher.java
@@ -13,9 +13,10 @@ import bjc.data.*;
  * @author Ben Culkin
  *
  * @param <ReturnType> The type returned by the pattern matcher.
+ * @param <InputType> The type of the input to match against.
  */
 public class MutablePatternMatcher<ReturnType, InputType>
-	implements IPatternMatcher<ReturnType, InputType>{
+	implements PatternMatcher<ReturnType, InputType> {
 	private final List<ComplexPattern<ReturnType, Object, InputType>> patterns;
 	
 	/**
@@ -45,15 +46,15 @@ public class MutablePatternMatcher<ReturnType, InputType>
 	@Override
 	public ReturnType matchFor(InputType input) throws NonExhaustiveMatch {
 		Iterator<ComplexPattern<ReturnType, Object, InputType>> iterator;
-		for (iterator = new NonCMEIterator<>(patterns);
-				iterator.hasNext();) {
+		iterator = new NonCMEIterator<>(patterns);
+		while(iterator.hasNext()) {
 			ComplexPattern<ReturnType, Object, InputType> pattern = iterator.next();
 			
-			IPair<Boolean, Object> matches = pattern.matches(input);
+			Pair<Boolean, Object> matches = pattern.matches(input);
 			
-			if (matches.getLeft()) {
-				pattern.apply(input, matches.getRight());
-			}
+			matches.doWith((bool, obj) -> {
+				if (bool) pattern.apply(input, obj);
+			});
 		}
 
 		throw new NonExhaustiveMatch("Non-exhaustive match against " + input);