Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1e8d077

Browse files
igfooigfoo
committed
Kotlin: Fix some warnings
1 parent f75e711 commit 1e8d077

1 file changed

Lines changed: 22 additions & 22 deletions

File tree

‎java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ open class KotlinFileExtractor(
175175
tp.superTypes.forEachIndexed { boundIdx, bound ->
176176
if(!(bound.isAny() || bound.isNullableAny())) {
177177
tw.getLabelFor<DbTypebound>("@\"bound;$boundIdx;{$id}\"") {
178-
tw.writeTypeBounds(it, useType(bound).javaResult.id as Label<out DbReftype>, boundIdx, id)
178+
tw.writeTypeBounds(it, useType(bound).javaResult.id.cast<DbReftype>(), boundIdx, id)
179179
}
180180
}
181181
}
@@ -380,7 +380,7 @@ open class KotlinFileExtractor(
380380

381381
extractEnclosingClass(c, id, locId, listOf())
382382

383-
c.typeParameters.mapIndexed { idx, it -> extractTypeParameter(it, idx) }
383+
c.typeParameters.mapIndexed { idx, param -> extractTypeParameter(param, idx) }
384384
if (extractDeclarations) {
385385
c.declarations.map { extractDeclaration(it) }
386386
if (extractStaticInitializer)
@@ -665,13 +665,13 @@ open class KotlinFileExtractor(
665665
else -> f.returnType.classFqName?.shortName()?.asString() ?: f.name.asString()
666666
}
667667
val constrId = id.cast<DbConstructor>()
668-
tw.writeConstrs(constrId, shortName, "$shortName$paramsSignature", unitType.javaResult.id, parentId, sourceDeclaration as Label<DbConstructor>)
668+
tw.writeConstrs(constrId, shortName, "$shortName$paramsSignature", unitType.javaResult.id, parentId, sourceDeclaration.cast<DbConstructor>())
669669
tw.writeConstrsKotlinType(constrId, unitType.kotlinResult.id)
670670
} else {
671671
val returnType = useType(substReturnType, TypeContext.RETURN)
672672
val shortName = getFunctionShortName(f)
673673
val methodId = id.cast<DbMethod>()
674-
tw.writeMethods(methodId, shortName, "$shortName$paramsSignature", returnType.javaResult.id, parentId, sourceDeclaration as Label<DbMethod>)
674+
tw.writeMethods(methodId, shortName, "$shortName$paramsSignature", returnType.javaResult.id, parentId, sourceDeclaration.cast<DbMethod>())
675675
tw.writeMethodsKotlinType(methodId, returnType.kotlinResult.id)
676676
}
677677

@@ -934,14 +934,14 @@ open class KotlinFileExtractor(
934934

935935
// Getter:
936936
extractStatement(s.getter, callable, blockId, 1)
937-
val l = getLocallyVisibleFunctionLabels(s.getter).function
938-
tw.writeKtPropertyGetters(propId, l)
937+
val getterLabel = getLocallyVisibleFunctionLabels(s.getter).function
938+
tw.writeKtPropertyGetters(propId, getterLabel)
939939

940940
val setter = s.setter
941941
if (setter != null) {
942942
extractStatement(setter, callable, blockId, 2)
943-
val l = getLocallyVisibleFunctionLabels(setter).function
944-
tw.writeKtPropertySetters(propId, l)
943+
val setterLabel = getLocallyVisibleFunctionLabels(setter).function
944+
tw.writeKtPropertySetters(propId, setterLabel)
945945
}
946946
}
947947
else -> {
@@ -2008,16 +2008,16 @@ open class KotlinFileExtractor(
20082008
updateRhs.getValueArgument(0)
20092009
} else null
20102010
} else null
2011-
} ?: null
2011+
}
20122012
}
20132013

