Add 'constructor' keyword in whole project where needed

This commit is contained in:
Denis Zharkov
2015-06-10 12:45:27 +03:00
parent 414d6b92f6
commit eb7114bd53
34 changed files with 62 additions and 48 deletions
@@ -23,7 +23,7 @@ import org.jetbrains.org.objectweb.asm.Opcodes
import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.Type
import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
public class MonitorInstruction private (private val opcode: Int) : IntrinsicMethod() { public class MonitorInstruction private constructor(private val opcode: Int) : IntrinsicMethod() {
companion object { companion object {
public val MONITOR_ENTER: MonitorInstruction = MonitorInstruction(Opcodes.MONITORENTER) public val MONITOR_ENTER: MonitorInstruction = MonitorInstruction(Opcodes.MONITORENTER)
public val MONITOR_EXIT: MonitorInstruction = MonitorInstruction(Opcodes.MONITOREXIT) public val MONITOR_EXIT: MonitorInstruction = MonitorInstruction(Opcodes.MONITOREXIT)
@@ -90,7 +90,7 @@ import java.util.Comparator
import kotlin.platform.platformStatic import kotlin.platform.platformStatic
import kotlin.properties.Delegates import kotlin.properties.Delegates
public class KotlinCoreEnvironment private( public class KotlinCoreEnvironment private constructor(
parentDisposable: Disposable, parentDisposable: Disposable,
applicationEnvironment: JavaCoreApplicationEnvironment, applicationEnvironment: JavaCoreApplicationEnvironment,
configuration: CompilerConfiguration configuration: CompilerConfiguration
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.utils.rethrow
import java.io.FileNotFoundException import java.io.FileNotFoundException
import java.io.IOException import java.io.IOException
public class VirtualFileKotlinClass private( public class VirtualFileKotlinClass private constructor(
public val file: VirtualFile, public val file: VirtualFile,
className: ClassId, className: ClassId,
classHeader: KotlinClassHeader, classHeader: KotlinClassHeader,
@@ -35,14 +35,14 @@ public trait AccessTarget {
public object BlackBox: AccessTarget public object BlackBox: AccessTarget
} }
public abstract class AccessValueInstruction protected ( public abstract class AccessValueInstruction protected constructor(
element: JetElement, element: JetElement,
lexicalScope: LexicalScope, lexicalScope: LexicalScope,
public val target: AccessTarget, public val target: AccessTarget,
override val receiverValues: Map<PseudoValue, ReceiverValue> override val receiverValues: Map<PseudoValue, ReceiverValue>
) : InstructionWithNext(element, lexicalScope), InstructionWithReceivers ) : InstructionWithNext(element, lexicalScope), InstructionWithReceivers
public class ReadValueInstruction private ( public class ReadValueInstruction private constructor(
element: JetElement, element: JetElement,
lexicalScope: LexicalScope, lexicalScope: LexicalScope,
target: AccessTarget, target: AccessTarget,
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate
public abstract class OperationInstruction protected( public abstract class OperationInstruction protected constructor(
element: JetElement, element: JetElement,
lexicalScope: LexicalScope, lexicalScope: LexicalScope,
override val inputValues: List<PseudoValue> override val inputValues: List<PseudoValue>
@@ -58,7 +58,7 @@ trait StrictlyValuedOperationInstruction: OperationInstruction {
get() = resultValue!! get() = resultValue!!
} }
public class CallInstruction private( public class CallInstruction private constructor(
element: JetElement, element: JetElement,
lexicalScope: LexicalScope, lexicalScope: LexicalScope,
val resolvedCall: ResolvedCall<*>, val resolvedCall: ResolvedCall<*>,
@@ -152,7 +152,7 @@ public enum class MagicKind(val sideEffectFree: Boolean = false) {
} }
// Merges values produced by alternative control-flow paths (such as 'if' branches) // Merges values produced by alternative control-flow paths (such as 'if' branches)
class MergeInstruction private( class MergeInstruction private constructor(
element: JetElement, element: JetElement,
lexicalScope: LexicalScope, lexicalScope: LexicalScope,
inputValues: List<PseudoValue> inputValues: List<PseudoValue>
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetExpression
import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.types.JetType
public class CompositeBindingContext private ( public class CompositeBindingContext private constructor(
private val delegates: List<BindingContext> private val delegates: List<BindingContext>
) : BindingContext { ) : BindingContext {
override fun getType(expression: JetExpression): JetType? { override fun getType(expression: JetExpression): JetType? {
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import kotlin.platform.platformStatic import kotlin.platform.platformStatic
public class ConstantExpressionEvaluator private (val trace: BindingTrace) : JetVisitor<CompileTimeConstant<*>, JetType>() { public class ConstantExpressionEvaluator private constructor(val trace: BindingTrace) : JetVisitor<CompileTimeConstant<*>, JetType>() {
companion object { companion object {
platformStatic public fun evaluate(expression: JetExpression, trace: BindingTrace, expectedType: JetType? = TypeUtils.NO_EXPECTED_TYPE): CompileTimeConstant<*>? { platformStatic public fun evaluate(expression: JetExpression, trace: BindingTrace, expectedType: JetType? = TypeUtils.NO_EXPECTED_TYPE): CompileTimeConstant<*>? {
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.StorageManager
public class FileBasedPackageMemberDeclarationProvider internal( public class FileBasedPackageMemberDeclarationProvider internal constructor(
storageManager: StorageManager, storageManager: StorageManager,
private val fqName: FqName, private val fqName: FqName,
private val factory: FileBasedDeclarationProviderFactory, private val factory: FileBasedDeclarationProviderFactory,
@@ -36,11 +36,13 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.ResolveSession
import org.jetbrains.kotlin.resolve.lazy.LazyClassContext import org.jetbrains.kotlin.resolve.lazy.LazyClassContext
public abstract class AbstractLazyMemberScope<D : DeclarationDescriptor, DP : DeclarationProvider> protected( public abstract class AbstractLazyMemberScope<D : DeclarationDescriptor, DP : DeclarationProvider>
protected constructor(
protected val c: LazyClassContext, protected val c: LazyClassContext,
protected val declarationProvider: DP, protected val declarationProvider: DP,
protected val thisDescriptor: D, protected val thisDescriptor: D,
protected val trace: BindingTrace) : JetScope { protected val trace: BindingTrace
) : JetScope {
protected val storageManager: StorageManager = c.storageManager protected val storageManager: StorageManager = c.storageManager
private val classDescriptors: MemoizedFunctionToNotNull<Name, List<ClassDescriptor>> = storageManager.createMemoizedFunction { resolveClassDescriptor(it) } private val classDescriptors: MemoizedFunctionToNotNull<Name, List<ClassDescriptor>> = storageManager.createMemoizedFunction { resolveClassDescriptor(it) }
@@ -31,7 +31,7 @@ import java.util.Collections
import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl
// SCRIPT: Members of a script class // SCRIPT: Members of a script class
public class LazyScriptClassMemberScope protected( public class LazyScriptClassMemberScope protected constructor(
private val resolveSession: ResolveSession, private val resolveSession: ResolveSession,
declarationProvider: ClassMemberDeclarationProvider, declarationProvider: ClassMemberDeclarationProvider,
thisClass: LazyClassDescriptor, thisClass: LazyClassDescriptor,
@@ -22,7 +22,11 @@ import com.intellij.openapi.extensions.ExtensionPointName
import java.lang.ref.WeakReference import java.lang.ref.WeakReference
import kotlin.platform.platformStatic import kotlin.platform.platformStatic
public open class MappedExtensionProvider<T, R> protected (private val epName: ExtensionPointName<T>, private val map: (List<T>) -> R) { public open class MappedExtensionProvider<T, R>
protected constructor(
private val epName: ExtensionPointName<T>,
private val map: (List<T>) -> R
) {
private var cached = WeakReference<Pair<Application, R>>(null) private var cached = WeakReference<Pair<Application, R>>(null)
public fun get(): R { public fun get(): R {
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.psi.JetFile
import javax.swing.* import javax.swing.*
import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.psi.JetClassOrObject
public class KotlinLightClassForPackage private( public class KotlinLightClassForPackage private constructor(
manager: PsiManager, manager: PsiManager,
private val packageFqName: FqName, private val packageFqName: FqName,
private val searchScope: GlobalSearchScope, private val searchScope: GlobalSearchScope,
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.config
import java.util.HashMap import java.util.HashMap
public class Services private(private val map: Map<Class<*>, Any>) { public class Services private constructor(private val map: Map<Class<*>, Any>) {
companion object { companion object {
public val EMPTY: Services = Builder().build() public val EMPTY: Services = Builder().build()
} }
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.name.Name
// The purpose of this class is to hold a unique signature of either a method or a field, so that annotations on a member can be put // The purpose of this class is to hold a unique signature of either a method or a field, so that annotations on a member can be put
// into a map indexed by these signatures // into a map indexed by these signatures
data class MemberSignature private(private val signature: String) { data class MemberSignature private constructor(private val signature: String) {
companion object { companion object {
platformStatic public fun fromMethodNameAndDesc(nameAndDesc: String): MemberSignature { platformStatic public fun fromMethodNameAndDesc(nameAndDesc: String): MemberSignature {
return MemberSignature(nameAndDesc) return MemberSignature(nameAndDesc)
@@ -39,7 +39,7 @@ private val TYPES_ELIGIBLE_FOR_SIMPLE_VISIT = setOf(
javaClass<Class<*>>(), javaClass<String>() javaClass<Class<*>>(), javaClass<String>()
) )
public class ReflectKotlinClass private( public class ReflectKotlinClass private constructor(
private val klass: Class<*>, private val klass: Class<*>,
private val classHeader: KotlinClassHeader private val classHeader: KotlinClassHeader
) : KotlinJvmBinaryClass { ) : KotlinJvmBinaryClass {
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
import org.jetbrains.kotlin.serialization.deserialization.LocalClassResolver import org.jetbrains.kotlin.serialization.deserialization.LocalClassResolver
import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.storage.LockBasedStorageManager
public class RuntimeModuleData private(private val injector: InjectorForRuntimeDescriptorLoader) { public class RuntimeModuleData private constructor(private val injector: InjectorForRuntimeDescriptorLoader) {
public val module: ModuleDescriptor get() = injector.getModuleDescriptor() public val module: ModuleDescriptor get() = injector.getModuleDescriptor()
public val localClassResolver: LocalClassResolver get() = injector.getDeserializationComponentsForJava().components.localClassResolver public val localClassResolver: LocalClassResolver get() = injector.getDeserializationComponentsForJava().components.localClassResolver
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
import java.util.* import java.util.*
public abstract class DeserializedMemberScope protected( public abstract class DeserializedMemberScope protected constructor(
protected val c: DeserializationContext, protected val c: DeserializationContext,
membersList: Collection<ProtoBuf.Callable> membersList: Collection<ProtoBuf.Callable>
) : JetScope { ) : JetScope {
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
import java.lang.reflect.Field import java.lang.reflect.Field
import java.lang.reflect.Method import java.lang.reflect.Method
abstract class DescriptorBasedProperty private( abstract class DescriptorBasedProperty private constructor(
container: KCallableContainerImpl, container: KCallableContainerImpl,
name: String, name: String,
receiverParameterDesc: String?, receiverParameterDesc: String?,
@@ -42,7 +42,7 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
public abstract class ElementResolver protected( public abstract class ElementResolver protected constructor(
public val resolveSession: ResolveSession public val resolveSession: ResolveSession
) { ) {
@@ -31,7 +31,7 @@ import com.intellij.openapi.vfs.VirtualFilePropertyEvent
import com.intellij.openapi.util.SimpleModificationTracker import com.intellij.openapi.util.SimpleModificationTracker
import kotlin.platform.platformStatic import kotlin.platform.platformStatic
class ModuleTypeCacheManager private (project: Project) { class ModuleTypeCacheManager private constructor(project: Project) {
companion object { companion object {
platformStatic fun getInstance(project: Project) = ServiceManager.getService(project, javaClass<ModuleTypeCacheManager>()) platformStatic fun getInstance(project: Project) = ServiceManager.getService(project, javaClass<ModuleTypeCacheManager>())
} }
@@ -22,7 +22,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
import com.intellij.psi.stubs.StubIndexKey import com.intellij.psi.stubs.StubIndexKey
import org.jetbrains.kotlin.psi.JetCallableDeclaration import org.jetbrains.kotlin.psi.JetCallableDeclaration
public class JetTopLevelExtensionsByReceiverTypeIndex private() : StringStubIndexExtension<JetCallableDeclaration>() { public class JetTopLevelExtensionsByReceiverTypeIndex private constructor() : StringStubIndexExtension<JetCallableDeclaration>() {
override fun getKey() = KEY override fun getKey() = KEY
@@ -115,7 +115,11 @@ fun LookupElement.addTailAndNameSimilarity(
return lookupElement return lookupElement
} }
class ExpectedInfoClassification private(val substitutor: TypeSubstitutor?, val makeNotNullable: Boolean) { class ExpectedInfoClassification
private constructor(
val substitutor: TypeSubstitutor?,
val makeNotNullable: Boolean
) {
companion object { companion object {
val notMatches = ExpectedInfoClassification(null, false) val notMatches = ExpectedInfoClassification(null, false)
fun matches(substitutor: TypeSubstitutor) = ExpectedInfoClassification(substitutor, false) fun matches(substitutor: TypeSubstitutor) = ExpectedInfoClassification(substitutor, false)
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.kotlin.psi.psiUtil.*
import java.util.ArrayList import java.util.ArrayList
data class DataForConversion private( data class DataForConversion private constructor(
val elementsAndTexts: Collection<Any> /* list consisting of PsiElement's to convert and plain String's */, val elementsAndTexts: Collection<Any> /* list consisting of PsiElement's to convert and plain String's */,
val importsAndPackage: String val importsAndPackage: String
) { ) {
@@ -112,7 +112,7 @@ public abstract class JetWholeProjectModalByCollectionAction<TTask : Any>(modalT
abstract fun collectTasksForFile(project: Project, file: JetFile, accumulator: MutableCollection<TTask>) abstract fun collectTasksForFile(project: Project, file: JetFile, accumulator: MutableCollection<TTask>)
} }
class JetWholeProjectForEachElementOfTypeFix<TTask> private ( class JetWholeProjectForEachElementOfTypeFix<TTask> private constructor(
private val collectingVisitorFactory: (MutableCollection<TTask>) -> JetVisitorVoid, private val collectingVisitorFactory: (MutableCollection<TTask>) -> JetVisitorVoid,
private val tasksProcessor: (Collection<TTask>) -> Unit, private val tasksProcessor: (Collection<TTask>) -> Unit,
private val name: String, private val name: String,
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.idea.JetBundle import org.jetbrains.kotlin.idea.JetBundle
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
public abstract class ReplaceCallFix protected (val psiElement: PsiElement) : IntentionAction { public abstract class ReplaceCallFix protected constructor(val psiElement: PsiElement) : IntentionAction {
override fun getFamilyName(): String = getText() override fun getFamilyName(): String = getText()
@@ -46,7 +46,7 @@ import javax.swing.JComponent
import javax.swing.JLabel import javax.swing.JLabel
import javax.swing.JPanel import javax.swing.JPanel
public class KotlinIntroduceParameterDialog private ( public class KotlinIntroduceParameterDialog private constructor(
project: Project, project: Project,
val editor: Editor, val editor: Editor,
val descriptor: IntroduceParameterDescriptor, val descriptor: IntroduceParameterDescriptor,
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.types.expressions.OperatorConventions.*
import java.util.ArrayList import java.util.ArrayList
import java.util.HashMap import java.util.HashMap
class Converter private( class Converter private constructor(
private val elementToConvert: PsiElement, private val elementToConvert: PsiElement,
val settings: ConverterSettings, val settings: ConverterSettings,
val inConversionScope: (PsiElement) -> Boolean, val inConversionScope: (PsiElement) -> Boolean,
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import java.io.File import java.io.File
class LocalFileKotlinClass private( class LocalFileKotlinClass private constructor(
private val file: File, private val file: File,
private val fileContents: ByteArray, private val fileContents: ByteArray,
className: ClassId, className: ClassId,
@@ -50,7 +50,7 @@ import org.jetbrains.kotlin.js.translate.context.Namer
* It's desirable to create temporary var only if node can have side effect, * It's desirable to create temporary var only if node can have side effect,
* and precedes inline call (in JavaScript evaluation order). * and precedes inline call (in JavaScript evaluation order).
*/ */
class ExpressionDecomposer private ( class ExpressionDecomposer private constructor(
private val scope: JsScope, private val scope: JsScope,
private val containsExtractable: Set<JsNode>, private val containsExtractable: Set<JsNode>,
private val containsNodeWithSideEffect: Set<JsNode> private val containsNodeWithSideEffect: Set<JsNode>
@@ -29,7 +29,11 @@ import org.jetbrains.kotlin.js.translate.utils.jsAstUtils.*
import kotlin.platform.platformStatic import kotlin.platform.platformStatic
class FunctionInlineMutator private (private val call: JsInvocation, private val inliningContext: InliningContext) { class FunctionInlineMutator
private constructor(
private val call: JsInvocation,
private val inliningContext: InliningContext
) {
private val invokedFunction: JsFunction private val invokedFunction: JsFunction
private val isResultNeeded: Boolean private val isResultNeeded: Boolean
private val namingContext: NamingContext private val namingContext: NamingContext
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.utils.fileUtils.readTextOrEmpty
import java.io.File import java.io.File
import java.util.ArrayList import java.util.ArrayList
public abstract class TranslationResult protected (public val diagnostics: Diagnostics) { public abstract class TranslationResult protected constructor(public val diagnostics: Diagnostics) {
public class Fail(diagnostics: Diagnostics) : TranslationResult(diagnostics) public class Fail(diagnostics: Diagnostics) : TranslationResult(diagnostics)
@@ -38,7 +38,7 @@ import java.util.ArrayList
import java.util.Collections import java.util.Collections
import kotlin.platform.platformStatic import kotlin.platform.platformStatic
public class CallArgumentTranslator private ( public class CallArgumentTranslator private constructor(
private val resolvedCall: ResolvedCall<*>, private val resolvedCall: ResolvedCall<*>,
private val receiver: JsExpression?, private val receiver: JsExpression?,
context: TranslationContext context: TranslationContext
@@ -141,7 +141,7 @@ public class TransformingStream<T, R>(stream: Stream<T>, transformer: (T) -> R)
deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.map() instead.") deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.map() instead.")
public class TransformingSequence<T, R> public class TransformingSequence<T, R>
deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.map(transformer)")) deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.map(transformer)"))
(private val sequence: Sequence<T>, private val transformer: (T) -> R) : Sequence<R> { constructor(private val sequence: Sequence<T>, private val transformer: (T) -> R) : Sequence<R> {
override fun iterator(): Iterator<R> = object : Iterator<R> { override fun iterator(): Iterator<R> = object : Iterator<R> {
val iterator = sequence.iterator() val iterator = sequence.iterator()
override fun next(): R { override fun next(): R {
@@ -166,7 +166,7 @@ public class TransformingIndexedStream<T, R>(stream: Stream<T>, transformer: (In
deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.mapIndexed() instead.") deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.mapIndexed() instead.")
public class TransformingIndexedSequence<T, R> public class TransformingIndexedSequence<T, R>
deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.mapIndexed(transformer)")) deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.mapIndexed(transformer)"))
(private val sequence: Sequence<T>, private val transformer: (Int, T) -> R) : Sequence<R> { constructor(private val sequence: Sequence<T>, private val transformer: (Int, T) -> R) : Sequence<R> {
override fun iterator(): Iterator<R> = object : Iterator<R> { override fun iterator(): Iterator<R> = object : Iterator<R> {
val iterator = sequence.iterator() val iterator = sequence.iterator()
var index = 0 var index = 0
@@ -191,7 +191,7 @@ public class IndexingStream<T>(stream: Stream<T>)
deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.withIndex() instead.") deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.withIndex() instead.")
public class IndexingSequence<T> public class IndexingSequence<T>
deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.withIndex()")) deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.withIndex()"))
(private val sequence: Sequence<T>) : Sequence<IndexedValue<T>> { constructor(private val sequence: Sequence<T>) : Sequence<IndexedValue<T>> {
override fun iterator(): Iterator<IndexedValue<T>> = object : Iterator<IndexedValue<T>> { override fun iterator(): Iterator<IndexedValue<T>> = object : Iterator<IndexedValue<T>> {
val iterator = sequence.iterator() val iterator = sequence.iterator()
var index = 0 var index = 0
@@ -217,7 +217,7 @@ public class MergingStream<T1, T2, V>(stream1: Stream<T1>, stream2: Stream<T2>,
deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.merge() instead.") deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.merge() instead.")
public class MergingSequence<T1, T2, V> public class MergingSequence<T1, T2, V>
deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence1.merge(sequence2, transform)")) deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence1.merge(sequence2, transform)"))
(private val sequence1: Sequence<T1>, constructor(private val sequence1: Sequence<T1>,
private val sequence2: Sequence<T2>, private val sequence2: Sequence<T2>,
private val transform: (T1, T2) -> V private val transform: (T1, T2) -> V
) : Sequence<V> { ) : Sequence<V> {
@@ -241,7 +241,7 @@ public class FlatteningStream<T, R>(stream: Stream<T>, transformer: (T) -> Strea
deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.flatMap() instead.") deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.flatMap() instead.")
public class FlatteningSequence<T, R> public class FlatteningSequence<T, R>
deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.flatMap(transformer)")) deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.flatMap(transformer)"))
(private val sequence: Sequence<T>, constructor(private val sequence: Sequence<T>,
private val transformer: (T) -> Sequence<R> private val transformer: (T) -> Sequence<R>
) : Sequence<R> { ) : Sequence<R> {
override fun iterator(): Iterator<R> = object : Iterator<R> { override fun iterator(): Iterator<R> = object : Iterator<R> {
@@ -286,7 +286,7 @@ public class Multistream<T>(stream: Stream<Stream<T>>)
deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.flatten() instead.") deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.flatten() instead.")
public class MultiSequence<T> public class MultiSequence<T>
deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.flatten()")) deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.flatten()"))
(private val sequence: Sequence<Sequence<T>>) : Sequence<T> { constructor(private val sequence: Sequence<Sequence<T>>) : Sequence<T> {
override fun iterator(): Iterator<T> = object : Iterator<T> { override fun iterator(): Iterator<T> = object : Iterator<T> {
val iterator = sequence.iterator() val iterator = sequence.iterator()
var itemIterator: Iterator<T>? = null var itemIterator: Iterator<T>? = null
@@ -333,7 +333,7 @@ public class TakeStream<T>(stream: Stream<T>, count: Int)
deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.take() instead.") deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.take() instead.")
public class TakeSequence<T> public class TakeSequence<T>
deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.take(count)")) deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.take(count)"))
(private val sequence: Sequence<T>, constructor(private val sequence: Sequence<T>,
private val count: Int private val count: Int
) : Sequence<T> { ) : Sequence<T> {
init { init {
@@ -367,7 +367,7 @@ public class TakeWhileStream<T>(stream: Stream<T>, predicate: (T) -> Boolean) :
deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.takeWhile() instead.") deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.takeWhile() instead.")
public class TakeWhileSequence<T> public class TakeWhileSequence<T>
deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.takeWhile(predicate)")) deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.takeWhile(predicate)"))
(private val sequence: Sequence<T>, constructor(private val sequence: Sequence<T>,
private val predicate: (T) -> Boolean private val predicate: (T) -> Boolean
) : Sequence<T> { ) : Sequence<T> {
override fun iterator(): Iterator<T> = object : Iterator<T> { override fun iterator(): Iterator<T> = object : Iterator<T> {
@@ -419,7 +419,7 @@ public class DropStream<T>(stream: Stream<T>, count: Int)
deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.drop() instead.") deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.drop() instead.")
public class DropSequence<T> public class DropSequence<T>
deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.drop(count)")) deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.drop(count)"))
(private val sequence: Sequence<T>, constructor(private val sequence: Sequence<T>,
private val count: Int private val count: Int
) : Sequence<T> { ) : Sequence<T> {
init { init {
@@ -460,7 +460,7 @@ public class DropWhileStream<T>(stream: Stream<T>, predicate: (T) -> Boolean) :
deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.dropWhile() instead.") deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.dropWhile() instead.")
public class DropWhileSequence<T> public class DropWhileSequence<T>
deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.dropWhile(predicate)")) deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.dropWhile(predicate)"))
(private val sequence: Sequence<T>, constructor(private val sequence: Sequence<T>,
private val predicate: (T) -> Boolean private val predicate: (T) -> Boolean
) : Sequence<T> { ) : Sequence<T> {
@@ -535,7 +535,7 @@ private class DistinctIterator<T, K>(private val source : Iterator<T>, private v
deprecated("This class is an implementation detail and shall be made internal soon. Use function sequence(nextFunction: () -> T?) instead.") deprecated("This class is an implementation detail and shall be made internal soon. Use function sequence(nextFunction: () -> T?) instead.")
public class FunctionSequence<T : Any> public class FunctionSequence<T : Any>
deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence(producer)")) deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence(producer)"))
(private val producer: () -> T?) : Sequence<T> { constructor(private val producer: () -> T?) : Sequence<T> {
override fun iterator(): Iterator<T> = object : Iterator<T> { override fun iterator(): Iterator<T> = object : Iterator<T> {
var nextState: Int = -1 // -1 for unknown, 0 for done, 1 for continue var nextState: Int = -1 // -1 for unknown, 0 for done, 1 for continue
var nextItem: T? = null var nextItem: T? = null
@@ -88,7 +88,7 @@ public data class MatchGroup(public val value: String, public val range: IntRang
* *
* For pattern syntax reference see [java.util.regex.Pattern] * For pattern syntax reference see [java.util.regex.Pattern]
*/ */
public class Regex internal (private val nativePattern: Pattern) { public class Regex internal constructor(private val nativePattern: Pattern) {
/** Creates a regular expression from the specified [pattern] string and the default options. */ /** Creates a regular expression from the specified [pattern] string and the default options. */