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

type cleanups

This commit is contained in:
Julian Dolby 2017-01-11 08:04:37 -05:00
parent 137fed6e62
commit 7a69f752d0
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java
View File

@ -1066,7 +1066,7 @@ public abstract class JDTJava2CAstTranslator<T extends Position> {
* NOT INCLUDING first parameter 'this' (for non-static methods)
*/
@Override
public List getArgumentTypes() {
public List<CAstType> getArgumentTypes() {
return fParameterTypes;
}
@ -1085,13 +1085,13 @@ public abstract class JDTJava2CAstTranslator<T extends Position> {
}
@Override
public Collection getSupertypes() {
public Collection<CAstType> getSupertypes() {
Assertions.UNREACHABLE("CAstType.FunctionImpl#getSupertypes() called???");
return null;
}
@Override
public Collection/* <CAstType> */getExceptionTypes() {
public Collection<CAstType>/* <CAstType> */getExceptionTypes() {
if (fExceptionTypes == null) {
fExceptionTypes = new LinkedHashSet<CAstType>();
if (fDecl != null)

2
com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java
View File

@ -122,7 +122,7 @@ public class JDTTypeDictionary extends CAstTypeDictionaryImpl {
@Override
@SuppressWarnings("unchecked")
public Collection getSupertypes() {
public Collection<CAstType> getSupertypes() {
if (fEltJdtType.isPrimitive())
return Collections.singleton(getCAstTypeFor(fAst.resolveWellKnownType("java.lang.Object")));
// TODO: there is no '.isReference()' as in Polyglot: is this right? enum? I think if it's another array it will

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

@ -415,7 +415,7 @@ public class JavaCAst2IRTranslator extends AstTranslator {
return new CAstType.Class() {
@Override
public Collection getSupertypes() {
public Collection<CAstType> getSupertypes() {
return Collections.emptySet();
}

2
com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/types/JavaPrimitiveTypeMap.java
View File

@ -43,7 +43,7 @@ public class JavaPrimitiveTypeMap {
}
@Override
public Collection getSupertypes() {
public Collection<CAstType> getSupertypes() {
return Collections.EMPTY_LIST;
}
}

2
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JSAstTranslator.java
View File

@ -470,7 +470,7 @@ public class JSAstTranslator extends AstTranslator {
}
@Override
public Collection getSupertypes() {
public Collection<CAstType> getSupertypes() {
return Collections.EMPTY_SET;
}
};

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

@ -1822,10 +1822,10 @@ public abstract class AstTranslator extends CAstVisitor<AstTranslator.WalkContex
if (yuck == 0) {
return ((CAstType.Method)f.getType()).getDeclaringType();
} else {
return (CAstType) ((CAstType.Method)f.getType()).getArgumentTypes().get(yuck-1);
return ((CAstType.Method)f.getType()).getArgumentTypes().get(yuck-1);
}
} else if (f.getType() instanceof CAstType.Function) {
return (CAstType) ((CAstType.Function)f.getType()).getArgumentTypes().get(yuck);
return ((CAstType.Function)f.getType()).getArgumentTypes().get(yuck);
} else {
return topType();
}
@ -3109,7 +3109,7 @@ public abstract class AstTranslator extends CAstVisitor<AstTranslator.WalkContex
return ConditionalBranchInstruction.Operator.NE;
else {
Assertions.UNREACHABLE("cannot translate " + CAstPrinter.print(op));
assert false : "cannot translate " + CAstPrinter.print(op);
return null;
}
}

8
com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstType.java
View File

@ -23,7 +23,7 @@ public interface CAstType {
*/
String getName();
Collection/*<CAstType>*/ getSupertypes();
Collection<CAstType> getSupertypes();
public interface Primitive extends CAstType {
// Need anything else? The name pretty much says it all...
@ -46,8 +46,8 @@ public interface CAstType {
public interface Function extends Reference {
CAstType getReturnType();
List/*<CAstType>*/ getArgumentTypes();
Collection/*<CAstType>*/ getExceptionTypes();
List<CAstType> getArgumentTypes();
Collection<CAstType> getExceptionTypes();
int getArgumentCount();
}
@ -70,7 +70,7 @@ public interface CAstType {
}
@Override
public Collection/*<CAstType>*/ getSupertypes() {
public Collection<CAstType>/*<CAstType>*/ getSupertypes() {
return Collections.EMPTY_SET;
}