From f9283a20abd9eaed0b0436bc54c60576233121f4 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Mon, 11 Apr 2016 09:32:59 -0400 Subject: Added new method to pairs and holders --- .../main/java/bjc/utils/data/lazy/LazyHolder.java | 93 +++++++++++++++++++--- 1 file changed, 83 insertions(+), 10 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/data/lazy/LazyHolder.java') diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/lazy/LazyHolder.java b/BJC-Utils2/src/main/java/bjc/utils/data/lazy/LazyHolder.java index 2ad8dbf..9f9dc4a 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/data/lazy/LazyHolder.java +++ b/BJC-Utils2/src/main/java/bjc/utils/data/lazy/LazyHolder.java @@ -21,34 +21,100 @@ import bjc.utils.funcdata.IFunctionalList; * The type of the data being held */ public class LazyHolder implements IHolder, ILazy { - private final class LazyHolderSupplier + private static final class LazyHolderHolder + implements IHolder { + private Supplier> holderSource; + + private IHolder holder; + + private IFunctionalList> actions = new FunctionalList<>(); + + public LazyHolderHolder(Supplier> source) { + + holderSource = source; + } + + @Override + public void doWith(Consumer action) { + actions.add((val) -> { + action.accept(val); + + return val; + }); + } + + @Override + public IHolder map(Function transformer) { + // TODO implement me + throw new UnsupportedOperationException( + "Mapping is not yet supported on bound holders"); + } + + @Override + public IHolder transform(Function transformer) { + actions.add(transformer); + + return this; + } + + @Override + public E unwrap(Function unwrapper) { + if (holder == null) { + holder = holderSource.get(); + } + + if (!actions.isEmpty()) { + actions.forEach((transform) -> { + holder.transform(transform); + }); + } + + return holder.unwrap(unwrapper); + } + + @Override + public IHolder bind(Function> binder) { + return new LazyHolderHolder<>(() -> { + return binder.apply(unwrap((val) -> val)); + }); + } + + } + + private static final class LazyHolderSupplier implements Supplier { - private IFunctionalList> pendingActions; - private Function pendingTransform; + private IFunctionalList> pendingActions; + private Function pendingTransform; + + private T2 heldValue; + private Supplier heldSource; - public LazyHolderSupplier(IFunctionalList> actons, - Function transform) { + public LazyHolderSupplier(IFunctionalList> actons, + Function transform, T2 heldValue, + Supplier heldSource) { // Resolve latent bug I just realized. After a map, adding new // actions to the original holder could've resulted in changes // to all unactualized mapped values from that holder pendingActions = new FunctionalList<>(); - for (Function action : actons.toIterable()) { + for (Function action : actons.toIterable()) { pendingActions.add(action); } this.pendingTransform = transform; + this.heldValue = heldValue; + this.heldSource = heldSource; } @Override public NewT get() { if (heldValue == null) { return pendingActions.reduceAux(heldSource.get(), - Function::apply, pendingTransform::apply); + Function::apply, pendingTransform::apply); } return pendingActions.reduceAux(heldValue, - Function::apply, pendingTransform::apply); + Function::apply, pendingTransform::apply); } } @@ -114,8 +180,8 @@ public class LazyHolder implements IHolder, ILazy { } // Don't actually map until we need to - return new LazyHolder<>( - new LazyHolderSupplier<>(actions, transform)); + return new LazyHolder<>(new LazyHolderSupplier<>(actions, + transform, heldValue, heldSource)); } @Override @@ -179,4 +245,11 @@ public class LazyHolder implements IHolder, ILazy { heldValue = action.apply(heldValue); }); } + + @Override + public IHolder bind(Function> binder) { + return new LazyHolderHolder<>(() -> { + return binder.apply(unwrap((val) -> val)); + }); + } } \ No newline at end of file -- cgit v1.2.3