Merge remote branch 'origin/master'

2011-12-27 11:46:22 +04:00
parent fa5be15852 90e5c03389
commit 8cad00a021
27 changed files with 284 additions and 95 deletions
@@ -670,7 +670,7 @@ public class JetTypeCheckerTest extends JetLiteFixture {
                    @Override
                    public void visitProperty(JetProperty property) {
                        if (property.getPropertyTypeRef() != null) {
-                            memberDeclarations.addVariableDescriptor(descriptorResolver.resolvePropertyDescriptor(classDescriptor, parameterScope, property));
+                            memberDeclarations.addPropertyDescriptor(descriptorResolver.resolvePropertyDescriptor(classDescriptor, parameterScope, property));
                        } else {
                            // TODO : Caution: a cyclic dependency possible
                            throw new UnsupportedOperationException();