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

Rename: KtClassInitializer -> KtAnonymousInitializer

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-11-19 14:25:16 +03:00
parent 917b8bfe66
commit 6bb89021dd
51 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+2 -2
View File
@@ -1264,8 +1264,8 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
initializer.accept(visitor);
}
}
else if (declaration instanceof KtClassInitializer) {
KtClassInitializer initializer = (KtClassInitializer) declaration;
else if (declaration instanceof KtAnonymousInitializer) {
KtAnonymousInitializer initializer = (KtAnonymousInitializer) declaration;
initializer.accept(visitor);
}
else if (declaration instanceof KtSecondaryConstructor) {
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+2 -2
View File
@@ -365,8 +365,8 @@ public abstract class MemberCodegen<T extends KtElement/* TODO: & JetDeclaration
initializeProperty(codegen.invoke(), (KtProperty) declaration);
}
}
else if (declaration instanceof KtClassInitializer) {
KtExpression body = ((KtClassInitializer) declaration).getBody();
else if (declaration instanceof KtAnonymousInitializer) {
KtExpression body = ((KtAnonymousInitializer) declaration).getBody();
if (body != null) {
codegen.invoke().gen(body, Type.VOID_TYPE);
}
compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java
+3 -3
View File
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState;
import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import org.jetbrains.kotlin.descriptors.ScriptDescriptor;
import org.jetbrains.kotlin.psi.KtClassInitializer;
import org.jetbrains.kotlin.psi.KtAnonymousInitializer;
import org.jetbrains.kotlin.psi.KtDeclaration;
import org.jetbrains.kotlin.psi.KtExpression;
import org.jetbrains.kotlin.psi.KtScript;
@@ -52,8 +52,8 @@ public class ScriptContext extends ClassContext {
KtScript script = (KtScript) DescriptorToSourceUtils.getSourceFromDescriptor(scriptDescriptor);
assert script != null : "Declaration should be present for script: " + scriptDescriptor;
KtDeclaration lastDeclaration = CollectionsKt.lastOrNull(script.getDeclarations());
if (lastDeclaration instanceof KtClassInitializer) {
this.lastStatement = ((KtClassInitializer) lastDeclaration).getBody();
if (lastDeclaration instanceof KtAnonymousInitializer) {
this.lastStatement = ((KtAnonymousInitializer) lastDeclaration).getBody();
}
else {
this.lastStatement = null;
compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java
+3 -3
View File
@@ -1343,7 +1343,7 @@ public class JetControlFlowProcessor {
}
@Override
public void visitAnonymousInitializer(@NotNull KtClassInitializer classInitializer) {
public void visitAnonymousInitializer(@NotNull KtAnonymousInitializer classInitializer) {
generateInstructions(classInitializer.getBody());
}
@@ -1355,7 +1355,7 @@ public class JetControlFlowProcessor {
private void generateInitializersForScriptClassOrObject(@NotNull KtDeclarationContainer classOrObject) {
for (KtDeclaration declaration : classOrObject.getDeclarations()) {
if (declaration instanceof KtProperty || declaration instanceof KtClassInitializer) {
if (declaration instanceof KtProperty || declaration instanceof KtAnonymousInitializer) {
generateInstructions(declaration);
}
}
@@ -1384,7 +1384,7 @@ public class JetControlFlowProcessor {
for (KtDeclaration declaration : classOrObject.getDeclarations()) {
if (declaration instanceof KtSecondaryConstructor ||
declaration instanceof KtProperty ||
declaration instanceof KtClassInitializer) {
declaration instanceof KtAnonymousInitializer) {
continue;
}
generateInstructions(declaration);
compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
+1 -1
View File
@@ -760,7 +760,7 @@ public class JetFlowInformationProvider {
//noinspection unchecked
KtExpression parent = PsiTreeUtil.getParentOfType(
element,
KtTryExpression.class, KtFunction.class, KtClassInitializer.class
KtTryExpression.class, KtFunction.class, KtAnonymousInitializer.class
);
if (parent instanceof KtTryExpression) {
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+1 -1
View File
@@ -716,7 +716,7 @@ public interface Errors {
DiagnosticFactory0<KtDeclarationWithBody>
NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY = DiagnosticFactory0.create(ERROR, DECLARATION_WITH_BODY);
DiagnosticFactory0<KtClassInitializer> ANONYMOUS_INITIALIZER_IN_INTERFACE = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<KtAnonymousInitializer> ANONYMOUS_INITIALIZER_IN_INTERFACE = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<KtThisExpression> NO_THIS = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<KtRootPackageExpression> PACKAGE_IS_NOT_AN_EXPRESSION = DiagnosticFactory0.create(ERROR);
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
+1 -1
View File
@@ -267,7 +267,7 @@ public object PositioningStrategies {
val elementToMark = when (element) {
is KtObjectDeclaration -> element.getObjectKeyword()
is KtPropertyAccessor -> element.getNamePlaceholder()
is KtClassInitializer -> element
is KtAnonymousInitializer -> element
else -> throw IllegalArgumentException(
"Can't find text range for element '${element.javaClass.getCanonicalName()}' with the text '${element.getText()}'")
}
compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt
+1 -1
View File
@@ -183,7 +183,7 @@ private object DebugTextBuildingVisitor : KtVisitor<String, Unit>() {
return renderChildren(nullableType, "", "", "?")
}
override fun visitAnonymousInitializer(initializer: KtClassInitializer, data: Unit?): String? {
override fun visitAnonymousInitializer(initializer: KtAnonymousInitializer, data: Unit?): String? {
val containingDeclaration = KtStubbedPsiUtil.getContainingDeclaration(initializer)
return "initializer in " + (containingDeclaration?.getDebugText() ?: "...")
}
compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassInitializer.java → compiler/frontend/src/org/jetbrains/kotlin/psi/KtAnonymousInitializer.java
+3 -3
View File
@@ -25,12 +25,12 @@ import org.jetbrains.kotlin.lexer.KtTokens;
import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub;
import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes;
public class KtClassInitializer extends KtDeclarationStub<KotlinPlaceHolderStub<KtClassInitializer>> implements KtStatementExpression {
public KtClassInitializer(@NotNull ASTNode node) {
public class KtAnonymousInitializer extends KtDeclarationStub<KotlinPlaceHolderStub<KtAnonymousInitializer>> implements KtStatementExpression {
public KtAnonymousInitializer(@NotNull ASTNode node) {
super(node);
}
public KtClassInitializer(@NotNull KotlinPlaceHolderStub<KtClassInitializer> stub) {
public KtAnonymousInitializer(@NotNull KotlinPlaceHolderStub<KtAnonymousInitializer> stub) {
super(stub, KtStubElementTypes.ANONYMOUS_INITIALIZER);
}
compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassBody.kt
+1 -1
View File
@@ -37,7 +37,7 @@ class KtClassBody : KtElementImplStub<KotlinPlaceHolderStub<KtClassBody>>, KtDec
override fun <R, D> accept(visitor: KtVisitor<R, D>, data: D) = visitor.visitClassBody(this, data)
val anonymousInitializers: List<KtClassInitializer>
val anonymousInitializers: List<KtAnonymousInitializer>
get() = findChildrenByType(KtNodeTypes.ANONYMOUS_INITIALIZER)
internal val secondaryConstructors: List<KtSecondaryConstructor>
compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt
+1 -1
View File
@@ -61,7 +61,7 @@ abstract public class KtClassOrObject :
}
}
public fun getAnonymousInitializers(): List<KtClassInitializer> = getBody()?.anonymousInitializers.orEmpty()
public fun getAnonymousInitializers(): List<KtAnonymousInitializer> = getBody()?.anonymousInitializers.orEmpty()
public fun getBody(): KtClassBody? = getStubOrPsiChild(KtStubElementTypes.CLASS_BODY)
compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt
+1 -1
View File
@@ -243,7 +243,7 @@ public class KtPsiFactory(private val project: Project) {
return createFunction("fun foo() {}").getBodyExpression() as KtBlockExpression
}
public fun createAnonymousInitializer(): KtClassInitializer {
public fun createAnonymousInitializer(): KtAnonymousInitializer {
return createClass("class A { init {} }").getAnonymousInitializers().first()
}
compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
+2 -2
View File
@@ -755,8 +755,8 @@ public class KtPsiUtil {
while (current != null) {
PsiElement parent = PsiTreeUtil.getStubOrPsiParent(current);
if (parent instanceof KtScript) return null;
if (current instanceof KtClassInitializer) {
return ((KtClassInitializer) current).getBody();
if (current instanceof KtAnonymousInitializer) {
return ((KtAnonymousInitializer) current).getBody();
}
if (current instanceof KtProperty || current instanceof KtFunction) {
if (parent instanceof KtFile) {
compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitor.java
+1 -1
View File
@@ -338,7 +338,7 @@ public class KtVisitor<R, D> extends PsiElementVisitor {
return visitKtElement(list, data);
}
public R visitAnonymousInitializer(@NotNull KtClassInitializer initializer, D data) {
public R visitAnonymousInitializer(@NotNull KtAnonymousInitializer initializer, D data) {
return visitDeclaration(initializer, data);
}
compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoid.java
+2 -2
View File
@@ -325,7 +325,7 @@ public class KtVisitorVoid extends KtVisitor<Void, Void> {
super.visitInitializerList(list, null);
}
public void visitAnonymousInitializer(@NotNull KtClassInitializer initializer) {
public void visitAnonymousInitializer(@NotNull KtAnonymousInitializer initializer) {
super.visitAnonymousInitializer(initializer, null);
}
@@ -889,7 +889,7 @@ public class KtVisitorVoid extends KtVisitor<Void, Void> {
}
@Override
public final Void visitAnonymousInitializer(@NotNull KtClassInitializer initializer, Void data) {
public final Void visitAnonymousInitializer(@NotNull KtAnonymousInitializer initializer, Void data) {
visitAnonymousInitializer(initializer);
return null;
}
compiler/frontend/src/org/jetbrains/kotlin/psi/KtVisitorVoidWithParameter.java
+2 -2
View File
@@ -322,7 +322,7 @@ public class KtVisitorVoidWithParameter<P> extends KtVisitor<Void, P> {
super.visitInitializerList(list, data);
}
public void visitAnonymousInitializerVoid(@NotNull KtClassInitializer initializer, P data) {
public void visitAnonymousInitializerVoid(@NotNull KtAnonymousInitializer initializer, P data) {
super.visitAnonymousInitializer(initializer, data);
}
@@ -864,7 +864,7 @@ public class KtVisitorVoidWithParameter<P> extends KtVisitor<Void, P> {
}
@Override
public final Void visitAnonymousInitializer(@NotNull KtClassInitializer initializer, P data) {
public final Void visitAnonymousInitializer(@NotNull KtAnonymousInitializer initializer, P data) {
visitAnonymousInitializerVoid(initializer, data);
return null;
}
compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementTypes.java
+2 -2
View File
@@ -31,8 +31,8 @@ public interface KtStubElementTypes {
KtClassElementType ENUM_ENTRY = new KtClassElementType("ENUM_ENTRY");
KtObjectElementType OBJECT_DECLARATION = new KtObjectElementType("OBJECT_DECLARATION");
KtPlaceHolderStubElementType<KtClassInitializer> ANONYMOUS_INITIALIZER =
new KtPlaceHolderStubElementType<KtClassInitializer>("ANONYMOUS_INITIALIZER", KtClassInitializer.class);
KtPlaceHolderStubElementType<KtAnonymousInitializer> ANONYMOUS_INITIALIZER =
new KtPlaceHolderStubElementType<KtAnonymousInitializer>("ANONYMOUS_INITIALIZER", KtAnonymousInitializer.class);
KtPlaceHolderStubElementType<KtSecondaryConstructor> SECONDARY_CONSTRUCTOR =
new KtPlaceHolderStubElementType<KtSecondaryConstructor>("SECONDARY_CONSTRUCTOR", KtSecondaryConstructor.class);
KtPlaceHolderStubElementType<KtPrimaryConstructor> PRIMARY_CONSTRUCTOR =
compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt
+1 -1
View File
@@ -202,7 +202,7 @@ public class AnnotationChecker(private val additionalCheckers: Iterable<Addition
is KtTypeParameter -> TargetLists.T_TYPE_PARAMETER
is KtTypeProjection ->
if (annotated.projectionKind == KtProjectionKind.STAR) TargetLists.T_STAR_PROJECTION else TargetLists.T_TYPE_PROJECTION
is KtClassInitializer -> TargetLists.T_INITIALIZER
is KtAnonymousInitializer -> TargetLists.T_INITIALIZER
is KtMultiDeclaration -> TargetLists.T_MULTI_DECLARATION
is KtFunctionLiteralExpression -> TargetLists.T_FUNCTION_LITERAL
is KtObjectLiteralExpression -> TargetLists.T_OBJECT_LITERAL
compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java
+1 -1
View File
@@ -39,7 +39,7 @@ public interface BodiesResolveContext {
@Mutable
Map<KtClassOrObject, ClassDescriptorWithResolutionScopes> getDeclaredClasses();
@Mutable
Map<KtClassInitializer, ClassDescriptorWithResolutionScopes> getAnonymousInitializers();
Map<KtAnonymousInitializer, ClassDescriptorWithResolutionScopes> getAnonymousInitializers();
@Mutable
Map<KtSecondaryConstructor, ConstructorDescriptor> getSecondaryConstructors();
@Mutable
compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java
+3 -3
View File
@@ -500,8 +500,8 @@ public class BodyResolver {
}
private void resolveAnonymousInitializers(@NotNull BodiesResolveContext c) {
for (Map.Entry<KtClassInitializer, ClassDescriptorWithResolutionScopes> entry : c.getAnonymousInitializers().entrySet()) {
KtClassInitializer initializer = entry.getKey();
for (Map.Entry<KtAnonymousInitializer, ClassDescriptorWithResolutionScopes> entry : c.getAnonymousInitializers().entrySet()) {
KtAnonymousInitializer initializer = entry.getKey();
ClassDescriptorWithResolutionScopes descriptor = entry.getValue();
resolveAnonymousInitializer(c.getOuterDataFlowInfo(), initializer, descriptor);
}
@@ -509,7 +509,7 @@ public class BodyResolver {
public void resolveAnonymousInitializer(
@NotNull DataFlowInfo outerDataFlowInfo,
@NotNull KtClassInitializer anonymousInitializer,
@NotNull KtAnonymousInitializer anonymousInitializer,
@NotNull ClassDescriptorWithResolutionScopes classDescriptor
) {
LexicalScope scopeForInitializers = classDescriptor.getScopeForInitializerResolution();
compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt
+1 -1
View File
@@ -154,7 +154,7 @@ public class LazyTopDownAnalyzer(
visitClassOrObject(declaration)
}
override fun visitAnonymousInitializer(initializer: KtClassInitializer) {
override fun visitAnonymousInitializer(initializer: KtAnonymousInitializer) {
val containerDescriptor = lazyDeclarationResolver.resolveToDescriptor(initializer.containingDeclaration) as ClassDescriptorWithResolutionScopes
c.getAnonymousInitializers().put(initializer, containerDescriptor)
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java
+2 -2
View File
@@ -38,7 +38,7 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
private final DataFlowInfo outerDataFlowInfo;
private final Map<KtClassOrObject, ClassDescriptorWithResolutionScopes> classes = Maps.newLinkedHashMap();
private final Map<KtClassInitializer, ClassDescriptorWithResolutionScopes> anonymousInitializers = Maps.newLinkedHashMap();
private final Map<KtAnonymousInitializer, ClassDescriptorWithResolutionScopes> anonymousInitializers = Maps.newLinkedHashMap();
private final Set<KtFile> files = new LinkedHashSet<KtFile>();
private final Map<KtSecondaryConstructor, ConstructorDescriptor> secondaryConstructors = Maps.newLinkedHashMap();
@@ -95,7 +95,7 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
}
@Override
public Map<KtClassInitializer, ClassDescriptorWithResolutionScopes> getAnonymousInitializers() {
public Map<KtAnonymousInitializer, ClassDescriptorWithResolutionScopes> getAnonymousInitializers() {
return anonymousInitializers;
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DeclarationScopeProviderImpl.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class DeclarationScopeProviderImpl implements DeclarationScopeProvider {
if (parentDeclaration instanceof KtClassOrObject) {
KtClassOrObject classOrObject = (KtClassOrObject) parentDeclaration;
LazyClassDescriptor classDescriptor = (LazyClassDescriptor) lazyDeclarationResolver.getClassDescriptor(classOrObject, NoLookupLocation.WHEN_GET_DECLARATION_SCOPE);
if (ktDeclaration instanceof KtClassInitializer || ktDeclaration instanceof KtProperty) {
if (ktDeclaration instanceof KtAnonymousInitializer || ktDeclaration instanceof KtProperty) {
return classDescriptor.getScopeForInitializerResolution();
}
if (ktDeclaration instanceof KtObjectDeclaration
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt
+1 -1
View File
@@ -38,7 +38,7 @@ public abstract class AbstractPsiBasedDeclarationProvider(storageManager: Storag
val classesAndObjects = ArrayListMultimap.create<Name, JetClassLikeInfo>() // order matters here
public fun putToIndex(declaration: KtDeclaration) {
if (declaration is KtClassInitializer || declaration is KtSecondaryConstructor) return
if (declaration is KtAnonymousInitializer || declaration is KtSecondaryConstructor) return
allDeclarations.add(declaration)
if (declaration is KtNamedFunction) {
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/AssignedVariablesSearcher.kt
+1 -1
View File
@@ -38,7 +38,7 @@ abstract class AssignedVariablesSearcher: KtTreeVisitorVoid() {
if (declaration is KtDeclarationWithBody || declaration is KtClassOrObject) {
currentDeclaration = declaration
}
else if (declaration is KtClassInitializer) {
else if (declaration is KtAnonymousInitializer) {
// Go to class declaration: init -> body -> class
currentDeclaration = declaration.parent.parent as KtDeclaration
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt
+2 -2
View File
@@ -93,7 +93,7 @@ public open class KtLightClassForExplicitDeclaration(
KtNamedFunction::class.java,
KtConstructor::class.java,
KtProperty::class.java,
KtClassInitializer::class.java,
KtAnonymousInitializer::class.java,
KtParameter::class.java)
if (declaration is KtParameter) {
@@ -109,7 +109,7 @@ public open class KtLightClassForExplicitDeclaration(
return getParentByPsiMethod(LightClassUtil.getLightClassPropertyMethods(declaration).getter, declaration.name, true)
}
if (declaration is KtClassInitializer) {
if (declaration is KtAnonymousInitializer) {
val parent = declaration.parent
val grandparent = parent.parent
compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
+1 -1
View File
@@ -108,7 +108,7 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
accessor.acceptChildren(this)
}
override fun visitAnonymousInitializer(initializer: KtClassInitializer) {
override fun visitAnonymousInitializer(initializer: KtAnonymousInitializer) {
initializer.acceptChildren(this)
}