Minor: fix warnings

This commit is contained in:
Natalia Ukhorskaya
2014-06-12 01:38:26 +04:00
parent f4b01b5f47
commit 0c17bbe1c4
@@ -66,7 +66,7 @@ class JDIEval(
) )
} }
override fun loadString(str: String): Value = vm.mirrorOf(str)!!.asValue() override fun loadString(str: String): Value = vm.mirrorOf(str).asValue()
override fun newInstance(classType: Type): Value { override fun newInstance(classType: Type): Value {
return NewObjectValue(classType) return NewObjectValue(classType)
@@ -253,12 +253,7 @@ class JDIEval(
val dimensions = name.count { it == '[' } val dimensions = name.count { it == '[' }
val baseTypeName = if (dimensions > 0) name.substring(0, name.indexOf('[')) else name val baseTypeName = if (dimensions > 0) name.substring(0, name.indexOf('[')) else name
val primitiveType = primitiveTypes[baseTypeName] val baseType = primitiveTypes[baseTypeName] ?: Type.getType("L$baseTypeName;").asReferenceType()
val baseType = if (primitiveType != null)
primitiveType
else {
Type.getType("L$baseTypeName;").asReferenceType()
}
if (dimensions == 0) if (dimensions == 0)
baseType baseType