From dc7a90a0814ea95613b6022036df7b04cbb252ca Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 9 Aug 2016 11:15:51 +0300 Subject: [PATCH] Minor: IrFileElementFactory -> IrDeclarationFactory --- ...leElementFactory.kt => IrDeclarationFactory.kt} | 8 ++++---- .../kotlin/psi2ir/IrDeclarationGenerator.kt | 14 +++++++------- .../kotlin/psi2ir/IrExpressionGenerator.kt | 2 +- .../org/jetbrains/kotlin/psi2ir/IrFileGenerator.kt | 4 ++-- .../jetbrains/kotlin/psi2ir/IrModuleGenerator.kt | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) rename compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/{IrFileElementFactory.kt => IrDeclarationFactory.kt} (94%) diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrFileElementFactory.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrDeclarationFactory.kt similarity index 94% rename from compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrFileElementFactory.kt rename to compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrDeclarationFactory.kt index 7361d4ef24b..6f5672d7db0 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrFileElementFactory.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrDeclarationFactory.kt @@ -23,13 +23,13 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.endOffset import org.jetbrains.kotlin.psi.psiUtil.startOffset -class IrFileElementFactory private constructor( +class IrDeclarationFactory private constructor( val fileEntry: PsiSourceManager.PsiFileEntry, val irFileImpl: IrFileImpl, val containingDeclaration: IrCompoundDeclaration ) { fun createChild(containingDeclaration: IrCompoundDeclaration) = - IrFileElementFactory(fileEntry, irFileImpl, containingDeclaration) + IrDeclarationFactory(fileEntry, irFileImpl, containingDeclaration) private fun D.addToContainer(): D = apply { containingDeclaration.addChildDeclaration(this) } @@ -67,13 +67,13 @@ class IrFileElementFactory private constructor( .addToContainer() companion object { - fun create(irModule: IrModuleImpl, sourceManager: PsiSourceManager, ktFile: KtFile, descriptor: PackageFragmentDescriptor): IrFileElementFactory { + fun create(irModule: IrModuleImpl, sourceManager: PsiSourceManager, ktFile: KtFile, descriptor: PackageFragmentDescriptor): IrDeclarationFactory { val fileEntry = sourceManager.getOrCreateFileEntry(ktFile) val fileName = fileEntry.getRecognizableName() val irFile = IrFileImpl(fileEntry, fileName, descriptor) sourceManager.putFileEntry(irFile, fileEntry) irModule.addFile(irFile) - return IrFileElementFactory(fileEntry, irFile, irFile) + return IrDeclarationFactory(fileEntry, irFile, irFile) } } } \ No newline at end of file diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrDeclarationGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrDeclarationGenerator.kt index 8d643e4c317..787de47fd2d 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrDeclarationGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrDeclarationGenerator.kt @@ -38,11 +38,11 @@ abstract class IrDeclarationGeneratorBase( override val context: IrGeneratorContext, override val irDeclaration: IrDeclaration, override val parent: IrDeclarationGenerator, - val fileElementFactory: IrFileElementFactory + val declarationFactory: IrDeclarationFactory ) : IrDeclarationGenerator { - val irExpressionGenerator = IrExpressionGenerator(context, fileElementFactory) + val irExpressionGenerator = IrExpressionGenerator(context, declarationFactory) - val containingDeclaration: IrCompoundDeclaration get() = fileElementFactory.containingDeclaration + val containingDeclaration: IrCompoundDeclaration get() = declarationFactory.containingDeclaration fun generateAnnotationEntries(annotationEntries: List) { // TODO create IrAnnotation's for each KtAnnotationEntry @@ -65,25 +65,25 @@ abstract class IrDeclarationGeneratorBase( fun generateFunctionDeclaration(ktNamedFunction: KtNamedFunction) { val functionDescriptor = getOrFail(BindingContext.FUNCTION, ktNamedFunction) { "unresolved fun" } val body = generateExpressionBody(ktNamedFunction.bodyExpression ?: TODO("function without body expression")) - fileElementFactory.createFunction(ktNamedFunction, functionDescriptor, body) + declarationFactory.createFunction(ktNamedFunction, functionDescriptor, body) } fun generatePropertyDeclaration(ktProperty: KtProperty) { val propertyDescriptor = getPropertyDescriptor(ktProperty) if (ktProperty.hasDelegate()) TODO("handle delegated property") val initializer = ktProperty.initializer?.let { generateExpressionBody(it) } - val irProperty = fileElementFactory.createSimpleProperty(ktProperty, propertyDescriptor, initializer) + val irProperty = declarationFactory.createSimpleProperty(ktProperty, propertyDescriptor, initializer) ktProperty.getter?.let { ktGetter -> val accessorDescriptor = getOrFail(BindingContext.PROPERTY_ACCESSOR, ktGetter) { "unresolved getter" } val getterDescriptor = accessorDescriptor as? PropertyGetterDescriptor ?: TODO("not a getter?") val getterBody = generateExpressionBody(ktGetter.bodyExpression ?: TODO("default getter")) - fileElementFactory.createPropertyGetter(ktGetter, irProperty, getterDescriptor, getterBody) + declarationFactory.createPropertyGetter(ktGetter, irProperty, getterDescriptor, getterBody) } ktProperty.setter?.let { ktSetter -> val accessorDescriptor = getOrFail(BindingContext.PROPERTY_ACCESSOR, ktSetter) { "unresolved setter" } val setterDescriptor = accessorDescriptor as? PropertySetterDescriptor ?: TODO("not a setter?") val setterBody = generateExpressionBody(ktSetter.bodyExpression ?: TODO("default setter")) - fileElementFactory.createPropertySetter(ktSetter, irProperty, setterDescriptor, setterBody) + declarationFactory.createPropertySetter(ktSetter, irProperty, setterDescriptor, setterBody) } } diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrExpressionGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrExpressionGenerator.kt index ab603eae572..ac7336dc0c6 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrExpressionGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrExpressionGenerator.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluat class IrExpressionGenerator( override val context: IrGeneratorContext, - val fileElementFactory: IrFileElementFactory + val declarationFactory: IrDeclarationFactory ) : KtVisitor(), IrGenerator { fun generateExpression(ktExpression: KtExpression) = ktExpression.generate() diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrFileGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrFileGenerator.kt index ef24bea6170..8cb025f1a21 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrFileGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrFileGenerator.kt @@ -24,8 +24,8 @@ class IrFileGenerator( context: IrGeneratorContext, irDeclaration: IrFileImpl, parent: IrModuleGenerator, - fileFileElementFactory: IrFileElementFactory -) : IrDeclarationGeneratorBase(context, irDeclaration, parent, fileFileElementFactory) { + declarationFactory: IrDeclarationFactory +) : IrDeclarationGeneratorBase(context, irDeclaration, parent, declarationFactory) { fun generateFileContent() { generateAnnotationEntries(ktFile.annotationEntries) diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrModuleGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrModuleGenerator.kt index b4a598ac85c..ebcf04c0e2a 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrModuleGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/IrModuleGenerator.kt @@ -26,7 +26,7 @@ class IrModuleGenerator(override val context: IrGeneratorContext) : IrDeclaratio fun generateModuleContent() { for (ktFile in context.inputFiles) { val packageFragmentDescriptor = getOrFail(BindingContext.FILE_TO_PACKAGE_FRAGMENT, ktFile) { "no package fragment for file" } - val irFileElementFactory = IrFileElementFactory.create(context.irModule, context.sourceManager, ktFile, packageFragmentDescriptor) + val irFileElementFactory = IrDeclarationFactory.create(context.irModule, context.sourceManager, ktFile, packageFragmentDescriptor) val irFile = irFileElementFactory.irFileImpl context.irModule.addFile(irFile) val generator = IrFileGenerator(ktFile, context, irFile, this, irFileElementFactory)