Merge pull request #202 from mipt-npm/commandertvis/signature-of-invoke

Fix JVM signature of generated invoke method for final classes
This commit is contained in:
Alexander Nozik 2021-02-11 19:45:30 +03:00 committed by GitHub
commit 5589dc0ce1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 23 deletions

View File

@ -257,8 +257,8 @@ repositories {
} }
dependencies { dependencies {
api("kscience.kmath:kmath-core:0.2.0-dev-6") api("kscience.kmath:kmath-core:0.2.0-dev-7")
// api("kscience.kmath:kmath-core-jvm:0.2.0-dev-6") for jvm-specific version // api("kscience.kmath:kmath-core-jvm:0.2.0-dev-7") for jvm-specific version
} }
``` ```

View File

@ -12,7 +12,7 @@ This subproject implements the following features:
> #### Artifact: > #### Artifact:
> >
> This module artifact: `kscience.kmath:kmath-ast:0.2.0-dev-6`. > This module artifact: `kscience.kmath:kmath-ast:0.2.0-dev-7`.
> >
> Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-ast/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-ast/_latestVersion) > Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-ast/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-ast/_latestVersion)
> >
@ -30,7 +30,7 @@ This subproject implements the following features:
> } > }
> >
> dependencies { > dependencies {
> implementation 'kscience.kmath:kmath-ast:0.2.0-dev-6' > implementation 'kscience.kmath:kmath-ast:0.2.0-dev-7'
> } > }
> ``` > ```
> **Gradle Kotlin DSL:** > **Gradle Kotlin DSL:**
@ -44,7 +44,7 @@ This subproject implements the following features:
> } > }
> >
> dependencies { > dependencies {
> implementation("kscience.kmath:kmath-ast:0.2.0-dev-6") > implementation("kscience.kmath:kmath-ast:0.2.0-dev-7")
> } > }
> ``` > ```
@ -75,7 +75,7 @@ import kscience.kmath.expressions.Symbol;
public final class AsmCompiledExpression_45045_0 implements Expression<Double> { public final class AsmCompiledExpression_45045_0 implements Expression<Double> {
private final Object[] constants; private final Object[] constants;
public final Double invoke(Map<Symbol, Double> arguments) { public final Double invoke(Map<Symbol, ? extends Double> arguments) {
return (Double)((Function2)this.constants[0]).invoke((Double)MapIntrinsics.getOrFail(arguments, "x"), 2); return (Double)((Function2)this.constants[0]).invoke((Double)MapIntrinsics.getOrFail(arguments, "x"), 2);
} }

View File

@ -33,7 +33,7 @@ import kscience.kmath.expressions.Symbol;
public final class AsmCompiledExpression_45045_0 implements Expression<Double> { public final class AsmCompiledExpression_45045_0 implements Expression<Double> {
private final Object[] constants; private final Object[] constants;
public final Double invoke(Map<Symbol, Double> arguments) { public final Double invoke(Map<Symbol, ? extends Double> arguments) {
return (Double)((Function2)this.constants[0]).invoke((Double)MapIntrinsics.getOrFail(arguments, "x"), 2); return (Double)((Function2)this.constants[0]).invoke((Double)MapIntrinsics.getOrFail(arguments, "x"), 2);
} }

View File

@ -83,7 +83,7 @@ internal class AsmBuilder<T>(
ACC_PUBLIC or ACC_FINAL, ACC_PUBLIC or ACC_FINAL,
"invoke", "invoke",
getMethodDescriptor(tType, MAP_TYPE), getMethodDescriptor(tType, MAP_TYPE),
"(L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}${if (Modifier.isFinal(classOfT.modifiers)) "" else "+"}${tType.descriptor}>;)${tType.descriptor}", "(L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}+${tType.descriptor}>;)${tType.descriptor}",
null, null,
).instructionAdapter { ).instructionAdapter {
invokeMethodVisitor = this invokeMethodVisitor = this

View File

@ -8,7 +8,7 @@ Complex and hypercomplex number systems in KMath:
> #### Artifact: > #### Artifact:
> >
> This module artifact: `kscience.kmath:kmath-complex:0.2.0-dev-6`. > This module artifact: `kscience.kmath:kmath-complex:0.2.0-dev-7`.
> >
> Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-complex/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-complex/_latestVersion) > Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-complex/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-complex/_latestVersion)
> >
@ -26,7 +26,7 @@ Complex and hypercomplex number systems in KMath:
> } > }
> >
> dependencies { > dependencies {
> implementation 'kscience.kmath:kmath-complex:0.2.0-dev-6' > implementation 'kscience.kmath:kmath-complex:0.2.0-dev-7'
> } > }
> ``` > ```
> **Gradle Kotlin DSL:** > **Gradle Kotlin DSL:**
@ -40,6 +40,6 @@ Complex and hypercomplex number systems in KMath:
> } > }
> >
> dependencies { > dependencies {
> implementation("kscience.kmath:kmath-complex:0.2.0-dev-6") > implementation("kscience.kmath:kmath-complex:0.2.0-dev-7")
> } > }
> ``` > ```

