[FIR] Rename FirClassImpl to FirRegularClassImpl

Also rename `buildClassImpl` to `buildRegularClass` and get rid
  of intermediate `AbstractFirRegularClassBuilder`
This commit is contained in:
Dmitriy Novozhilov
2020-05-26 11:05:32 +03:00
parent 60fd505a9c
commit 6d37776267
16 changed files with 49 additions and 141 deletions
@@ -32,10 +32,11 @@ object BuilderConfigurator : AbstractBuilderConfigurator<FirTreeBuilder>(FirTree
fields from klass without listOf("symbol", "resolvePhase", "attributes")
}
val regularClassBuilder by builder("AbstractFirRegularClassBuilder") {
builder(regularClass) {
parents += classBuilder
parents += typeParameterRefsOwnerBuilder
fields from regularClass without "attributes"
defaultNull("companionObject")
openBuilder()
}
val qualifiedAccessBuilder by builder {
@@ -81,12 +82,6 @@ object BuilderConfigurator : AbstractBuilderConfigurator<FirTreeBuilder>(FirTree
openBuilder()
}
builder(regularClass) {
parents += regularClassBuilder
defaultNull("companionObject")
openBuilder()
}
builder(anonymousObject) {
parents += classBuilder
}
@@ -31,12 +31,10 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
noImpl(declarationStatus)
noImpl(resolvedDeclarationStatus)
val regularClassConfig: ImplementationContext.() -> Unit = {
impl(regularClass) {
defaultFalse("hasLazyNestedClassifiers", withGetter = true)
}
impl(regularClass, "FirClassImpl", regularClassConfig)
impl(anonymousObject)
impl(typeAlias)