diff --git a/build.sbt b/build.sbt index 6931fc35ef..73ae942af3 100644 --- a/build.sbt +++ b/build.sbt @@ -1228,6 +1228,21 @@ val testLogProviderOptions = Seq( "-Dconfig.resource=application-test.conf" ) +lazy val `engine-common` = project + .in(file("engine/common")) + .settings( + frgaalJavaCompilerSetting, + Test / fork := true, + commands += WithDebugCommand.withDebug, + Test / envVars ++= distributionEnvironmentOverrides, + Test / javaOptions ++= Seq( + ), + libraryDependencies ++= Seq( + "org.graalvm.polyglot" % "polyglot" % graalMavenPackagesVersion % "provided" + ) + ) + .dependsOn(testkit % Test) + lazy val `polyglot-api` = project .in(file("engine/polyglot-api")) .settings( @@ -1255,6 +1270,7 @@ lazy val `polyglot-api` = project GenerateFlatbuffers.flatcVersion := flatbuffersVersion, Compile / sourceGenerators += GenerateFlatbuffers.task ) + .dependsOn(`engine-common`) .dependsOn(pkg) .dependsOn(`text-buffer`) .dependsOn(`logging-utils`) diff --git a/engine/polyglot-api/src/main/java/org/enso/polyglot/CompilationStage.java b/engine/common/src/main/java/org/enso/common/CompilationStage.java similarity index 97% rename from engine/polyglot-api/src/main/java/org/enso/polyglot/CompilationStage.java rename to engine/common/src/main/java/org/enso/common/CompilationStage.java index a8b36645c1..cf6a85083a 100644 --- a/engine/polyglot-api/src/main/java/org/enso/polyglot/CompilationStage.java +++ b/engine/common/src/main/java/org/enso/common/CompilationStage.java @@ -1,4 +1,4 @@ -package org.enso.polyglot; +package org.enso.common; /** Defines a stage of compilation of the module. */ public enum CompilationStage { diff --git a/engine/polyglot-api/src/main/java/org/enso/polyglot/HostAccessFactory.java b/engine/common/src/main/java/org/enso/common/HostAccessFactory.java similarity index 95% rename from engine/polyglot-api/src/main/java/org/enso/polyglot/HostAccessFactory.java rename to engine/common/src/main/java/org/enso/common/HostAccessFactory.java index 12fd68e13d..7f06fcca80 100644 --- a/engine/polyglot-api/src/main/java/org/enso/polyglot/HostAccessFactory.java +++ b/engine/common/src/main/java/org/enso/common/HostAccessFactory.java @@ -1,4 +1,4 @@ -package org.enso.polyglot; +package org.enso.common; import org.graalvm.polyglot.HostAccess; diff --git a/engine/polyglot-api/src/main/java/org/enso/polyglot/HostEnsoUtils.java b/engine/common/src/main/java/org/enso/common/HostEnsoUtils.java similarity index 95% rename from engine/polyglot-api/src/main/java/org/enso/polyglot/HostEnsoUtils.java rename to engine/common/src/main/java/org/enso/common/HostEnsoUtils.java index 7c782dc480..b493cba050 100644 --- a/engine/polyglot-api/src/main/java/org/enso/polyglot/HostEnsoUtils.java +++ b/engine/common/src/main/java/org/enso/common/HostEnsoUtils.java @@ -1,4 +1,4 @@ -package org.enso.polyglot; +package org.enso.common; import org.graalvm.polyglot.PolyglotException; diff --git a/engine/polyglot-api/src/main/java/org/enso/polyglot/LanguageInfo.java b/engine/common/src/main/java/org/enso/common/LanguageInfo.java similarity index 93% rename from engine/polyglot-api/src/main/java/org/enso/polyglot/LanguageInfo.java rename to engine/common/src/main/java/org/enso/common/LanguageInfo.java index 3d4332f5eb..4818f4bf69 100644 --- a/engine/polyglot-api/src/main/java/org/enso/polyglot/LanguageInfo.java +++ b/engine/common/src/main/java/org/enso/common/LanguageInfo.java @@ -1,4 +1,4 @@ -package org.enso.polyglot; +package org.enso.common; /** Constainer for language-level constants */ public class LanguageInfo { diff --git a/engine/polyglot-api/src/main/java/org/enso/polyglot/MethodNames.java b/engine/common/src/main/java/org/enso/common/MethodNames.java similarity index 98% rename from engine/polyglot-api/src/main/java/org/enso/polyglot/MethodNames.java rename to engine/common/src/main/java/org/enso/common/MethodNames.java index 9c27bebe5d..8f3187fc38 100644 --- a/engine/polyglot-api/src/main/java/org/enso/polyglot/MethodNames.java +++ b/engine/common/src/main/java/org/enso/common/MethodNames.java @@ -1,4 +1,4 @@ -package org.enso.polyglot; +package org.enso.common; /** Container for polyglot method names */ public class MethodNames { diff --git a/engine/interpreter-dsl-test/src/test/java/org/enso/interpreter/dsl/test/ThrowableCatchTest.java b/engine/interpreter-dsl-test/src/test/java/org/enso/interpreter/dsl/test/ThrowableCatchTest.java index 55cf065c66..26d6fdca31 100644 --- a/engine/interpreter-dsl-test/src/test/java/org/enso/interpreter/dsl/test/ThrowableCatchTest.java +++ b/engine/interpreter-dsl-test/src/test/java/org/enso/interpreter/dsl/test/ThrowableCatchTest.java @@ -9,14 +9,14 @@ import java.nio.file.Paths; import java.util.List; import java.util.function.Supplier; import java.util.logging.Level; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames.TopScope; import org.enso.interpreter.EnsoLanguage; import org.enso.interpreter.runtime.EnsoContext; import org.enso.interpreter.runtime.callable.function.Function; import org.enso.interpreter.runtime.data.text.Text; import org.enso.interpreter.runtime.error.DataflowError; import org.enso.interpreter.runtime.error.PanicException; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames.TopScope; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.io.IOAccess; diff --git a/engine/language-server/src/main/java/org/enso/languageserver/boot/resource/TruffleContextInitialization.java b/engine/language-server/src/main/java/org/enso/languageserver/boot/resource/TruffleContextInitialization.java index ab998914a9..c7da5ede98 100644 --- a/engine/language-server/src/main/java/org/enso/languageserver/boot/resource/TruffleContextInitialization.java +++ b/engine/language-server/src/main/java/org/enso/languageserver/boot/resource/TruffleContextInitialization.java @@ -2,8 +2,8 @@ package org.enso.languageserver.boot.resource; import akka.event.EventStream; import java.util.concurrent.Executor; +import org.enso.common.LanguageInfo; import org.enso.languageserver.event.InitializedEvent; -import org.enso.polyglot.LanguageInfo; import org.graalvm.polyglot.Context; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala b/engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala index 9bc2f78531..8877ca5351 100644 --- a/engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala +++ b/engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala @@ -49,7 +49,8 @@ import org.enso.logger.Converter import org.enso.logger.masking.Masking import org.enso.logger.JulHandler import org.enso.logger.akka.AkkaConverter -import org.enso.polyglot.{HostAccessFactory, RuntimeOptions, RuntimeServerInfo} +import org.enso.common.HostAccessFactory +import org.enso.polyglot.{RuntimeOptions, RuntimeServerInfo} import org.enso.profiling.events.NoopEventsMonitor import org.enso.searcher.memory.InMemorySuggestionsRepo import org.enso.text.{ContentBasedVersioning, Sha3_224VersionCalculator} diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/libraries/CompilerBasedDependencyExtractor.scala b/engine/language-server/src/main/scala/org/enso/languageserver/libraries/CompilerBasedDependencyExtractor.scala index 077cae40d8..54bbbdd0a6 100644 --- a/engine/language-server/src/main/scala/org/enso/languageserver/libraries/CompilerBasedDependencyExtractor.scala +++ b/engine/language-server/src/main/scala/org/enso/languageserver/libraries/CompilerBasedDependencyExtractor.scala @@ -7,7 +7,8 @@ import org.enso.logger.Converter import org.enso.logger.JulHandler import org.enso.pkg.Package import org.enso.pkg.SourceFile -import org.enso.polyglot.{HostAccessFactory, PolyglotContext, RuntimeOptions} +import org.enso.common.HostAccessFactory +import org.enso.polyglot.{PolyglotContext, RuntimeOptions} import org.graalvm.polyglot.Context import org.slf4j.event.Level diff --git a/engine/polyglot-api/src/main/java/org/enso/polyglot/RuntimeOptions.java b/engine/polyglot-api/src/main/java/org/enso/polyglot/RuntimeOptions.java index ad2de6ab86..1421079bea 100644 --- a/engine/polyglot-api/src/main/java/org/enso/polyglot/RuntimeOptions.java +++ b/engine/polyglot-api/src/main/java/org/enso/polyglot/RuntimeOptions.java @@ -2,7 +2,11 @@ package org.enso.polyglot; import com.oracle.truffle.api.Option; import java.util.Arrays; -import org.graalvm.options.*; +import org.enso.common.LanguageInfo; +import org.graalvm.options.OptionCategory; +import org.graalvm.options.OptionDescriptor; +import org.graalvm.options.OptionDescriptors; +import org.graalvm.options.OptionKey; /** Class representing runtime options supported by the Enso engine. */ public class RuntimeOptions { diff --git a/engine/polyglot-api/src/main/scala/org/enso/polyglot/Function.scala b/engine/polyglot-api/src/main/scala/org/enso/polyglot/Function.scala index 744e4aa5ba..c9235c2405 100644 --- a/engine/polyglot-api/src/main/scala/org/enso/polyglot/Function.scala +++ b/engine/polyglot-api/src/main/scala/org/enso/polyglot/Function.scala @@ -1,6 +1,7 @@ package org.enso.polyglot import org.graalvm.polyglot.Value +import org.enso.common.MethodNames /** Represents an Enso function. * diff --git a/engine/polyglot-api/src/main/scala/org/enso/polyglot/Module.scala b/engine/polyglot-api/src/main/scala/org/enso/polyglot/Module.scala index 66042bce14..8ac6aadf4c 100644 --- a/engine/polyglot-api/src/main/scala/org/enso/polyglot/Module.scala +++ b/engine/polyglot-api/src/main/scala/org/enso/polyglot/Module.scala @@ -7,7 +7,7 @@ import org.graalvm.polyglot.Value * @param value the polyglot value of this scope */ class Module(private val value: Value) { - import MethodNames.Module._ + import org.enso.common.MethodNames.Module._ /** @return the name of the module */ diff --git a/engine/polyglot-api/src/main/scala/org/enso/polyglot/PolyglotContext.scala b/engine/polyglot-api/src/main/scala/org/enso/polyglot/PolyglotContext.scala index 32c03297c6..5ea0992e97 100644 --- a/engine/polyglot-api/src/main/scala/org/enso/polyglot/PolyglotContext.scala +++ b/engine/polyglot-api/src/main/scala/org/enso/polyglot/PolyglotContext.scala @@ -1,5 +1,6 @@ package org.enso.polyglot import java.io.File +import org.enso.common.LanguageInfo import org.graalvm.polyglot.{Context, Source} diff --git a/engine/polyglot-api/src/main/scala/org/enso/polyglot/TopScope.scala b/engine/polyglot-api/src/main/scala/org/enso/polyglot/TopScope.scala index e0bc5eddf1..3b3150f737 100644 --- a/engine/polyglot-api/src/main/scala/org/enso/polyglot/TopScope.scala +++ b/engine/polyglot-api/src/main/scala/org/enso/polyglot/TopScope.scala @@ -7,7 +7,7 @@ import org.graalvm.polyglot.Value * @param value the polyglot value of this scope */ class TopScope(private val value: Value) { - import MethodNames.TopScope._ + import org.enso.common.MethodNames.TopScope._ /** Gets a module by name. * diff --git a/engine/polyglot-api/src/test/scala/org/enso/polyglot/ApiTest.scala b/engine/polyglot-api/src/test/scala/org/enso/polyglot/ApiTest.scala index d2fea6051f..b26b0d080c 100644 --- a/engine/polyglot-api/src/test/scala/org/enso/polyglot/ApiTest.scala +++ b/engine/polyglot-api/src/test/scala/org/enso/polyglot/ApiTest.scala @@ -7,7 +7,7 @@ import org.scalatest.matchers.should.Matchers import java.nio.file.Paths class ApiTest extends AnyFlatSpec with Matchers { - import LanguageInfo._ + import org.enso.common.LanguageInfo._ val executionContext = new PolyglotContext( Context .newBuilder(ID) diff --git a/engine/polyglot-api/src/test/scala/org/enso/polyglot/ModuleManagementTest.scala b/engine/polyglot-api/src/test/scala/org/enso/polyglot/ModuleManagementTest.scala index 0c597d7005..c2c3bc83cd 100644 --- a/engine/polyglot-api/src/test/scala/org/enso/polyglot/ModuleManagementTest.scala +++ b/engine/polyglot-api/src/test/scala/org/enso/polyglot/ModuleManagementTest.scala @@ -28,7 +28,7 @@ class ModuleManagementTest ) val executionContext = new PolyglotContext( Context - .newBuilder(LanguageInfo.ID) + .newBuilder(org.enso.common.LanguageInfo.ID) .allowExperimentalOptions(true) .allowAllAccess(true) .option(RuntimeOptions.PROJECT_ROOT, pkg.root.getAbsolutePath) diff --git a/engine/runner/src/main/java/org/enso/runner/ContextFactory.java b/engine/runner/src/main/java/org/enso/runner/ContextFactory.java index c22f79d0a2..14112186d2 100644 --- a/engine/runner/src/main/java/org/enso/runner/ContextFactory.java +++ b/engine/runner/src/main/java/org/enso/runner/ContextFactory.java @@ -4,11 +4,11 @@ import java.io.File; import java.io.InputStream; import java.io.OutputStream; import java.util.Map; +import org.enso.common.HostAccessFactory; +import org.enso.common.LanguageInfo; import org.enso.logger.Converter; import org.enso.logger.JulHandler; import org.enso.logger.LoggerSetup; -import org.enso.polyglot.HostAccessFactory; -import org.enso.polyglot.LanguageInfo; import org.enso.polyglot.PolyglotContext; import org.enso.polyglot.RuntimeOptions; import org.enso.polyglot.debugger.DebugServerInfo; diff --git a/engine/runner/src/main/scala/org/enso/runner/Main.scala b/engine/runner/src/main/scala/org/enso/runner/Main.scala index bc520601f9..a9669f6326 100644 --- a/engine/runner/src/main/scala/org/enso/runner/Main.scala +++ b/engine/runner/src/main/scala/org/enso/runner/Main.scala @@ -16,7 +16,8 @@ import org.enso.languageserver.boot.{ import org.enso.libraryupload.LibraryUploader.UploadFailedError import org.slf4j.event.Level import org.enso.pkg.{Contact, PackageManager, Template} -import org.enso.polyglot.{HostEnsoUtils, LanguageInfo, Module, PolyglotContext} +import org.enso.common.{HostEnsoUtils, LanguageInfo} +import org.enso.polyglot.{Module, PolyglotContext} import org.enso.profiling.sampler.{NoopSampler, OutputStreamSampler} import org.enso.version.VersionDescription import org.graalvm.polyglot.PolyglotException diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/Utils.java b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/Utils.java index 5fa97f05f2..6c06dd494a 100644 --- a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/Utils.java +++ b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/Utils.java @@ -10,9 +10,9 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.logging.Level; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.interpreter.runtime.EnsoContext; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Value; diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/inline/InlineContextUtils.java b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/inline/InlineContextUtils.java index 68b5a4f214..db69b09543 100644 --- a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/inline/InlineContextUtils.java +++ b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/inline/InlineContextUtils.java @@ -3,11 +3,11 @@ package org.enso.compiler.benchmarks.inline; import java.io.IOException; import java.util.HashSet; import java.util.Set; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.compiler.benchmarks.CodeGenerator; import org.enso.compiler.benchmarks.Utils; import org.enso.interpreter.runtime.data.Type; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ImportStandardLibrariesBenchmark.java b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ImportStandardLibrariesBenchmark.java index 8cb86738fe..9a5b2582e4 100644 --- a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ImportStandardLibrariesBenchmark.java +++ b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ImportStandardLibrariesBenchmark.java @@ -7,12 +7,12 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.compiler.Compiler; import org.enso.compiler.benchmarks.Utils; import org.enso.interpreter.runtime.Module; import org.enso.interpreter.runtime.data.Type; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManyErrorsBenchmark.java b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManyErrorsBenchmark.java index d8a236d125..40e7ef8703 100644 --- a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManyErrorsBenchmark.java +++ b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManyErrorsBenchmark.java @@ -6,13 +6,13 @@ import java.io.OutputStream; import java.util.List; import java.util.Random; import java.util.concurrent.TimeUnit; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.compiler.Compiler; import org.enso.compiler.benchmarks.CodeGenerator; import org.enso.compiler.benchmarks.Utils; import org.enso.interpreter.runtime.Module; import org.enso.interpreter.runtime.data.Type; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManyLocalVarsBenchmark.java b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManyLocalVarsBenchmark.java index c30ca4b79c..57aad6465e 100644 --- a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManyLocalVarsBenchmark.java +++ b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManyLocalVarsBenchmark.java @@ -5,13 +5,13 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Random; import java.util.concurrent.TimeUnit; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.compiler.Compiler; import org.enso.compiler.benchmarks.CodeGenerator; import org.enso.compiler.benchmarks.Utils; import org.enso.interpreter.runtime.Module; import org.enso.interpreter.runtime.data.Type; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; import org.openjdk.jmh.annotations.Benchmark; diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManyNestedBlocksBenchmark.java b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManyNestedBlocksBenchmark.java index e6a28f4804..88adcc8697 100644 --- a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManyNestedBlocksBenchmark.java +++ b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManyNestedBlocksBenchmark.java @@ -6,13 +6,13 @@ import java.io.OutputStream; import java.util.Random; import java.util.Set; import java.util.concurrent.TimeUnit; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.compiler.Compiler; import org.enso.compiler.benchmarks.CodeGenerator; import org.enso.compiler.benchmarks.Utils; import org.enso.interpreter.runtime.Module; import org.enso.interpreter.runtime.data.Type; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; import org.openjdk.jmh.annotations.Benchmark; diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManySmallMethodsBenchmark.java b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManySmallMethodsBenchmark.java index 62b0087332..c0e39d4704 100644 --- a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManySmallMethodsBenchmark.java +++ b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/module/ManySmallMethodsBenchmark.java @@ -9,13 +9,13 @@ import java.util.List; import java.util.Random; import java.util.Set; import java.util.concurrent.TimeUnit; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.compiler.Compiler; import org.enso.compiler.benchmarks.CodeGenerator; import org.enso.compiler.benchmarks.Utils; import org.enso.interpreter.runtime.Module; import org.enso.interpreter.runtime.data.Type; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; import org.openjdk.jmh.annotations.Benchmark; diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java b/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java index b6806a700e..0dd584605c 100644 --- a/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java +++ b/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java @@ -7,8 +7,8 @@ import java.util.List; import java.util.Random; import java.util.Set; import java.util.concurrent.TimeUnit; +import org.enso.common.MethodNames.Module; import org.enso.compiler.benchmarks.Utils; -import org.enso.polyglot.MethodNames.Module; import org.graalvm.polyglot.Value; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/IfVsCaseBenchmarks.java b/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/IfVsCaseBenchmarks.java index 25d22dbdb9..639ad3c535 100644 --- a/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/IfVsCaseBenchmarks.java +++ b/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/IfVsCaseBenchmarks.java @@ -7,8 +7,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.concurrent.TimeUnit; +import org.enso.common.MethodNames.Module; import org.enso.compiler.benchmarks.Utils; -import org.enso.polyglot.MethodNames.Module; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Value; import org.openjdk.jmh.annotations.Benchmark; diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/SrcUtil.java b/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/SrcUtil.java index bbb33261d5..f79e0c832d 100644 --- a/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/SrcUtil.java +++ b/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/SrcUtil.java @@ -4,7 +4,7 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.util.Objects; -import org.enso.polyglot.MethodNames.Module; +import org.enso.common.MethodNames.Module; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/TypePatternBenchmarks.java b/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/TypePatternBenchmarks.java index 3000527826..3c4045b215 100644 --- a/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/TypePatternBenchmarks.java +++ b/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/TypePatternBenchmarks.java @@ -2,8 +2,8 @@ package org.enso.interpreter.bench.benchmarks.semantic; import java.util.concurrent.TimeUnit; import java.util.function.Function; +import org.enso.common.MethodNames.Module; import org.enso.compiler.benchmarks.Utils; -import org.enso.polyglot.MethodNames.Module; import org.graalvm.polyglot.Value; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/WarningBenchmarks.java b/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/WarningBenchmarks.java index b7d81e156c..24196a4dd2 100644 --- a/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/WarningBenchmarks.java +++ b/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/WarningBenchmarks.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Objects; import java.util.Random; import java.util.concurrent.TimeUnit; +import org.enso.common.MethodNames; import org.enso.compiler.benchmarks.Utils; -import org.enso.polyglot.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Value; import org.openjdk.jmh.annotations.Benchmark; diff --git a/engine/runtime-compiler/src/main/java/org/enso/compiler/context/CompilerContext.java b/engine/runtime-compiler/src/main/java/org/enso/compiler/context/CompilerContext.java index effa333604..f78c59a71c 100644 --- a/engine/runtime-compiler/src/main/java/org/enso/compiler/context/CompilerContext.java +++ b/engine/runtime-compiler/src/main/java/org/enso/compiler/context/CompilerContext.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.concurrent.Future; import java.util.function.Consumer; import java.util.logging.Level; +import org.enso.common.CompilationStage; import org.enso.compiler.Compiler; import org.enso.compiler.PackageRepository; import org.enso.compiler.Passes; @@ -18,8 +19,6 @@ import org.enso.compiler.data.CompilerConfig; import org.enso.editions.LibraryName; import org.enso.pkg.Package; import org.enso.pkg.QualifiedName; -import org.enso.polyglot.CompilationStage; -import org.enso.polyglot.data.TypeGraph; /** * Interface that encapsulate all services {@link Compiler} needs from Truffle or other environment. @@ -98,19 +97,19 @@ public interface CompilerContext extends CompilerStub { CompilationStage getCompilationStage(Module module); - TypeGraph getTypeHierarchy(); + org.enso.polyglot.data.TypeGraph getTypeHierarchy(); Future serializeLibrary( Compiler compiler, LibraryName libraryName, boolean useGlobalCacheLocations); + scala.Option> deserializeSuggestions(LibraryName libraryName) + throws InterruptedException; + Future serializeModule( Compiler compiler, Module module, boolean useGlobalCacheLocations, boolean usePool); boolean deserializeModule(Compiler compiler, Module module); - scala.Option> deserializeSuggestions(LibraryName libraryName) - throws InterruptedException; - void shutdown(boolean waitForPendingJobCompletion); public static interface Updater { diff --git a/engine/runtime-compiler/src/main/java/org/enso/compiler/phase/ImportResolverForIR.java b/engine/runtime-compiler/src/main/java/org/enso/compiler/phase/ImportResolverForIR.java index 1cf843ee8b..1416d35d2b 100644 --- a/engine/runtime-compiler/src/main/java/org/enso/compiler/phase/ImportResolverForIR.java +++ b/engine/runtime-compiler/src/main/java/org/enso/compiler/phase/ImportResolverForIR.java @@ -3,6 +3,7 @@ package org.enso.compiler.phase; import java.io.IOException; import java.util.Objects; +import org.enso.common.CompilationStage; import org.enso.compiler.Compiler; import org.enso.compiler.context.CompilerContext; import org.enso.compiler.core.ir.Module; @@ -13,7 +14,6 @@ import org.enso.compiler.data.BindingsMap; import org.enso.compiler.data.BindingsMap$ModuleReference$Concrete; import org.enso.compiler.data.BindingsMap.ResolvedType; import org.enso.editions.LibraryName; -import org.enso.polyglot.CompilationStage; import scala.Option; import scala.Tuple2; diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/Compiler.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/Compiler.scala index e531ff9acb..e4a8dc8965 100644 --- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/Compiler.scala +++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/Compiler.scala @@ -36,8 +36,8 @@ import org.enso.compiler.phase.{ } import org.enso.editions.LibraryName import org.enso.pkg.QualifiedName -import org.enso.polyglot.LanguageInfo -import org.enso.polyglot.CompilationStage +import org.enso.common.LanguageInfo +import org.enso.common.CompilationStage import org.enso.syntax2.Tree import java.io.{PrintStream, StringReader} diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/phase/BuiltinsIrBuilder.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/phase/BuiltinsIrBuilder.scala index 26b5977b5b..4ba0d0b9c6 100644 --- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/phase/BuiltinsIrBuilder.scala +++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/phase/BuiltinsIrBuilder.scala @@ -8,7 +8,7 @@ import org.enso.compiler.context.{ ModuleContext } import org.enso.compiler.data.CompilerConfig -import org.enso.polyglot.CompilationStage +import org.enso.common.CompilationStage import scala.util.Using /** A phase responsible for initializing the builtins' IR from the provided diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/phase/ImportResolver.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/phase/ImportResolver.scala index 6a1809280a..efa96e61dd 100644 --- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/phase/ImportResolver.scala +++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/phase/ImportResolver.scala @@ -7,7 +7,7 @@ import org.enso.compiler.core.ir.{DiagnosticStorage, MetadataStorage} import org.enso.compiler.core.ir.module.scope.{Export, Import} import org.enso.compiler.data.BindingsMap import org.enso.compiler.pass.analyse.BindingAnalysis -import org.enso.polyglot.CompilationStage +import org.enso.common.CompilationStage import scala.collection.mutable import java.io.IOException diff --git a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/SerializeModuleJob.java b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/SerializeModuleJob.java index 6d9ce4ebc0..09085a20f7 100644 --- a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/SerializeModuleJob.java +++ b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/SerializeModuleJob.java @@ -1,9 +1,9 @@ package org.enso.interpreter.instrument.job; import java.util.logging.Level; +import org.enso.common.CompilationStage; import org.enso.interpreter.instrument.execution.RuntimeContext; import org.enso.pkg.QualifiedName; -import org.enso.polyglot.CompilationStage; /** The job that serializes module. */ public final class SerializeModuleJob extends BackgroundJob { diff --git a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/service/ExecutionService.java b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/service/ExecutionService.java index 3008690c7e..bfc5b565c3 100644 --- a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/service/ExecutionService.java +++ b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/service/ExecutionService.java @@ -23,6 +23,8 @@ import java.util.Optional; import java.util.UUID; import java.util.function.Consumer; import java.util.logging.Level; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.compiler.context.SimpleUpdate; import org.enso.interpreter.instrument.Endpoint; import org.enso.interpreter.instrument.MethodCallsCache; @@ -53,8 +55,6 @@ import org.enso.interpreter.service.error.TypeNotFoundException; import org.enso.lockmanager.client.ConnectedLockManager; import org.enso.logger.masking.MaskedString; import org.enso.pkg.QualifiedName; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.enso.polyglot.debugger.ExecutedVisualization; import org.enso.polyglot.debugger.IdExecutionService; import org.enso.text.editing.JavaEditorAdapter; diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/DeserializeLibrarySuggestionsJob.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/DeserializeLibrarySuggestionsJob.scala index 2e1bbe7176..59b3341305 100644 --- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/DeserializeLibrarySuggestionsJob.scala +++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/DeserializeLibrarySuggestionsJob.scala @@ -32,7 +32,8 @@ final class DeserializeLibrarySuggestionsJob( "Deserializing suggestions for library [{}].", libraryName ) - ctx.executionService.getContext.getCompiler.context + val cc = ctx.executionService.getContext.getCompiler.context + cc .deserializeSuggestions(libraryName) .foreach { cachedSuggestions => ctx.endpoint.sendToClient( diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/EnsureCompiledJob.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/EnsureCompiledJob.scala index 0e321de514..49688b1120 100644 --- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/EnsureCompiledJob.scala +++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/EnsureCompiledJob.scala @@ -2,6 +2,7 @@ package org.enso.interpreter.instrument.job import cats.implicits._ import com.oracle.truffle.api.TruffleLogger +import org.enso.common.CompilationStage import org.enso.compiler.CompilerResult import org.enso.compiler.context._ import org.enso.compiler.core.Implicits.AsMetadata @@ -31,7 +32,6 @@ import org.enso.interpreter.instrument.{ import org.enso.interpreter.runtime.Module import org.enso.interpreter.service.error.ModuleNotFoundForFileException import org.enso.pkg.QualifiedName -import org.enso.polyglot.CompilationStage import org.enso.polyglot.runtime.Runtime.Api import org.enso.polyglot.runtime.Runtime.Api.StackItem import org.enso.text.buffer.Rope diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala index 91739e2ca6..9189d74893 100644 --- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala +++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala @@ -28,7 +28,7 @@ import org.enso.interpreter.service.ExecutionService.{ FunctionPointer } import org.enso.interpreter.service.error._ -import org.enso.polyglot.LanguageInfo +import org.enso.common.LanguageInfo import org.enso.polyglot.debugger.ExecutedVisualization import org.enso.polyglot.runtime.Runtime.Api import org.enso.polyglot.runtime.Runtime.Api.{ContextId, ExecutionResult} diff --git a/engine/runtime-instrument-common/src/test/java/org/enso/interpreter/runtime/ModuleTestUtils.java b/engine/runtime-instrument-common/src/test/java/org/enso/interpreter/runtime/ModuleTestUtils.java index 5e6c24f59c..a7d04265e2 100644 --- a/engine/runtime-instrument-common/src/test/java/org/enso/interpreter/runtime/ModuleTestUtils.java +++ b/engine/runtime-instrument-common/src/test/java/org/enso/interpreter/runtime/ModuleTestUtils.java @@ -1,6 +1,6 @@ package org.enso.interpreter.runtime; -import org.enso.polyglot.CompilationStage; +import org.enso.common.CompilationStage; public final class ModuleTestUtils { private ModuleTestUtils() {} diff --git a/engine/runtime-instrument-common/src/test/scala/org/enso/compiler/test/CompilerTestSetup.scala b/engine/runtime-instrument-common/src/test/scala/org/enso/compiler/test/CompilerTestSetup.scala index 3c64093d64..17b353bd46 100644 --- a/engine/runtime-instrument-common/src/test/scala/org/enso/compiler/test/CompilerTestSetup.scala +++ b/engine/runtime-instrument-common/src/test/scala/org/enso/compiler/test/CompilerTestSetup.scala @@ -13,7 +13,7 @@ import org.enso.interpreter.runtime import org.enso.interpreter.runtime.ModuleTestUtils import org.enso.compiler.context.LocalScope import org.enso.pkg.QualifiedName -import org.enso.polyglot.CompilationStage +import org.enso.common.CompilationStage /** A reduced version of [[org.enso.compiler.test.CompilerRunner]] that avoids introducing a cyclic dependency * to `runtime-instrument-common` subject. diff --git a/engine/runtime-instrument-runtime-server/src/main/java/org/enso/interpreter/instrument/RuntimeServerInstrument.java b/engine/runtime-instrument-runtime-server/src/main/java/org/enso/interpreter/instrument/RuntimeServerInstrument.java index 84d6b75236..befa84fb83 100644 --- a/engine/runtime-instrument-runtime-server/src/main/java/org/enso/interpreter/instrument/RuntimeServerInstrument.java +++ b/engine/runtime-instrument-runtime-server/src/main/java/org/enso/interpreter/instrument/RuntimeServerInstrument.java @@ -58,7 +58,7 @@ public class RuntimeServerInstrument extends TruffleInstrument { @Override public void onLanguageContextInitialized(TruffleContext context, LanguageInfo language) { - if (language.getId().equals(org.enso.polyglot.LanguageInfo.ID)) { + if (language.getId().equals(org.enso.common.LanguageInfo.ID)) { Object token = context.enter(null); ExecutionService service; try { diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ExecCompilerTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ExecCompilerTest.java index 6cee2c30d3..ce381864b7 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ExecCompilerTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ExecCompilerTest.java @@ -9,7 +9,7 @@ import static org.junit.Assert.fail; import java.net.URI; import java.nio.file.Paths; import java.util.logging.Level; -import org.enso.polyglot.MethodNames; +import org.enso.common.MethodNames; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.PolyglotException; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ImportsAndFQNConsistencyTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ImportsAndFQNConsistencyTest.java index 1e43256949..4b4ce861f0 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ImportsAndFQNConsistencyTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ImportsAndFQNConsistencyTest.java @@ -9,12 +9,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import org.enso.common.LanguageInfo; import org.enso.compiler.core.ir.module.scope.Definition; import org.enso.compiler.core.ir.module.scope.Export; import org.enso.compiler.core.ir.module.scope.definition.Method; import org.enso.interpreter.runtime.EnsoContext; import org.enso.interpreter.test.TestBase; -import org.enso.polyglot.LanguageInfo; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.junit.AfterClass; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerdeCompilerTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerdeCompilerTest.java index fe513ec4b4..c9f9d5ce04 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerdeCompilerTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerdeCompilerTest.java @@ -17,11 +17,11 @@ import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.SimpleFormatter; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.compiler.core.ir.Module; import org.enso.interpreter.runtime.EnsoContext; import org.enso.pkg.PackageManager; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.io.IOAccess; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializationManagerTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializationManagerTest.java index 9fc0d8c009..cab58424d1 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializationManagerTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializationManagerTest.java @@ -9,6 +9,8 @@ import java.util.concurrent.TimeoutException; import java.util.function.Supplier; import java.util.stream.Stream; import org.apache.commons.io.FileUtils; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.editions.LibraryName; import org.enso.interpreter.runtime.EnsoContext; import org.enso.interpreter.runtime.util.TruffleFileSystem; @@ -16,8 +18,6 @@ import org.enso.interpreter.test.InterpreterContext; import org.enso.interpreter.util.ScalaConversions; import org.enso.pkg.Package; import org.enso.pkg.PackageManager; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.enso.polyglot.Suggestion; import org.junit.After; import org.junit.Assert; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializerTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializerTest.java index a156ec863f..fc55a071e4 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializerTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializerTest.java @@ -9,10 +9,10 @@ import java.io.IOException; import java.nio.file.Paths; import java.util.concurrent.TimeUnit; import java.util.logging.Level; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.interpreter.runtime.EnsoContext; import org.enso.pkg.PackageManager; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.io.IOAccess; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/caches/ModuleCacheTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/caches/ModuleCacheTest.java index eb4fb9187d..5c5f1ee48f 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/caches/ModuleCacheTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/caches/ModuleCacheTest.java @@ -5,12 +5,12 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.nio.ByteBuffer; +import org.enso.common.CompilationStage; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.compiler.CompilerTest; import org.enso.interpreter.runtime.EnsoContext; import org.enso.interpreter.test.TestBase; -import org.enso.polyglot.CompilationStage; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleSourcesTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleSourcesTest.java index c6717b2759..d99dfc4937 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleSourcesTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleSourcesTest.java @@ -6,8 +6,8 @@ import java.io.File; import java.io.IOException; import java.nio.file.Paths; import java.util.logging.Level; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.polyglot.RuntimeOptions; import org.enso.text.buffer.Rope$; import org.graalvm.polyglot.Context; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleTest.java index 6d4e659b8f..a74bc382bc 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleTest.java @@ -9,11 +9,11 @@ import java.io.File; import java.io.IOException; import java.nio.file.Paths; import java.util.logging.Level; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.compiler.data.BindingsMap; import org.enso.compiler.data.BindingsMap$ModuleReference$Concrete; import org.enso.pkg.QualifiedName; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Engine; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleTestUtils.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleTestUtils.java index 5e6c24f59c..a7d04265e2 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleTestUtils.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleTestUtils.java @@ -1,6 +1,6 @@ package org.enso.interpreter.runtime; -import org.enso.polyglot.CompilationStage; +import org.enso.common.CompilationStage; public final class ModuleTestUtils { private ModuleTestUtils() {} diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ResourceManagerTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ResourceManagerTest.java index e1c2a91938..9c63961781 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ResourceManagerTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ResourceManagerTest.java @@ -8,9 +8,9 @@ import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.interpreter.test.TestBase; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.junit.Test; public class ResourceManagerTest extends TestBase { diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AtomConstructorTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AtomConstructorTest.java index 09f7f7b1d2..2e4cb2a363 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AtomConstructorTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AtomConstructorTest.java @@ -5,12 +5,12 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.util.function.Function; +import org.enso.common.MethodNames; import org.enso.interpreter.runtime.data.atom.Atom; import org.enso.interpreter.runtime.data.atom.AtomConstructor; import org.enso.interpreter.runtime.data.atom.AtomNewInstanceNode; import org.enso.interpreter.runtime.data.atom.StructsLibrary; import org.enso.interpreter.runtime.error.PanicException; -import org.enso.polyglot.MethodNames; import org.graalvm.polyglot.Context; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AutoscopedConstructorTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AutoscopedConstructorTest.java index 8f7a03ccba..ec7bd9933b 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AutoscopedConstructorTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AutoscopedConstructorTest.java @@ -6,7 +6,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.ByteArrayOutputStream; -import org.enso.polyglot.MethodNames; +import org.enso.common.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.PolyglotException; import org.junit.AfterClass; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryDispatchTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryDispatchTest.java index 5443f061e2..04d415e995 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryDispatchTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryDispatchTest.java @@ -4,8 +4,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import org.enso.common.MethodNames; import org.enso.interpreter.runtime.error.PanicException; -import org.enso.polyglot.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.PolyglotException; import org.graalvm.polyglot.Source; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpFloatTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpFloatTest.java index dde3127e2d..b29e9f39e1 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpFloatTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpFloatTest.java @@ -8,7 +8,7 @@ import com.google.common.collect.Streams; import java.util.Arrays; import java.util.Random; import java.util.stream.Stream; -import org.enso.polyglot.MethodNames; +import org.enso.common.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.PolyglotException; import org.graalvm.polyglot.Value; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpIntegerTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpIntegerTest.java index 61919d54b8..654828225e 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpIntegerTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpIntegerTest.java @@ -8,7 +8,7 @@ import com.google.common.collect.Streams; import java.util.Arrays; import java.util.Random; import java.util.stream.Stream; -import org.enso.polyglot.MethodNames; +import org.enso.common.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Value; import org.junit.AfterClass; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DebuggingEnsoTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DebuggingEnsoTest.java index 538de3c492..7be1496204 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DebuggingEnsoTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DebuggingEnsoTest.java @@ -31,7 +31,7 @@ import java.util.Set; import java.util.TreeSet; import java.util.logging.Level; import java.util.stream.Collectors; -import org.enso.polyglot.MethodNames.Module; +import org.enso.common.MethodNames.Module; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Engine; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DiagnosticFormatterTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DiagnosticFormatterTest.java index 06524f6c5f..057f8bc53c 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DiagnosticFormatterTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DiagnosticFormatterTest.java @@ -11,12 +11,12 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames.Module; +import org.enso.common.MethodNames.TopScope; import org.enso.compiler.core.ir.Diagnostic; import org.enso.interpreter.runtime.EnsoContext; import org.enso.interpreter.runtime.util.DiagnosticFormatter; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames.Module; -import org.enso.polyglot.MethodNames.TopScope; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.PolyglotException; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsTest.java index 7ea7b87feb..d6770ee96d 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsTest.java @@ -15,11 +15,11 @@ import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +import org.enso.common.MethodNames; import org.enso.interpreter.node.expression.builtin.interop.syntax.HostValueToEnsoNode; import org.enso.interpreter.node.expression.builtin.meta.EqualsNode; import org.enso.interpreter.runtime.callable.UnresolvedConversion; import org.enso.interpreter.runtime.number.EnsoBigInteger; -import org.enso.polyglot.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/FindExceptionMessageTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/FindExceptionMessageTest.java index c47930d664..fe9266c064 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/FindExceptionMessageTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/FindExceptionMessageTest.java @@ -7,8 +7,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import org.enso.common.HostEnsoUtils; import org.enso.interpreter.instrument.job.VisualizationResult; -import org.enso.polyglot.HostEnsoUtils; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.PolyglotException; import org.graalvm.polyglot.Value; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/LazyAtomFieldTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/LazyAtomFieldTest.java index 65fac2a9e7..4e41cde4c6 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/LazyAtomFieldTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/LazyAtomFieldTest.java @@ -7,7 +7,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; import java.util.stream.Collectors; -import org.enso.polyglot.MethodNames; +import org.enso.common.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/MetaObjectTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/MetaObjectTest.java index 0037d0dc27..79dc41ce19 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/MetaObjectTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/MetaObjectTest.java @@ -15,9 +15,9 @@ import java.net.URI; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; +import org.enso.common.MethodNames; import org.enso.interpreter.runtime.type.ConstantsGen; import org.enso.interpreter.test.ValuesGenerator.Language; -import org.enso.polyglot.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/PolyglotFindExceptionMessageTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/PolyglotFindExceptionMessageTest.java index e2cb230786..5b4dbd688f 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/PolyglotFindExceptionMessageTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/PolyglotFindExceptionMessageTest.java @@ -3,7 +3,7 @@ package org.enso.interpreter.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import org.enso.polyglot.HostEnsoUtils; +import org.enso.common.HostEnsoUtils; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.PolyglotException; import org.graalvm.polyglot.Value; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/PrintTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/PrintTest.java index 02781a6f7c..df34e6ab21 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/PrintTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/PrintTest.java @@ -6,7 +6,7 @@ import java.io.ByteArrayOutputStream; import java.net.URI; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; -import org.enso.polyglot.MethodNames; +import org.enso.common.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SignaturePolyglotTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SignaturePolyglotTest.java index 9e8ba06ab2..656ab8bb31 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SignaturePolyglotTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SignaturePolyglotTest.java @@ -7,7 +7,7 @@ import static org.junit.Assert.fail; import java.io.OutputStream; import java.net.URI; import java.time.format.DateTimeFormatter; -import org.enso.polyglot.MethodNames; +import org.enso.common.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.PolyglotException; import org.graalvm.polyglot.Source; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SignatureTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SignatureTest.java index 536c3f470e..52daed1668 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SignatureTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SignatureTest.java @@ -10,7 +10,7 @@ import java.io.OutputStream; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; -import org.enso.polyglot.MethodNames; +import org.enso.common.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.PolyglotException; import org.graalvm.polyglot.Source; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TestBase.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TestBase.java index eee3ed129e..acd20f01f7 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TestBase.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TestBase.java @@ -15,11 +15,11 @@ import java.util.Map; import java.util.concurrent.Callable; import java.util.function.Function; import java.util.logging.Level; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames.Module; +import org.enso.common.MethodNames.TopScope; import org.enso.interpreter.EnsoLanguage; import org.enso.interpreter.runtime.EnsoContext; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames.Module; -import org.enso.polyglot.MethodNames.TopScope; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Language; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ValuesGenerator.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ValuesGenerator.java index 81b5bf7bf9..c251993ab9 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ValuesGenerator.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ValuesGenerator.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TimeZone; -import org.enso.polyglot.MethodNames; -import org.enso.polyglot.MethodNames.Module; +import org.enso.common.MethodNames; +import org.enso.common.MethodNames.Module; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.PolyglotException; import org.graalvm.polyglot.Value; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java index 71b6ce54cb..8f670b293e 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java @@ -3,12 +3,12 @@ package org.enso.interpreter.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.interpreter.runtime.EnsoContext; import org.enso.interpreter.runtime.error.Warning; import org.enso.interpreter.runtime.error.WarningsLibrary; import org.enso.interpreter.runtime.error.WithWarnings; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.graalvm.polyglot.Context; import org.junit.AfterClass; import org.junit.Assert; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/AssertionsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/AssertionsTest.java index 8d80ecbf03..a78448a5c2 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/AssertionsTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/AssertionsTest.java @@ -11,10 +11,10 @@ import static org.junit.Assert.fail; import java.io.ByteArrayOutputStream; import java.util.List; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.interpreter.runtime.EnsoContext; import org.enso.interpreter.test.TestBase; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.PolyglotException; import org.graalvm.polyglot.Value; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/DisabledAssertionsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/DisabledAssertionsTest.java index c005a4a0c6..7033b81ec5 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/DisabledAssertionsTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/DisabledAssertionsTest.java @@ -5,10 +5,10 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames.TopScope; import org.enso.interpreter.runtime.EnsoContext; import org.enso.interpreter.test.TestBase; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames.TopScope; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Value; import org.junit.AfterClass; diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/SuccessfulAssertionExpressionTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/SuccessfulAssertionExpressionTest.java index 4f535ed880..64fbb8a0b2 100644 --- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/SuccessfulAssertionExpressionTest.java +++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/SuccessfulAssertionExpressionTest.java @@ -4,8 +4,8 @@ import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; import java.util.List; +import org.enso.common.LanguageInfo; import org.enso.interpreter.test.TestBase; -import org.enso.polyglot.LanguageInfo; import org.graalvm.polyglot.Context; import org.junit.After; import org.junit.AfterClass; diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/refactoring/IRUtilsTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/refactoring/IRUtilsTest.scala index bf31fe0d88..f439ece0b1 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/refactoring/IRUtilsTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/refactoring/IRUtilsTest.scala @@ -7,7 +7,7 @@ import org.enso.interpreter.runtime import org.enso.interpreter.runtime.EnsoContext import org.enso.interpreter.test.InterpreterContext import org.enso.pkg.QualifiedName -import org.enso.polyglot.{LanguageInfo, MethodNames} +import org.enso.common.{LanguageInfo, MethodNames} import org.scalatest.OptionValues import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/CompilerTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/CompilerTest.scala index 5abdf5ce3f..839819f70c 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/CompilerTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/CompilerTest.scala @@ -17,7 +17,7 @@ import org.enso.interpreter.runtime import org.enso.interpreter.runtime.ModuleTestUtils import org.enso.compiler.context.LocalScope import org.enso.pkg.QualifiedName -import org.enso.polyglot.CompilationStage +import org.enso.common.CompilationStage import java.util.UUID diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/ModifiedTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/ModifiedTest.scala index 7fc423c771..7ee9abb409 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/ModifiedTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/ModifiedTest.scala @@ -4,7 +4,8 @@ import org.apache.commons.io.FileUtils import org.apache.commons.io.filefilter.{IOFileFilter, TrueFileFilter} import org.enso.interpreter.test.{InterpreterException, ValueEquality} import org.enso.pkg.PackageManager -import org.enso.polyglot.{LanguageInfo, PolyglotContext, RuntimeOptions} +import org.enso.common.LanguageInfo +import org.enso.polyglot.{PolyglotContext, RuntimeOptions} import org.graalvm.polyglot.{Context, Value} import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpec diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/context/SuggestionBuilderTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/context/SuggestionBuilderTest.scala index 23a76c5bad..69816890b7 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/context/SuggestionBuilderTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/context/SuggestionBuilderTest.scala @@ -1,12 +1,11 @@ -package org.enso.compiler.test.context - import org.enso.compiler.context.SuggestionBuilder import org.enso.compiler.core.ir.Module import org.enso.interpreter.runtime import org.enso.interpreter.runtime.EnsoContext import org.enso.interpreter.test.InterpreterContext import org.enso.pkg.QualifiedName -import org.enso.polyglot.{LanguageInfo, MethodNames, Suggestion} +import org.enso.common.{LanguageInfo, MethodNames} +import org.enso.polyglot.Suggestion import org.enso.polyglot.data.Tree import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala index 93aa0b8416..6a52daa0e0 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala @@ -10,7 +10,9 @@ import org.enso.interpreter.runtime import org.enso.interpreter.runtime.EnsoContext import org.enso.persist.Persistance import org.enso.pkg.QualifiedName -import org.enso.polyglot.{LanguageInfo, MethodNames, RuntimeOptions} +import org.enso.common.LanguageInfo +import org.enso.common.MethodNames +import org.enso.polyglot.RuntimeOptions import org.graalvm.polyglot.{Context, Engine} import org.scalatest.BeforeAndAfter import org.scalatest.matchers.should.Matchers diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/semantic/TypeSignaturesTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/semantic/TypeSignaturesTest.scala index 189625960a..375c891250 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/semantic/TypeSignaturesTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/semantic/TypeSignaturesTest.scala @@ -10,7 +10,7 @@ import org.enso.interpreter.runtime import org.enso.interpreter.runtime.EnsoContext import org.enso.interpreter.test.InterpreterContext import org.enso.pkg.QualifiedName -import org.enso.polyglot.{LanguageInfo, MethodNames} +import org.enso.common.{LanguageInfo, MethodNames} import org.scalatest.matchers.{MatchResult, Matcher} import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/InterpreterTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/InterpreterTest.scala index 9bebf47d09..943daa697f 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/InterpreterTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/InterpreterTest.scala @@ -13,12 +13,8 @@ import org.enso.polyglot.debugger.{ ReplExecutor, SessionManager } -import org.enso.polyglot.{ - Function, - LanguageInfo, - PolyglotContext, - RuntimeOptions -} +import org.enso.common.LanguageInfo +import org.enso.polyglot.{Function, PolyglotContext, RuntimeOptions} import org.graalvm.polyglot.{Context, Value} import org.scalatest.Assertions import org.scalatest.matchers.should.Matchers diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/PackageTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/PackageTest.scala index 67e28de3de..a33a70bce0 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/PackageTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/PackageTest.scala @@ -1,7 +1,8 @@ package org.enso.interpreter.test import org.enso.pkg.PackageManager -import org.enso.polyglot.{LanguageInfo, PolyglotContext, RuntimeOptions} +import org.enso.common.LanguageInfo +import org.enso.polyglot.{PolyglotContext, RuntimeOptions} import org.graalvm.polyglot.{Context, Value} import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/BuiltinTypesTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/BuiltinTypesTest.scala index 50c623bf1c..8ec93cf289 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/BuiltinTypesTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/BuiltinTypesTest.scala @@ -2,7 +2,9 @@ package org.enso.interpreter.test.instrument import org.enso.interpreter.runtime.`type`.ConstantsGen import org.enso.interpreter.test.Metadata -import org.enso.polyglot._ +import org.enso.common.LanguageInfo +import org.enso.polyglot.RuntimeOptions +import org.enso.polyglot.RuntimeServerInfo import org.enso.polyglot.runtime.Runtime.Api import org.graalvm.polyglot.Context import org.scalatest.BeforeAndAfterEach diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/InstrumentTestContext.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/InstrumentTestContext.scala index a166b649cc..15c4663112 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/InstrumentTestContext.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/InstrumentTestContext.scala @@ -3,7 +3,8 @@ package org.enso.interpreter.test.instrument import org.apache.commons.io.FileUtils import org.enso.distribution.locking.ThreadSafeFileLockManager import org.enso.pkg.{Package, PackageManager} -import org.enso.polyglot.{LanguageInfo, PolyglotContext} +import org.enso.common.LanguageInfo +import org.enso.polyglot.PolyglotContext import org.enso.polyglot.runtime.Runtime.Api import org.graalvm.polyglot.Context diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeAsyncCommandsTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeAsyncCommandsTest.scala index 6f1634382b..6c3f5b6318 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeAsyncCommandsTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeAsyncCommandsTest.scala @@ -1,7 +1,9 @@ package org.enso.interpreter.test.instrument import org.enso.interpreter.test.Metadata -import org.enso.polyglot._ +import org.enso.common.LanguageInfo +import org.enso.polyglot.RuntimeOptions +import org.enso.polyglot.RuntimeServerInfo import org.enso.polyglot.runtime.Runtime.Api import org.enso.text.{ContentVersion, Sha3_224VersionCalculator} import org.graalvm.polyglot.Context diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeComponentsTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeComponentsTest.scala index 9d4e2fddc0..dce4690a4e 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeComponentsTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeComponentsTest.scala @@ -12,7 +12,10 @@ import org.enso.pkg.{ Package, PackageManager } -import org.enso.polyglot._ +import org.enso.common.LanguageInfo +import org.enso.common.MethodNames +import org.enso.polyglot.RuntimeOptions +import org.enso.polyglot.RuntimeServerInfo import org.enso.polyglot.runtime.Runtime.Api import org.enso.testkit.OsSpec import org.graalvm.polyglot.Context diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeErrorsTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeErrorsTest.scala index a440a55c3b..184632dbdb 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeErrorsTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeErrorsTest.scala @@ -2,7 +2,9 @@ package org.enso.interpreter.test.instrument import org.enso.interpreter.runtime.`type`.ConstantsGen import org.enso.interpreter.test.Metadata -import org.enso.polyglot._ +import org.enso.common.LanguageInfo +import org.enso.polyglot.RuntimeOptions +import org.enso.polyglot.RuntimeServerInfo import org.enso.polyglot.runtime.Runtime.Api import org.enso.text.editing.model import org.enso.text.editing.model.TextEdit diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeExecutionEnvironmentTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeExecutionEnvironmentTest.scala index 2ee40cf8b6..10af4ad994 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeExecutionEnvironmentTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeExecutionEnvironmentTest.scala @@ -4,7 +4,10 @@ import org.enso.interpreter.runtime.EnsoContext import org.enso.interpreter.runtime.`type`.ConstantsGen import org.enso.interpreter.test.Metadata import org.enso.pkg.{Package, PackageManager} -import org.enso.polyglot._ +import org.enso.common.LanguageInfo +import org.enso.common.MethodNames +import org.enso.polyglot.RuntimeOptions +import org.enso.polyglot.RuntimeServerInfo import org.enso.polyglot.runtime.Runtime.Api import org.enso.testkit.OsSpec import org.graalvm.polyglot.Context diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeInstrumentTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeInstrumentTest.scala index 1495dda4dc..0e2c5dfce1 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeInstrumentTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeInstrumentTest.scala @@ -2,7 +2,9 @@ package org.enso.interpreter.test.instrument import org.enso.interpreter.runtime.`type`.{Constants, ConstantsGen} import org.enso.interpreter.test.Metadata -import org.enso.polyglot._ +import org.enso.common.LanguageInfo +import org.enso.polyglot.RuntimeOptions +import org.enso.polyglot.RuntimeServerInfo import org.enso.polyglot.runtime.Runtime.Api import org.enso.text.{ContentVersion, Sha3_224VersionCalculator} import org.graalvm.polyglot.Context diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeProjectContextTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeProjectContextTest.scala index 012be601cd..dd1dd648f6 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeProjectContextTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeProjectContextTest.scala @@ -1,6 +1,7 @@ package org.enso.interpreter.test.instrument -import org.enso.polyglot.{LanguageInfo, RuntimeOptions} +import org.enso.common.LanguageInfo +import org.enso.polyglot.RuntimeOptions import org.graalvm.polyglot.{Context, PolyglotException} import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeRefactoringTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeRefactoringTest.scala index a987064f67..fcadb07233 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeRefactoringTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeRefactoringTest.scala @@ -3,7 +3,9 @@ package org.enso.interpreter.test.instrument import org.apache.commons.io.output.TeeOutputStream import org.enso.interpreter.runtime.`type`.ConstantsGen import org.enso.interpreter.test.Metadata -import org.enso.polyglot._ +import org.enso.common.LanguageInfo +import org.enso.polyglot.RuntimeOptions +import org.enso.polyglot.RuntimeServerInfo import org.enso.polyglot.runtime.Runtime.Api import org.enso.text.editing.model import org.enso.text.editing.model.TextEdit diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeServerTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeServerTest.scala index 9c26c0f28f..74ec5bb6ab 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeServerTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeServerTest.scala @@ -4,8 +4,11 @@ import org.apache.commons.io.output.TeeOutputStream import org.enso.interpreter.runtime.EnsoContext import org.enso.interpreter.runtime.`type`.{Constants, ConstantsGen, Types} import org.enso.interpreter.test.Metadata -import org.enso.polyglot._ +import org.enso.common.LanguageInfo +import org.enso.common.MethodNames import org.enso.polyglot.data.TypeGraph +import org.enso.polyglot.RuntimeOptions +import org.enso.polyglot.RuntimeServerInfo import org.enso.polyglot.runtime.Runtime.Api import org.enso.text.editing.model import org.enso.text.editing.model.TextEdit diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeStdlibTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeStdlibTest.scala index c43b70aa97..49fa69485d 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeStdlibTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeStdlibTest.scala @@ -2,7 +2,10 @@ package org.enso.interpreter.test.instrument import org.enso.interpreter.test.Metadata import org.enso.pkg.{Package, PackageManager, QualifiedName} -import org.enso.polyglot._ +import org.enso.common.LanguageInfo +import org.enso.polyglot.RuntimeOptions +import org.enso.polyglot.RuntimeServerInfo +import org.enso.polyglot.Suggestion import org.enso.polyglot.runtime.Runtime.Api import org.enso.testkit.OsSpec import org.graalvm.polyglot.Context diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeSuggestionUpdatesTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeSuggestionUpdatesTest.scala index 646daedded..16095f02f5 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeSuggestionUpdatesTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeSuggestionUpdatesTest.scala @@ -1,7 +1,12 @@ package org.enso.interpreter.test.instrument import org.enso.interpreter.runtime.`type`.ConstantsGen -import org.enso.polyglot._ +import org.enso.common.LanguageInfo +import org.enso.polyglot.RuntimeOptions +import org.enso.polyglot.RuntimeServerInfo +import org.enso.polyglot.ExportedSymbol +import org.enso.polyglot.ModuleExports +import org.enso.polyglot.Suggestion import org.enso.polyglot.data.Tree import org.enso.polyglot.runtime.Runtime.Api import org.enso.text.editing.model diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeTextEditsTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeTextEditsTest.scala index f9bd71f63e..36633c27f7 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeTextEditsTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeTextEditsTest.scala @@ -1,9 +1,9 @@ package org.enso.interpreter.test.instrument import org.enso.interpreter.runtime.`type`.ConstantsGen +import org.enso.common.LanguageInfo import org.enso.polyglot.{ ExportedSymbol, - LanguageInfo, ModuleExports, RuntimeOptions, RuntimeServerInfo, diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeTypesTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeTypesTest.scala index 488fcca3f5..3b5d106e4d 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeTypesTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeTypesTest.scala @@ -4,7 +4,10 @@ import org.apache.commons.io.output.TeeOutputStream import org.enso.interpreter.runtime.EnsoContext import org.enso.interpreter.runtime.`type`.ConstantsGen import org.enso.interpreter.test.Metadata -import org.enso.polyglot._ +import org.enso.common.LanguageInfo +import org.enso.common.MethodNames +import org.enso.polyglot.RuntimeOptions +import org.enso.polyglot.RuntimeServerInfo import org.enso.polyglot.runtime.Runtime.Api import org.enso.text.editing.model import org.enso.text.editing.model.TextEdit diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/CodeLocationsTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/CodeLocationsTest.scala index f753eef70e..ccf25ea822 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/CodeLocationsTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/CodeLocationsTest.scala @@ -6,7 +6,7 @@ import org.enso.interpreter.node.controlflow.caseexpr.CaseNode import org.enso.interpreter.node.expression.literal.LiteralNode import org.enso.interpreter.node.scope.{AssignmentNode, ReadLocalVariableNode} import org.enso.interpreter.test.{InterpreterContext, InterpreterTest} -import org.enso.polyglot.MethodNames +import org.enso.common.MethodNames class CodeLocationsTest extends InterpreterTest { diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/RuntimeManagementTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/RuntimeManagementTest.scala index 524d5e77a1..1082c584ed 100644 --- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/RuntimeManagementTest.scala +++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/RuntimeManagementTest.scala @@ -2,7 +2,7 @@ package org.enso.interpreter.test.semantic import org.enso.interpreter.runtime.EnsoContext import org.enso.interpreter.test.{InterpreterContext, InterpreterTest} -import org.enso.polyglot.{LanguageInfo, MethodNames} +import org.enso.common.{LanguageInfo, MethodNames} import scala.ref.WeakReference import scala.util.Try diff --git a/engine/runtime/src/main/java/org/enso/interpreter/EnsoLanguage.java b/engine/runtime/src/main/java/org/enso/interpreter/EnsoLanguage.java index f5ab472f4f..826a79361a 100644 --- a/engine/runtime/src/main/java/org/enso/interpreter/EnsoLanguage.java +++ b/engine/runtime/src/main/java/org/enso/interpreter/EnsoLanguage.java @@ -15,6 +15,7 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.List; import java.util.Objects; +import org.enso.common.LanguageInfo; import org.enso.compiler.Compiler; import org.enso.compiler.context.InlineContext; import org.enso.compiler.context.LocalScope; @@ -43,7 +44,6 @@ import org.enso.interpreter.runtime.tag.Patchable; import org.enso.interpreter.util.FileDetector; import org.enso.lockmanager.client.ConnectedLockManager; import org.enso.logger.masking.MaskingFactory; -import org.enso.polyglot.LanguageInfo; import org.enso.polyglot.RuntimeOptions; import org.enso.syntax2.Line; import org.enso.syntax2.Tree; diff --git a/engine/runtime/src/main/java/org/enso/interpreter/caches/ModuleCache.java b/engine/runtime/src/main/java/org/enso/interpreter/caches/ModuleCache.java index d32c446ec2..b8697fcd88 100644 --- a/engine/runtime/src/main/java/org/enso/interpreter/caches/ModuleCache.java +++ b/engine/runtime/src/main/java/org/enso/interpreter/caches/ModuleCache.java @@ -15,11 +15,11 @@ import java.util.Arrays; import java.util.Optional; import java.util.logging.Level; import org.apache.commons.lang3.StringUtils; +import org.enso.common.CompilationStage; import org.enso.compiler.core.ir.Module; import org.enso.interpreter.runtime.EnsoContext; import org.enso.interpreter.runtime.builtin.Builtins; import org.enso.persist.Persistance; -import org.enso.polyglot.CompilationStage; public final class ModuleCache implements Cache.Spi { diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java index a00c341555..bcc455d84d 100644 --- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java +++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java @@ -37,6 +37,7 @@ import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; import java.util.logging.Level; +import org.enso.common.LanguageInfo; import org.enso.compiler.Compiler; import org.enso.compiler.PackageRepository; import org.enso.compiler.PackageRepositoryUtils; @@ -60,7 +61,6 @@ import org.enso.librarymanager.resolved.LibraryRoot; import org.enso.pkg.Package; import org.enso.pkg.PackageManager; import org.enso.pkg.QualifiedName; -import org.enso.polyglot.LanguageInfo; import org.enso.polyglot.RuntimeOptions; import org.enso.polyglot.debugger.IdExecutionService; import org.graalvm.options.OptionKey; diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/Module.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/Module.java index cf47819204..a7f29b4c6a 100644 --- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/Module.java +++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/Module.java @@ -23,6 +23,9 @@ import java.util.Map; import java.util.UUID; import java.util.WeakHashMap; import java.util.logging.Level; +import org.enso.common.CompilationStage; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames; import org.enso.compiler.context.CompilerContext; import org.enso.compiler.context.LocalScope; import org.enso.compiler.context.SimpleUpdate; @@ -44,9 +47,6 @@ import org.enso.interpreter.runtime.scope.ModuleScope; import org.enso.interpreter.runtime.type.Types; import org.enso.pkg.Package; import org.enso.pkg.QualifiedName; -import org.enso.polyglot.CompilationStage; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames; import org.enso.text.buffer.Rope; /** Represents a source module with a known location. */ diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/ModuleSources.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/ModuleSources.java index 26687029cb..804b9a9376 100644 --- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/ModuleSources.java +++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/ModuleSources.java @@ -3,8 +3,8 @@ package org.enso.interpreter.runtime; import com.oracle.truffle.api.TruffleFile; import com.oracle.truffle.api.source.Source; import java.io.IOException; +import org.enso.common.LanguageInfo; import org.enso.pkg.QualifiedName; -import org.enso.polyglot.LanguageInfo; import org.enso.text.buffer.Rope; /** diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/TruffleCompilerContext.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/TruffleCompilerContext.java index 0f8acd9db2..835c43b076 100644 --- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/TruffleCompilerContext.java +++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/TruffleCompilerContext.java @@ -18,6 +18,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; import java.util.function.Consumer; import java.util.logging.Level; +import org.enso.common.CompilationStage; +import org.enso.common.LanguageInfo; import org.enso.compiler.Compiler; import org.enso.compiler.PackageRepository; import org.enso.compiler.Passes; @@ -41,8 +43,6 @@ import org.enso.interpreter.runtime.type.Types; import org.enso.interpreter.runtime.util.DiagnosticFormatter; import org.enso.pkg.Package; import org.enso.pkg.QualifiedName; -import org.enso.polyglot.CompilationStage; -import org.enso.polyglot.LanguageInfo; import org.enso.polyglot.Suggestion; import org.enso.polyglot.data.TypeGraph; import scala.collection.immutable.ListSet; @@ -588,6 +588,7 @@ final class TruffleCompilerContext implements CompilerContext { } } + @Override public scala.Option> deserializeSuggestions( LibraryName libraryName) throws InterruptedException { var option = deserializeSuggestionsImpl(libraryName); diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/callable/function/Function.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/callable/function/Function.java index 07113e3adf..ead3051ba1 100644 --- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/callable/function/Function.java +++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/callable/function/Function.java @@ -18,6 +18,7 @@ import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.api.source.SourceSection; +import org.enso.common.MethodNames; import org.enso.interpreter.node.callable.InteropApplicationNode; import org.enso.interpreter.node.callable.dispatch.InvokeFunctionNode; import org.enso.interpreter.node.expression.builtin.BuiltinRootNode; @@ -31,7 +32,6 @@ import org.enso.interpreter.runtime.data.vector.ArrayLikeHelpers; import org.enso.interpreter.runtime.library.dispatch.TypesLibrary; import org.enso.interpreter.runtime.state.State; import org.enso.interpreter.runtime.type.Types; -import org.enso.polyglot.MethodNames; /** A runtime representation of a function object in Enso. */ @ExportLibrary(InteropLibrary.class) diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/scope/TopLevelScope.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/scope/TopLevelScope.java index 2dd714572c..0dd5629983 100644 --- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/scope/TopLevelScope.java +++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/scope/TopLevelScope.java @@ -14,6 +14,7 @@ import java.io.File; import java.util.Collection; import java.util.Optional; import java.util.concurrent.ExecutionException; +import org.enso.common.MethodNames; import org.enso.compiler.PackageRepository; import org.enso.interpreter.EnsoLanguage; import org.enso.interpreter.runtime.EnsoContext; @@ -25,7 +26,6 @@ import org.enso.interpreter.runtime.type.Types; import org.enso.interpreter.util.ScalaConversions; import org.enso.pkg.Package; import org.enso.pkg.QualifiedName; -import org.enso.polyglot.MethodNames; /** Represents the top scope of Enso execution, containing all the importable modules. */ @ExportLibrary(InteropLibrary.class) diff --git a/engine/runtime/src/main/java/org/enso/interpreter/util/FileDetector.java b/engine/runtime/src/main/java/org/enso/interpreter/util/FileDetector.java index 0bdfa3cc04..6109dabcce 100644 --- a/engine/runtime/src/main/java/org/enso/interpreter/util/FileDetector.java +++ b/engine/runtime/src/main/java/org/enso/interpreter/util/FileDetector.java @@ -7,7 +7,7 @@ import java.io.InputStream; import java.nio.charset.Charset; import org.apache.tika.detect.DefaultEncodingDetector; import org.apache.tika.detect.EncodingDetector; -import org.enso.polyglot.LanguageInfo; +import org.enso.common.LanguageInfo; /** A detector for finding a {@link TruffleFile file's} MIME type and encoding. */ public final class FileDetector implements TruffleFile.FileTypeDetector { diff --git a/engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala b/engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala index 6254e79a05..3626b8e628 100644 --- a/engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala +++ b/engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala @@ -22,7 +22,7 @@ import org.enso.pkg.{ SourceFile } import org.enso.text.buffer.Rope -import org.enso.polyglot.CompilationStage +import org.enso.common.CompilationStage import java.nio.file.Path import scala.collection.immutable.ListSet @@ -578,9 +578,12 @@ private class DefaultPackageRepository( val cache = ensurePackageIsLoaded(libraryName).toOption.flatMap { _ => if (!loadedLibraryBindings.contains(libraryName)) { loadedPackages.get(libraryName).flatten.foreach(loadDependencies(_)) - val cachedBindingOption = context + val cachedBindingOption = None + /* TBD: this has to be called somehow + context .asInstanceOf[TruffleCompilerContext] .deserializeLibraryBindings(libraryName) + */ loadedLibraryBindings.addOne((libraryName, cachedBindingOption)) } loadedLibraryBindings.get(libraryName) diff --git a/lib/java/benchmarks-common/src/main/java/org/enso/interpreter/bench/Utils.java b/lib/java/benchmarks-common/src/main/java/org/enso/interpreter/bench/Utils.java index 4b2248a469..2eb875b6a7 100644 --- a/lib/java/benchmarks-common/src/main/java/org/enso/interpreter/bench/Utils.java +++ b/lib/java/benchmarks-common/src/main/java/org/enso/interpreter/bench/Utils.java @@ -1,7 +1,7 @@ package org.enso.interpreter.bench; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames.Module; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames.Module; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; diff --git a/lib/scala/bench-processor/src/main/java/org/enso/benchmarks/processor/BenchProcessor.java b/lib/scala/bench-processor/src/main/java/org/enso/benchmarks/processor/BenchProcessor.java index be5fefdcee..553b204471 100644 --- a/lib/scala/bench-processor/src/main/java/org/enso/benchmarks/processor/BenchProcessor.java +++ b/lib/scala/bench-processor/src/main/java/org/enso/benchmarks/processor/BenchProcessor.java @@ -19,8 +19,8 @@ import org.enso.benchmarks.BenchGroup; import org.enso.benchmarks.BenchSpec; import org.enso.benchmarks.ModuleBenchSuite; import org.enso.benchmarks.Utils; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames.TopScope; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames.TopScope; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.PolyglotException; @@ -60,8 +60,8 @@ public class BenchProcessor extends AbstractProcessor { "import org.graalvm.polyglot.Context;", "import org.graalvm.polyglot.Value;", "import org.graalvm.polyglot.io.IOAccess;", - "import org.enso.polyglot.LanguageInfo;", - "import org.enso.polyglot.MethodNames;", + "import org.enso.common.LanguageInfo;", + "import org.enso.common.MethodNames;", "import org.enso.polyglot.RuntimeOptions;", "import org.enso.benchmarks.processor.SpecCollector;", "import org.enso.benchmarks.ModuleBenchSuite;", diff --git a/lib/scala/bench-processor/src/main/java/org/enso/benchmarks/processor/SpecCollector.java b/lib/scala/bench-processor/src/main/java/org/enso/benchmarks/processor/SpecCollector.java index 07aa543469..4c9040e5cd 100644 --- a/lib/scala/bench-processor/src/main/java/org/enso/benchmarks/processor/SpecCollector.java +++ b/lib/scala/bench-processor/src/main/java/org/enso/benchmarks/processor/SpecCollector.java @@ -5,7 +5,7 @@ import java.util.List; import org.enso.benchmarks.BenchGroup; import org.enso.benchmarks.BenchSuite; import org.enso.benchmarks.ModuleBenchSuite; -import org.enso.polyglot.MethodNames.Module; +import org.enso.common.MethodNames.Module; import org.graalvm.polyglot.Value; /** Collect benchmark specifications from Enso source files. */ diff --git a/lib/scala/bench-processor/src/test/java/org/enso/benchmarks/TestSpecCollector.java b/lib/scala/bench-processor/src/test/java/org/enso/benchmarks/TestSpecCollector.java index a6841d79a2..a51d997bb2 100644 --- a/lib/scala/bench-processor/src/test/java/org/enso/benchmarks/TestSpecCollector.java +++ b/lib/scala/bench-processor/src/test/java/org/enso/benchmarks/TestSpecCollector.java @@ -11,9 +11,9 @@ import java.net.URISyntaxException; import java.nio.file.Files; import java.util.List; import org.enso.benchmarks.processor.SpecCollector; +import org.enso.common.LanguageInfo; +import org.enso.common.MethodNames.TopScope; import org.enso.pkg.PackageManager; -import org.enso.polyglot.LanguageInfo; -import org.enso.polyglot.MethodNames.TopScope; import org.enso.polyglot.RuntimeOptions; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Value; diff --git a/lib/scala/logging-truffle-connector/src/main/scala/org/enso/truffleloggerwrapper/TruffleLoggerWrapper.scala b/lib/scala/logging-truffle-connector/src/main/scala/org/enso/truffleloggerwrapper/TruffleLoggerWrapper.scala index 747e138d01..603eee0b73 100644 --- a/lib/scala/logging-truffle-connector/src/main/scala/org/enso/truffleloggerwrapper/TruffleLoggerWrapper.scala +++ b/lib/scala/logging-truffle-connector/src/main/scala/org/enso/truffleloggerwrapper/TruffleLoggerWrapper.scala @@ -2,7 +2,7 @@ package org.enso.truffleloggerwrapper import com.oracle.truffle.api.TruffleLogger import org.enso.logger.masking.Masking -import org.enso.polyglot.LanguageInfo +import org.enso.common.LanguageInfo import org.slf4j.helpers.MessageFormatter import org.slf4j.{Logger, Marker} diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/boot/Cli.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/boot/Cli.scala index 2c513b9809..b354466563 100644 --- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/boot/Cli.scala +++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/boot/Cli.scala @@ -1,7 +1,7 @@ package org.enso.projectmanager.boot import org.apache.commons.cli -import org.enso.polyglot.LanguageInfo +import org.enso.common.LanguageInfo import scala.util.Try