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

Fixed references after renaming Name.getName()->asString()

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-05-22 20:51:23 +04:00
committed by Pavel V. Talanov
parent 4e8d14024c
commit dfae4b606b
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/jetbrains/jet/j2k/Converter.kt
+14 -14
View File
@@ -522,20 +522,20 @@ public open class Converter() {
class object {
public val NOT_NULL_ANNOTATIONS: Set<String> = ImmutableSet.of<String>("org.jetbrains.annotations.NotNull", "com.sun.istack.internal.NotNull", "javax.annotation.Nonnull")!!
public val PRIMITIVE_TYPE_CONVERSIONS: Map<String, String> = ImmutableMap.builder<String, String>()
?.put("byte", BYTE.getName())
?.put("short", SHORT.getName())
?.put("int", INT.getName())
?.put("long", LONG.getName())
?.put("float", FLOAT.getName())
?.put("double", DOUBLE.getName())
?.put("char", CHAR.getName())
?.put(JAVA_LANG_BYTE, BYTE.getName())
?.put(JAVA_LANG_SHORT, SHORT.getName())
?.put(JAVA_LANG_INTEGER, INT.getName())
?.put(JAVA_LANG_LONG, LONG.getName())
?.put(JAVA_LANG_FLOAT, FLOAT.getName())
?.put(JAVA_LANG_DOUBLE, DOUBLE.getName())
?.put(JAVA_LANG_CHARACTER, CHAR.getName())
?.put("byte", BYTE.asString())
?.put("short", SHORT.asString())
?.put("int", INT.asString())
?.put("long", LONG.asString())
?.put("float", FLOAT.asString())
?.put("double", DOUBLE.asString())
?.put("char", CHAR.asString())
?.put(JAVA_LANG_BYTE, BYTE.asString())
?.put(JAVA_LANG_SHORT, SHORT.asString())
?.put(JAVA_LANG_INTEGER, INT.asString())
?.put(JAVA_LANG_LONG, LONG.asString())
?.put(JAVA_LANG_FLOAT, FLOAT.asString())
?.put(JAVA_LANG_DOUBLE, DOUBLE.asString())
?.put(JAVA_LANG_CHARACTER, CHAR.asString())
?.build()!!
private fun quoteKeywords(packageName: String): String {
src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
+1 -1
View File
@@ -239,7 +239,7 @@ public open class ExpressionVisitor(converter: Converter): StatementVisitor(conv
if (resolved is PsiClass) {
val clazz = resolved as PsiClass
if (PrimitiveType.values() any { it.getTypeName().getName() == clazz.getName() }) {
if (PrimitiveType.values() any { it.getTypeName().asString() == clazz.getName() }) {
myResult = Identifier(clazz.getQualifiedName()!!, false)
return
}