make common project classes hierarchy flat

2025-01-12 04:31:32 +02:00
parent cacffd01e8
commit c0b23d50e5
43 changed files with 58 additions and 74 deletions
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/Compiler.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/Compiler.java
@@ -2,10 +2,10 @@ package me.topchetoeu.j2s.runtime;

 import java.util.function.Function;

+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.common.Filename;
+import me.topchetoeu.j2s.common.Key;
 import me.topchetoeu.j2s.common.Location;
-import me.topchetoeu.j2s.common.environment.Environment;
-import me.topchetoeu.j2s.common.environment.Key;
 import me.topchetoeu.j2s.runtime.exceptions.EngineException;
 import me.topchetoeu.j2s.runtime.values.functions.FunctionValue;

--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/EventLoop.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/EventLoop.java
@@ -3,9 +3,9 @@ package me.topchetoeu.j2s.runtime;
 import java.util.concurrent.Future;
 import java.util.function.Supplier;

+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.common.Filename;
-import me.topchetoeu.j2s.common.environment.Environment;
-import me.topchetoeu.j2s.common.environment.Key;
+import me.topchetoeu.j2s.common.Key;
 import me.topchetoeu.j2s.runtime.exceptions.EngineException;
 import me.topchetoeu.j2s.runtime.values.Value;
 import me.topchetoeu.j2s.runtime.values.functions.FunctionValue;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/Frame.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/Frame.java
@@ -4,9 +4,9 @@ import java.util.Arrays;
 import java.util.Stack;
 import java.util.concurrent.CancellationException;

+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.common.Instruction;
-import me.topchetoeu.j2s.common.environment.Environment;
-import me.topchetoeu.j2s.common.environment.Key;
+import me.topchetoeu.j2s.common.Key;
 import me.topchetoeu.j2s.runtime.debug.DebugContext;
 import me.topchetoeu.j2s.runtime.exceptions.EngineException;
 import me.topchetoeu.j2s.runtime.values.Value;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/InstructionRunner.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/InstructionRunner.java
@@ -4,9 +4,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Optional;

+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.common.Instruction;
 import me.topchetoeu.j2s.common.Operation;
-import me.topchetoeu.j2s.common.environment.Environment;
 import me.topchetoeu.j2s.runtime.exceptions.EngineException;
 import me.topchetoeu.j2s.runtime.values.Value;
 import me.topchetoeu.j2s.runtime.values.functions.CodeFunction;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/debug/DebugContext.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/debug/DebugContext.java
@@ -3,12 +3,12 @@ package me.topchetoeu.j2s.runtime.debug;
 import java.util.HashMap;
 import java.util.WeakHashMap;

+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.common.Filename;
 import me.topchetoeu.j2s.common.FunctionBody;
+import me.topchetoeu.j2s.common.FunctionMap;
 import me.topchetoeu.j2s.common.Instruction;
-import me.topchetoeu.j2s.common.environment.Environment;
-import me.topchetoeu.j2s.common.environment.Key;
-import me.topchetoeu.j2s.common.mapping.FunctionMap;
+import me.topchetoeu.j2s.common.Key;
 import me.topchetoeu.j2s.runtime.Frame;
 import me.topchetoeu.j2s.runtime.exceptions.EngineException;
 import me.topchetoeu.j2s.runtime.values.Value;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/debug/DebugHandler.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/debug/DebugHandler.java
@@ -1,10 +1,10 @@
 package me.topchetoeu.j2s.runtime.debug;

+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.common.Filename;
 import me.topchetoeu.j2s.common.FunctionBody;
+import me.topchetoeu.j2s.common.FunctionMap;
 import me.topchetoeu.j2s.common.Instruction;
-import me.topchetoeu.j2s.common.environment.Environment;
-import me.topchetoeu.j2s.common.mapping.FunctionMap;
 import me.topchetoeu.j2s.runtime.Frame;
 import me.topchetoeu.j2s.runtime.exceptions.EngineException;
 import me.topchetoeu.j2s.runtime.values.Value;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/exceptions/EngineException.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/exceptions/EngineException.java
@@ -3,8 +3,8 @@ package me.topchetoeu.j2s.runtime.exceptions;
 import java.util.ArrayList;
 import java.util.List;

+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.common.Location;
-import me.topchetoeu.j2s.common.environment.Environment;
 import me.topchetoeu.j2s.runtime.values.Value;
 import me.topchetoeu.j2s.runtime.values.objects.ObjectValue;
 import me.topchetoeu.j2s.runtime.values.objects.ObjectValue.PrototypeProvider;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/KeyCache.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/KeyCache.java
@@ -1,6 +1,6 @@
 package me.topchetoeu.j2s.runtime.values;

-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.values.primitives.StringValue;
 import me.topchetoeu.j2s.runtime.values.primitives.SymbolValue;
 import me.topchetoeu.j2s.runtime.values.primitives.numbers.NumberValue;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/Member.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/Member.java
@@ -2,7 +2,7 @@ package me.topchetoeu.j2s.runtime.values;

 import java.util.Optional;

-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.values.functions.FunctionValue;
 import me.topchetoeu.j2s.runtime.values.objects.ObjectValue;
 import me.topchetoeu.j2s.runtime.values.primitives.BoolValue;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/Value.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/Value.java
@@ -14,9 +14,9 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;

+import me.topchetoeu.j2s.common.Environment;
+import me.topchetoeu.j2s.common.Key;
 import me.topchetoeu.j2s.common.SyntaxException;
