azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Generator] Replace IntrinsicConstEvaluation string with const property

Browse Source
This commit is contained in:
Ivan Kylchik
2023-07-21 12:48:42 +02:00
committed by Space Team
parent ba49879b5e
commit 097535aeea
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/builtins/primitives/BasePrimitivesGenerator.kt
+9 -9
View File
@@ -352,7 +352,7 @@ abstract class BasePrimitivesGenerator(private val writer: PrintWriter) : BuiltI
method { method {
appendDoc(doc) appendDoc(doc)
annotations += "kotlin.internal.IntrinsicConstEvaluation" annotations += intrinsicConstEvaluationAnnotation
signature { signature {
isOverride = otherKind == thisKind isOverride = otherKind == thisKind
isOperator = true isOperator = true
@@ -379,7 +379,7 @@ abstract class BasePrimitivesGenerator(private val writer: PrintWriter) : BuiltI
val annotationsToAdd = buildList { val annotationsToAdd = buildList {
if (operatorName == "rem") add("SinceKotlin(\"1.1\")") if (operatorName == "rem") add("SinceKotlin(\"1.1\")")
add("kotlin.internal.IntrinsicConstEvaluation") add(intrinsicConstEvaluationAnnotation)
} }
method { method {
@@ -418,7 +418,7 @@ abstract class BasePrimitivesGenerator(private val writer: PrintWriter) : BuiltI
method { method {
appendDoc(doc) appendDoc(doc)
annotations += "kotlin.internal.IntrinsicConstEvaluation" annotations += intrinsicConstEvaluationAnnotation
signature { signature {
isOperator = true isOperator = true
methodName = operatorName methodName = operatorName
@@ -487,7 +487,7 @@ abstract class BasePrimitivesGenerator(private val writer: PrintWriter) : BuiltI
for ((operatorName, doc) in shiftOperators) { for ((operatorName, doc) in shiftOperators) {
method { method {
appendDoc(doc + END_LINE + END_LINE + detail) appendDoc(doc + END_LINE + END_LINE + detail)
annotations += "kotlin.internal.IntrinsicConstEvaluation" annotations += intrinsicConstEvaluationAnnotation
signature { signature {
isInfix = true isInfix = true
methodName = operatorName methodName = operatorName
@@ -505,7 +505,7 @@ abstract class BasePrimitivesGenerator(private val writer: PrintWriter) : BuiltI
for ((operatorName, doc) in bitwiseOperators) { for ((operatorName, doc) in bitwiseOperators) {
method { method {
appendDoc(doc) appendDoc(doc)
annotations += "kotlin.internal.IntrinsicConstEvaluation" annotations += intrinsicConstEvaluationAnnotation
signature { signature {
isInfix = true isInfix = true
methodName = operatorName methodName = operatorName
@@ -521,7 +521,7 @@ abstract class BasePrimitivesGenerator(private val writer: PrintWriter) : BuiltI
method { method {
appendDoc("Inverts the bits in this value.") appendDoc("Inverts the bits in this value.")
annotations += "kotlin.internal.IntrinsicConstEvaluation" annotations += intrinsicConstEvaluationAnnotation
signature { signature {
methodName = "inv" methodName = "inv"
returnType = thisKind.capitalized returnType = thisKind.capitalized
@@ -574,7 +574,7 @@ abstract class BasePrimitivesGenerator(private val writer: PrintWriter) : BuiltI
annotationsToAdd += "Suppress(\"OVERRIDE_DEPRECATION\")" annotationsToAdd += "Suppress(\"OVERRIDE_DEPRECATION\")"
} }
annotationsToAdd += "kotlin.internal.IntrinsicConstEvaluation" annotationsToAdd += intrinsicConstEvaluationAnnotation
method { method {
appendDoc(doc) appendDoc(doc)
annotations += annotationsToAdd annotations += annotationsToAdd
@@ -589,7 +589,7 @@ abstract class BasePrimitivesGenerator(private val writer: PrintWriter) : BuiltI
private fun ClassBuilder.generateEquals(thisKind: PrimitiveType) { private fun ClassBuilder.generateEquals(thisKind: PrimitiveType) {
method { method {
annotations += "kotlin.internal.IntrinsicConstEvaluation" annotations += intrinsicConstEvaluationAnnotation
signature { signature {
isOverride = true isOverride = true
methodName = "equals" methodName = "equals"
@@ -604,7 +604,7 @@ abstract class BasePrimitivesGenerator(private val writer: PrintWriter) : BuiltI
private fun ClassBuilder.generateToString(thisKind: PrimitiveType) { private fun ClassBuilder.generateToString(thisKind: PrimitiveType) {
method { method {
annotations += "kotlin.internal.IntrinsicConstEvaluation" annotations += intrinsicConstEvaluationAnnotation
signature { signature {
isOverride = true isOverride = true
methodName = "toString" methodName = "toString"
generators/builtins/primitives/NativePrimitivesGenerator.kt
+1 -1
View File
@@ -213,7 +213,7 @@ class NativePrimitivesGenerator(writer: PrintWriter) : BasePrimitivesGenerator(w
private fun ClassBuilder.generateCustomEquals(thisKind: PrimitiveType) { private fun ClassBuilder.generateCustomEquals(thisKind: PrimitiveType) {
method { method {
annotations += "Deprecated(\"Provided for binary compatibility\", level = DeprecationLevel.HIDDEN)" annotations += "Deprecated(\"Provided for binary compatibility\", level = DeprecationLevel.HIDDEN)"
annotations += "kotlin.internal.IntrinsicConstEvaluation" annotations += intrinsicConstEvaluationAnnotation
signature { signature {
methodName = "equals" methodName = "equals"
parameter { parameter {
generators/builtins/primitives/utils.kt
+1
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.generators.builtins.numbers.primitives
import org.jetbrains.kotlin.generators.builtins.PrimitiveType import org.jetbrains.kotlin.generators.builtins.PrimitiveType
internal const val END_LINE = "\n" internal const val END_LINE = "\n"
internal const val intrinsicConstEvaluationAnnotation = "kotlin.internal.IntrinsicConstEvaluation"
internal fun PrimitiveType.castToIfNecessary(otherType: PrimitiveType): String { internal fun PrimitiveType.castToIfNecessary(otherType: PrimitiveType): String {
if (this !in PrimitiveType.onlyNumeric || otherType !in PrimitiveType.onlyNumeric) { if (this !in PrimitiveType.onlyNumeric || otherType !in PrimitiveType.onlyNumeric) {