kscience/kmath
9
0
Fork 1
Code Issues Pull Requests 6 Packages Projects Releases 16 Wiki Activity

Dev #127

Merged
altavir merged 214 commits from dev into master 2020-08-11 08:33:21 +03:00
Conversation 0 Commits 214 Files Changed 149 +6 -6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 092728b1c3 - Show all commits

12
kmath-ast/src/jvmMain/kotlin/scientifik/kmath/asm/internal/AsmBuilder.kt
View File

@ -91,12 +91,12 @@ internal class AsmBuilder<T> internal constructor(
/** /**
* Stack of useful objects types on stack to verify types. * Stack of useful objects types on stack to verify types.
*/ */
private val typeStack: Stack<Type> = Stack() private val typeStack: ArrayDeque<Type> = ArrayDeque()
/** /**
* Stack of useful objects types on stack expected by algebra calls. * Stack of useful objects types on stack expected by algebra calls.
*/ */
internal val expectationStack: Stack<Type> = Stack<Type>().apply { push(tType) } internal val expectationStack: ArrayDeque<Type> = ArrayDeque<Type>().apply { push(tType) }
/** /**
* The cache for instance built by this builder. * The cache for instance built by this builder.
@ -270,7 +270,7 @@ internal class AsmBuilder<T> internal constructor(
*/ */
internal fun loadTConstant(value: T) { internal fun loadTConstant(value: T) {
if (classOfT in INLINABLE_NUMBERS) { if (classOfT in INLINABLE_NUMBERS) {
val expectedType = expectationStack.pop()!! val expectedType = expectationStack.pop()
val mustBeBoxed = expectedType.sort == Type.OBJECT val mustBeBoxed = expectedType.sort == Type.OBJECT
loadNumberConstant(value as Number, mustBeBoxed) loadNumberConstant(value as Number, mustBeBoxed)
if (mustBeBoxed) typeStack.push(tType) else typeStack.push(primitiveMask) if (mustBeBoxed) typeStack.push(tType) else typeStack.push(primitiveMask)
@ -371,7 +371,7 @@ internal class AsmBuilder<T> internal constructor(
checkcast(tType) checkcast(tType)
val expectedType = expectationStack.pop()!! val expectedType = expectationStack.pop()
if (expectedType.sort == Type.OBJECT) if (expectedType.sort == Type.OBJECT)
typeStack.push(tType) typeStack.push(tType)
@ -405,7 +405,7 @@ internal class AsmBuilder<T> internal constructor(
) { ) {
run loop@{ run loop@{
repeat(expectedArity) { repeat(expectedArity) {
if (typeStack.empty()) return@loop if (typeStack.isEmpty()) return@loop
typeStack.pop() typeStack.pop()
} }
} }
@ -420,7 +420,7 @@ internal class AsmBuilder<T> internal constructor(
invokeMethodVisitor.checkcast(tType) invokeMethodVisitor.checkcast(tType)
val isLastExpr = expectationStack.size == 1 val isLastExpr = expectationStack.size == 1
val expectedType = expectationStack.pop()!! val expectedType = expectationStack.pop()
if (expectedType.sort == Type.OBJECT || isLastExpr) if (expectedType.sort == Type.OBJECT || isLastExpr)
typeStack.push(tType) typeStack.push(tType)