Skip to content

Commit 8fdcd91

Browse files
committed
rename foreach and hcaerof to createIterable and createReversedIterable respectively
1 parent 014728a commit 8fdcd91

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

javascript/extractor/src/com/semmle/js/extractor/CFGExtractor.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,15 +182,15 @@ public CFGExtractor(ASTExtractor astExtractor) {
182182
}
183183

184184
@SuppressWarnings("unchecked")
185-
private static Iterable<Node> foreach(Object nd) {
185+
private static Iterable<Node> createIterable(Object nd) {
186186
if (nd == null) return Collections.<Node>emptySet();
187187
if (nd instanceof Node) return CollectionUtil.singletonIterable((Node) nd);
188188
return (Iterable<Node>) nd;
189189
}
190190

191-
private Iterable<Node> hcaerof(final Object nd) {
191+
private Iterable<Node> createReversedIterable(final Object nd) {
192192
List<Node> list = new ArrayList<>();
193-
foreach(nd).forEach(list::add);
193+
createIterable(nd).forEach(list::add);
194194
Collections.reverse(list);
195195
return list;
196196
}
@@ -223,7 +223,7 @@ private static Object union(Object xs, Object ys) {
223223
if (xs instanceof List<?>) {
224224
@SuppressWarnings("unchecked")
225225
List<Node> xsCopy = new ArrayList<Node>((List<Node>) xs);
226-
for (Node y : foreach(ys)) if (!xsCopy.contains(y)) xsCopy.add(y);
226+
for (Node y : createIterable(ys)) if (!xsCopy.contains(y)) xsCopy.add(y);
227227
return xsCopy;
228228
} else {
229229
if (ys instanceof List<?>) {
@@ -251,7 +251,7 @@ private static Object union(Object xs, Object ys) {
251251
*/
252252
private void writeSuccessors(INode prev, Object succs) {
253253
Label prevKey = trapwriter.localID(prev);
254-
for (Node succ : foreach(succs)) writeSuccessor(prevKey, succ);
254+
for (Node succ : createIterable(succs)) writeSuccessor(prevKey, succ);
255255
}
256256

257257
/**
@@ -918,7 +918,7 @@ private Node visit(Node nd, Object trueSuccessors, Object falseSuccessors) {
918918
private Object seq(Object... nodes) {
919919
Object fst = nodes[nodes.length - 1];
920920
for (int i = nodes.length - 2; i >= 0; --i) {
921-
for (Node node : hcaerof(nodes[i])) {
921+
for (Node node : createReversedIterable(nodes[i])) {
922922
Node ffst = visit(node, fst, null);
923923
if (ffst != null) fst = ffst;
924924
}
@@ -1856,7 +1856,7 @@ public Void visit(JSXSpreadAttribute nd, SuccessorInfo c) {
18561856
Label propkey = trapwriter.localID(nd, "JSXSpreadAttribute");
18571857
Label spreadkey = trapwriter.localID(nd);
18581858
trapwriter.addTuple("successor", spreadkey, propkey);
1859-
for (Node succ : foreach(c.getAllSuccessors())) writeSuccessor(propkey, succ);
1859+
for (Node succ : createIterable(c.getAllSuccessors())) writeSuccessor(propkey, succ);
18601860
return null;
18611861
}
18621862

0 commit comments

Comments
 (0)