azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: CompileTimeConstantUtils, builtins are not needed to check for string type

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-07-23 17:30:54 +03:00
parent 7203a7833a
commit 78f55583f0
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java
+2 -3
View File
@@ -81,13 +81,12 @@ public class CompileTimeConstantUtils {
return false; return false;
} }
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
if (isEnumClass(typeDescriptor) || if (isEnumClass(typeDescriptor) ||
isAnnotationClass(typeDescriptor) || isAnnotationClass(typeDescriptor) ||
KotlinBuiltIns.isKClass(typeDescriptor) || KotlinBuiltIns.isKClass(typeDescriptor) ||
KotlinBuiltIns.isPrimitiveArray(parameterType) || KotlinBuiltIns.isPrimitiveArray(parameterType) ||
KotlinBuiltIns.isPrimitiveType(parameterType) || KotlinBuiltIns.isPrimitiveType(parameterType) ||
builtIns.getStringType().equals(parameterType)) { KotlinBuiltIns.isString(parameterType)) {
return true; return true;
} }
@@ -103,7 +102,7 @@ public class CompileTimeConstantUtils {
return isEnumClass(arrayTypeDescriptor) || return isEnumClass(arrayTypeDescriptor) ||
isAnnotationClass(arrayTypeDescriptor) || isAnnotationClass(arrayTypeDescriptor) ||
KotlinBuiltIns.isKClass(arrayTypeDescriptor) || KotlinBuiltIns.isKClass(arrayTypeDescriptor) ||
builtIns.getStringType().equals(arrayType); KotlinBuiltIns.isString(arrayType);
} }
} }
} }