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

miscellaneous housekeeping 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@1365 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
sjfink 2007-07-06 03:07:24 +00:00
parent 8864b70d50
commit 5d6eb70c5b
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/loader/JavaSourceLoaderImpl.java
View File

@ -89,7 +89,7 @@ public abstract class JavaSourceLoaderImpl extends ClassLoaderImpl {
public IClass getSuperclass() {
for (Iterator iter = superTypeNames.iterator(); iter.hasNext();) {
TypeName name = (TypeName) iter.next();
IClass domoType = lookupClass(name, cha);
IClass domoType = lookupClass(name);
if (domoType != null && !domoType.isInterface()) {
return domoType;
}
@ -104,7 +104,7 @@ public abstract class JavaSourceLoaderImpl extends ClassLoaderImpl {
List<IClass> result = new ArrayList<IClass>();
for (Iterator iter = superTypeNames.iterator(); iter.hasNext();) {
TypeName name = (TypeName) iter.next();
IClass domoType = lookupClass(name, cha);
IClass domoType = lookupClass(name);
if (domoType != null && domoType.isInterface()) {
result.add(domoType);
}
@ -322,7 +322,7 @@ public abstract class JavaSourceLoaderImpl extends ClassLoaderImpl {
int lastLeftParen = parents[i].lastIndexOf('(');
int lastQ = parents[i].lastIndexOf('/', lastLeftParen);
String typeName = parents[i].substring(0, lastQ);
final IClass cls = lookupClass(TypeName.string2TypeName(typeName), cha);
final IClass cls = lookupClass(TypeName.string2TypeName(typeName));
String sig = parents[i].substring(lastQ);
int nameEnd = sig.indexOf('(');

9
com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/JavaCAst2IRTranslator.java
View File

@ -214,8 +214,7 @@ public class JavaCAst2IRTranslator extends AstTranslator {
// N.B.: base class may actually ask to create a synthetic type to wrap
// code bodies, so we may see other things than TYPE_ENTITY here.
IClass owner =
loader.lookupClass(makeType(topEntity.getType()).getName(),
loader().getClassHierarchy());
loader.lookupClass(makeType(topEntity.getType()).getName());
if (owner == null) {
Assertions._assert(owner != null, makeType(topEntity.getType()).getName() + " not found in " + loader);
@ -229,8 +228,7 @@ public class JavaCAst2IRTranslator extends AstTranslator {
CAstType.Method methodType= (Method) N.getType();
CAstType owningType= methodType.getDeclaringType();
IClass owner =
loader.lookupClass(makeType(owningType).getName(),
loader().getClassHierarchy());
loader.lookupClass(makeType(owningType).getName());
if (owner == null) {
Assertions._assert(owner != null, makeType(owningType).getName().toString() + " not found in " + loader);
@ -252,8 +250,7 @@ public class JavaCAst2IRTranslator extends AstTranslator {
CAstType.Method methodType= (Method) N.getType();
CAstType owningType= methodType.getDeclaringType();
IClass owner =
loader.lookupClass(makeType(owningType).getName(),
loader().getClassHierarchy());
loader.lookupClass(makeType(owningType).getName());
if (owner == null) {
Assertions._assert(owner != null, makeType(owningType).getName().toString() + " not found in " + loader);