miscellaneous minor cleanups. eclipse build stuff. import statements.
git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@680 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
parent
6937ed8e80
commit
f4fef68587
|
@ -8,7 +8,7 @@ Bundle-Vendor: IBM
|
|||
Bundle-Localization: plugin
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
com.ibm.wala.core
|
||||
Eclipse-AutoStart: true
|
||||
Eclipse-LazyStart: true
|
||||
Export-Package: com.ibm.wala.cast.analysis.typeInference,
|
||||
com.ibm.wala.cast.ipa.callgraph,
|
||||
com.ibm.wala.cast.ir.cfg,
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
source.. = source/
|
||||
source.. = source/,\
|
||||
source/java/
|
||||
output.. = bin/
|
||||
bin.includes = META-INF/,\
|
||||
.
|
||||
|
|
|
@ -54,7 +54,7 @@ public class DelegatingAstPointerKeys implements AstPointerKeyFactory {
|
|||
}
|
||||
|
||||
private final Map specificStringKeys = new HashMap();
|
||||
private final Map specificIndexKeys = new HashMap();
|
||||
// private final Map specificIndexKeys = new HashMap();
|
||||
|
||||
public PointerKey getPointerKeyForInstanceField(InstanceKey I, IField f) {
|
||||
PointerKey fk = base.getPointerKeyForInstanceField(I, f);
|
||||
|
|
|
@ -10,8 +10,9 @@
|
|||
*****************************************************************************/
|
||||
package com.ibm.wala.cast.ir.ssa;
|
||||
|
||||
import com.ibm.wala.ssa.*;
|
||||
import com.ibm.wala.util.debug.Assertions;
|
||||
import com.ibm.wala.ssa.ReflectiveMemberAccess;
|
||||
import com.ibm.wala.ssa.SymbolTable;
|
||||
import com.ibm.wala.ssa.ValueDecorator;
|
||||
|
||||
public abstract class AbstractReflectiveGet extends ReflectiveMemberAccess {
|
||||
private final int result;
|
||||
|
|
|
@ -11,8 +11,9 @@
|
|||
package com.ibm.wala.cast.ir.ssa;
|
||||
|
||||
|
||||
import com.ibm.wala.ssa.*;
|
||||
import com.ibm.wala.util.debug.Assertions;
|
||||
import com.ibm.wala.ssa.ReflectiveMemberAccess;
|
||||
import com.ibm.wala.ssa.SymbolTable;
|
||||
import com.ibm.wala.ssa.ValueDecorator;
|
||||
|
||||
public abstract class AbstractReflectivePut extends ReflectiveMemberAccess {
|
||||
private final int value;
|
||||
|
|
|
@ -10,17 +10,23 @@
|
|||
*****************************************************************************/
|
||||
package com.ibm.wala.cast.ir.ssa;
|
||||
|
||||
import com.ibm.wala.cast.loader.*;
|
||||
import com.ibm.wala.cfg.*;
|
||||
import com.ibm.wala.ssa.*;
|
||||
import com.ibm.wala.ssa.SSAOptions.*;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import com.ibm.wala.cfg.IBasicBlock;
|
||||
import com.ibm.wala.ssa.IR;
|
||||
import com.ibm.wala.ssa.SSACFG;
|
||||
import com.ibm.wala.ssa.SSAInstruction;
|
||||
import com.ibm.wala.ssa.SSAOptions;
|
||||
import com.ibm.wala.ssa.SSAPhiInstruction;
|
||||
import com.ibm.wala.ssa.SymbolTable;
|
||||
import com.ibm.wala.ssa.SSAOptions.DefaultValues;
|
||||
import com.ibm.wala.util.collections.IntStack;
|
||||
import com.ibm.wala.util.debug.Assertions;
|
||||
import com.ibm.wala.util.graph.DominanceFrontiers;
|
||||
import com.ibm.wala.util.graph.Graph;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
|
||||
/**
|
||||
* Abstract core of traditional SSA conversion (Cytron et al.).
|
||||
|
|
|
@ -10,20 +10,31 @@
|
|||
*****************************************************************************/
|
||||
package com.ibm.wala.cast.ir.ssa;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.Stack;
|
||||
|
||||
import com.ibm.wala.cast.ir.ssa.AstIRFactory.AstIR;
|
||||
import com.ibm.wala.cast.ir.ssa.analysis.LiveAnalysis;
|
||||
import com.ibm.wala.cast.loader.*;
|
||||
import com.ibm.wala.cast.loader.AstMethod.*;
|
||||
import com.ibm.wala.cast.loader.AstMethod;
|
||||
import com.ibm.wala.cast.loader.AstMethod.DebuggingInformation;
|
||||
import com.ibm.wala.cast.loader.AstMethod.LexicalInformation;
|
||||
import com.ibm.wala.shrikeBT.IInstruction;
|
||||
import com.ibm.wala.ssa.*;
|
||||
import com.ibm.wala.ssa.SSACFG;
|
||||
import com.ibm.wala.ssa.SSAInstruction;
|
||||
import com.ibm.wala.ssa.SSAOptions;
|
||||
import com.ibm.wala.ssa.SSAPhiInstruction;
|
||||
import com.ibm.wala.ssa.SymbolTable;
|
||||
import com.ibm.wala.ssa.IR.SSA2LocalMap;
|
||||
import com.ibm.wala.util.collections.IntStack;
|
||||
import com.ibm.wala.util.debug.Assertions;
|
||||
import com.ibm.wala.util.debug.Trace;
|
||||
import com.ibm.wala.util.graph.Graph;
|
||||
import com.ibm.wala.util.intset.*;
|
||||
|
||||
import java.util.*;
|
||||
import com.ibm.wala.util.intset.BitVector;
|
||||
import com.ibm.wala.util.intset.BitVectorIntSet;
|
||||
import com.ibm.wala.util.intset.IntSet;
|
||||
import com.ibm.wala.util.intset.MutableIntSet;
|
||||
|
||||
/**
|
||||
* @author Julian Dolby
|
||||
|
|
|
@ -10,7 +10,17 @@
|
|||
*****************************************************************************/
|
||||
package com.ibm.wala.cast.ir.translator;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.Stack;
|
||||
|
||||
import com.ibm.wala.cast.ir.ssa.AssignInstruction;
|
||||
import com.ibm.wala.cast.ir.ssa.AstAssertInstruction;
|
||||
|
@ -46,15 +56,21 @@ import com.ibm.wala.shrikeBT.ConditionalBranchInstruction;
|
|||
import com.ibm.wala.shrikeBT.IInstruction;
|
||||
import com.ibm.wala.shrikeBT.ShiftInstruction;
|
||||
import com.ibm.wala.shrikeBT.UnaryOpInstruction;
|
||||
import com.ibm.wala.ssa.*;
|
||||
import com.ibm.wala.types.*;
|
||||
import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
|
||||
import com.ibm.wala.ssa.SSAGetCaughtExceptionInstruction;
|
||||
import com.ibm.wala.ssa.SSAInstruction;
|
||||
import com.ibm.wala.ssa.SSAInstructionFactory;
|
||||
import com.ibm.wala.ssa.SSALoadClassInstruction;
|
||||
import com.ibm.wala.ssa.SymbolTable;
|
||||
import com.ibm.wala.types.FieldReference;
|
||||
import com.ibm.wala.types.TypeName;
|
||||
import com.ibm.wala.types.TypeReference;
|
||||
import com.ibm.wala.util.Atom;
|
||||
import com.ibm.wala.util.collections.*;
|
||||
import com.ibm.wala.util.collections.Pair;
|
||||
import com.ibm.wala.util.debug.Assertions;
|
||||
import com.ibm.wala.util.debug.Trace;
|
||||
import com.ibm.wala.util.graph.INodeWithNumber;
|
||||
import com.ibm.wala.util.graph.impl.SparseNumberedGraph;
|
||||
import com.ibm.wala.util.graph.traverse.*;
|
||||
|
||||
/**
|
||||
* @author Julian Dolby TODO: document me.
|
||||
|
|
|
@ -11,16 +11,20 @@
|
|||
package com.ibm.wala.cast.loader;
|
||||
|
||||
|
||||
import com.ibm.wala.cast.tree.*;
|
||||
import com.ibm.wala.cast.types.*;
|
||||
import com.ibm.wala.classLoader.*;
|
||||
import com.ibm.wala.ipa.cha.*;
|
||||
import com.ibm.wala.types.*;
|
||||
import com.ibm.wala.util.Atom;
|
||||
import com.ibm.wala.util.collections.*;
|
||||
import com.ibm.wala.util.debug.Assertions;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import java.util.*;
|
||||
import com.ibm.wala.cast.tree.CAstSourcePositionMap;
|
||||
import com.ibm.wala.classLoader.IClass;
|
||||
import com.ibm.wala.classLoader.IClassLoader;
|
||||
import com.ibm.wala.classLoader.IField;
|
||||
import com.ibm.wala.ipa.cha.ClassHierarchy;
|
||||
import com.ibm.wala.ipa.cha.ClassHierarchyException;
|
||||
import com.ibm.wala.types.FieldReference;
|
||||
import com.ibm.wala.types.TypeName;
|
||||
import com.ibm.wala.types.TypeReference;
|
||||
import com.ibm.wala.util.Atom;
|
||||
import com.ibm.wala.util.debug.Assertions;
|
||||
|
||||
public abstract class AstDynamicPropertyClass extends AstClass {
|
||||
private final TypeReference defaultDescriptor;
|
||||
|
|
|
@ -11,14 +11,15 @@
|
|||
package com.ibm.wala.cast.loader;
|
||||
|
||||
|
||||
import com.ibm.wala.cast.tree.*;
|
||||
import com.ibm.wala.classLoader.*;
|
||||
import com.ibm.wala.ipa.cha.ClassHierarchy;
|
||||
import com.ibm.wala.types.*;
|
||||
import com.ibm.wala.util.Atom;
|
||||
import com.ibm.wala.util.debug.Assertions;
|
||||
import java.util.Collection;
|
||||
|
||||
import java.util.*;
|
||||
import com.ibm.wala.cast.tree.CAstQualifier;
|
||||
import com.ibm.wala.classLoader.IClass;
|
||||
import com.ibm.wala.classLoader.IField;
|
||||
import com.ibm.wala.ipa.cha.ClassHierarchy;
|
||||
import com.ibm.wala.types.FieldReference;
|
||||
import com.ibm.wala.types.TypeReference;
|
||||
import com.ibm.wala.util.Atom;
|
||||
|
||||
public class AstField implements IField {
|
||||
private final Collection qualifiers;
|
||||
|
|
|
@ -11,18 +11,23 @@
|
|||
package com.ibm.wala.cast.loader;
|
||||
|
||||
|
||||
import com.ibm.wala.cast.tree.*;
|
||||
import com.ibm.wala.cast.types.*;
|
||||
import com.ibm.wala.classLoader.*;
|
||||
import com.ibm.wala.ipa.cha.*;
|
||||
import com.ibm.wala.shrikeCT.*;
|
||||
import com.ibm.wala.types.*;
|
||||
import com.ibm.wala.util.Atom;
|
||||
import com.ibm.wala.util.collections.*;
|
||||
import com.ibm.wala.util.debug.Assertions;
|
||||
import java.net.URL;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
|
||||
import java.net.*;
|
||||
import java.util.*;
|
||||
import com.ibm.wala.cast.tree.CAstSourcePositionMap;
|
||||
import com.ibm.wala.cast.types.AstMethodReference;
|
||||
import com.ibm.wala.cast.types.AstTypeReference;
|
||||
import com.ibm.wala.classLoader.IClass;
|
||||
import com.ibm.wala.classLoader.IClassLoader;
|
||||
import com.ibm.wala.classLoader.IField;
|
||||
import com.ibm.wala.classLoader.IMethod;
|
||||
import com.ibm.wala.ipa.cha.ClassHierarchyException;
|
||||
import com.ibm.wala.shrikeCT.ClassConstants;
|
||||
import com.ibm.wala.types.Selector;
|
||||
import com.ibm.wala.types.TypeName;
|
||||
import com.ibm.wala.types.TypeReference;
|
||||
import com.ibm.wala.util.Atom;
|
||||
|
||||
abstract public class AstFunctionClass implements IClass, ClassConstants {
|
||||
private final IClassLoader loader;
|
||||
|
|
|
@ -10,8 +10,7 @@
|
|||
*****************************************************************************/
|
||||
package com.ibm.wala.cast.tree.impl;
|
||||
|
||||
import com.ibm.wala.cast.tree.*;
|
||||
import com.ibm.wala.cast.tree.CAstSourcePositionMap.*;
|
||||
import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
|
||||
|
||||
public abstract class AbstractSourcePosition implements Position {
|
||||
|
||||
|
|
|
@ -10,10 +10,9 @@
|
|||
*****************************************************************************/
|
||||
package com.ibm.wala.cast.tree.impl;
|
||||
|
||||
import com.ibm.wala.cast.tree.*;
|
||||
|
||||
import java.io.*;
|
||||
import java.net.*;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.URL;
|
||||
|
||||
public class LineNumberPosition extends AbstractSourcePosition {
|
||||
private final URL url;
|
||||
|
|
|
@ -10,12 +10,18 @@
|
|||
*****************************************************************************/
|
||||
package com.ibm.wala.cast.util;
|
||||
|
||||
import com.ibm.wala.cast.tree.*;
|
||||
import com.ibm.wala.cast.tree.impl.*;
|
||||
import com.ibm.wala.util.debug.*;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.TreeMap;
|
||||
|
||||
import java.lang.reflect.*;
|
||||
import java.util.*;
|
||||
import com.ibm.wala.cast.tree.CAstNode;
|
||||
import com.ibm.wala.util.debug.Assertions;
|
||||
import com.ibm.wala.util.debug.Trace;
|
||||
|
||||
public class CAstPattern {
|
||||
private static boolean DEBUG_PARSER = false;
|
||||
|
@ -370,10 +376,10 @@ public class CAstPattern {
|
|||
this.patternString = patternString;
|
||||
}
|
||||
|
||||
private Parser(String patternString, int start) {
|
||||
this(patternString);
|
||||
this.start = start;
|
||||
}
|
||||
// private Parser(String patternString, int start) {
|
||||
// this(patternString);
|
||||
// this.start = start;
|
||||
// }
|
||||
|
||||
private String parseName(boolean internal) {
|
||||
if (patternString.charAt(start) == (internal?'{':'<')) {
|
||||
|
|
|
@ -10,12 +10,16 @@
|
|||
*****************************************************************************/
|
||||
package com.ibm.wala.cast.util;
|
||||
|
||||
import com.ibm.wala.cast.tree.*;
|
||||
import com.ibm.wala.cast.tree.impl.*;
|
||||
import javax.xml.parsers.DocumentBuilder;
|
||||
import javax.xml.parsers.DocumentBuilderFactory;
|
||||
import javax.xml.parsers.ParserConfigurationException;
|
||||
|
||||
import javax.xml.parsers.*;
|
||||
import org.w3c.dom.DOMImplementation;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import org.w3c.dom.Text;
|
||||
|
||||
import org.w3c.dom.*;
|
||||
import com.ibm.wala.cast.tree.CAstNode;
|
||||
|
||||
public class CAstToDOM extends CAstPrinter {
|
||||
|
||||
|
|
|
@ -10,10 +10,11 @@
|
|||
*****************************************************************************/
|
||||
package com.ibm.wala.cast.util;
|
||||
|
||||
import com.ibm.wala.util.warnings.*;
|
||||
|
||||
import java.io.*;
|
||||
import java.net.*;
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.URL;
|
||||
|
||||
public class TemporaryFile {
|
||||
|
||||
|
|
Loading…
Reference in New Issue