DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor to move stuff into wala.util 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@4031 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
sjfink 2011-01-17 21:13:34 +00:00
parent e8da3e3d8d
commit 6416445fe4
14 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
com.ibm.wala.core/META-INF/MANIFEST.MF
View File

@ -29,7 +29,6 @@ Export-Package: .,
com.ibm.wala.demandpa.alg.refinepolicy,
com.ibm.wala.demandpa.alg.statemachine,
com.ibm.wala.demandpa.flowgraph,
com.ibm.wala.demandpa.genericutil,
com.ibm.wala.demandpa.util,
com.ibm.wala.dynamic,
com.ibm.wala.escape,

2
com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/CallStack.java
View File

@ -38,8 +38,8 @@
package com.ibm.wala.demandpa.alg;
import com.ibm.wala.demandpa.alg.statemachine.StateMachine.State;
import com.ibm.wala.demandpa.genericutil.ImmutableStack;
import com.ibm.wala.ipa.callgraph.propagation.cfa.CallerSiteContext;
import com.ibm.wala.util.collections.ImmutableStack;
/**
* Representation for a calling context.

10
com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/DemandRefinementPointsTo.java
View File

@ -81,11 +81,6 @@ import com.ibm.wala.demandpa.flowgraph.PutFieldLabel;
import com.ibm.wala.demandpa.flowgraph.ReturnBarLabel;
import com.ibm.wala.demandpa.flowgraph.ReturnLabel;
import com.ibm.wala.demandpa.flowgraph.IFlowLabel.IFlowLabelVisitor;
import com.ibm.wala.demandpa.genericutil.ArraySet;
import com.ibm.wala.demandpa.genericutil.ArraySetMultiMap;
import com.ibm.wala.demandpa.genericutil.HashSetMultiMap;
import com.ibm.wala.demandpa.genericutil.MultiMap;
import com.ibm.wala.demandpa.genericutil.Util;
import com.ibm.wala.demandpa.util.ArrayContents;
import com.ibm.wala.demandpa.util.MemoryAccess;
import com.ibm.wala.demandpa.util.MemoryAccessMap;
@ -120,12 +115,17 @@ import com.ibm.wala.ssa.SSAInvokeInstruction;
import com.ibm.wala.ssa.SSANewInstruction;
import com.ibm.wala.ssa.SSAPutInstruction;
import com.ibm.wala.util.Predicate;
import com.ibm.wala.util.collections.ArraySet;
import com.ibm.wala.util.collections.ArraySetMultiMap;
import com.ibm.wala.util.collections.HashMapFactory;
import com.ibm.wala.util.collections.HashSetFactory;
import com.ibm.wala.util.collections.HashSetMultiMap;
import com.ibm.wala.util.collections.Iterator2Collection;
import com.ibm.wala.util.collections.Iterator2Iterable;
import com.ibm.wala.util.collections.MapIterator;
import com.ibm.wala.util.collections.MultiMap;
import com.ibm.wala.util.collections.Pair;
import com.ibm.wala.util.collections.Util;
import com.ibm.wala.util.debug.Assertions;
import com.ibm.wala.util.debug.UnimplementedError;
import com.ibm.wala.util.functions.Function;

2
com.ibm.wala.core/src/com/ibm/wala/util/graph/labeled/SparseNumberedLabeledEdgeManager.java
View File

@ -53,7 +53,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import com.ibm.wala.demandpa.genericutil.ArraySetMultiMap;
import com.ibm.wala.util.collections.ArraySetMultiMap;
import com.ibm.wala.util.collections.HashMapFactory;
import com.ibm.wala.util.collections.HashSetFactory;
import com.ibm.wala.util.collections.Iterator2Collection;

3
com.ibm.wala.util/META-INF/MANIFEST.MF
View File

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: Util
Bundle-SymbolicName: com.ibm.wala.util
Bundle-Version: 1.0.0.qualifier
Export-Package: com.ibm.wala.util.collections,
Export-Package: com.ibm.wala.util,
com.ibm.wala.util.collections,
com.ibm.wala.util.debug,
com.ibm.wala.util.functions,
com.ibm.wala.util.intset,

0
com.ibm.wala.core/src/com/ibm/wala/util/Predicate.java → com.ibm.wala.util/src/com/ibm/wala/util/Predicate.java
View File

3
com.ibm.wala.core/src/com/ibm/wala/demandpa/genericutil/AbstractMultiMap.java → com.ibm.wala.util/src/com/ibm/wala/util/collections/AbstractMultiMap.java
View File

@ -35,14 +35,13 @@
* IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
* UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
package com.ibm.wala.demandpa.genericutil;
package com.ibm.wala.util.collections;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
import com.ibm.wala.util.collections.HashMapFactory;
abstract class AbstractMultiMap<K, V> implements MultiMap<K, V> {

2
com.ibm.wala.core/src/com/ibm/wala/demandpa/genericutil/ArraySet.java → com.ibm.wala.util/src/com/ibm/wala/util/collections/ArraySet.java
View File

@ -35,7 +35,7 @@
* IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
* UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
package com.ibm.wala.demandpa.genericutil;
package com.ibm.wala.util.collections;
import java.util.AbstractSet;
import java.util.Collection;

2
com.ibm.wala.core/src/com/ibm/wala/demandpa/genericutil/ArraySetMultiMap.java → com.ibm.wala.util/src/com/ibm/wala/util/collections/ArraySetMultiMap.java
View File

@ -35,7 +35,7 @@
* IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
* UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
package com.ibm.wala.demandpa.genericutil;
package com.ibm.wala.util.collections;
import java.util.Collection;
import java.util.Set;

3
com.ibm.wala.core/src/com/ibm/wala/demandpa/genericutil/HashSetMultiMap.java → com.ibm.wala.util/src/com/ibm/wala/util/collections/HashSetMultiMap.java
View File

@ -35,11 +35,10 @@
* IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
* UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
package com.ibm.wala.demandpa.genericutil;
package com.ibm.wala.util.collections;
import java.util.Set;
import com.ibm.wala.util.collections.HashSetFactory;
public class HashSetMultiMap<K, V> extends AbstractMultiMap<K, V> {

4
com.ibm.wala.core/src/com/ibm/wala/demandpa/genericutil/ImmutableStack.java → com.ibm.wala.util/src/com/ibm/wala/util/collections/ImmutableStack.java
View File

@ -36,14 +36,12 @@
* UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
package com.ibm.wala.demandpa.genericutil;
package com.ibm.wala.util.collections;
import java.util.Arrays;
import java.util.EmptyStackException;
import java.util.Iterator;
import com.ibm.wala.util.collections.ArrayIterator;
import com.ibm.wala.util.collections.EmptyIterator;
/**
* An immutable stack of objects. The {@link #push(Object)} and {@link #pop()} operations create new stacks.

2
com.ibm.wala.core/src/com/ibm/wala/demandpa/genericutil/MultiMap.java → com.ibm.wala.util/src/com/ibm/wala/util/collections/MultiMap.java
View File

@ -35,7 +35,7 @@
* IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
* UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
package com.ibm.wala.demandpa.genericutil;
package com.ibm.wala.util.collections;
import java.util.Collection;
import java.util.Set;

2
com.ibm.wala.core/src/com/ibm/wala/demandpa/genericutil/ObjectVisitor.java → com.ibm.wala.util/src/com/ibm/wala/util/collections/ObjectVisitor.java
View File

@ -35,7 +35,7 @@
* IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
* UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
package com.ibm.wala.demandpa.genericutil;
package com.ibm.wala.util.collections;
public interface ObjectVisitor<T> {

3
com.ibm.wala.core/src/com/ibm/wala/demandpa/genericutil/Util.java → com.ibm.wala.util/src/com/ibm/wala/util/collections/Util.java
View File

@ -35,7 +35,7 @@
* IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
* UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
package com.ibm.wala.demandpa.genericutil;
package com.ibm.wala.util.collections;
import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
@ -50,7 +50,6 @@ import java.util.List;
import java.util.Set;
import com.ibm.wala.util.Predicate;
import com.ibm.wala.util.collections.HashSetFactory;
import com.ibm.wala.util.functions.Function;
/**