From df94066e3af02ff02d5ab4d033a3d603f743234c Mon Sep 17 00:00:00 2001 From: bjculkin Date: Mon, 12 Feb 2018 22:45:04 -0500 Subject: Formatting pass --- .../bjc/utils/data/TopDownTransformIterator.java | 57 ++++++++++++---------- 1 file changed, 30 insertions(+), 27 deletions(-) (limited to 'base/src/main/java/bjc/utils/data/TopDownTransformIterator.java') diff --git a/base/src/main/java/bjc/utils/data/TopDownTransformIterator.java b/base/src/main/java/bjc/utils/data/TopDownTransformIterator.java index c6b7d31..8f3e40c 100644 --- a/base/src/main/java/bjc/utils/data/TopDownTransformIterator.java +++ b/base/src/main/java/bjc/utils/data/TopDownTransformIterator.java @@ -50,7 +50,7 @@ public class TopDownTransformIterator implements Iterator> src) { - if (curYield != null) { + if(curYield != null) { toYield.push(curYield); } @@ -63,51 +63,54 @@ public class TopDownTransformIterator implements Iterator flushYields(final ITree val) { - if (curYield != null) { + if(curYield != null) { toYield.add(new SingleIterator<>(val)); - if (curYield.hasNext()) + if(curYield.hasNext()) return curYield.next(); else { - while (toYield.size() != 0 && !curYield.hasNext()) { + while(toYield.size() != 0 && !curYield.hasNext()) { curYield = toYield.pop(); } - if (toYield.size() == 0 && !curYield.hasNext()) { + if(toYield.size() == 0 && !curYield.hasNext()) { curYield = null; return val; - } else return curYield.next(); + } else + return curYield.next(); } - } else return val; + } else + return val; } @Override public ITree next() { - if (done) throw new NoSuchElementException(); + if(done) throw new NoSuchElementException(); - if (curYield != null) { - if (curYield.hasNext()) + if(curYield != null) { + if(curYield.hasNext()) return curYield.next(); else { - while (toYield.size() != 0 && !curYield.hasNext()) { + while(toYield.size() != 0 && !curYield.hasNext()) { curYield = toYield.pop(); } - if (toYield.size() == 0 && !curYield.hasNext()) { + if(toYield.size() == 0 && !curYield.hasNext()) { curYield = null; - } else return curYield.next(); + } else + return curYield.next(); } } - if (initial) { + if(initial) { final TopDownTransformResult res = picker.apply(preParent.getHead()); - switch (res) { + switch(res) { case PASSTHROUGH: postParent = new Tree<>(preParent.getHead()); - if (preParent.getChildrenCount() != 0) { - for (int i = 0; i < preParent.getChildrenCount(); i++) { + if(preParent.getChildrenCount() != 0) { + for(int i = 0; i < preParent.getChildrenCount(); i++) { preChildren.add(preParent.getChild(i)); } @@ -127,8 +130,8 @@ public class TopDownTransformIterator implements Iterator implements Iterator(intRes.getHead()); - if (intRes.getChildrenCount() != 0) { - for (int i = 0; i < intRes.getChildrenCount(); i++) { + if(intRes.getChildrenCount() != 0) { + for(int i = 0; i < intRes.getChildrenCount(); i++) { preChildren.add(intRes.getChild(i)); } @@ -159,13 +162,13 @@ public class TopDownTransformIterator implements Iterator(picker, transform, preChildren.pop()); final ITree res = curChild.next(); @@ -176,12 +179,12 @@ public class TopDownTransformIterator implements Iterator res = null; - if (postParent == null) { + if(postParent == null) { res = new Tree<>(preParent.getHead()); System.out.println("\t\tTRACE: adding nodes " + postChildren + " to " + res); - for (final ITree child : postChildren) { + for(final ITree child : postChildren) { res.addChild(child); } @@ -191,7 +194,7 @@ public class TopDownTransformIterator implements Iterator child : postChildren) { + for(final ITree child : postChildren) { res.addChild(child); } } -- cgit v1.2.3