rename foreach and hcaerof to createIterable and createReversedIterable respectively

erik-krogh · erik-krogh · commit 8fdcd917eedd · 2021-08-03T08:59:32.000+02:00
diff --git a/javascript/extractor/src/com/semmle/js/extractor/CFGExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/CFGExtractor.java
@@ -182,15 +182,15 @@ public CFGExtractor(ASTExtractor astExtractor) {
   }
 
   @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 instanceof Node) return CollectionUtil.singletonIterable((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<>();
-    foreach(nd).forEach(list::add);
+    createIterable(nd).forEach(list::add);
     Collections.reverse(list);
     return list;
   }
@@ -223,7 +223,7 @@ private static Object union(Object xs, Object ys) {
     if (xs instanceof List<?>) {
       @SuppressWarnings("unchecked")
       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;
     } else {
       if (ys instanceof List<?>) {
@@ -251,7 +251,7 @@ private static Object union(Object xs, Object ys) {
    */
   private void writeSuccessors(INode prev, Object succs) {
     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 @@ private Node visit(Node nd, Object trueSuccessors, Object falseSuccessors) {
     private Object seq(Object... nodes) {
       Object fst = nodes[nodes.length - 1];
       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);
           if (ffst != null) fst = ffst;
         }
@@ -1856,7 +1856,7 @@ public Void visit(JSXSpreadAttribute nd, SuccessorInfo c) {
       Label propkey = trapwriter.localID(nd, "JSXSpreadAttribute");
       Label spreadkey = trapwriter.localID(nd);
       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;
     }
 
