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

Got rid of constructors/initializers zoo in property descriptors

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-03-25 19:17:06 +04:00
parent eaad1f9f50
commit 1aaea21f63
6 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/AccessorForPropertyDescriptor.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class AccessorForPropertyDescriptor extends PropertyDescriptorImpl {
@NotNull DeclarationDescriptor containingDeclaration,
int index
) {
super(containingDeclaration, Annotations.EMPTY, Modality.FINAL, Visibilities.LOCAL,
super(null, containingDeclaration, Annotations.EMPTY, Modality.FINAL, Visibilities.LOCAL,
original.isVar(), Name.identifier(original.getName() + "$b$" + index),
Kind.DECLARATION);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+3 -3
View File
@@ -821,7 +821,7 @@ public class DescriptorResolver {
) {
DeclarationDescriptor containingDeclaration = scope.getContainingDeclaration();
if (JetPsiUtil.isScriptDeclaration(variable)) {
PropertyDescriptorImpl propertyDescriptor = new PropertyDescriptorImpl(
PropertyDescriptorImpl propertyDescriptor = PropertyDescriptorImpl.create(
containingDeclaration,
annotationResolver.resolveAnnotationsWithArguments(scope, variable.getModifierList(), trace),
Modality.FINAL,
@@ -883,7 +883,7 @@ public class DescriptorResolver {
? resolveModalityFromModifiers(property, getDefaultModality(containingDeclaration, hasBody))
: Modality.FINAL;
Visibility visibility = resolveVisibilityFromModifiers(property, getDefaultVisibility(property, containingDeclaration));
PropertyDescriptorImpl propertyDescriptor = new PropertyDescriptorImpl(
PropertyDescriptorImpl propertyDescriptor = PropertyDescriptorImpl.create(
containingDeclaration,
annotationResolver.resolveAnnotationsWithoutArguments(scope, modifierList, trace),
modality,
@@ -1287,7 +1287,7 @@ public class DescriptorResolver {
}
}
PropertyDescriptorImpl propertyDescriptor = new PropertyDescriptorImpl(
PropertyDescriptorImpl propertyDescriptor = PropertyDescriptorImpl.create(
classDescriptor,
valueParameter.getAnnotations(),
resolveModalityFromModifiers(parameter, Modality.FINAL),