From 79f450e1746fae16a924f15e9860dbc5c60d7ec8 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 17 Jul 2015 13:08:58 +0300 Subject: [PATCH] Remove GenerationState secondary constructor --- .../kotlin/codegen/state/GenerationState.kt | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt index e2bdffa3838..d474cd1c9c1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt @@ -36,24 +36,24 @@ import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.DelegatingBindingTrace import java.io.File -public class GenerationState( +public class GenerationState jvmOverloads constructor( public val project: Project, builderFactory: ClassBuilderFactory, - public val progress: Progress, + public val progress: Progress = Progress.DEAF, public val module: ModuleDescriptor, bindingContext: BindingContext, public val files: List, - disableCallAssertions: Boolean, - disableParamAssertions: Boolean, - public val generateDeclaredClassFilter: GenerationState.GenerateClassFilter, - disableInline: Boolean, - disableOptimization: Boolean, + disableCallAssertions: Boolean = true, + disableParamAssertions: Boolean = true, + public val generateDeclaredClassFilter: GenerationState.GenerateClassFilter = GenerationState.GenerateClassFilter.GENERATE_ALL, + disableInline: Boolean = false, + disableOptimization: Boolean = false, public val packagesWithObsoleteParts: Collection = emptySet(), // for PackageCodegen in incremental compilation mode - public val moduleId: String?, - public val diagnostics: DiagnosticSink, + public val moduleId: String? = null, + public val diagnostics: DiagnosticSink = DiagnosticSink.DO_NOTHING, // TODO: temporary hack, see JetTypeMapperWithOutDirectory state for details - public val outDirectory: File? + public val outDirectory: File? = null ) { public interface GenerateClassFilter { public fun shouldAnnotateClass(classOrObject: JetClassOrObject): Boolean @@ -98,15 +98,6 @@ public class GenerationState( public val isInlineEnabled: Boolean = !disableInline @jvmName("isInlineEnabled") get - public constructor( - project: Project, - builderFactory: ClassBuilderFactory, - module: ModuleDescriptor, - bindingContext: BindingContext, - files: List) : this(project, builderFactory, Progress.DEAF, module, bindingContext, files, true, true, GenerateClassFilter.GENERATE_ALL, - false, false, emptySet(), null, DiagnosticSink.DO_NOTHING, null) { - } - init { var builderFactory = builderFactory