rename `foreach` and `hcaerof` to `createIterable` and `createReversedIterable` respectively

This commit is contained in:
Erik Krogh Kristensen 2020-08-19 11:27:17 +02:00
Родитель 014728a66a
Коммит 8fdcd917ee
1 изменённых файлов: 7 добавлений и 7 удалений

Просмотреть файл

@ -182,15 +182,15 @@ public class CFGExtractor {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private static Iterable<Node> foreach(Object nd) { private static Iterable<Node> createIterable(Object nd) {
if (nd == null) return Collections.<Node>emptySet(); if (nd == null) return Collections.<Node>emptySet();
if (nd instanceof Node) return CollectionUtil.singletonIterable((Node) nd); if (nd instanceof Node) return CollectionUtil.singletonIterable((Node) nd);
return (Iterable<Node>) nd; return (Iterable<Node>) nd;
} }
private Iterable<Node> hcaerof(final Object nd) { private Iterable<Node> createReversedIterable(final Object nd) {
List<Node> list = new ArrayList<>(); List<Node> list = new ArrayList<>();
foreach(nd).forEach(list::add); createIterable(nd).forEach(list::add);
Collections.reverse(list); Collections.reverse(list);
return list; return list;
} }
@ -223,7 +223,7 @@ public class CFGExtractor {
if (xs instanceof List<?>) { if (xs instanceof List<?>) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
List<Node> xsCopy = new ArrayList<Node>((List<Node>) xs); List<Node> xsCopy = new ArrayList<Node>((List<Node>) xs);
for (Node y : foreach(ys)) if (!xsCopy.contains(y)) xsCopy.add(y); for (Node y : createIterable(ys)) if (!xsCopy.contains(y)) xsCopy.add(y);
return xsCopy; return xsCopy;
} else { } else {
if (ys instanceof List<?>) { if (ys instanceof List<?>) {
@ -251,7 +251,7 @@ public class CFGExtractor {
*/ */
private void writeSuccessors(INode prev, Object succs) { private void writeSuccessors(INode prev, Object succs) {
Label prevKey = trapwriter.localID(prev); Label prevKey = trapwriter.localID(prev);
for (Node succ : foreach(succs)) writeSuccessor(prevKey, succ); for (Node succ : createIterable(succs)) writeSuccessor(prevKey, succ);
} }
/** /**
@ -918,7 +918,7 @@ public class CFGExtractor {
private Object seq(Object... nodes) { private Object seq(Object... nodes) {
Object fst = nodes[nodes.length - 1]; Object fst = nodes[nodes.length - 1];
for (int i = nodes.length - 2; i >= 0; --i) { for (int i = nodes.length - 2; i >= 0; --i) {
for (Node node : hcaerof(nodes[i])) { for (Node node : createReversedIterable(nodes[i])) {
Node ffst = visit(node, fst, null); Node ffst = visit(node, fst, null);
if (ffst != null) fst = ffst; if (ffst != null) fst = ffst;
} }
@ -1856,7 +1856,7 @@ public class CFGExtractor {
Label propkey = trapwriter.localID(nd, "JSXSpreadAttribute"); Label propkey = trapwriter.localID(nd, "JSXSpreadAttribute");
Label spreadkey = trapwriter.localID(nd); Label spreadkey = trapwriter.localID(nd);
trapwriter.addTuple("successor", spreadkey, propkey); trapwriter.addTuple("successor", spreadkey, propkey);
for (Node succ : foreach(c.getAllSuccessors())) writeSuccessor(propkey, succ); for (Node succ : createIterable(c.getAllSuccessors())) writeSuccessor(propkey, succ);
return null; return null;
} }