From 12d64220659051a9723446c4f0b86559b1a1d199 Mon Sep 17 00:00:00 2001 From: Iaroslav Postovalov Date: Sun, 20 Dec 2020 21:43:04 +0700 Subject: [PATCH] Fix wrong package --- .../jsMain/kotlin/kscience/kmath/estree/Codegen.kt | 1 + .../kscience/kmath/estree/internal/JSBuilder.kt | 11 ----------- .../kmath/estree/internal/astring/astring.kt | 2 +- .../estree/internal/estree/estree.extensions.kt | 12 ------------ .../kscience/kmath/estree/internal/estree/estree.kt | 2 +- 5 files changed, 3 insertions(+), 25 deletions(-) diff --git a/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/Codegen.kt b/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/Codegen.kt index d10c9c0cf..50454fa34 100644 --- a/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/Codegen.kt +++ b/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/Codegen.kt @@ -4,6 +4,7 @@ import estree.* import kscience.kmath.ast.MST import kscience.kmath.ast.MstExpression import kscience.kmath.estree.internal.JSBuilder +import kscience.kmath.estree.internal.estree.BaseExpression import kscience.kmath.expressions.Expression import kscience.kmath.operations.Algebra import kscience.kmath.operations.NumericAlgebra diff --git a/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/JSBuilder.kt b/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/JSBuilder.kt index b38be085d..a55ac62a4 100644 --- a/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/JSBuilder.kt +++ b/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/JSBuilder.kt @@ -1,18 +1,7 @@ package kscience.kmath.estree.internal import kscience.kmath.estree.internal.astring.generate -import estree.* import kscience.kmath.estree.internal.estree.* -import kscience.kmath.estree.internal.estree.BlockStatement -import kscience.kmath.estree.internal.estree.FunctionExpression -import kscience.kmath.estree.internal.estree.Identifier -import kscience.kmath.estree.internal.estree.MemberExpression -import kscience.kmath.estree.internal.estree.Program -import kscience.kmath.estree.internal.estree.ReturnStatement -import kscience.kmath.estree.internal.estree.SimpleCallExpression -import kscience.kmath.estree.internal.estree.SimpleLiteral -import kscience.kmath.estree.internal.estree.VariableDeclaration -import kscience.kmath.estree.internal.estree.VariableDeclarator import kscience.kmath.expressions.Expression import kscience.kmath.expressions.Symbol diff --git a/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/astring/astring.kt b/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/astring/astring.kt index 4ef3acf20..cf0a8de25 100644 --- a/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/astring/astring.kt +++ b/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/astring/astring.kt @@ -3,7 +3,7 @@ package kscience.kmath.estree.internal.astring -import estree.BaseNode +import kscience.kmath.estree.internal.estree.BaseNode internal external interface Options { var indent: String? diff --git a/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/estree/estree.extensions.kt b/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/estree/estree.extensions.kt index 951cd9ef8..5bc197d0c 100644 --- a/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/estree/estree.extensions.kt +++ b/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/estree/estree.extensions.kt @@ -1,17 +1,5 @@ package kscience.kmath.estree.internal.estree -import estree.* -import estree.BlockStatement -import estree.FunctionExpression -import estree.Identifier -import estree.MemberExpression -import estree.Program -import estree.ReturnStatement -import estree.SimpleCallExpression -import estree.SimpleLiteral -import estree.VariableDeclaration -import estree.VariableDeclarator - internal fun Program(sourceType: String, vararg body: dynamic) = object : Program { override var type = "Program" override var sourceType = sourceType diff --git a/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/estree/estree.kt index 8d894a1b1..a5385d1ee 100644 --- a/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/estree/estree.kt +++ b/kmath-ast/src/jsMain/kotlin/kscience/kmath/estree/internal/estree/estree.kt @@ -1,4 +1,4 @@ -package estree +package kscience.kmath.estree.internal.estree import kotlin.js.RegExp