-import me.topchetoeu.j2s.common.environment.Environment;
-import me.topchetoeu.j2s.common.environment.Key;
 import me.topchetoeu.j2s.runtime.EventLoop;
 import me.topchetoeu.j2s.runtime.exceptions.EngineException;
 import me.topchetoeu.j2s.runtime.values.Member.PropertyMember;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/functions/Arguments.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/functions/Arguments.java
@@ -1,7 +1,7 @@
 package me.topchetoeu.j2s.runtime.values.functions;


-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.values.Value;
 import me.topchetoeu.j2s.runtime.values.objects.ObjectValue;
 import me.topchetoeu.j2s.runtime.values.primitives.UserValue;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/functions/CodeFunction.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/functions/CodeFunction.java
@@ -1,7 +1,7 @@
 package me.topchetoeu.j2s.runtime.values.functions;

+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.common.FunctionBody;
-import me.topchetoeu.j2s.common.environment.Environment;
 import me.topchetoeu.j2s.runtime.Frame;
 import me.topchetoeu.j2s.runtime.values.Value;
 import me.topchetoeu.j2s.runtime.values.objects.ObjectValue;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/functions/FunctionValue.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/functions/FunctionValue.java
@@ -5,7 +5,7 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;

-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.debug.DebugContext;
 import me.topchetoeu.j2s.runtime.exceptions.EngineException;
 import me.topchetoeu.j2s.runtime.values.KeyCache;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/functions/NativeFunction.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/functions/NativeFunction.java
@@ -1,6 +1,6 @@
 package me.topchetoeu.j2s.runtime.values.functions;

-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.values.Value;

 public final class NativeFunction extends FunctionValue {
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/objects/ArrayLikeValue.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/objects/ArrayLikeValue.java
@@ -7,7 +7,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;

-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.exceptions.EngineException;
 import me.topchetoeu.j2s.runtime.values.KeyCache;
 import me.topchetoeu.j2s.runtime.values.Member;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/objects/ArrayValue.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/objects/ArrayValue.java
@@ -6,7 +6,7 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.stream.Stream;

-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.values.Value;
 import me.topchetoeu.j2s.runtime.values.primitives.VoidValue;

--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/objects/ObjectValue.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/objects/ObjectValue.java
@@ -10,8 +10,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;

-import me.topchetoeu.j2s.common.environment.Environment;
-import me.topchetoeu.j2s.common.environment.Key;
+import me.topchetoeu.j2s.common.Environment;
+import me.topchetoeu.j2s.common.Key;
 import me.topchetoeu.j2s.runtime.exceptions.EngineException;
 import me.topchetoeu.j2s.runtime.values.KeyCache;
 import me.topchetoeu.j2s.runtime.values.Member;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/objects/buffers/TypedArrayValue.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/objects/buffers/TypedArrayValue.java
@@ -2,7 +2,7 @@ package me.topchetoeu.j2s.runtime.values.objects.buffers;

 import java.util.WeakHashMap;

-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.values.Value;
 import me.topchetoeu.j2s.runtime.values.objects.ArrayLikeValue;
 import me.topchetoeu.j2s.runtime.values.objects.ObjectValue;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/BoolValue.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/BoolValue.java
@@ -1,6 +1,6 @@
 package me.topchetoeu.j2s.runtime.values.primitives;

-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.values.objects.ObjectValue;
 import me.topchetoeu.j2s.runtime.values.primitives.numbers.NumberValue;

--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/PrimitiveValue.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/PrimitiveValue.java
@@ -4,7 +4,7 @@ import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;

-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.values.KeyCache;
 import me.topchetoeu.j2s.runtime.values.Member;
 import me.topchetoeu.j2s.runtime.values.Value;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/StringValue.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/StringValue.java
@@ -7,8 +7,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.WeakHashMap;

+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.common.StringifyUtils;
-import me.topchetoeu.j2s.common.environment.Environment;
 import me.topchetoeu.j2s.runtime.values.KeyCache;
 import me.topchetoeu.j2s.runtime.values.Member;
 import me.topchetoeu.j2s.runtime.values.Member.FieldMember;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/SymbolValue.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/SymbolValue.java
@@ -5,7 +5,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;

-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.exceptions.EngineException;
 import me.topchetoeu.j2s.runtime.values.Value;
 import me.topchetoeu.j2s.runtime.values.objects.ObjectValue;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/UserValue.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/UserValue.java
@@ -7,7 +7,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;

-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.values.KeyCache;
 import me.topchetoeu.j2s.runtime.values.Member;
 import me.topchetoeu.j2s.runtime.values.Value;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/VoidValue.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/VoidValue.java
@@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;

-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.exceptions.EngineException;
 import me.topchetoeu.j2s.runtime.values.KeyCache;
 import me.topchetoeu.j2s.runtime.values.Member;
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/numbers/IntValue.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/numbers/IntValue.java
@@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;

-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.values.objects.ObjectValue;

 public final class IntValue extends NumberValue {
--- a/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/numbers/NumberValue.java
+++ b/runtime/src/main/java/me/topchetoeu/j2s/runtime/values/primitives/numbers/NumberValue.java
@@ -1,6 +1,6 @@
 package me.topchetoeu.j2s.runtime.values.primitives.numbers;

-import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.Environment;
 import me.topchetoeu.j2s.runtime.values.objects.ObjectValue;
 import me.topchetoeu.j2s.runtime.values.primitives.PrimitiveValue;
 import me.topchetoeu.j2s.runtime.values.primitives.StringValue;