From 0adbb10835ee24170357d812f1a1f47a7aea0123 Mon Sep 17 00:00:00 2001 From: Nikita Klimenko Date: Wed, 19 Jun 2024 15:26:04 +0300 Subject: [PATCH 1/2] Update kotlin to 2.0.20-dev-5379 --- plugins/kotlin-dataframe/gradle.properties | 2 +- .../dataframe/plugin/extensions/ExtensionsGenerator.kt | 2 +- .../dataframe/plugin/extensions/FunctionCallTransformer.kt | 2 +- .../kotlinx/dataframe/plugin/extensions/TokenGenerator.kt | 2 +- .../jetbrains/kotlinx/dataframe/plugin/utils/firFactories.kt | 2 +- plugins/kotlin-dataframe/testData/box/diff.fir.ir.txt | 2 +- .../kotlin-dataframe/testData/box/explodeDataFrame.fir.ir.txt | 2 +- .../testData/box/flexibleReturnType.fir.ir.txt | 4 ++-- plugins/kotlin-dataframe/testData/box/join.fir.ir.txt | 2 +- plugins/kotlin-dataframe/testData/box/platformType.fir.ir.txt | 2 +- plugins/kotlin-dataframe/testData/box/read.fir.ir.txt | 2 +- plugins/kotlin-dataframe/testData/box/readCSV.fir.ir.txt | 2 +- .../testData/box/readJsonStr_const.fir.ir.txt | 2 +- .../testData/box/readJsonStr_localProperty.fir.ir.txt | 2 +- .../testData/box/readJsonStr_memberProperty.fir.ir.txt | 2 +- plugins/kotlin-dataframe/testData/box/toDataFrame.fir.ir.txt | 2 +- .../kotlin-dataframe/testData/box/toDataFrame_dsl.fir.ir.txt | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/plugins/kotlin-dataframe/gradle.properties b/plugins/kotlin-dataframe/gradle.properties index f302d79f17..cfe50e0df5 100644 --- a/plugins/kotlin-dataframe/gradle.properties +++ b/plugins/kotlin-dataframe/gradle.properties @@ -1,2 +1,2 @@ kotlin.code.style=official -kotlinVersion=2.0.20-dev-2972 +kotlinVersion=2.0.20-dev-5379 diff --git a/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/extensions/ExtensionsGenerator.kt b/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/extensions/ExtensionsGenerator.kt index 072968c043..d0b857b5c4 100644 --- a/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/extensions/ExtensionsGenerator.kt +++ b/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/extensions/ExtensionsGenerator.kt @@ -16,13 +16,13 @@ import org.jetbrains.kotlin.fir.extensions.predicateBasedProvider import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol +import org.jetbrains.kotlin.fir.toFirResolvedTypeRef import org.jetbrains.kotlin.fir.types.ConeClassLikeType import org.jetbrains.kotlin.fir.types.ConeTypeProjection import org.jetbrains.kotlin.fir.types.classId import org.jetbrains.kotlin.fir.types.coneType import org.jetbrains.kotlin.fir.types.constructType import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl -import org.jetbrains.kotlin.fir.types.toFirResolvedTypeRef import org.jetbrains.kotlin.fir.types.toSymbol import org.jetbrains.kotlin.fir.types.toTypeProjection import org.jetbrains.kotlin.name.CallableId diff --git a/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/extensions/FunctionCallTransformer.kt b/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/extensions/FunctionCallTransformer.kt index c8f6a8e42a..d3e0778580 100644 --- a/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/extensions/FunctionCallTransformer.kt +++ b/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/extensions/FunctionCallTransformer.kt @@ -52,6 +52,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol +import org.jetbrains.kotlin.fir.toFirResolvedTypeRef import org.jetbrains.kotlin.fir.types.ConeKotlinTypeProjection import org.jetbrains.kotlin.fir.types.ConeStarProjection import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef @@ -61,7 +62,6 @@ import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl import org.jetbrains.kotlin.fir.types.impl.FirImplicitAnyTypeRef import org.jetbrains.kotlin.fir.types.resolvedType import org.jetbrains.kotlin.fir.types.toClassSymbol -import org.jetbrains.kotlin.fir.types.toFirResolvedTypeRef import org.jetbrains.kotlin.fir.types.toRegularClassSymbol import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.name.CallableId diff --git a/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/extensions/TokenGenerator.kt b/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/extensions/TokenGenerator.kt index 8477bf3b97..b8075afb12 100644 --- a/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/extensions/TokenGenerator.kt +++ b/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/extensions/TokenGenerator.kt @@ -25,10 +25,10 @@ import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol +import org.jetbrains.kotlin.fir.toFirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl -import org.jetbrains.kotlin.fir.types.toFirResolvedTypeRef import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.SpecialNames diff --git a/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/utils/firFactories.kt b/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/utils/firFactories.kt index d17f886818..91933c580d 100644 --- a/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/utils/firFactories.kt +++ b/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/utils/firFactories.kt @@ -17,9 +17,9 @@ import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLookupTagWithFixedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol +import org.jetbrains.kotlin.fir.toFirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl -import org.jetbrains.kotlin.fir.types.toFirResolvedTypeRef import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin diff --git a/plugins/kotlin-dataframe/testData/box/diff.fir.ir.txt b/plugins/kotlin-dataframe/testData/box/diff.fir.ir.txt index c652b38603..ea9c6ca73c 100644 --- a/plugins/kotlin-dataframe/testData/box/diff.fir.ir.txt +++ b/plugins/kotlin-dataframe/testData/box/diff.fir.ir.txt @@ -50,7 +50,7 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/diff.kt BLOCK_BODY VAR name:df type:org.jetbrains.kotlinx.dataframe.DataFrame<*> [val] CALL 'public final fun readDelimStr (text: kotlin.String, colTypes: kotlin.collections.Map, skipLines: kotlin.Int, readLines: kotlin.Int?): org.jetbrains.kotlinx.dataframe.DataFrame<*> declared in org.jetbrains.kotlinx.dataframe.io' type=org.jetbrains.kotlinx.dataframe.DataFrame<*> origin=null - $receiver: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion + $receiver: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion text: CALL 'public final fun trimIndent (): kotlin.String declared in kotlin.text' type=kotlin.String origin=null $receiver: CONST String type=kotlin.String value="\n char,level,race,charclass,zone,guild,timestamp\n 59425,1,Orc,Rogue,Orgrimmar,165,01/01/08 00:02:04\n 65494,9,Orc,Hunter,Durotar,-1,01/01/08 00:02:04\n " VAR name:df1 type:org.jetbrains.kotlinx.dataframe.DataFrame [val] diff --git a/plugins/kotlin-dataframe/testData/box/explodeDataFrame.fir.ir.txt b/plugins/kotlin-dataframe/testData/box/explodeDataFrame.fir.ir.txt index 8d0af1bb9d..3fb6457793 100644 --- a/plugins/kotlin-dataframe/testData/box/explodeDataFrame.fir.ir.txt +++ b/plugins/kotlin-dataframe/testData/box/explodeDataFrame.fir.ir.txt @@ -5,7 +5,7 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/explodeDataFrame.kt CALL 'public final fun let (block: kotlin.Function1): R of kotlin.let declared in kotlin' type=org.jetbrains.kotlinx.dataframe.DataFrame.ReadJson_01> origin=null : org.jetbrains.kotlinx.dataframe.DataFrame.Companion : org.jetbrains.kotlinx.dataframe.DataFrame.ReadJson_01> - $receiver: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion + $receiver: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion block: FUN_EXPR type=kotlin.Function1.ReadJson_01>> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:org.jetbrains.kotlinx.dataframe.DataFrame.Companion) returnType:org.jetbrains.kotlinx.dataframe.DataFrame.ReadJson_01> VALUE_PARAMETER name:it index:0 type:org.jetbrains.kotlinx.dataframe.DataFrame.Companion diff --git a/plugins/kotlin-dataframe/testData/box/flexibleReturnType.fir.ir.txt b/plugins/kotlin-dataframe/testData/box/flexibleReturnType.fir.ir.txt index 586f6c7fe1..6af717f6d7 100644 --- a/plugins/kotlin-dataframe/testData/box/flexibleReturnType.fir.ir.txt +++ b/plugins/kotlin-dataframe/testData/box/flexibleReturnType.fir.ir.txt @@ -28,7 +28,7 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/flexibleReturnType.kt BLOCK_BODY VAR name:df type:org.jetbrains.kotlinx.dataframe.DataFrame<*> [val] CALL 'public final fun readDelimStr (text: kotlin.String, colTypes: kotlin.collections.Map, skipLines: kotlin.Int, readLines: kotlin.Int?): org.jetbrains.kotlinx.dataframe.DataFrame<*> declared in org.jetbrains.kotlinx.dataframe.io' type=org.jetbrains.kotlinx.dataframe.DataFrame<*> origin=null - $receiver: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion + $receiver: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion text: CALL 'public final fun trimIndent (): kotlin.String declared in kotlin.text' type=kotlin.String origin=null $receiver: CONST String type=kotlin.String value="\n char,level,race,charclass,zone,guild,timestamp\n 59425,1,Orc,Rogue,Orgrimmar,165,01/01/08 00:02:04\n 65494,9,Orc,Hunter,Durotar,-1,01/01/08 00:02:04\n " VAR name:df1 type:org.jetbrains.kotlinx.dataframe.DataFrame [val] @@ -499,7 +499,7 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/flexibleReturnType.kt CONST String type=kotlin.String value="OK" FUN name:diff visibility:public modality:FINAL ($receiver:org.jetbrains.kotlinx.dataframe.DataRow, unit:java.time.temporal.ChronoUnit, expression:@[ExtensionFunctionType] kotlin.Function2, @[ParameterName(name = "it")] org.jetbrains.kotlinx.dataframe.DataRow, V of org.jetbrains.kotlinx.dataframe.diff>) returnType:kotlin.Long? annotations: - OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalTypeInference modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass]) + OptIn(markerClass = [CLASS_REFERENCE 'CLASS ANNOTATION_CLASS name:ExperimentalTypeInference modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass]) OverloadResolutionByLambdaReturnType TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false TYPE_PARAMETER name:V index:1 variance: superTypes:[java.time.temporal.Temporal] reified:false diff --git a/plugins/kotlin-dataframe/testData/box/join.fir.ir.txt b/plugins/kotlin-dataframe/testData/box/join.fir.ir.txt index ef7b670583..87b91ad2ed 100644 --- a/plugins/kotlin-dataframe/testData/box/join.fir.ir.txt +++ b/plugins/kotlin-dataframe/testData/box/join.fir.ir.txt @@ -5,7 +5,7 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/join.kt CALL 'public final fun let (block: kotlin.Function1): R of kotlin.let declared in kotlin' type=org.jetbrains.kotlinx.dataframe.DataFrame.ReadJson_01> origin=null : org.jetbrains.kotlinx.dataframe.DataFrame.Companion : org.jetbrains.kotlinx.dataframe.DataFrame.ReadJson_01> - $receiver: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion + $receiver: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion block: FUN_EXPR type=kotlin.Function1.ReadJson_01>> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:org.jetbrains.kotlinx.dataframe.DataFrame.Companion) returnType:org.jetbrains.kotlinx.dataframe.DataFrame.ReadJson_01> VALUE_PARAMETER name:it index:0 type:org.jetbrains.kotlinx.dataframe.DataFrame.Companion diff --git a/plugins/kotlin-dataframe/testData/box/platformType.fir.ir.txt b/plugins/kotlin-dataframe/testData/box/platformType.fir.ir.txt index 1de6da8aab..79db30634c 100644 --- a/plugins/kotlin-dataframe/testData/box/platformType.fir.ir.txt +++ b/plugins/kotlin-dataframe/testData/box/platformType.fir.ir.txt @@ -54,7 +54,7 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/platformType.kt BLOCK_BODY VAR name:df type:org.jetbrains.kotlinx.dataframe.DataFrame<*> [val] CALL 'public final fun read (path: kotlin.String, header: kotlin.collections.List): org.jetbrains.kotlinx.dataframe.DataFrame<*> declared in org.jetbrains.kotlinx.dataframe.io' type=org.jetbrains.kotlinx.dataframe.DataFrame<*> origin=null - $receiver: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion + $receiver: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion path: CONST String type=kotlin.String value="" VAR name:df1 type:org.jetbrains.kotlinx.dataframe.DataFrame [val] CALL 'public final fun cast (): org.jetbrains.kotlinx.dataframe.DataFrame declared in org.jetbrains.kotlinx.dataframe.api' type=org.jetbrains.kotlinx.dataframe.DataFrame origin=null diff --git a/plugins/kotlin-dataframe/testData/box/read.fir.ir.txt b/plugins/kotlin-dataframe/testData/box/read.fir.ir.txt index bba13c355b..549454403c 100644 --- a/plugins/kotlin-dataframe/testData/box/read.fir.ir.txt +++ b/plugins/kotlin-dataframe/testData/box/read.fir.ir.txt @@ -5,7 +5,7 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/read.kt CALL 'public final fun let (block: kotlin.Function1): R of kotlin.let declared in kotlin' type=org.jetbrains.kotlinx.dataframe.DataFrame.Read_16> origin=null : org.jetbrains.kotlinx.dataframe.DataFrame.Companion : org.jetbrains.kotlinx.dataframe.DataFrame.Read_16> - $receiver: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion + $receiver: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion block: FUN_EXPR type=kotlin.Function1.Read_16>> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:org.jetbrains.kotlinx.dataframe.DataFrame.Companion) returnType:org.jetbrains.kotlinx.dataframe.DataFrame.Read_16> VALUE_PARAMETER name:it index:0 type:org.jetbrains.kotlinx.dataframe.DataFrame.Companion diff --git a/plugins/kotlin-dataframe/testData/box/readCSV.fir.ir.txt b/plugins/kotlin-dataframe/testData/box/readCSV.fir.ir.txt index 758647482e..5d16f0f5c6 100644 --- a/plugins/kotlin-dataframe/testData/box/readCSV.fir.ir.txt +++ b/plugins/kotlin-dataframe/testData/box/readCSV.fir.ir.txt @@ -5,7 +5,7 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/readCSV.kt CALL 'public final fun let (block: kotlin.Function1): R of kotlin.let declared in kotlin' type=org.jetbrains.kotlinx.dataframe.DataFrame.ReadCSV_74> origin=null : org.jetbrains.kotlinx.dataframe.DataFrame.Companion : org.jetbrains.kotlinx.dataframe.DataFrame.ReadCSV_74> - $receiver: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion + $receiver: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion block: FUN_EXPR type=kotlin.Function1.ReadCSV_74>> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:org.jetbrains.kotlinx.dataframe.DataFrame.Companion) returnType:org.jetbrains.kotlinx.dataframe.DataFrame.ReadCSV_74> VALUE_PARAMETER name:it index:0 type:org.jetbrains.kotlinx.dataframe.DataFrame.Companion diff --git a/plugins/kotlin-dataframe/testData/box/readJsonStr_const.fir.ir.txt b/plugins/kotlin-dataframe/testData/box/readJsonStr_const.fir.ir.txt index 8537920b09..29418a69f5 100644 --- a/plugins/kotlin-dataframe/testData/box/readJsonStr_const.fir.ir.txt +++ b/plugins/kotlin-dataframe/testData/box/readJsonStr_const.fir.ir.txt @@ -5,7 +5,7 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/readJsonStr_const.kt CALL 'public final fun let (block: kotlin.Function1): R of kotlin.let declared in kotlin' type=org.jetbrains.kotlinx.dataframe.DataFrame.ReadJsonStr_09> origin=null : org.jetbrains.kotlinx.dataframe.DataFrame.Companion : org.jetbrains.kotlinx.dataframe.DataFrame.ReadJsonStr_09> - $receiver: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion + $receiver: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion block: FUN_EXPR type=kotlin.Function1.ReadJsonStr_09>> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:org.jetbrains.kotlinx.dataframe.DataFrame.Companion) returnType:org.jetbrains.kotlinx.dataframe.DataFrame.ReadJsonStr_09> VALUE_PARAMETER name:it index:0 type:org.jetbrains.kotlinx.dataframe.DataFrame.Companion diff --git a/plugins/kotlin-dataframe/testData/box/readJsonStr_localProperty.fir.ir.txt b/plugins/kotlin-dataframe/testData/box/readJsonStr_localProperty.fir.ir.txt index 8471f6b64b..4d3f6e0835 100644 --- a/plugins/kotlin-dataframe/testData/box/readJsonStr_localProperty.fir.ir.txt +++ b/plugins/kotlin-dataframe/testData/box/readJsonStr_localProperty.fir.ir.txt @@ -7,7 +7,7 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/readJsonStr_localProperty. CALL 'public final fun let (block: kotlin.Function1): R of kotlin.let declared in kotlin' type=org.jetbrains.kotlinx.dataframe.DataFrame.ReadJsonStr_09> origin=null : org.jetbrains.kotlinx.dataframe.DataFrame.Companion : org.jetbrains.kotlinx.dataframe.DataFrame.ReadJsonStr_09> - $receiver: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion + $receiver: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion block: FUN_EXPR type=kotlin.Function1.ReadJsonStr_09>> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:org.jetbrains.kotlinx.dataframe.DataFrame.Companion) returnType:org.jetbrains.kotlinx.dataframe.DataFrame.ReadJsonStr_09> VALUE_PARAMETER name:it index:0 type:org.jetbrains.kotlinx.dataframe.DataFrame.Companion diff --git a/plugins/kotlin-dataframe/testData/box/readJsonStr_memberProperty.fir.ir.txt b/plugins/kotlin-dataframe/testData/box/readJsonStr_memberProperty.fir.ir.txt index 1554580e0f..73c2fb6b58 100644 --- a/plugins/kotlin-dataframe/testData/box/readJsonStr_memberProperty.fir.ir.txt +++ b/plugins/kotlin-dataframe/testData/box/readJsonStr_memberProperty.fir.ir.txt @@ -36,7 +36,7 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/readJsonStr_memberProperty CALL 'public final fun let (block: kotlin.Function1): R of kotlin.let declared in kotlin' type=org.jetbrains.kotlinx.dataframe.DataFrame.ReadJsonStr_09> origin=null : org.jetbrains.kotlinx.dataframe.DataFrame.Companion : org.jetbrains.kotlinx.dataframe.DataFrame.ReadJsonStr_09> - $receiver: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion + $receiver: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion block: FUN_EXPR type=kotlin.Function1.ReadJsonStr_09>> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:org.jetbrains.kotlinx.dataframe.DataFrame.Companion) returnType:org.jetbrains.kotlinx.dataframe.DataFrame.ReadJsonStr_09> VALUE_PARAMETER name:it index:0 type:org.jetbrains.kotlinx.dataframe.DataFrame.Companion diff --git a/plugins/kotlin-dataframe/testData/box/toDataFrame.fir.ir.txt b/plugins/kotlin-dataframe/testData/box/toDataFrame.fir.ir.txt index a717a2399e..79319f39aa 100644 --- a/plugins/kotlin-dataframe/testData/box/toDataFrame.fir.ir.txt +++ b/plugins/kotlin-dataframe/testData/box/toDataFrame.fir.ir.txt @@ -312,7 +312,7 @@ FILE fqName: fileName:/toDataFrame.kt CALL 'public open fun now (): @[FlexibleNullability] java.time.Year? declared in java.time.Year' type=@[FlexibleNullability] java.time.Year? origin=null boolean: CONST Boolean type=kotlin.Boolean value=true instant: CALL 'public open fun now (): kotlinx.datetime.Instant declared in kotlinx.datetime.Clock.System' type=kotlinx.datetime.Instant origin=null - $this: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:System modality:FINAL visibility:public superTypes:[kotlinx.datetime.Clock]' type=kotlinx.datetime.Clock.System + $this: GET_OBJECT 'CLASS OBJECT name:System modality:FINAL visibility:public superTypes:[kotlinx.datetime.Clock]' type=kotlinx.datetime.Clock.System numberI: CONST Int type=kotlin.Int value=12 number: CONST Int type=kotlin.Int value=12 numberFloat: CONST Float type=kotlin.Float value=12.0 diff --git a/plugins/kotlin-dataframe/testData/box/toDataFrame_dsl.fir.ir.txt b/plugins/kotlin-dataframe/testData/box/toDataFrame_dsl.fir.ir.txt index 44111f08cf..ac4dc21dc5 100644 --- a/plugins/kotlin-dataframe/testData/box/toDataFrame_dsl.fir.ir.txt +++ b/plugins/kotlin-dataframe/testData/box/toDataFrame_dsl.fir.ir.txt @@ -1039,7 +1039,7 @@ FILE fqName: fileName:/toDataFrame_dsl.kt CALL 'public abstract fun exclude (vararg classes: kotlin.reflect.KClass<*>): kotlin.Unit declared in org.jetbrains.kotlinx.dataframe.api.TraversePropertiesDsl' type=kotlin.Unit origin=null $this: GET_VAR '$this$properties: org.jetbrains.kotlinx.dataframe.api.TraversePropertiesDsl declared in .box...' type=org.jetbrains.kotlinx.dataframe.api.TraversePropertiesDsl origin=null classes: VARARG type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*> - CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:public superTypes:[kotlin.Number; kotlin.Comparable; java.io.Serializable]' type=kotlin.reflect.KClass + CLASS_REFERENCE 'CLASS CLASS name:Int modality:FINAL visibility:public superTypes:[kotlin.Number; kotlin.Comparable; java.io.Serializable]' type=kotlin.reflect.KClass CALL 'public abstract fun exclude (vararg properties: kotlin.reflect.KCallable<*>): kotlin.Unit declared in org.jetbrains.kotlinx.dataframe.api.TraversePropertiesDsl' type=kotlin.Unit origin=null $this: GET_VAR '$this$properties: org.jetbrains.kotlinx.dataframe.api.TraversePropertiesDsl declared in .box...' type=org.jetbrains.kotlinx.dataframe.api.TraversePropertiesDsl origin=null properties: VARARG type=kotlin.Array> varargElementType=kotlin.reflect.KCallable<*> From 5931d15455af728b6ec52c88ec6fcae722fa27ce Mon Sep 17 00:00:00 2001 From: Nikita Klimenko Date: Wed, 19 Jun 2024 15:26:16 +0300 Subject: [PATCH 2/2] Prevent JSON from parsing malformed input --- .../kotlinx/dataframe/impl/io/readJson.kt | 2 + .../kotlinx/dataframe/io/CsvTests.kt | 9 ++ .../jetbrains/kotlinx/dataframe/io/json.kt | 13 +++ .../dataframe/gradle/DataFrameReadTest.kt | 2 +- .../testData/box/read.fir.ir.txt | 104 ++---------------- .../testData/box/read.fir.txt | 35 +----- .../testData/box/readCSV.fir.ir.txt | 104 ++---------------- .../testData/box/readCSV.fir.txt | 35 +----- 8 files changed, 61 insertions(+), 243 deletions(-) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/readJson.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/readJson.kt index a61b23cc2a..2994526b3d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/readJson.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/readJson.kt @@ -215,6 +215,7 @@ internal fun fromJsonListAnyColumns( v.longOrNull != null -> collector.add(v.long) v.doubleOrNull != null -> collector.add(v.double) v.floatOrNull != null -> collector.add(v.float) + else -> error("Malformed JSON element ${v::class}: $v") } } @@ -527,6 +528,7 @@ internal fun fromJsonListArrayAndValueColumns( v.longOrNull != null -> collector.add(v.long) v.doubleOrNull != null -> collector.add(v.double) v.floatOrNull != null -> collector.add(v.float) + else -> error("Malformed JSON element ${v::class}: $v") } } diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/CsvTests.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/CsvTests.kt index e9c80d28a2..e2aca14eda 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/CsvTests.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/CsvTests.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlinx.dataframe.testResource import org.junit.Test import java.io.File import java.io.StringWriter +import java.net.URL import java.util.Locale import kotlin.reflect.KClass import kotlin.reflect.typeOf @@ -249,6 +250,14 @@ class CsvTests { producedFile.delete() } + @Test + fun `check integrity of example data`() { + val df = DataFrame.readCSV("../data/jetbrains_repositories.csv") + df.columnNames() shouldBe listOf("full_name", "html_url", "stargazers_count", "topics", "watchers") + df.columnTypes() shouldBe listOf(typeOf(), typeOf(), typeOf(), typeOf(), typeOf()) + df shouldBe DataFrame.readCSV("../data/jetbrains repositories.csv") + } + companion object { private val simpleCsv = testCsv("testCSV") private val csvWithFrenchLocale = testCsv("testCSVwithFrenchLocale") diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/json.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/json.kt index 6eb1025018..2868df1cc2 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/json.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/json.kt @@ -1,12 +1,15 @@ package org.jetbrains.kotlinx.dataframe.io import io.kotest.assertions.throwables.shouldNotThrowAny +import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.collections.shouldBeIn import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldContain import io.kotest.matchers.string.shouldNotContain import io.kotest.matchers.types.instanceOf import io.kotest.matchers.types.shouldBeInstanceOf +import kotlinx.serialization.json.Json +import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.boolean import kotlinx.serialization.json.int import kotlinx.serialization.json.jsonArray @@ -42,6 +45,7 @@ import org.jetbrains.kotlinx.dataframe.impl.io.SerializationKeys.METADATA import org.jetbrains.kotlinx.dataframe.impl.io.SerializationKeys.NCOL import org.jetbrains.kotlinx.dataframe.impl.io.SerializationKeys.NROW import org.jetbrains.kotlinx.dataframe.impl.io.SerializationKeys.VERSION +import org.jetbrains.kotlinx.dataframe.impl.io.readJson import org.jetbrains.kotlinx.dataframe.impl.nothingType import org.jetbrains.kotlinx.dataframe.io.JSON.TypeClashTactic.ANY_COLUMNS import org.jetbrains.kotlinx.dataframe.io.JSON.TypeClashTactic.ARRAY_AND_VALUE_COLUMNS @@ -1077,4 +1081,13 @@ class JsonTests { val json = df.toJson() DataFrame.readJsonStr(json) shouldBe df } + + @Test + fun `parse invalid literal`() { + // https://github.com/Kotlin/kotlinx.serialization/issues/2511 + val json = Json.decodeFromString("""[jetbrains, jetbrains-youtrack, youtrack, youtrack-api]""") + shouldThrow { + readJson(json, emptyList()) + } + } } diff --git a/plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/DataFrameReadTest.kt b/plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/DataFrameReadTest.kt index e7307aac63..180dd02884 100644 --- a/plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/DataFrameReadTest.kt +++ b/plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/DataFrameReadTest.kt @@ -33,7 +33,7 @@ class DataFrameReadTest { fun `file with invalid json`() { val temp = Files.createTempDirectory("").toFile() val invalidJson = File(temp, "test.json").also { it.writeText(".") } - shouldNotThrowAny { + shouldThrow { DataFrame.read(invalidJson) } } diff --git a/plugins/kotlin-dataframe/testData/box/read.fir.ir.txt b/plugins/kotlin-dataframe/testData/box/read.fir.ir.txt index 549454403c..b1e2850c52 100644 --- a/plugins/kotlin-dataframe/testData/box/read.fir.ir.txt +++ b/plugins/kotlin-dataframe/testData/box/read.fir.ir.txt @@ -50,7 +50,7 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/read.kt PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:topics visibility:public modality:ABSTRACT [val] annotations: Order(order = 3) - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:ABSTRACT <> ($this:org.jetbrains.kotlinx.dataframe.box..Read_16I) returnType:org.jetbrains.kotlinx.dataframe.DataFrame.Topics_391> + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:ABSTRACT <> ($this:org.jetbrains.kotlinx.dataframe.box..Read_16I) returnType:kotlin.String correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:topics visibility:public modality:ABSTRACT [val] $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Read_16I PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:watchers visibility:public modality:ABSTRACT [val] @@ -90,30 +90,30 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/read.kt $this: GET_VAR ': org.jetbrains.kotlinx.dataframe.ColumnsContainer.Read_16I> declared in org.jetbrains.kotlinx.dataframe.box..Scope0.' type=org.jetbrains.kotlinx.dataframe.ColumnsContainer.Read_16I> origin=null columnName: CONST String type=kotlin.String value="full_name" PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:topics visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:topics type:org.jetbrains.kotlinx.dataframe.DataFrame.Topics_391> visibility:private [final] - FUN GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name: visibility:public modality:FINAL <> ($this:org.jetbrains.kotlinx.dataframe.box..Scope0, $receiver:org.jetbrains.kotlinx.dataframe.DataRow.Read_16I>) returnType:org.jetbrains.kotlinx.dataframe.DataFrame.Topics_391> + FIELD PROPERTY_BACKING_FIELD name:topics type:kotlin.String visibility:private [final] + FUN GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name: visibility:public modality:FINAL <> ($this:org.jetbrains.kotlinx.dataframe.box..Scope0, $receiver:org.jetbrains.kotlinx.dataframe.DataRow.Read_16I>) returnType:kotlin.String annotations: JvmName(name = "Read_16I_topics") correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:topics visibility:public modality:FINAL [val] $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Scope0 $receiver: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.DataRow.Read_16I> BLOCK_BODY - RETURN type=org.jetbrains.kotlinx.dataframe.DataFrame.Topics_391> from='public final fun (): org.jetbrains.kotlinx.dataframe.DataFrame.Topics_391> declared in org.jetbrains.kotlinx.dataframe.box..Scope0' - TYPE_OP type=org.jetbrains.kotlinx.dataframe.DataFrame.Topics_391> origin=CAST typeOperand=org.jetbrains.kotlinx.dataframe.DataFrame.Topics_391> + RETURN type=kotlin.String from='public final fun (): kotlin.String declared in org.jetbrains.kotlinx.dataframe.box..Scope0' + TYPE_OP type=kotlin.String origin=CAST typeOperand=kotlin.String CALL 'public abstract fun get (name: kotlin.String): kotlin.Any? declared in org.jetbrains.kotlinx.dataframe.DataRow' type=kotlin.Any? origin=null $this: GET_VAR ': org.jetbrains.kotlinx.dataframe.DataRow.Read_16I> declared in org.jetbrains.kotlinx.dataframe.box..Scope0.' type=org.jetbrains.kotlinx.dataframe.DataRow.Read_16I> origin=null name: CONST String type=kotlin.String value="topics" PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:topics visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:topics type:org.jetbrains.kotlinx.dataframe.DataColumn.Topics_391>> visibility:private [final] - FUN GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name: visibility:public modality:FINAL <> ($this:org.jetbrains.kotlinx.dataframe.box..Scope0, $receiver:org.jetbrains.kotlinx.dataframe.ColumnsContainer.Read_16I>) returnType:org.jetbrains.kotlinx.dataframe.DataColumn.Topics_391>> + FIELD PROPERTY_BACKING_FIELD name:topics type:org.jetbrains.kotlinx.dataframe.DataColumn visibility:private [final] + FUN GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name: visibility:public modality:FINAL <> ($this:org.jetbrains.kotlinx.dataframe.box..Scope0, $receiver:org.jetbrains.kotlinx.dataframe.ColumnsContainer.Read_16I>) returnType:org.jetbrains.kotlinx.dataframe.DataColumn annotations: JvmName(name = "Read_16I_topics") correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:topics visibility:public modality:FINAL [val] $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Scope0 $receiver: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.ColumnsContainer.Read_16I> BLOCK_BODY - RETURN type=org.jetbrains.kotlinx.dataframe.DataColumn.Topics_391>> from='public final fun (): org.jetbrains.kotlinx.dataframe.DataColumn.Topics_391>> declared in org.jetbrains.kotlinx.dataframe.box..Scope0' - TYPE_OP type=org.jetbrains.kotlinx.dataframe.DataColumn.Topics_391>> origin=CAST typeOperand=org.jetbrains.kotlinx.dataframe.DataColumn.Topics_391>> + RETURN type=org.jetbrains.kotlinx.dataframe.DataColumn from='public final fun (): org.jetbrains.kotlinx.dataframe.DataColumn declared in org.jetbrains.kotlinx.dataframe.box..Scope0' + TYPE_OP type=org.jetbrains.kotlinx.dataframe.DataColumn origin=CAST typeOperand=org.jetbrains.kotlinx.dataframe.DataColumn CALL 'public open fun get (columnName: kotlin.String): org.jetbrains.kotlinx.dataframe.DataColumn<*> declared in org.jetbrains.kotlinx.dataframe.ColumnsContainer' type=kotlin.Any? origin=null $this: GET_VAR ': org.jetbrains.kotlinx.dataframe.ColumnsContainer.Read_16I> declared in org.jetbrains.kotlinx.dataframe.box..Scope0.' type=org.jetbrains.kotlinx.dataframe.ColumnsContainer.Read_16I> origin=null columnName: CONST String type=kotlin.String value="topics" @@ -218,78 +218,6 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/read.kt overridden: public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any - CLASS CLASS name:Topics_391 modality:ABSTRACT visibility:local superTypes:[kotlin.Any] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:org.jetbrains.kotlinx.dataframe.box..Topics_391 - CONSTRUCTOR GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] visibility:public <> () returnType:org.jetbrains.kotlinx.dataframe.box..Topics_391 [primary] - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Topics_391 modality:ABSTRACT visibility:local superTypes:[kotlin.Any]' - FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] - overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] - overridden: - public open fun hashCode (): kotlin.Int declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] - overridden: - public open fun toString (): kotlin.String declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:value visibility:public modality:ABSTRACT [val] - annotations: - Order(order = 0) - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:ABSTRACT <> ($this:org.jetbrains.kotlinx.dataframe.box..Topics_391) returnType:kotlin.Double - correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:value visibility:public modality:ABSTRACT [val] - $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Topics_391 - CLASS CLASS name:Scope1 modality:FINAL visibility:local superTypes:[kotlin.Any] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:org.jetbrains.kotlinx.dataframe.box..Scope1 - PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Double visibility:private [final] - FUN GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name: visibility:public modality:FINAL <> ($this:org.jetbrains.kotlinx.dataframe.box..Scope1, $receiver:org.jetbrains.kotlinx.dataframe.DataRow.Topics_391>) returnType:kotlin.Double - annotations: - JvmName(name = "Topics_391_value") - correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:value visibility:public modality:FINAL [val] - $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Scope1 - $receiver: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.DataRow.Topics_391> - BLOCK_BODY - RETURN type=kotlin.Double from='public final fun (): kotlin.Double declared in org.jetbrains.kotlinx.dataframe.box..Scope1' - TYPE_OP type=kotlin.Double origin=CAST typeOperand=kotlin.Double - CALL 'public abstract fun get (name: kotlin.String): kotlin.Any? declared in org.jetbrains.kotlinx.dataframe.DataRow' type=kotlin.Any? origin=null - $this: GET_VAR ': org.jetbrains.kotlinx.dataframe.DataRow.Topics_391> declared in org.jetbrains.kotlinx.dataframe.box..Scope1.' type=org.jetbrains.kotlinx.dataframe.DataRow.Topics_391> origin=null - name: CONST String type=kotlin.String value="value" - PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:org.jetbrains.kotlinx.dataframe.DataColumn visibility:private [final] - FUN GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name: visibility:public modality:FINAL <> ($this:org.jetbrains.kotlinx.dataframe.box..Scope1, $receiver:org.jetbrains.kotlinx.dataframe.ColumnsContainer.Topics_391>) returnType:org.jetbrains.kotlinx.dataframe.DataColumn - annotations: - JvmName(name = "Topics_391_value") - correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:value visibility:public modality:FINAL [val] - $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Scope1 - $receiver: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.ColumnsContainer.Topics_391> - BLOCK_BODY - RETURN type=org.jetbrains.kotlinx.dataframe.DataColumn from='public final fun (): org.jetbrains.kotlinx.dataframe.DataColumn declared in org.jetbrains.kotlinx.dataframe.box..Scope1' - TYPE_OP type=org.jetbrains.kotlinx.dataframe.DataColumn origin=CAST typeOperand=org.jetbrains.kotlinx.dataframe.DataColumn - CALL 'public open fun get (columnName: kotlin.String): org.jetbrains.kotlinx.dataframe.DataColumn<*> declared in org.jetbrains.kotlinx.dataframe.ColumnsContainer' type=kotlin.Any? origin=null - $this: GET_VAR ': org.jetbrains.kotlinx.dataframe.ColumnsContainer.Topics_391> declared in org.jetbrains.kotlinx.dataframe.box..Scope1.' type=org.jetbrains.kotlinx.dataframe.ColumnsContainer.Topics_391> origin=null - columnName: CONST String type=kotlin.String value="value" - CONSTRUCTOR GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] visibility:public <> () returnType:org.jetbrains.kotlinx.dataframe.box..Scope1 [primary] - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Scope1 modality:FINAL visibility:local superTypes:[kotlin.Any]' - FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] - overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] - overridden: - public open fun hashCode (): kotlin.Int declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] - overridden: - public open fun toString (): kotlin.String declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any CLASS CLASS name:Read_16 modality:ABSTRACT visibility:local superTypes:[org.jetbrains.kotlinx.dataframe.box..Read_16I] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:org.jetbrains.kotlinx.dataframe.box..Read_16 CONSTRUCTOR GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] visibility:public <> () returnType:org.jetbrains.kotlinx.dataframe.box..Read_16 [primary] @@ -343,11 +271,11 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/read.kt annotations: Order(order = 3) overridden: - public abstract topics: org.jetbrains.kotlinx.dataframe.DataFrame.Topics_391> declared in org.jetbrains.kotlinx.dataframe.box..Read_16I - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:org.jetbrains.kotlinx.dataframe.box..Read_16I) returnType:org.jetbrains.kotlinx.dataframe.DataFrame.Topics_391> [fake_override] + public abstract topics: kotlin.String declared in org.jetbrains.kotlinx.dataframe.box..Read_16I + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:org.jetbrains.kotlinx.dataframe.box..Read_16I) returnType:kotlin.String [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:topics visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): org.jetbrains.kotlinx.dataframe.DataFrame.Topics_391> declared in org.jetbrains.kotlinx.dataframe.box..Read_16I + public abstract fun (): kotlin.String declared in org.jetbrains.kotlinx.dataframe.box..Read_16I $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Read_16I PROPERTY FAKE_OVERRIDE name:watchers visibility:public modality:ABSTRACT [fake_override,val] annotations: @@ -367,14 +295,6 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/read.kt correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:scope0 visibility:public modality:ABSTRACT [var] $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Read_16 VALUE_PARAMETER name: index:0 type:org.jetbrains.kotlinx.dataframe.box..Scope0 - PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:scope1 visibility:public modality:ABSTRACT [var] - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:ABSTRACT <> ($this:org.jetbrains.kotlinx.dataframe.box..Read_16) returnType:org.jetbrains.kotlinx.dataframe.box..Scope1 - correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:scope1 visibility:public modality:ABSTRACT [var] - $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Read_16 - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:ABSTRACT <> ($this:org.jetbrains.kotlinx.dataframe.box..Read_16, :org.jetbrains.kotlinx.dataframe.box..Scope1) returnType:kotlin.Unit - correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:scope1 visibility:public modality:ABSTRACT [var] - $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Read_16 - VALUE_PARAMETER name: index:0 type:org.jetbrains.kotlinx.dataframe.box..Scope1 RETURN type=kotlin.Nothing from='local final fun (it: org.jetbrains.kotlinx.dataframe.DataFrame.Companion): org.jetbrains.kotlinx.dataframe.DataFrame.Read_16> declared in org.jetbrains.kotlinx.dataframe.box' CALL 'public final fun read (path: kotlin.String, header: kotlin.collections.List): org.jetbrains.kotlinx.dataframe.DataFrame<*> declared in org.jetbrains.kotlinx.dataframe.io' type=org.jetbrains.kotlinx.dataframe.DataFrame.Read_16> origin=null $receiver: GET_VAR 'it: org.jetbrains.kotlinx.dataframe.DataFrame.Companion declared in org.jetbrains.kotlinx.dataframe.box.' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion origin=null diff --git a/plugins/kotlin-dataframe/testData/box/read.fir.txt b/plugins/kotlin-dataframe/testData/box/read.fir.txt index fc2ff0b90d..6f66eb98a4 100644 --- a/plugins/kotlin-dataframe/testData/box/read.fir.txt +++ b/plugins/kotlin-dataframe/testData/box/read.fir.txt @@ -7,8 +7,8 @@ FILE: read.kt @R|org/jetbrains/kotlinx/dataframe/annotations/Order|(order = Int(0)) public abstract val full_name: R|kotlin/String| public get(): R|kotlin/String| - @R|org/jetbrains/kotlinx/dataframe/annotations/Order|(order = Int(3)) public abstract val topics: R|org/jetbrains/kotlinx/dataframe/DataFrame</Topics_391>| - public get(): R|org/jetbrains/kotlinx/dataframe/DataFrame</Topics_391>| + @R|org/jetbrains/kotlinx/dataframe/annotations/Order|(order = Int(3)) public abstract val topics: R|kotlin/String| + public get(): R|kotlin/String| @R|org/jetbrains/kotlinx/dataframe/annotations/Order|(order = Int(4)) public abstract val watchers: R|kotlin/Int| public get(): R|kotlin/Int| @@ -30,11 +30,11 @@ FILE: read.kt public final val R|org/jetbrains/kotlinx/dataframe/ColumnsContainer</Read_16I>|.full_name: R|org/jetbrains/kotlinx/dataframe/DataColumn| public get(): R|org/jetbrains/kotlinx/dataframe/DataColumn| - public final val R|org/jetbrains/kotlinx/dataframe/DataRow</Read_16I>|.topics: R|org/jetbrains/kotlinx/dataframe/DataFrame</Topics_391>| - public get(): R|org/jetbrains/kotlinx/dataframe/DataFrame</Topics_391>| + public final val R|org/jetbrains/kotlinx/dataframe/DataRow</Read_16I>|.topics: R|kotlin/String| + public get(): R|kotlin/String| - public final val R|org/jetbrains/kotlinx/dataframe/ColumnsContainer</Read_16I>|.topics: R|org/jetbrains/kotlinx/dataframe/DataColumn/Topics_391>>| - public get(): R|org/jetbrains/kotlinx/dataframe/DataColumn/Topics_391>>| + public final val R|org/jetbrains/kotlinx/dataframe/ColumnsContainer</Read_16I>|.topics: R|org/jetbrains/kotlinx/dataframe/DataColumn| + public get(): R|org/jetbrains/kotlinx/dataframe/DataColumn| public final val R|org/jetbrains/kotlinx/dataframe/DataRow</Read_16I>|.watchers: R|kotlin/Int| public get(): R|kotlin/Int| @@ -58,34 +58,11 @@ FILE: read.kt } - local abstract class Topics_391 : R|kotlin/Any| { - @R|org/jetbrains/kotlinx/dataframe/annotations/Order|(order = Int(0)) public abstract val value: R|kotlin/Double| - public get(): R|kotlin/Double| - - public constructor(): R|/Topics_391| - - } - - local final class Scope1 : R|kotlin/Any| { - public final val R|org/jetbrains/kotlinx/dataframe/DataRow</Topics_391>|.value: R|kotlin/Double| - public get(): R|kotlin/Double| - - public final val R|org/jetbrains/kotlinx/dataframe/ColumnsContainer</Topics_391>|.value: R|org/jetbrains/kotlinx/dataframe/DataColumn| - public get(): R|org/jetbrains/kotlinx/dataframe/DataColumn| - - public constructor(): R|/Scope1| - - } - local abstract class Read_16 : R|/Read_16I| { public abstract var scope0: R|/Scope0| public get(): R|/Scope0| public set(value: R|/Scope0|): R|kotlin/Unit| - public abstract var scope1: R|/Scope1| - public get(): R|/Scope1| - public set(value: R|/Scope1|): R|kotlin/Unit| - public constructor(): R|/Read_16| } diff --git a/plugins/kotlin-dataframe/testData/box/readCSV.fir.ir.txt b/plugins/kotlin-dataframe/testData/box/readCSV.fir.ir.txt index 5d16f0f5c6..0f256e8aaa 100644 --- a/plugins/kotlin-dataframe/testData/box/readCSV.fir.ir.txt +++ b/plugins/kotlin-dataframe/testData/box/readCSV.fir.ir.txt @@ -50,7 +50,7 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/readCSV.kt PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:topics visibility:public modality:ABSTRACT [val] annotations: Order(order = 3) - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:ABSTRACT <> ($this:org.jetbrains.kotlinx.dataframe.box..ReadCSV_74I) returnType:org.jetbrains.kotlinx.dataframe.DataFrame.Topics_311> + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:ABSTRACT <> ($this:org.jetbrains.kotlinx.dataframe.box..ReadCSV_74I) returnType:kotlin.String correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:topics visibility:public modality:ABSTRACT [val] $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..ReadCSV_74I PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:watchers visibility:public modality:ABSTRACT [val] @@ -90,30 +90,30 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/readCSV.kt $this: GET_VAR ': org.jetbrains.kotlinx.dataframe.ColumnsContainer.ReadCSV_74I> declared in org.jetbrains.kotlinx.dataframe.box..Scope0.' type=org.jetbrains.kotlinx.dataframe.ColumnsContainer.ReadCSV_74I> origin=null columnName: CONST String type=kotlin.String value="full_name" PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:topics visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:topics type:org.jetbrains.kotlinx.dataframe.DataFrame.Topics_311> visibility:private [final] - FUN GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name: visibility:public modality:FINAL <> ($this:org.jetbrains.kotlinx.dataframe.box..Scope0, $receiver:org.jetbrains.kotlinx.dataframe.DataRow.ReadCSV_74I>) returnType:org.jetbrains.kotlinx.dataframe.DataFrame.Topics_311> + FIELD PROPERTY_BACKING_FIELD name:topics type:kotlin.String visibility:private [final] + FUN GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name: visibility:public modality:FINAL <> ($this:org.jetbrains.kotlinx.dataframe.box..Scope0, $receiver:org.jetbrains.kotlinx.dataframe.DataRow.ReadCSV_74I>) returnType:kotlin.String annotations: JvmName(name = "ReadCSV_74I_topics") correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:topics visibility:public modality:FINAL [val] $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Scope0 $receiver: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.DataRow.ReadCSV_74I> BLOCK_BODY - RETURN type=org.jetbrains.kotlinx.dataframe.DataFrame.Topics_311> from='public final fun (): org.jetbrains.kotlinx.dataframe.DataFrame.Topics_311> declared in org.jetbrains.kotlinx.dataframe.box..Scope0' - TYPE_OP type=org.jetbrains.kotlinx.dataframe.DataFrame.Topics_311> origin=CAST typeOperand=org.jetbrains.kotlinx.dataframe.DataFrame.Topics_311> + RETURN type=kotlin.String from='public final fun (): kotlin.String declared in org.jetbrains.kotlinx.dataframe.box..Scope0' + TYPE_OP type=kotlin.String origin=CAST typeOperand=kotlin.String CALL 'public abstract fun get (name: kotlin.String): kotlin.Any? declared in org.jetbrains.kotlinx.dataframe.DataRow' type=kotlin.Any? origin=null $this: GET_VAR ': org.jetbrains.kotlinx.dataframe.DataRow.ReadCSV_74I> declared in org.jetbrains.kotlinx.dataframe.box..Scope0.' type=org.jetbrains.kotlinx.dataframe.DataRow.ReadCSV_74I> origin=null name: CONST String type=kotlin.String value="topics" PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:topics visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:topics type:org.jetbrains.kotlinx.dataframe.DataColumn.Topics_311>> visibility:private [final] - FUN GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name: visibility:public modality:FINAL <> ($this:org.jetbrains.kotlinx.dataframe.box..Scope0, $receiver:org.jetbrains.kotlinx.dataframe.ColumnsContainer.ReadCSV_74I>) returnType:org.jetbrains.kotlinx.dataframe.DataColumn.Topics_311>> + FIELD PROPERTY_BACKING_FIELD name:topics type:org.jetbrains.kotlinx.dataframe.DataColumn visibility:private [final] + FUN GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name: visibility:public modality:FINAL <> ($this:org.jetbrains.kotlinx.dataframe.box..Scope0, $receiver:org.jetbrains.kotlinx.dataframe.ColumnsContainer.ReadCSV_74I>) returnType:org.jetbrains.kotlinx.dataframe.DataColumn annotations: JvmName(name = "ReadCSV_74I_topics") correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:topics visibility:public modality:FINAL [val] $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Scope0 $receiver: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.ColumnsContainer.ReadCSV_74I> BLOCK_BODY - RETURN type=org.jetbrains.kotlinx.dataframe.DataColumn.Topics_311>> from='public final fun (): org.jetbrains.kotlinx.dataframe.DataColumn.Topics_311>> declared in org.jetbrains.kotlinx.dataframe.box..Scope0' - TYPE_OP type=org.jetbrains.kotlinx.dataframe.DataColumn.Topics_311>> origin=CAST typeOperand=org.jetbrains.kotlinx.dataframe.DataColumn.Topics_311>> + RETURN type=org.jetbrains.kotlinx.dataframe.DataColumn from='public final fun (): org.jetbrains.kotlinx.dataframe.DataColumn declared in org.jetbrains.kotlinx.dataframe.box..Scope0' + TYPE_OP type=org.jetbrains.kotlinx.dataframe.DataColumn origin=CAST typeOperand=org.jetbrains.kotlinx.dataframe.DataColumn CALL 'public open fun get (columnName: kotlin.String): org.jetbrains.kotlinx.dataframe.DataColumn<*> declared in org.jetbrains.kotlinx.dataframe.ColumnsContainer' type=kotlin.Any? origin=null $this: GET_VAR ': org.jetbrains.kotlinx.dataframe.ColumnsContainer.ReadCSV_74I> declared in org.jetbrains.kotlinx.dataframe.box..Scope0.' type=org.jetbrains.kotlinx.dataframe.ColumnsContainer.ReadCSV_74I> origin=null columnName: CONST String type=kotlin.String value="topics" @@ -218,78 +218,6 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/readCSV.kt overridden: public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any - CLASS CLASS name:Topics_311 modality:ABSTRACT visibility:local superTypes:[kotlin.Any] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:org.jetbrains.kotlinx.dataframe.box..Topics_311 - CONSTRUCTOR GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] visibility:public <> () returnType:org.jetbrains.kotlinx.dataframe.box..Topics_311 [primary] - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Topics_311 modality:ABSTRACT visibility:local superTypes:[kotlin.Any]' - FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] - overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] - overridden: - public open fun hashCode (): kotlin.Int declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] - overridden: - public open fun toString (): kotlin.String declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:value visibility:public modality:ABSTRACT [val] - annotations: - Order(order = 0) - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:ABSTRACT <> ($this:org.jetbrains.kotlinx.dataframe.box..Topics_311) returnType:kotlin.Double - correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:value visibility:public modality:ABSTRACT [val] - $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Topics_311 - CLASS CLASS name:Scope1 modality:FINAL visibility:local superTypes:[kotlin.Any] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:org.jetbrains.kotlinx.dataframe.box..Scope1 - PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Double visibility:private [final] - FUN GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name: visibility:public modality:FINAL <> ($this:org.jetbrains.kotlinx.dataframe.box..Scope1, $receiver:org.jetbrains.kotlinx.dataframe.DataRow.Topics_311>) returnType:kotlin.Double - annotations: - JvmName(name = "Topics_311_value") - correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:value visibility:public modality:FINAL [val] - $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Scope1 - $receiver: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.DataRow.Topics_311> - BLOCK_BODY - RETURN type=kotlin.Double from='public final fun (): kotlin.Double declared in org.jetbrains.kotlinx.dataframe.box..Scope1' - TYPE_OP type=kotlin.Double origin=CAST typeOperand=kotlin.Double - CALL 'public abstract fun get (name: kotlin.String): kotlin.Any? declared in org.jetbrains.kotlinx.dataframe.DataRow' type=kotlin.Any? origin=null - $this: GET_VAR ': org.jetbrains.kotlinx.dataframe.DataRow.Topics_311> declared in org.jetbrains.kotlinx.dataframe.box..Scope1.' type=org.jetbrains.kotlinx.dataframe.DataRow.Topics_311> origin=null - name: CONST String type=kotlin.String value="value" - PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:org.jetbrains.kotlinx.dataframe.DataColumn visibility:private [final] - FUN GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name: visibility:public modality:FINAL <> ($this:org.jetbrains.kotlinx.dataframe.box..Scope1, $receiver:org.jetbrains.kotlinx.dataframe.ColumnsContainer.Topics_311>) returnType:org.jetbrains.kotlinx.dataframe.DataColumn - annotations: - JvmName(name = "Topics_311_value") - correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] name:value visibility:public modality:FINAL [val] - $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..Scope1 - $receiver: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.ColumnsContainer.Topics_311> - BLOCK_BODY - RETURN type=org.jetbrains.kotlinx.dataframe.DataColumn from='public final fun (): org.jetbrains.kotlinx.dataframe.DataColumn declared in org.jetbrains.kotlinx.dataframe.box..Scope1' - TYPE_OP type=org.jetbrains.kotlinx.dataframe.DataColumn origin=CAST typeOperand=org.jetbrains.kotlinx.dataframe.DataColumn - CALL 'public open fun get (columnName: kotlin.String): org.jetbrains.kotlinx.dataframe.DataColumn<*> declared in org.jetbrains.kotlinx.dataframe.ColumnsContainer' type=kotlin.Any? origin=null - $this: GET_VAR ': org.jetbrains.kotlinx.dataframe.ColumnsContainer.Topics_311> declared in org.jetbrains.kotlinx.dataframe.box..Scope1.' type=org.jetbrains.kotlinx.dataframe.ColumnsContainer.Topics_311> origin=null - columnName: CONST String type=kotlin.String value="value" - CONSTRUCTOR GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] visibility:public <> () returnType:org.jetbrains.kotlinx.dataframe.box..Scope1 [primary] - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Scope1 modality:FINAL visibility:local superTypes:[kotlin.Any]' - FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] - overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] - overridden: - public open fun hashCode (): kotlin.Int declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] - overridden: - public open fun toString (): kotlin.String declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any CLASS CLASS name:ReadCSV_74 modality:ABSTRACT visibility:local superTypes:[org.jetbrains.kotlinx.dataframe.box..ReadCSV_74I] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:org.jetbrains.kotlinx.dataframe.box..ReadCSV_74 CONSTRUCTOR GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.DataFramePlugin] visibility:public <> () returnType:org.jetbrains.kotlinx.dataframe.box..ReadCSV_74 [primary] @@ -343,11 +271,11 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/readCSV.kt annotations: Order(order = 3) overridden: - public abstract topics: org.jetbrains.kotlinx.dataframe.DataFrame.Topics_311> declared in org.jetbrains.kotlinx.dataframe.box..ReadCSV_74I - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:org.jetbrains.kotlinx.dataframe.box..ReadCSV_74I) returnType:org.jetbrains.kotlinx.dataframe.DataFrame.Topics_311> [fake_override] + public abstract topics: kotlin.String declared in org.jetbrains.kotlinx.dataframe.box..ReadCSV_74I + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:org.jetbrains.kotlinx.dataframe.box..ReadCSV_74I) returnType:kotlin.String [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:topics visibility:public modality:ABSTRACT [fake_override,val] overridden: - public abstract fun (): org.jetbrains.kotlinx.dataframe.DataFrame.Topics_311> declared in org.jetbrains.kotlinx.dataframe.box..ReadCSV_74I + public abstract fun (): kotlin.String declared in org.jetbrains.kotlinx.dataframe.box..ReadCSV_74I $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..ReadCSV_74I PROPERTY FAKE_OVERRIDE name:watchers visibility:public modality:ABSTRACT [fake_override,val] annotations: @@ -367,14 +295,6 @@ FILE fqName:org.jetbrains.kotlinx.dataframe fileName:/readCSV.kt correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:scope0 visibility:public modality:ABSTRACT [var] $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..ReadCSV_74 VALUE_PARAMETER name: index:0 type:org.jetbrains.kotlinx.dataframe.box..Scope0 - PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:scope1 visibility:public modality:ABSTRACT [var] - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:ABSTRACT <> ($this:org.jetbrains.kotlinx.dataframe.box..ReadCSV_74) returnType:org.jetbrains.kotlinx.dataframe.box..Scope1 - correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:scope1 visibility:public modality:ABSTRACT [var] - $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..ReadCSV_74 - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:ABSTRACT <> ($this:org.jetbrains.kotlinx.dataframe.box..ReadCSV_74, :org.jetbrains.kotlinx.dataframe.box..Scope1) returnType:kotlin.Unit - correspondingProperty: PROPERTY GENERATED[org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator.Key] name:scope1 visibility:public modality:ABSTRACT [var] - $this: VALUE_PARAMETER name: type:org.jetbrains.kotlinx.dataframe.box..ReadCSV_74 - VALUE_PARAMETER name: index:0 type:org.jetbrains.kotlinx.dataframe.box..Scope1 RETURN type=kotlin.Nothing from='local final fun (it: org.jetbrains.kotlinx.dataframe.DataFrame.Companion): org.jetbrains.kotlinx.dataframe.DataFrame.ReadCSV_74> declared in org.jetbrains.kotlinx.dataframe.box' CALL 'public final fun readCSV (fileOrUrl: kotlin.String, delimiter: kotlin.Char, header: kotlin.collections.List, colTypes: kotlin.collections.Map, skipLines: kotlin.Int, readLines: kotlin.Int?, duplicate: kotlin.Boolean, charset: java.nio.charset.Charset, parserOptions: org.jetbrains.kotlinx.dataframe.api.ParserOptions?): org.jetbrains.kotlinx.dataframe.DataFrame<*> declared in org.jetbrains.kotlinx.dataframe.io' type=org.jetbrains.kotlinx.dataframe.DataFrame.ReadCSV_74> origin=null $receiver: GET_VAR 'it: org.jetbrains.kotlinx.dataframe.DataFrame.Companion declared in org.jetbrains.kotlinx.dataframe.box.' type=org.jetbrains.kotlinx.dataframe.DataFrame.Companion origin=null diff --git a/plugins/kotlin-dataframe/testData/box/readCSV.fir.txt b/plugins/kotlin-dataframe/testData/box/readCSV.fir.txt index b5b2789aad..daf183e80a 100644 --- a/plugins/kotlin-dataframe/testData/box/readCSV.fir.txt +++ b/plugins/kotlin-dataframe/testData/box/readCSV.fir.txt @@ -7,8 +7,8 @@ FILE: readCSV.kt @R|org/jetbrains/kotlinx/dataframe/annotations/Order|(order = Int(0)) public abstract val full_name: R|kotlin/String| public get(): R|kotlin/String| - @R|org/jetbrains/kotlinx/dataframe/annotations/Order|(order = Int(3)) public abstract val topics: R|org/jetbrains/kotlinx/dataframe/DataFrame</Topics_311>| - public get(): R|org/jetbrains/kotlinx/dataframe/DataFrame</Topics_311>| + @R|org/jetbrains/kotlinx/dataframe/annotations/Order|(order = Int(3)) public abstract val topics: R|kotlin/String| + public get(): R|kotlin/String| @R|org/jetbrains/kotlinx/dataframe/annotations/Order|(order = Int(4)) public abstract val watchers: R|kotlin/Int| public get(): R|kotlin/Int| @@ -30,11 +30,11 @@ FILE: readCSV.kt public final val R|org/jetbrains/kotlinx/dataframe/ColumnsContainer</ReadCSV_74I>|.full_name: R|org/jetbrains/kotlinx/dataframe/DataColumn| public get(): R|org/jetbrains/kotlinx/dataframe/DataColumn| - public final val R|org/jetbrains/kotlinx/dataframe/DataRow</ReadCSV_74I>|.topics: R|org/jetbrains/kotlinx/dataframe/DataFrame</Topics_311>| - public get(): R|org/jetbrains/kotlinx/dataframe/DataFrame</Topics_311>| + public final val R|org/jetbrains/kotlinx/dataframe/DataRow</ReadCSV_74I>|.topics: R|kotlin/String| + public get(): R|kotlin/String| - public final val R|org/jetbrains/kotlinx/dataframe/ColumnsContainer</ReadCSV_74I>|.topics: R|org/jetbrains/kotlinx/dataframe/DataColumn/Topics_311>>| - public get(): R|org/jetbrains/kotlinx/dataframe/DataColumn/Topics_311>>| + public final val R|org/jetbrains/kotlinx/dataframe/ColumnsContainer</ReadCSV_74I>|.topics: R|org/jetbrains/kotlinx/dataframe/DataColumn| + public get(): R|org/jetbrains/kotlinx/dataframe/DataColumn| public final val R|org/jetbrains/kotlinx/dataframe/DataRow</ReadCSV_74I>|.watchers: R|kotlin/Int| public get(): R|kotlin/Int| @@ -58,34 +58,11 @@ FILE: readCSV.kt } - local abstract class Topics_311 : R|kotlin/Any| { - @R|org/jetbrains/kotlinx/dataframe/annotations/Order|(order = Int(0)) public abstract val value: R|kotlin/Double| - public get(): R|kotlin/Double| - - public constructor(): R|/Topics_311| - - } - - local final class Scope1 : R|kotlin/Any| { - public final val R|org/jetbrains/kotlinx/dataframe/DataRow</Topics_311>|.value: R|kotlin/Double| - public get(): R|kotlin/Double| - - public final val R|org/jetbrains/kotlinx/dataframe/ColumnsContainer</Topics_311>|.value: R|org/jetbrains/kotlinx/dataframe/DataColumn| - public get(): R|org/jetbrains/kotlinx/dataframe/DataColumn| - - public constructor(): R|/Scope1| - - } - local abstract class ReadCSV_74 : R|/ReadCSV_74I| { public abstract var scope0: R|/Scope0| public get(): R|/Scope0| public set(value: R|/Scope0|): R|kotlin/Unit| - public abstract var scope1: R|/Scope1| - public get(): R|/Scope1| - public set(value: R|/Scope1|): R|kotlin/Unit| - public constructor(): R|/ReadCSV_74| }