@@ -182,15 +182,15 @@ public CFGExtractor(ASTExtractor astExtractor) {
182
182
}
183
183
184
184
@ SuppressWarnings ("unchecked" )
185
- private static Iterable <Node > foreach (Object nd ) {
185
+ private static Iterable <Node > createIterable (Object nd ) {
186
186
if (nd == null ) return Collections .<Node >emptySet ();
187
187
if (nd instanceof Node ) return CollectionUtil .singletonIterable ((Node ) nd );
188
188
return (Iterable <Node >) nd ;
189
189
}
190
190
191
- private Iterable <Node > hcaerof (final Object nd ) {
191
+ private Iterable <Node > createReversedIterable (final Object nd ) {
192
192
List <Node > list = new ArrayList <>();
193
- foreach (nd ).forEach (list ::add );
193
+ createIterable (nd ).forEach (list ::add );
194
194
Collections .reverse (list );
195
195
return list ;
196
196
}
@@ -223,7 +223,7 @@ private static Object union(Object xs, Object ys) {
223
223
if (xs instanceof List <?>) {
224
224
@ SuppressWarnings ("unchecked" )
225
225
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 );
227
227
return xsCopy ;
228
228
} else {
229
229
if (ys instanceof List <?>) {
@@ -251,7 +251,7 @@ private static Object union(Object xs, Object ys) {
251
251
*/
252
252
private void writeSuccessors (INode prev , Object succs ) {
253
253
Label prevKey = trapwriter .localID (prev );
254
- for (Node succ : foreach (succs )) writeSuccessor (prevKey , succ );
254
+ for (Node succ : createIterable (succs )) writeSuccessor (prevKey , succ );
255
255
}
256
256
257
257
/**
@@ -918,7 +918,7 @@ private Node visit(Node nd, Object trueSuccessors, Object falseSuccessors) {
918
918
private Object seq (Object ... nodes ) {
919
919
Object fst = nodes [nodes .length - 1 ];
920
920
for (int i = nodes .length - 2 ; i >= 0 ; --i ) {
921
- for (Node node : hcaerof (nodes [i ])) {
921
+ for (Node node : createReversedIterable (nodes [i ])) {
922
922
Node ffst = visit (node , fst , null );
923
923
if (ffst != null ) fst = ffst ;
924
924
}
@@ -1856,7 +1856,7 @@ public Void visit(JSXSpreadAttribute nd, SuccessorInfo c) {
1856
1856
Label propkey = trapwriter .localID (nd , "JSXSpreadAttribute" );
1857
1857
Label spreadkey = trapwriter .localID (nd );
1858
1858
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 );
1860
1860
return null ;
1861
1861
}
1862
1862
0 commit comments