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

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:
sjfink 2007-02-08 19:08:31 +00:00
parent 6937ed8e80
commit f4fef68587
16 changed files with 131 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
com.ibm.wala.cast/META-INF/MANIFEST.MF
View File

@ -8,7 +8,7 @@ Bundle-Vendor: IBM
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime, Require-Bundle: org.eclipse.core.runtime,
com.ibm.wala.core com.ibm.wala.core
Eclipse-AutoStart: true Eclipse-LazyStart: true
Export-Package: com.ibm.wala.cast.analysis.typeInference, Export-Package: com.ibm.wala.cast.analysis.typeInference,
com.ibm.wala.cast.ipa.callgraph, com.ibm.wala.cast.ipa.callgraph,
com.ibm.wala.cast.ir.cfg, com.ibm.wala.cast.ir.cfg,

3
com.ibm.wala.cast/build.properties
View File

@ -1,4 +1,5 @@
source.. = source/ source.. = source/,\
source/java/
output.. = bin/ output.. = bin/
bin.includes = META-INF/,\ bin.includes = META-INF/,\
. .

2
com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/DelegatingAstPointerKeys.java
View File

@ -54,7 +54,7 @@ public class DelegatingAstPointerKeys implements AstPointerKeyFactory {
} }
private final Map specificStringKeys = new HashMap(); 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) { public PointerKey getPointerKeyForInstanceField(InstanceKey I, IField f) {
PointerKey fk = base.getPointerKeyForInstanceField(I, f); PointerKey fk = base.getPointerKeyForInstanceField(I, f);

5
com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractReflectiveGet.java
View File

@ -10,8 +10,9 @@
*****************************************************************************/ *****************************************************************************/
package com.ibm.wala.cast.ir.ssa; package com.ibm.wala.cast.ir.ssa;
import com.ibm.wala.ssa.*; import com.ibm.wala.ssa.ReflectiveMemberAccess;
import com.ibm.wala.util.debug.Assertions; import com.ibm.wala.ssa.SymbolTable;
import com.ibm.wala.ssa.ValueDecorator;
public abstract class AbstractReflectiveGet extends ReflectiveMemberAccess { public abstract class AbstractReflectiveGet extends ReflectiveMemberAccess {
private final int result; private final int result;

5
com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractReflectivePut.java
View File

@ -11,8 +11,9 @@
package com.ibm.wala.cast.ir.ssa; package com.ibm.wala.cast.ir.ssa;
import com.ibm.wala.ssa.*; import com.ibm.wala.ssa.ReflectiveMemberAccess;
import com.ibm.wala.util.debug.Assertions; import com.ibm.wala.ssa.SymbolTable;
import com.ibm.wala.ssa.ValueDecorator;
public abstract class AbstractReflectivePut extends ReflectiveMemberAccess { public abstract class AbstractReflectivePut extends ReflectiveMemberAccess {
private final int value; private final int value;

18
com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractSSAConversion.java
View File

@ -10,17 +10,23 @@
*****************************************************************************/ *****************************************************************************/
package com.ibm.wala.cast.ir.ssa; package com.ibm.wala.cast.ir.ssa;
import com.ibm.wala.cast.loader.*; import java.util.Iterator;
import com.ibm.wala.cfg.*; import java.util.LinkedHashSet;
import com.ibm.wala.ssa.*; import java.util.Set;
import com.ibm.wala.ssa.SSAOptions.*;
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.collections.IntStack;
import com.ibm.wala.util.debug.Assertions; import com.ibm.wala.util.debug.Assertions;
import com.ibm.wala.util.graph.DominanceFrontiers; import com.ibm.wala.util.graph.DominanceFrontiers;
import com.ibm.wala.util.graph.Graph; import com.ibm.wala.util.graph.Graph;
import java.util.*;
/** /**
* Abstract core of traditional SSA conversion (Cytron et al.). * Abstract core of traditional SSA conversion (Cytron et al.).

27
com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/SSAConversion.java
View File

@ -10,20 +10,31 @@
*****************************************************************************/ *****************************************************************************/
package com.ibm.wala.cast.ir.ssa; 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.AstIRFactory.AstIR;
import com.ibm.wala.cast.ir.ssa.analysis.LiveAnalysis; 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.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.ssa.IR.SSA2LocalMap;
import com.ibm.wala.util.collections.IntStack;
import com.ibm.wala.util.debug.Assertions; import com.ibm.wala.util.debug.Assertions;
import com.ibm.wala.util.debug.Trace; import com.ibm.wala.util.debug.Trace;
import com.ibm.wala.util.graph.Graph; import com.ibm.wala.util.intset.BitVector;
import com.ibm.wala.util.intset.*; import com.ibm.wala.util.intset.BitVectorIntSet;
import com.ibm.wala.util.intset.IntSet;
import java.util.*; import com.ibm.wala.util.intset.MutableIntSet;
/** /**
* @author Julian Dolby * @author Julian Dolby

26
com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java
View File

@ -10,7 +10,17 @@
*****************************************************************************/ *****************************************************************************/
package com.ibm.wala.cast.ir.translator; 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.AssignInstruction;
import com.ibm.wala.cast.ir.ssa.AstAssertInstruction; 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.IInstruction;
import com.ibm.wala.shrikeBT.ShiftInstruction; import com.ibm.wala.shrikeBT.ShiftInstruction;
import com.ibm.wala.shrikeBT.UnaryOpInstruction; import com.ibm.wala.shrikeBT.UnaryOpInstruction;
import com.ibm.wala.ssa.*; import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
import com.ibm.wala.types.*; 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.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.Assertions;
import com.ibm.wala.util.debug.Trace; import com.ibm.wala.util.debug.Trace;
import com.ibm.wala.util.graph.INodeWithNumber; import com.ibm.wala.util.graph.INodeWithNumber;
import com.ibm.wala.util.graph.impl.SparseNumberedGraph; import com.ibm.wala.util.graph.impl.SparseNumberedGraph;
import com.ibm.wala.util.graph.traverse.*;
/** /**
* @author Julian Dolby TODO: document me. * @author Julian Dolby TODO: document me.

22
com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstDynamicPropertyClass.java
View File

@ -11,16 +11,20 @@
package com.ibm.wala.cast.loader; package com.ibm.wala.cast.loader;
import com.ibm.wala.cast.tree.*; import java.util.HashMap;
import com.ibm.wala.cast.types.*; import java.util.Map;
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.*; 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 { public abstract class AstDynamicPropertyClass extends AstClass {
private final TypeReference defaultDescriptor; private final TypeReference defaultDescriptor;

15
com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstField.java
View File

@ -11,14 +11,15 @@
package com.ibm.wala.cast.loader; package com.ibm.wala.cast.loader;
import com.ibm.wala.cast.tree.*; import java.util.Collection;
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.*; 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 { public class AstField implements IField {
private final Collection qualifiers; private final Collection qualifiers;

27
com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstFunctionClass.java
View File

@ -11,18 +11,23 @@
package com.ibm.wala.cast.loader; package com.ibm.wala.cast.loader;
import com.ibm.wala.cast.tree.*; import java.net.URL;
import com.ibm.wala.cast.types.*; import java.util.Collection;
import com.ibm.wala.classLoader.*; import java.util.Collections;
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.*; import com.ibm.wala.cast.tree.CAstSourcePositionMap;
import java.util.*; 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 { abstract public class AstFunctionClass implements IClass, ClassConstants {
private final IClassLoader loader; private final IClassLoader loader;

3
com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/AbstractSourcePosition.java
View File

@ -10,8 +10,7 @@
*****************************************************************************/ *****************************************************************************/
package com.ibm.wala.cast.tree.impl; package com.ibm.wala.cast.tree.impl;
import com.ibm.wala.cast.tree.*; import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
import com.ibm.wala.cast.tree.CAstSourcePositionMap.*;
public abstract class AbstractSourcePosition implements Position { public abstract class AbstractSourcePosition implements Position {

7
com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/LineNumberPosition.java
View File

@ -10,10 +10,9 @@
*****************************************************************************/ *****************************************************************************/
package com.ibm.wala.cast.tree.impl; package com.ibm.wala.cast.tree.impl;
import com.ibm.wala.cast.tree.*; import java.io.IOException;
import java.io.InputStream;
import java.io.*; import java.net.URL;
import java.net.*;
public class LineNumberPosition extends AbstractSourcePosition { public class LineNumberPosition extends AbstractSourcePosition {
private final URL url; private final URL url;

24
com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPattern.java
View File

@ -10,12 +10,18 @@
*****************************************************************************/ *****************************************************************************/
package com.ibm.wala.cast.util; package com.ibm.wala.cast.util;
import com.ibm.wala.cast.tree.*; import java.lang.reflect.Field;
import com.ibm.wala.cast.tree.impl.*; import java.util.ArrayList;
import com.ibm.wala.util.debug.*; 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 com.ibm.wala.cast.tree.CAstNode;
import java.util.*; import com.ibm.wala.util.debug.Assertions;
import com.ibm.wala.util.debug.Trace;
public class CAstPattern { public class CAstPattern {
private static boolean DEBUG_PARSER = false; private static boolean DEBUG_PARSER = false;
@ -370,10 +376,10 @@ public class CAstPattern {
this.patternString = patternString; this.patternString = patternString;
} }
private Parser(String patternString, int start) { // private Parser(String patternString, int start) {
this(patternString); // this(patternString);
this.start = start; // this.start = start;
} // }
private String parseName(boolean internal) { private String parseName(boolean internal) {
if (patternString.charAt(start) == (internal?'{':'<')) { if (patternString.charAt(start) == (internal?'{':'<')) {

12
com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstToDOM.java
View File

@ -10,12 +10,16 @@
*****************************************************************************/ *****************************************************************************/
package com.ibm.wala.cast.util; package com.ibm.wala.cast.util;
import com.ibm.wala.cast.tree.*; import javax.xml.parsers.DocumentBuilder;
import com.ibm.wala.cast.tree.impl.*; 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 { public class CAstToDOM extends CAstPrinter {

9
com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/TemporaryFile.java
View File

@ -10,10 +10,11 @@
*****************************************************************************/ *****************************************************************************/
package com.ibm.wala.cast.util; package com.ibm.wala.cast.util;
import com.ibm.wala.util.warnings.*; import java.io.File;
import java.io.FileOutputStream;
import java.io.*; import java.io.IOException;
import java.net.*; import java.io.InputStream;
import java.net.URL;
public class TemporaryFile { public class TemporaryFile {