View File

@ -15,7 +15,7 @@ performance calculations to code generation.
> #### Artifact: > #### Artifact:
> >
> This module artifact: `kscience.kmath:kmath-core:0.2.0-dev-6`. > This module artifact: `kscience.kmath:kmath-core:0.2.0-dev-7`.
> >
> Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-core/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-core/_latestVersion) > Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-core/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-core/_latestVersion)
> >
@ -33,7 +33,7 @@ performance calculations to code generation.
> } > }
> >
> dependencies { > dependencies {
> implementation 'kscience.kmath:kmath-core:0.2.0-dev-6' > implementation 'kscience.kmath:kmath-core:0.2.0-dev-7'
> } > }
> ``` > ```
> **Gradle Kotlin DSL:** > **Gradle Kotlin DSL:**
@ -47,6 +47,6 @@ performance calculations to code generation.
> } > }
> >
> dependencies { > dependencies {
> implementation("kscience.kmath:kmath-core:0.2.0-dev-6") > implementation("kscience.kmath:kmath-core:0.2.0-dev-7")
> } > }
> ``` > ```

View File

@ -7,7 +7,7 @@
> #### Artifact: > #### Artifact:
> >
> This module artifact: `kscience.kmath:kmath-for-real:0.2.0-dev-6`. > This module artifact: `kscience.kmath:kmath-for-real:0.2.0-dev-7`.
> >
> Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-for-real/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-for-real/_latestVersion) > Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-for-real/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-for-real/_latestVersion)
> >
@ -25,7 +25,7 @@
> } > }
> >
> dependencies { > dependencies {
> implementation 'kscience.kmath:kmath-for-real:0.2.0-dev-6' > implementation 'kscience.kmath:kmath-for-real:0.2.0-dev-7'
> } > }
> ``` > ```
> **Gradle Kotlin DSL:** > **Gradle Kotlin DSL:**
@ -39,6 +39,6 @@
> } > }
> >
> dependencies { > dependencies {
> implementation("kscience.kmath:kmath-for-real:0.2.0-dev-6") > implementation("kscience.kmath:kmath-for-real:0.2.0-dev-7")
> } > }
> ``` > ```

View File

@ -10,7 +10,7 @@ Functions and interpolations:
> #### Artifact: > #### Artifact:
> >
> This module artifact: `kscience.kmath:kmath-functions:0.2.0-dev-6`. > This module artifact: `kscience.kmath:kmath-functions:0.2.0-dev-7`.
> >
> Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-functions/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-functions/_latestVersion) > Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-functions/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-functions/_latestVersion)
> >
@ -28,7 +28,7 @@ Functions and interpolations:
> } > }
> >
> dependencies { > dependencies {
> implementation 'kscience.kmath:kmath-functions:0.2.0-dev-6' > implementation 'kscience.kmath:kmath-functions:0.2.0-dev-7'
> } > }
> ``` > ```
> **Gradle Kotlin DSL:** > **Gradle Kotlin DSL:**
@ -42,6 +42,6 @@ Functions and interpolations:
> } > }
> >
> dependencies { > dependencies {
> implementation("kscience.kmath:kmath-functions:0.2.0-dev-6") > implementation("kscience.kmath:kmath-functions:0.2.0-dev-7")
> } > }
> ``` > ```

View File

@ -9,7 +9,7 @@ This subproject implements the following features:
> #### Artifact: > #### Artifact:
> >
> This module artifact: `kscience.kmath:kmath-nd4j:0.2.0-dev-6`. > This module artifact: `kscience.kmath:kmath-nd4j:0.2.0-dev-7`.
> >
> Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-nd4j/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-nd4j/_latestVersion) > Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/kscience/kmath-nd4j/images/download.svg) ](https://bintray.com/mipt-npm/kscience/kmath-nd4j/_latestVersion)
> >
@ -27,7 +27,7 @@ This subproject implements the following features:
> } > }
> >
> dependencies { > dependencies {
> implementation 'kscience.kmath:kmath-nd4j:0.2.0-dev-6' > implementation 'kscience.kmath:kmath-nd4j:0.2.0-dev-7'
> } > }
> ``` > ```
> **Gradle Kotlin DSL:** > **Gradle Kotlin DSL:**
@ -41,7 +41,7 @@ This subproject implements the following features:
> } > }
> >
> dependencies { > dependencies {
> implementation("kscience.kmath:kmath-nd4j:0.2.0-dev-6") > implementation("kscience.kmath:kmath-nd4j:0.2.0-dev-7")
> } > }
> ``` > ```