hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-02 20:25:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

move createCollection to the only place it is used

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2020-08-20 00:19:28 +02:00
parent ef5ea437c3
commit 85d6bfe044
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
javascript/extractor/src/com/semmle/js/extractor/CFGExtractor.java
View File

@@ -186,27 +186,6 @@ public class CFGExtractor {
this.metrics = astExtractor.getMetrics();
}
/**
* Creates an `Collection<Node>` from the one-or-more nodes contained in `nodes`.
* `nodes` is either `null`, a `Node`, or a `Collection<Node>`.
*/
@SuppressWarnings("unchecked")
private static Collection<Node> createCollection(Object nodes) { // TODO: Delete usages.
if (nodes == null) return Collections.<Node>emptySet();
if (nodes instanceof Node) return Collections.<Node>singleton((Node) nodes);
return (Collection<Node>) nodes;
}
/**
* Creates an `Collection<Node>` that iterates the nodes in reverse order from the one-or-more nodes contained in `nodes`.
*/
private static Collection<Node> createReversedCollection(final Object nodes) {
List<Node> list = new ArrayList<>();
createCollection(nodes).forEach(list::add);
Collections.reverse(list);
return list;
}
private static Collection<Node> union(Node x, Node y) {
return union(Collections.singleton(x), Collections.singleton(y));
}
@@ -954,6 +933,27 @@ public class CFGExtractor {
return First.of(nd);
}
/**
* Creates an `Collection<Node>` from the one-or-more nodes contained in `nodes`.
* `nodes` is either `null`, a `Node`, or a `Collection<Node>`.
*/
@SuppressWarnings("unchecked")
private Collection<Node> createCollection(Object nodes) { // TODO: Delete usages.
if (nodes == null) return Collections.<Node>emptySet();
if (nodes instanceof Node) return Collections.<Node>singleton((Node) nodes);
return (Collection<Node>) nodes;
}
/**
* Creates an `Collection<Node>` that iterates the nodes in reverse order from the one-or-more nodes contained in `nodes`.
*/
private Collection<Node> createReversedCollection(final Object nodes) {
List<Node> list = new ArrayList<>();
createCollection(nodes).forEach(list::add);
Collections.reverse(list);
return list;
}
/**
* Visit each of the `nodes` in reverse order, with the successor of the `i`th node set to the `i+1`th node, such that the `followingCache` for a given node is populated when visiting the previous node.
*