From 085b9704b818a2e6c2b62af69ab96b452f5a820a Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Sat, 16 Jun 2012 18:27:33 +0400
Subject: [PATCH] Added checking for overridden properties number in
 NamespaceComparator.

---
 .../readKotlinBinaryClass/prop/OverrideClassVal.txt         | 2 +-
 .../readKotlinBinaryClass/prop/OverrideTraitVal.txt         | 2 +-
 .../readKotlinBinaryClass/prop/PropFromSuperclass.txt       | 2 +-
 .../readKotlinBinaryClass/prop/VarDelegationToTraitImpl.txt | 2 +-
 .../org/jetbrains/jet/jvm/compiler/NamespaceComparator.java | 6 +++++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.txt b/compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.txt
index 7f7b3095a72..0446aa5c427 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.txt
@@ -5,6 +5,6 @@ internal open class test.BaseClass : jet.Any {
     public final /*constructor*/ fun <init>(): test.BaseClass
 }
 internal open class test.Subclass : test.BaseClass {
-    internal open val shape: jet.String
+    internal open override /*1*/ val shape: jet.String
     public final /*constructor*/ fun <init>(): test.Subclass
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.txt b/compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.txt
index 297bdb7e7e5..20c9dad1560 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.txt
@@ -1,7 +1,7 @@
 namespace test
 
 internal open class test.Subclass : test.Trait {
-    internal open val shape: jet.String
+    internal open override /*1*/ val shape: jet.String
     public final /*constructor*/ fun <init>(): test.Subclass
 }
 internal abstract trait test.Trait : jet.Any {
diff --git a/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt b/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt
index d01bf3e5239..1672a6cfe16 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt
@@ -5,6 +5,6 @@ internal open class test.BaseClass : jet.Any {
     public final /*constructor*/ fun <init>(): test.BaseClass
 }
 internal final class test.Subclass : test.BaseClass {
-    internal final val exactly: jet.Int
+    internal final override /*1*/ val exactly: jet.Int
     public final /*constructor*/ fun <init>(): test.Subclass
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.txt b/compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.txt
index 0128922ec34..407b1bc696f 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.txt
@@ -4,6 +4,6 @@ internal abstract trait test.A : jet.Any {
     internal open var v: jet.String
 }
 internal final class test.B : test.A {
-    internal open var v: jet.String
+    internal open override /*1*/ var v: jet.String
     public final /*constructor*/ fun <init>(): test.B
 }
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java
index c5679058b41..84631962a09 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java
@@ -274,7 +274,7 @@ public class NamespaceComparator {
             }
 
             if (!fun.getOverriddenDescriptors().isEmpty()) {
-                sb.append("override /*" + fun.getOverriddenDescriptors().size() + "*/ ");
+                sb.append("override /*").append(fun.getOverriddenDescriptors().size()).append("*/ ");
             }
 
             if (fun instanceof ConstructorDescriptor) {
@@ -332,6 +332,10 @@ public class NamespaceComparator {
                 sb.append(" ");
             }
 
+            if (!prop.getOverriddenDescriptors().isEmpty()) {
+                sb.append("override /*").append(prop.getOverriddenDescriptors().size()).append("*/ ");
+            }
+
             if (prop.isVar()) {
                 sb.append("var ");
             }