From 190c9814cf1a26a1cb762e1b778f9bf55d9b0c04 Mon Sep 17 00:00:00 2001 From: Parker TenBroeck <51721964+ParkerTenBroeck@users.noreply.github.com> Date: Thu, 1 May 2025 11:11:04 -0400 Subject: [PATCH] reorganized --- src/{Examples.java => AsyncExamples.java} | 14 +++++++------- src/Lexer.java | 2 +- src/Main.java | 12 ++++++------ src/{async_example => async_runtime}/Delay.java | 6 +++--- src/{async_example => async_runtime}/Jokio.java | 6 +++--- .../net/ServerSocket.java | 7 +++---- .../net/Socket.java | 6 +++--- src/{generator => }/future/Future.java | 2 +- src/{generator => }/future/Waker.java | 2 +- src/{generator => }/gen/Gen.java | 2 +- src/{generator => generators}/RT.java | 4 ++-- .../runtime => generators/loadtime}/Frame.java | 4 +--- .../loadtime}/FrameTracker.java | 3 +-- .../loadtime}/GeneratorClassLoader.java | 10 +++++----- .../loadtime}/ParamConsumer.java | 2 +- .../loadtime}/ReplacementKind.java | 2 +- .../loadtime}/SavedStateTracker.java | 2 +- .../loadtime}/SpecialMethod.java | 2 +- .../loadtime}/SpecialMethodHandler.java | 2 +- .../loadtime}/StateBuilder.java | 2 +- .../loadtime}/StateMachineBuilder.java | 2 +- .../loadtime}/future/FutureSMBuilder.java | 8 ++++---- .../loadtime}/gen/GenSMBuilder.java | 6 +++--- 23 files changed, 52 insertions(+), 56 deletions(-) rename src/{Examples.java => AsyncExamples.java} (92%) rename src/{async_example => async_runtime}/Delay.java (93%) rename src/{async_example => async_runtime}/Jokio.java (96%) rename src/{async_example => async_runtime}/net/ServerSocket.java (96%) rename src/{async_example => async_runtime}/net/Socket.java (98%) rename src/{generator => }/future/Future.java (96%) rename src/{generator => }/future/Waker.java (82%) rename src/{generator => }/gen/Gen.java (96%) rename src/{generator => generators}/RT.java (84%) rename src/{generator/runtime => generators/loadtime}/Frame.java (93%) rename src/{generator/runtime => generators/loadtime}/FrameTracker.java (99%) rename src/{generator/runtime => generators/loadtime}/GeneratorClassLoader.java (96%) rename src/{generator/runtime => generators/loadtime}/ParamConsumer.java (81%) rename src/{generator/runtime => generators/loadtime}/ReplacementKind.java (77%) rename src/{generator/runtime => generators/loadtime}/SavedStateTracker.java (98%) rename src/{generator/runtime => generators/loadtime}/SpecialMethod.java (84%) rename src/{generator/runtime => generators/loadtime}/SpecialMethodHandler.java (92%) rename src/{generator/runtime => generators/loadtime}/StateBuilder.java (97%) rename src/{generator/runtime => generators/loadtime}/StateMachineBuilder.java (99%) rename src/{generator/runtime => generators/loadtime}/future/FutureSMBuilder.java (98%) rename src/{generator/runtime => generators/loadtime}/gen/GenSMBuilder.java (98%) diff --git a/src/Examples.java b/src/AsyncExamples.java similarity index 92% rename from src/Examples.java rename to src/AsyncExamples.java index bfe1e15..252dfd0 100644 --- a/src/Examples.java +++ b/src/AsyncExamples.java @@ -1,16 +1,16 @@ -import async_example.Delay; -import async_example.Jokio; -import async_example.net.ServerSocket; -import async_example.net.Socket; -import generator.future.Future; -import generator.future.Waker; +import async_runtime.Delay; +import async_runtime.Jokio; +import async_runtime.net.ServerSocket; +import async_runtime.net.Socket; +import future.Future; +import future.Waker; import java.io.IOException; import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -public class Examples { +public class AsyncExamples { static long sent = 0; static long received = 0; diff --git a/src/Lexer.java b/src/Lexer.java index 9bc3787..bfaad65 100644 --- a/src/Lexer.java +++ b/src/Lexer.java @@ -1,4 +1,4 @@ -import generator.gen.Gen; +import gen.Gen; public class Lexer { public sealed interface Token{} diff --git a/src/Main.java b/src/Main.java index ec9c29c..38dfd8f 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,8 +1,8 @@ -import async_example.Jokio; -import generator.RT; -import generator.future.Future; -import generator.future.Waker; -import generator.gen.Gen; +import async_runtime.Jokio; +import generators.RT; +import future.Future; +import future.Waker; +import gen.Gen; public class Main implements Runnable { public static void main(String[] args) { @@ -57,7 +57,7 @@ public class Main implements Runnable { } void await(){ - new Jokio().blocking(Examples.test()); + new Jokio().blocking(AsyncExamples.test()); } diff --git a/src/async_example/Delay.java b/src/async_runtime/Delay.java similarity index 93% rename from src/async_example/Delay.java rename to src/async_runtime/Delay.java index c57c1c4..72d30e9 100644 --- a/src/async_example/Delay.java +++ b/src/async_runtime/Delay.java @@ -1,7 +1,7 @@ -package async_example; +package async_runtime; -import generator.future.Future; -import generator.future.Waker; +import future.Future; +import future.Waker; import java.util.Timer; import java.util.TimerTask; diff --git a/src/async_example/Jokio.java b/src/async_runtime/Jokio.java similarity index 96% rename from src/async_example/Jokio.java rename to src/async_runtime/Jokio.java index 2ddd19c..3e1e0e4 100644 --- a/src/async_example/Jokio.java +++ b/src/async_runtime/Jokio.java @@ -1,7 +1,7 @@ -package async_example; +package async_runtime; -import generator.future.Future; -import generator.future.Waker; +import future.Future; +import future.Waker; import java.util.ArrayDeque; import java.util.HashSet; diff --git a/src/async_example/net/ServerSocket.java b/src/async_runtime/net/ServerSocket.java similarity index 96% rename from src/async_example/net/ServerSocket.java rename to src/async_runtime/net/ServerSocket.java index 968a2a6..5832ecf 100644 --- a/src/async_example/net/ServerSocket.java +++ b/src/async_runtime/net/ServerSocket.java @@ -1,14 +1,13 @@ -package async_example.net; +package async_runtime.net; -import generator.future.Future; -import generator.future.Waker; +import future.Future; +import future.Waker; import java.io.IOException; import java.net.InetSocketAddress; import java.nio.channels.SelectionKey; import java.nio.channels.Selector; import java.nio.channels.ServerSocketChannel; -import java.nio.channels.SocketChannel; import java.util.ArrayDeque; public class ServerSocket implements AutoCloseable{ diff --git a/src/async_example/net/Socket.java b/src/async_runtime/net/Socket.java similarity index 98% rename from src/async_example/net/Socket.java rename to src/async_runtime/net/Socket.java index e8cd424..eaf8063 100644 --- a/src/async_example/net/Socket.java +++ b/src/async_runtime/net/Socket.java @@ -1,7 +1,7 @@ -package async_example.net; +package async_runtime.net; -import generator.future.Future; -import generator.future.Waker; +import future.Future; +import future.Waker; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/src/generator/future/Future.java b/src/future/Future.java similarity index 96% rename from src/generator/future/Future.java rename to src/future/Future.java index e4fd208..a64d7ad 100644 --- a/src/generator/future/Future.java +++ b/src/future/Future.java @@ -1,4 +1,4 @@ -package generator.future; +package future; public interface Future { diff --git a/src/generator/future/Waker.java b/src/future/Waker.java similarity index 82% rename from src/generator/future/Waker.java rename to src/future/Waker.java index 2541766..a332f12 100644 --- a/src/generator/future/Waker.java +++ b/src/future/Waker.java @@ -1,4 +1,4 @@ -package generator.future; +package future; public interface Waker { diff --git a/src/generator/gen/Gen.java b/src/gen/Gen.java similarity index 96% rename from src/generator/gen/Gen.java rename to src/gen/Gen.java index 18c4104..86df4b3 100644 --- a/src/generator/gen/Gen.java +++ b/src/gen/Gen.java @@ -1,4 +1,4 @@ -package generator.gen; +package gen; public interface Gen { Res next(); diff --git a/src/generator/RT.java b/src/generators/RT.java similarity index 84% rename from src/generator/RT.java rename to src/generators/RT.java index 5e450e4..84baacc 100644 --- a/src/generator/RT.java +++ b/src/generators/RT.java @@ -1,7 +1,7 @@ -package generator; +package generators; -import generator.runtime.GeneratorClassLoader; +import generators.loadtime.GeneratorClassLoader; public class RT { public static void runWithGeneratorSupport(Class clazz){ diff --git a/src/generator/runtime/Frame.java b/src/generators/loadtime/Frame.java similarity index 93% rename from src/generator/runtime/Frame.java rename to src/generators/loadtime/Frame.java index 0c375b6..78a19e9 100644 --- a/src/generator/runtime/Frame.java +++ b/src/generators/loadtime/Frame.java @@ -1,8 +1,6 @@ -package generator.runtime; +package generators.loadtime; import java.lang.classfile.CodeBuilder; -import java.lang.classfile.TypeKind; -import java.lang.constant.ConstantDescs; import java.util.Arrays; public record Frame(FrameTracker.Type[] locals, FrameTracker.Type[] stack) { diff --git a/src/generator/runtime/FrameTracker.java b/src/generators/loadtime/FrameTracker.java similarity index 99% rename from src/generator/runtime/FrameTracker.java rename to src/generators/loadtime/FrameTracker.java index fb8897c..c2eb8de 100644 --- a/src/generator/runtime/FrameTracker.java +++ b/src/generators/loadtime/FrameTracker.java @@ -1,4 +1,4 @@ -package generator.runtime; +package generators.loadtime; import java.lang.classfile.*; import java.lang.classfile.attribute.RuntimeInvisibleTypeAnnotationsAttribute; @@ -8,7 +8,6 @@ import java.lang.classfile.attribute.StackMapTableAttribute; import java.lang.classfile.instruction.*; import java.lang.constant.*; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.Objects; diff --git a/src/generator/runtime/GeneratorClassLoader.java b/src/generators/loadtime/GeneratorClassLoader.java similarity index 96% rename from src/generator/runtime/GeneratorClassLoader.java rename to src/generators/loadtime/GeneratorClassLoader.java index e8b86b0..54de2fb 100644 --- a/src/generator/runtime/GeneratorClassLoader.java +++ b/src/generators/loadtime/GeneratorClassLoader.java @@ -1,9 +1,9 @@ -package generator.runtime; +package generators.loadtime; -import generator.future.Future; -import generator.gen.Gen; -import generator.runtime.future.FutureSMBuilder; -import generator.runtime.gen.GenSMBuilder; +import future.Future; +import gen.Gen; +import generators.loadtime.future.FutureSMBuilder; +import generators.loadtime.gen.GenSMBuilder; import java.io.IOException; import java.lang.classfile.*; diff --git a/src/generator/runtime/ParamConsumer.java b/src/generators/loadtime/ParamConsumer.java similarity index 81% rename from src/generator/runtime/ParamConsumer.java rename to src/generators/loadtime/ParamConsumer.java index 8f1548b..2c1c38b 100644 --- a/src/generator/runtime/ParamConsumer.java +++ b/src/generators/loadtime/ParamConsumer.java @@ -1,4 +1,4 @@ -package generator.runtime; +package generators.loadtime; import java.lang.constant.ClassDesc; diff --git a/src/generator/runtime/ReplacementKind.java b/src/generators/loadtime/ReplacementKind.java similarity index 77% rename from src/generator/runtime/ReplacementKind.java rename to src/generators/loadtime/ReplacementKind.java index 9e1d461..b5bfd8d 100644 --- a/src/generator/runtime/ReplacementKind.java +++ b/src/generators/loadtime/ReplacementKind.java @@ -1,4 +1,4 @@ -package generator.runtime; +package generators.loadtime; public enum ReplacementKind { ImmediateReplacingPop, diff --git a/src/generator/runtime/SavedStateTracker.java b/src/generators/loadtime/SavedStateTracker.java similarity index 98% rename from src/generator/runtime/SavedStateTracker.java rename to src/generators/loadtime/SavedStateTracker.java index 357cbda..927a7bf 100644 --- a/src/generator/runtime/SavedStateTracker.java +++ b/src/generators/loadtime/SavedStateTracker.java @@ -1,4 +1,4 @@ -package generator.runtime; +package generators.loadtime; import java.lang.classfile.CodeBuilder; import java.lang.classfile.TypeKind; diff --git a/src/generator/runtime/SpecialMethod.java b/src/generators/loadtime/SpecialMethod.java similarity index 84% rename from src/generator/runtime/SpecialMethod.java rename to src/generators/loadtime/SpecialMethod.java index 0338acf..12819aa 100644 --- a/src/generator/runtime/SpecialMethod.java +++ b/src/generators/loadtime/SpecialMethod.java @@ -1,4 +1,4 @@ -package generator.runtime; +package generators.loadtime; import java.lang.constant.ClassDesc; import java.lang.constant.MethodTypeDesc; diff --git a/src/generator/runtime/SpecialMethodHandler.java b/src/generators/loadtime/SpecialMethodHandler.java similarity index 92% rename from src/generator/runtime/SpecialMethodHandler.java rename to src/generators/loadtime/SpecialMethodHandler.java index 62e755f..737e1bd 100644 --- a/src/generator/runtime/SpecialMethodHandler.java +++ b/src/generators/loadtime/SpecialMethodHandler.java @@ -1,4 +1,4 @@ -package generator.runtime; +package generators.loadtime; import java.lang.classfile.CodeBuilder; diff --git a/src/generator/runtime/StateBuilder.java b/src/generators/loadtime/StateBuilder.java similarity index 97% rename from src/generator/runtime/StateBuilder.java rename to src/generators/loadtime/StateBuilder.java index b418156..c148e87 100644 --- a/src/generator/runtime/StateBuilder.java +++ b/src/generators/loadtime/StateBuilder.java @@ -1,4 +1,4 @@ -package generator.runtime; +package generators.loadtime; import java.lang.classfile.CodeBuilder; import java.lang.classfile.Label; diff --git a/src/generator/runtime/StateMachineBuilder.java b/src/generators/loadtime/StateMachineBuilder.java similarity index 99% rename from src/generator/runtime/StateMachineBuilder.java rename to src/generators/loadtime/StateMachineBuilder.java index 84acec0..661d0ad 100644 --- a/src/generator/runtime/StateMachineBuilder.java +++ b/src/generators/loadtime/StateMachineBuilder.java @@ -1,4 +1,4 @@ -package generator.runtime; +package generators.loadtime; import java.lang.classfile.*; import java.lang.classfile.attribute.InnerClassInfo; diff --git a/src/generator/runtime/future/FutureSMBuilder.java b/src/generators/loadtime/future/FutureSMBuilder.java similarity index 98% rename from src/generator/runtime/future/FutureSMBuilder.java rename to src/generators/loadtime/future/FutureSMBuilder.java index 16f0d43..5f91876 100644 --- a/src/generator/runtime/future/FutureSMBuilder.java +++ b/src/generators/loadtime/future/FutureSMBuilder.java @@ -1,8 +1,8 @@ -package generator.runtime.future; +package generators.loadtime.future; -import generator.future.Future; -import generator.future.Waker; -import generator.runtime.*; +import future.Future; +import future.Waker; +import generators.loadtime.*; import java.lang.classfile.*; import java.lang.constant.ClassDesc; diff --git a/src/generator/runtime/gen/GenSMBuilder.java b/src/generators/loadtime/gen/GenSMBuilder.java similarity index 98% rename from src/generator/runtime/gen/GenSMBuilder.java rename to src/generators/loadtime/gen/GenSMBuilder.java index 454c46b..bb4516c 100644 --- a/src/generator/runtime/gen/GenSMBuilder.java +++ b/src/generators/loadtime/gen/GenSMBuilder.java @@ -1,7 +1,7 @@ -package generator.runtime.gen; +package generators.loadtime.gen; -import generator.gen.Gen; -import generator.runtime.*; +import gen.Gen; +import generators.loadtime.*; import java.lang.classfile.*; import java.lang.constant.ClassDesc;