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

Delete deprecated Type.Constructor message, advance ABI version

Browse Source 
Original commit: e749bc262d
This commit is contained in:
Alexander Udalov
2015-09-16 16:21:43 +03:00
parent 7de15ca7d1
commit 99bf0fd03f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
+10 -10
View File
@@ -232,14 +232,14 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkEquals(old.flexibleUpperBound, new.flexibleUpperBound)) return false if (!checkEquals(old.flexibleUpperBound, new.flexibleUpperBound)) return false
} }
if (old.hasConstructorClassName() != new.hasConstructorClassName()) return false if (old.hasClassName() != new.hasClassName()) return false
if (old.hasConstructorClassName()) { if (old.hasClassName()) {
if (!checkClassIdEquals(old.constructorClassName, new.constructorClassName)) return false if (!checkClassIdEquals(old.className, new.className)) return false
} }
if (old.hasConstructorTypeParameter() != new.hasConstructorTypeParameter()) return false if (old.hasTypeParameter() != new.hasTypeParameter()) return false
if (old.hasConstructorTypeParameter()) { if (old.hasTypeParameter()) {
if (old.constructorTypeParameter != new.constructorTypeParameter) return false if (old.typeParameter != new.typeParameter) return false
} }
if (old.getExtensionCount(JvmProtoBuf.typeAnnotation) != new.getExtensionCount(JvmProtoBuf.typeAnnotation)) return false if (old.getExtensionCount(JvmProtoBuf.typeAnnotation) != new.getExtensionCount(JvmProtoBuf.typeAnnotation)) return false
@@ -746,12 +746,12 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (I
hashCode = 31 * hashCode + flexibleUpperBound.hashCode(stringIndexes, fqNameIndexes) hashCode = 31 * hashCode + flexibleUpperBound.hashCode(stringIndexes, fqNameIndexes)
} }
if (hasConstructorClassName()) { if (hasClassName()) {
hashCode = 31 * hashCode + fqNameIndexes(constructorClassName) hashCode = 31 * hashCode + fqNameIndexes(className)
} }
if (hasConstructorTypeParameter()) { if (hasTypeParameter()) {
hashCode = 31 * hashCode + constructorTypeParameter hashCode = 31 * hashCode + typeParameter
} }
for(i in 0..getExtensionCount(JvmProtoBuf.typeAnnotation) - 1) { for(i in 0..getExtensionCount(JvmProtoBuf.typeAnnotation) - 1) {