implement hcaerof in terms of foreach

erik-krogh · erik-krogh · commit 014728a66a51 · 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
@@ -189,15 +189,10 @@ private static Iterable<Node> foreach(Object nd) {
   }
 
   private Iterable<Node> hcaerof(final Object nd) {
-    if (nd == null) return Collections.<Node>emptySet();
-    if (nd instanceof Node) return CollectionUtil.singletonIterable((Node) nd);
-    return new Iterable<Node>() {
-      @SuppressWarnings("unchecked")
-      @Override
-      public Iterator<Node> iterator() {
-        return CollectionUtil.reverseIterator((List<Node>) nd);
-      }
-    };
+    List<Node> list = new ArrayList<>();
+    foreach(nd).forEach(list::add);
+    Collections.reverse(list);
+    return list;
   }
 
   /** Returns a list of all the nodes in a tree of nested lists. */
