diff --git a/Interpreter/src/bench/java/org/enso/interpreter/BenchmarkItem.java b/Interpreter/src/bench/java/org/enso/interpreter/bench/BenchmarkItem.java similarity index 95% rename from Interpreter/src/bench/java/org/enso/interpreter/BenchmarkItem.java rename to Interpreter/src/bench/java/org/enso/interpreter/bench/BenchmarkItem.java index dd98fda8592..c4271906f2a 100644 --- a/Interpreter/src/bench/java/org/enso/interpreter/BenchmarkItem.java +++ b/Interpreter/src/bench/java/org/enso/interpreter/bench/BenchmarkItem.java @@ -1,4 +1,4 @@ -package org.enso.interpreter; +package org.enso.interpreter.bench; import org.openjdk.jmh.results.Result; diff --git a/Interpreter/src/bench/java/org/enso/interpreter/BenchmarkResultProcessor.java b/Interpreter/src/bench/java/org/enso/interpreter/bench/BenchmarkResultProcessor.java similarity index 95% rename from Interpreter/src/bench/java/org/enso/interpreter/BenchmarkResultProcessor.java rename to Interpreter/src/bench/java/org/enso/interpreter/bench/BenchmarkResultProcessor.java index 45b296858d6..9ed9ac6a76d 100644 --- a/Interpreter/src/bench/java/org/enso/interpreter/BenchmarkResultProcessor.java +++ b/Interpreter/src/bench/java/org/enso/interpreter/bench/BenchmarkResultProcessor.java @@ -1,4 +1,4 @@ -package org.enso.interpreter; +package org.enso.interpreter.bench; import org.openjdk.jmh.results.Result; import org.openjdk.jmh.results.RunResult; diff --git a/Interpreter/src/bench/java/org/enso/interpreter/BenchmarksRunner.java b/Interpreter/src/bench/java/org/enso/interpreter/bench/BenchmarksRunner.java similarity index 98% rename from Interpreter/src/bench/java/org/enso/interpreter/BenchmarksRunner.java rename to Interpreter/src/bench/java/org/enso/interpreter/bench/BenchmarksRunner.java index 5592fa15e30..782804bcaa1 100644 --- a/Interpreter/src/bench/java/org/enso/interpreter/BenchmarksRunner.java +++ b/Interpreter/src/bench/java/org/enso/interpreter/bench/BenchmarksRunner.java @@ -1,4 +1,4 @@ -package org.enso.interpreter; +package org.enso.interpreter.bench; import org.openjdk.jmh.results.RunResult; import org.openjdk.jmh.runner.BenchmarkList; diff --git a/Interpreter/src/bench/java/org/enso/interpreter/Report.java b/Interpreter/src/bench/java/org/enso/interpreter/bench/Report.java similarity index 98% rename from Interpreter/src/bench/java/org/enso/interpreter/Report.java rename to Interpreter/src/bench/java/org/enso/interpreter/bench/Report.java index a2604f19f1e..ea2cc3e0382 100644 --- a/Interpreter/src/bench/java/org/enso/interpreter/Report.java +++ b/Interpreter/src/bench/java/org/enso/interpreter/bench/Report.java @@ -1,4 +1,4 @@ -package org.enso.interpreter; +package org.enso.interpreter.bench; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; diff --git a/Interpreter/src/bench/java/org/enso/interpreter/ReportItem.java b/Interpreter/src/bench/java/org/enso/interpreter/bench/ReportItem.java similarity index 97% rename from Interpreter/src/bench/java/org/enso/interpreter/ReportItem.java rename to Interpreter/src/bench/java/org/enso/interpreter/bench/ReportItem.java index c88741d26e5..c591ee625f3 100644 --- a/Interpreter/src/bench/java/org/enso/interpreter/ReportItem.java +++ b/Interpreter/src/bench/java/org/enso/interpreter/bench/ReportItem.java @@ -1,4 +1,4 @@ -package org.enso.interpreter; +package org.enso.interpreter.bench; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; diff --git a/Interpreter/src/main/java/org/enso/interpreter/optimiser/constant/.gitkeep b/Interpreter/src/bench/java/org/enso/interpreter/bench/benchmarks/analysis/.gitkeep similarity index 100% rename from Interpreter/src/main/java/org/enso/interpreter/optimiser/constant/.gitkeep rename to Interpreter/src/bench/java/org/enso/interpreter/bench/benchmarks/analysis/.gitkeep diff --git a/Interpreter/src/bench/java/org/enso/interpreter/benchmarks/AtomBenchmarks.java b/Interpreter/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/AtomBenchmarks.java similarity index 91% rename from Interpreter/src/bench/java/org/enso/interpreter/benchmarks/AtomBenchmarks.java rename to Interpreter/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/AtomBenchmarks.java index ce5c0c48e30..214ab530745 100644 --- a/Interpreter/src/bench/java/org/enso/interpreter/benchmarks/AtomBenchmarks.java +++ b/Interpreter/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/AtomBenchmarks.java @@ -1,6 +1,6 @@ -package org.enso.interpreter.benchmarks; +package org.enso.interpreter.bench.benchmarks.semantic; -import org.enso.interpreter.fixtures.AtomFixtures; +import org.enso.interpreter.bench.fixtures.semantic.AtomFixtures; import org.openjdk.jmh.annotations.*; import java.util.concurrent.TimeUnit; diff --git a/Interpreter/src/bench/java/org/enso/interpreter/benchmarks/NamedDefaultedArgumentBenchmarks.java b/Interpreter/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/NamedDefaultedArgumentBenchmarks.java similarity index 83% rename from Interpreter/src/bench/java/org/enso/interpreter/benchmarks/NamedDefaultedArgumentBenchmarks.java rename to Interpreter/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/NamedDefaultedArgumentBenchmarks.java index 05cb7c28416..fed177fadd3 100644 --- a/Interpreter/src/bench/java/org/enso/interpreter/benchmarks/NamedDefaultedArgumentBenchmarks.java +++ b/Interpreter/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/NamedDefaultedArgumentBenchmarks.java @@ -1,6 +1,6 @@ -package org.enso.interpreter.benchmarks; +package org.enso.interpreter.bench.benchmarks.semantic; -import org.enso.interpreter.fixtures.NamedDefaultedArgumentFixtures; +import org.enso.interpreter.bench.fixtures.semantic.NamedDefaultedArgumentFixtures; import org.openjdk.jmh.annotations.*; import java.util.concurrent.TimeUnit; diff --git a/Interpreter/src/bench/java/org/enso/interpreter/benchmarks/RecursionBenchmarks.java b/Interpreter/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/RecursionBenchmarks.java similarity index 87% rename from Interpreter/src/bench/java/org/enso/interpreter/benchmarks/RecursionBenchmarks.java rename to Interpreter/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/RecursionBenchmarks.java index eadde01110c..14b8f5b87d8 100644 --- a/Interpreter/src/bench/java/org/enso/interpreter/benchmarks/RecursionBenchmarks.java +++ b/Interpreter/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/RecursionBenchmarks.java @@ -1,6 +1,6 @@ -package org.enso.interpreter.benchmarks; +package org.enso.interpreter.bench.benchmarks.semantic; -import org.enso.interpreter.fixtures.RecursionFixtures; +import org.enso.interpreter.bench.fixtures.semantic.RecursionFixtures; import org.openjdk.jmh.annotations.*; import java.util.concurrent.TimeUnit; diff --git a/Interpreter/src/bench/scala/org/enso/interpreter/RegressionTest.scala b/Interpreter/src/bench/scala/org/enso/interpreter/bench/RegressionTest.scala similarity index 94% rename from Interpreter/src/bench/scala/org/enso/interpreter/RegressionTest.scala rename to Interpreter/src/bench/scala/org/enso/interpreter/bench/RegressionTest.scala index 32c2e1616de..b26862d023f 100644 --- a/Interpreter/src/bench/scala/org/enso/interpreter/RegressionTest.scala +++ b/Interpreter/src/bench/scala/org/enso/interpreter/bench/RegressionTest.scala @@ -1,4 +1,4 @@ -package org.enso.interpreter +package org.enso.interpreter.bench import org.scalatest.{FlatSpec, Matchers} diff --git a/Interpreter/src/bench/scala/org/enso/interpreter/bench/fixtures/analysis/.gitkeep b/Interpreter/src/bench/scala/org/enso/interpreter/bench/fixtures/analysis/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Interpreter/src/bench/scala/org/enso/interpreter/fixtures/AtomFixtures.scala b/Interpreter/src/bench/scala/org/enso/interpreter/bench/fixtures/semantic/AtomFixtures.scala similarity index 96% rename from Interpreter/src/bench/scala/org/enso/interpreter/fixtures/AtomFixtures.scala rename to Interpreter/src/bench/scala/org/enso/interpreter/bench/fixtures/semantic/AtomFixtures.scala index 0f4f5ff6a0b..4147560592b 100644 --- a/Interpreter/src/bench/scala/org/enso/interpreter/fixtures/AtomFixtures.scala +++ b/Interpreter/src/bench/scala/org/enso/interpreter/bench/fixtures/semantic/AtomFixtures.scala @@ -1,6 +1,6 @@ -package org.enso.interpreter.fixtures +package org.enso.interpreter.bench.fixtures.semantic -import org.enso.interpreter.LanguageRunner +import org.enso.interpreter.test.semantic.LanguageRunner class AtomFixtures extends LanguageRunner { val million: Long = 1000000 diff --git a/Interpreter/src/bench/scala/org/enso/interpreter/fixtures/NamedDefaultedArgumentFixtures.scala b/Interpreter/src/bench/scala/org/enso/interpreter/bench/fixtures/semantic/NamedDefaultedArgumentFixtures.scala similarity index 88% rename from Interpreter/src/bench/scala/org/enso/interpreter/fixtures/NamedDefaultedArgumentFixtures.scala rename to Interpreter/src/bench/scala/org/enso/interpreter/bench/fixtures/semantic/NamedDefaultedArgumentFixtures.scala index 2099bd67698..adaeb5ec6f0 100644 --- a/Interpreter/src/bench/scala/org/enso/interpreter/fixtures/NamedDefaultedArgumentFixtures.scala +++ b/Interpreter/src/bench/scala/org/enso/interpreter/bench/fixtures/semantic/NamedDefaultedArgumentFixtures.scala @@ -1,6 +1,6 @@ -package org.enso.interpreter.fixtures +package org.enso.interpreter.bench.fixtures.semantic -import org.enso.interpreter.LanguageRunner +import org.enso.interpreter.test.semantic.LanguageRunner class NamedDefaultedArgumentFixtures extends LanguageRunner { val hundredMillion: Long = 100000000 diff --git a/Interpreter/src/bench/scala/org/enso/interpreter/fixtures/RecursionFixtures.scala b/Interpreter/src/bench/scala/org/enso/interpreter/bench/fixtures/semantic/RecursionFixtures.scala similarity index 94% rename from Interpreter/src/bench/scala/org/enso/interpreter/fixtures/RecursionFixtures.scala rename to Interpreter/src/bench/scala/org/enso/interpreter/bench/fixtures/semantic/RecursionFixtures.scala index c089de982cd..e4723d347c5 100644 --- a/Interpreter/src/bench/scala/org/enso/interpreter/fixtures/RecursionFixtures.scala +++ b/Interpreter/src/bench/scala/org/enso/interpreter/bench/fixtures/semantic/RecursionFixtures.scala @@ -1,7 +1,7 @@ -package org.enso.interpreter.fixtures +package org.enso.interpreter.bench.fixtures.semantic import org.enso.interpreter.Constants -import org.enso.interpreter.LanguageRunner +import org.enso.interpreter.test.semantic.LanguageRunner class RecursionFixtures extends LanguageRunner { val hundredMillion: Long = 100000000 diff --git a/Interpreter/src/main/java/org/enso/interpreter/node/callable/argument/sorter/CachedArgumentSorterNode.java b/Interpreter/src/main/java/org/enso/interpreter/node/callable/argument/sorter/CachedArgumentSorterNode.java index a9c960a6b4c..f2663ff7271 100644 --- a/Interpreter/src/main/java/org/enso/interpreter/node/callable/argument/sorter/CachedArgumentSorterNode.java +++ b/Interpreter/src/main/java/org/enso/interpreter/node/callable/argument/sorter/CachedArgumentSorterNode.java @@ -5,7 +5,7 @@ import org.enso.interpreter.node.BaseNode; import org.enso.interpreter.node.callable.InvokeCallableNode; import org.enso.interpreter.node.callable.InvokeCallableNodeGen; import org.enso.interpreter.node.callable.dispatch.CallOptimiserNode; -import org.enso.interpreter.optimiser.tco.TailCallException; +import org.enso.interpreter.runtime.control.TailCallException; import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo; import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo.ArgumentMapping; import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo.ArgumentMappingBuilder; diff --git a/Interpreter/src/main/java/org/enso/interpreter/node/callable/dispatch/LoopingCallOptimiserNode.java b/Interpreter/src/main/java/org/enso/interpreter/node/callable/dispatch/LoopingCallOptimiserNode.java index 2ec94c00395..ee964c109c9 100644 --- a/Interpreter/src/main/java/org/enso/interpreter/node/callable/dispatch/LoopingCallOptimiserNode.java +++ b/Interpreter/src/main/java/org/enso/interpreter/node/callable/dispatch/LoopingCallOptimiserNode.java @@ -7,7 +7,7 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.RepeatingNode; import org.enso.interpreter.node.callable.ExecuteCallNode; import org.enso.interpreter.node.callable.ExecuteCallNodeGen; -import org.enso.interpreter.optimiser.tco.TailCallException; +import org.enso.interpreter.runtime.control.TailCallException; /** * A version of {@link CallOptimiserNode} that is fully prepared to handle tail calls. Tail calls diff --git a/Interpreter/src/main/java/org/enso/interpreter/node/callable/dispatch/SimpleCallOptimiserNode.java b/Interpreter/src/main/java/org/enso/interpreter/node/callable/dispatch/SimpleCallOptimiserNode.java index f6851e48c75..33641dd7b0a 100644 --- a/Interpreter/src/main/java/org/enso/interpreter/node/callable/dispatch/SimpleCallOptimiserNode.java +++ b/Interpreter/src/main/java/org/enso/interpreter/node/callable/dispatch/SimpleCallOptimiserNode.java @@ -3,7 +3,7 @@ package org.enso.interpreter.node.callable.dispatch; import com.oracle.truffle.api.CompilerDirectives; import org.enso.interpreter.node.callable.ExecuteCallNode; import org.enso.interpreter.node.callable.ExecuteCallNodeGen; -import org.enso.interpreter.optimiser.tco.TailCallException; +import org.enso.interpreter.runtime.control.TailCallException; /** * Optimistic version of {@link CallOptimiserNode} for the non tail call recursive case. Tries to diff --git a/Interpreter/src/main/java/org/enso/interpreter/optimiser/tco/TailCallException.java b/Interpreter/src/main/java/org/enso/interpreter/runtime/control/TailCallException.java similarity index 96% rename from Interpreter/src/main/java/org/enso/interpreter/optimiser/tco/TailCallException.java rename to Interpreter/src/main/java/org/enso/interpreter/runtime/control/TailCallException.java index 6f2675fb019..d50de13ff49 100644 --- a/Interpreter/src/main/java/org/enso/interpreter/optimiser/tco/TailCallException.java +++ b/Interpreter/src/main/java/org/enso/interpreter/runtime/control/TailCallException.java @@ -1,4 +1,4 @@ -package org.enso.interpreter.optimiser.tco; +package org.enso.interpreter.runtime.control; import com.oracle.truffle.api.nodes.ControlFlowException; import org.enso.interpreter.runtime.callable.function.Function; diff --git a/Interpreter/src/main/scala/org/enso/interpreter/analysis/.gitkeep b/Interpreter/src/main/scala/org/enso/interpreter/analysis/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Interpreter/src/test/scala/org/enso/interpreter/LanguageTest.scala b/Interpreter/src/test/scala/org/enso/interpreter/test/LanguageTest.scala similarity index 79% rename from Interpreter/src/test/scala/org/enso/interpreter/LanguageTest.scala rename to Interpreter/src/test/scala/org/enso/interpreter/test/LanguageTest.scala index 748db17f164..c09109b2923 100644 --- a/Interpreter/src/test/scala/org/enso/interpreter/LanguageTest.scala +++ b/Interpreter/src/test/scala/org/enso/interpreter/test/LanguageTest.scala @@ -1,10 +1,9 @@ -package org.enso.interpreter +package org.enso.interpreter.test.semantic -import org.graalvm.polyglot.Context -import org.graalvm.polyglot.Value +import org.enso.interpreter.{AstGlobalScope, Constants, EnsoParser} +import org.graalvm.polyglot.{Context, Value} import org.scalactic.Equality -import org.scalatest.FlatSpec -import org.scalatest.Matchers +import org.scalatest.{FlatSpec, Matchers} trait LanguageRunner { implicit class RichValue(value: Value) { diff --git a/Interpreter/src/test/scala/org/enso/interpreter/test/analysis/.gitkeep b/Interpreter/src/test/scala/org/enso/interpreter/test/analysis/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Interpreter/src/test/scala/org/enso/interpreter/ConstructorsTest.scala b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/ConstructorsTest.scala similarity index 98% rename from Interpreter/src/test/scala/org/enso/interpreter/ConstructorsTest.scala rename to Interpreter/src/test/scala/org/enso/interpreter/test/semantic/ConstructorsTest.scala index 711b43640c9..f8159de8266 100644 --- a/Interpreter/src/test/scala/org/enso/interpreter/ConstructorsTest.scala +++ b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/ConstructorsTest.scala @@ -1,4 +1,4 @@ -package org.enso.interpreter +package org.enso.interpreter.test.semantic import org.graalvm.polyglot.PolyglotException diff --git a/Interpreter/src/test/scala/org/enso/interpreter/CurryingTest.scala b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/CurryingTest.scala similarity index 96% rename from Interpreter/src/test/scala/org/enso/interpreter/CurryingTest.scala rename to Interpreter/src/test/scala/org/enso/interpreter/test/semantic/CurryingTest.scala index 67ec0230b0a..3aa055c1b34 100644 --- a/Interpreter/src/test/scala/org/enso/interpreter/CurryingTest.scala +++ b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/CurryingTest.scala @@ -1,4 +1,4 @@ -package org.enso.interpreter; +package org.enso.interpreter.test.semantic class CurryingTest extends LanguageTest { "Functions" should "allow partial application" in { diff --git a/Interpreter/src/test/scala/org/enso/interpreter/FunctionArgumentsTest.scala b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/FunctionArgumentsTest.scala similarity index 97% rename from Interpreter/src/test/scala/org/enso/interpreter/FunctionArgumentsTest.scala rename to Interpreter/src/test/scala/org/enso/interpreter/test/semantic/FunctionArgumentsTest.scala index b41a7ea9752..343da68852b 100644 --- a/Interpreter/src/test/scala/org/enso/interpreter/FunctionArgumentsTest.scala +++ b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/FunctionArgumentsTest.scala @@ -1,4 +1,4 @@ -package org.enso.interpreter +package org.enso.interpreter.test.semantic class FunctionArgumentsTest extends LanguageTest { "Functions" should "take arguments and use them in their bodies" in { diff --git a/Interpreter/src/test/scala/org/enso/interpreter/GlobalScopeTest.scala b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/GlobalScopeTest.scala similarity index 98% rename from Interpreter/src/test/scala/org/enso/interpreter/GlobalScopeTest.scala rename to Interpreter/src/test/scala/org/enso/interpreter/test/semantic/GlobalScopeTest.scala index f863fa5883e..00b4017772c 100644 --- a/Interpreter/src/test/scala/org/enso/interpreter/GlobalScopeTest.scala +++ b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/GlobalScopeTest.scala @@ -1,4 +1,4 @@ -package org.enso.interpreter +package org.enso.interpreter.test.semantic import org.graalvm.polyglot.PolyglotException diff --git a/Interpreter/src/test/scala/org/enso/interpreter/ImportsTest.scala b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/ImportsTest.scala similarity index 94% rename from Interpreter/src/test/scala/org/enso/interpreter/ImportsTest.scala rename to Interpreter/src/test/scala/org/enso/interpreter/test/semantic/ImportsTest.scala index b7cd2231657..5e05d89641e 100644 --- a/Interpreter/src/test/scala/org/enso/interpreter/ImportsTest.scala +++ b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/ImportsTest.scala @@ -1,4 +1,4 @@ -package org.enso.interpreter +package org.enso.interpreter.test.semantic import org.graalvm.polyglot.PolyglotException diff --git a/Interpreter/src/test/scala/org/enso/interpreter/InteropTest.scala b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/InteropTest.scala similarity index 95% rename from Interpreter/src/test/scala/org/enso/interpreter/InteropTest.scala rename to Interpreter/src/test/scala/org/enso/interpreter/test/semantic/InteropTest.scala index dd20e4e9b8e..0bf1a813ae6 100644 --- a/Interpreter/src/test/scala/org/enso/interpreter/InteropTest.scala +++ b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/InteropTest.scala @@ -1,4 +1,4 @@ -package org.enso.interpreter +package org.enso.interpreter.test.semantic class InteropTest extends LanguageTest { "Interop library" should "support tail recursive functions" in { diff --git a/Interpreter/src/test/scala/org/enso/interpreter/LexicalScopeTest.scala b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/LexicalScopeTest.scala similarity index 97% rename from Interpreter/src/test/scala/org/enso/interpreter/LexicalScopeTest.scala rename to Interpreter/src/test/scala/org/enso/interpreter/test/semantic/LexicalScopeTest.scala index cf4805b2e8a..dc82863a4c9 100644 --- a/Interpreter/src/test/scala/org/enso/interpreter/LexicalScopeTest.scala +++ b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/LexicalScopeTest.scala @@ -1,4 +1,4 @@ -package org.enso.interpreter +package org.enso.interpreter.test.semantic import org.graalvm.polyglot.PolyglotException diff --git a/Interpreter/src/test/scala/org/enso/interpreter/MethodsTest.scala b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/MethodsTest.scala similarity index 96% rename from Interpreter/src/test/scala/org/enso/interpreter/MethodsTest.scala rename to Interpreter/src/test/scala/org/enso/interpreter/test/semantic/MethodsTest.scala index 8fe67bb89e9..1980ea8289c 100644 --- a/Interpreter/src/test/scala/org/enso/interpreter/MethodsTest.scala +++ b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/MethodsTest.scala @@ -1,4 +1,4 @@ -package org.enso.interpreter +package org.enso.interpreter.test.semantic import org.graalvm.polyglot.PolyglotException diff --git a/Interpreter/src/test/scala/org/enso/interpreter/NamedArgumentsTest.scala b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/NamedArgumentsTest.scala similarity index 99% rename from Interpreter/src/test/scala/org/enso/interpreter/NamedArgumentsTest.scala rename to Interpreter/src/test/scala/org/enso/interpreter/test/semantic/NamedArgumentsTest.scala index 0b5f3745284..0558eb11c83 100644 --- a/Interpreter/src/test/scala/org/enso/interpreter/NamedArgumentsTest.scala +++ b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/NamedArgumentsTest.scala @@ -1,4 +1,4 @@ -package org.enso.interpreter +package org.enso.interpreter.test.semantic import org.graalvm.polyglot.PolyglotException diff --git a/Interpreter/src/test/scala/org/enso/interpreter/PackageTest.scala b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/PackageTest.scala similarity index 78% rename from Interpreter/src/test/scala/org/enso/interpreter/PackageTest.scala rename to Interpreter/src/test/scala/org/enso/interpreter/test/semantic/PackageTest.scala index be02f65c96e..6082b792d96 100644 --- a/Interpreter/src/test/scala/org/enso/interpreter/PackageTest.scala +++ b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/PackageTest.scala @@ -1,14 +1,12 @@ -package org.enso.interpreter +package org.enso.interpreter.test.semantic import java.io.File +import org.enso.interpreter.Constants import org.enso.interpreter.runtime.RuntimeOptions -import org.graalvm.polyglot.Context -import org.graalvm.polyglot.Source -import org.graalvm.polyglot.Value -import org.scalatest.FlatSpec -import org.scalatest.Matchers import org.enso.pkg.Package +import org.graalvm.polyglot.{Context, Source, Value} +import org.scalatest.{FlatSpec, Matchers} trait PackageTest extends FlatSpec with Matchers with ValueEquality { diff --git a/Interpreter/src/test/scala/org/enso/interpreter/SimpleArithmeticTest.scala b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/SimpleArithmeticTest.scala similarity index 82% rename from Interpreter/src/test/scala/org/enso/interpreter/SimpleArithmeticTest.scala rename to Interpreter/src/test/scala/org/enso/interpreter/test/semantic/SimpleArithmeticTest.scala index 9ea9bad13d3..07e2c30cd15 100644 --- a/Interpreter/src/test/scala/org/enso/interpreter/SimpleArithmeticTest.scala +++ b/Interpreter/src/test/scala/org/enso/interpreter/test/semantic/SimpleArithmeticTest.scala @@ -1,4 +1,4 @@ -package org.enso.interpreter +package org.enso.interpreter.test.semantic class SimpleArithmeticTest extends LanguageTest { "1 + 1" should "equal 2" in {