20142014
fun writeUpdateInPlaceExpr(origin: IrStatementOrigin, tw: TrapWriter, id: Label<DbAssignexpr>, type: TypeResults, exprParent: ExprParent): Boolean {
20152015
when(origin) {
2016-
IrStatementOrigin.PLUSEQ -> tw.writeExprs_assignaddexpr(id as Label<DbAssignaddexpr>, type.javaResult.id, exprParent.parent, exprParent.idx)
2017-
IrStatementOrigin.MINUSEQ -> tw.writeExprs_assignsubexpr(id as Label<DbAssignsubexpr>, type.javaResult.id, exprParent.parent, exprParent.idx)
2018-
IrStatementOrigin.MULTEQ -> tw.writeExprs_assignmulexpr(id as Label<DbAssignmulexpr>, type.javaResult.id, exprParent.parent, exprParent.idx)
2019-
IrStatementOrigin.DIVEQ -> tw.writeExprs_assigndivexpr(id as Label<DbAssigndivexpr>, type.javaResult.id, exprParent.parent, exprParent.idx)
2020-
IrStatementOrigin.PERCEQ -> tw.writeExprs_assignremexpr(id as Label<DbAssignremexpr>, type.javaResult.id, exprParent.parent, exprParent.idx)
2016+
IrStatementOrigin.PLUSEQ -> tw.writeExprs_assignaddexpr(id.cast<DbAssignaddexpr>(), type.javaResult.id, exprParent.parent, exprParent.idx)
2017+
IrStatementOrigin.MINUSEQ -> tw.writeExprs_assignsubexpr(id.cast<DbAssignsubexpr>(), type.javaResult.id, exprParent.parent, exprParent.idx)
2018+
IrStatementOrigin.MULTEQ -> tw.writeExprs_assignmulexpr(id.cast<DbAssignmulexpr>(), type.javaResult.id, exprParent.parent, exprParent.idx)
2019+
IrStatementOrigin.DIVEQ -> tw.writeExprs_assigndivexpr(id.cast<DbAssigndivexpr>(), type.javaResult.id, exprParent.parent, exprParent.idx)
2020+
IrStatementOrigin.PERCEQ -> tw.writeExprs_assignremexpr(id.cast<DbAssignremexpr>(), type.javaResult.id, exprParent.parent, exprParent.idx)
20212021
else -> return false
20222022
}
20232023
return true
@@ -2686,7 +2686,7 @@ open class KotlinFileExtractor(
26862686
}
26872687

26882688
private open inner class GeneratedClassHelper(protected val locId: Label<DbLocation>, protected val ids: GeneratedClassLabels) {
2689-
protected val classId = ids.type.javaResult.id as Label<out DbClass>
2689+
protected val classId = ids.type.javaResult.id.cast<DbClass>()
26902690

26912691
fun writeExpressionMetadataToTrapFile(id: Label<out DbExpr>, callable: Label<out DbCallable>, stmt: Label<out DbStmt>) {
26922692
tw.writeHasLocation(id, locId)
@@ -2710,20 +2710,20 @@ open class KotlinFileExtractor(
27102710
stmtIdx: Int
27112711
) {
27122712
val paramId = tw.getFreshIdLabel<DbParam>()
2713-
val paramType = extractValueParameter(paramId, paramType, paramName, locId, ids.constructor, paramIdx, null, paramId, false)
2713+
val paramTypeRes = extractValueParameter(paramId, paramType, paramName, locId, ids.constructor, paramIdx, null, paramId, false)
27142714

27152715
val assignmentStmtId = tw.getFreshIdLabel<DbExprstmt>()
27162716
tw.writeStmts_exprstmt(assignmentStmtId, ids.constructorBlock, stmtIdx, ids.constructor)
27172717
tw.writeHasLocation(assignmentStmtId, locId)
27182718

27192719
val assignmentId = tw.getFreshIdLabel<DbAssignexpr>()
2720-
tw.writeExprs_assignexpr(assignmentId, paramType.javaResult.id, assignmentStmtId, 0)
2721-
tw.writeExprsKotlinType(assignmentId, paramType.kotlinResult.id)
2720+
tw.writeExprs_assignexpr(assignmentId, paramTypeRes.javaResult.id, assignmentStmtId, 0)
2721+
tw.writeExprsKotlinType(assignmentId, paramTypeRes.kotlinResult.id)
27222722
writeExpressionMetadataToTrapFile(assignmentId, ids.constructor, assignmentStmtId)
27232723

27242724
val lhsId = tw.getFreshIdLabel<DbVaraccess>()
2725-
tw.writeExprs_varaccess(lhsId, paramType.javaResult.id, assignmentId, 0)
2726-
tw.writeExprsKotlinType(lhsId, paramType.kotlinResult.id)
2725+
tw.writeExprs_varaccess(lhsId, paramTypeRes.javaResult.id, assignmentId, 0)
2726+
tw.writeExprsKotlinType(lhsId, paramTypeRes.kotlinResult.id)
27272727
tw.writeVariableBinding(lhsId, fieldId)
27282728
writeExpressionMetadataToTrapFile(lhsId, ids.constructor, assignmentStmtId)
27292729

@@ -2733,8 +2733,8 @@ open class KotlinFileExtractor(
27332733
writeExpressionMetadataToTrapFile(thisId, ids.constructor, assignmentStmtId)
27342734

27352735
val rhsId = tw.getFreshIdLabel<DbVaraccess>()
2736-
tw.writeExprs_varaccess(rhsId, paramType.javaResult.id, assignmentId, 1)
2737-
tw.writeExprsKotlinType(rhsId, paramType.kotlinResult.id)
2736+
tw.writeExprs_varaccess(rhsId, paramTypeRes.javaResult.id, assignmentId, 1)
2737+
tw.writeExprsKotlinType(rhsId, paramTypeRes.kotlinResult.id)
27382738
tw.writeVariableBinding(rhsId, paramId)
27392739
writeExpressionMetadataToTrapFile(rhsId, ids.constructor, assignmentStmtId)
27402740
}

0 commit comments

Comments
 (0)