migrated to gradle

.gitattributes

@@ -0,0 +1,12 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+
+# Binary files should be left untouched
+*.jar           binary
+

.gitignore

@@ -1,7 +1,21 @@
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
 ### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
 out/
 !**/src/main/**/out/
 !**/src/test/**/out/
+.idea
 
 ### Eclipse ###
 .apt_generated
@@ -28,5 +42,3 @@ bin/
 ### Mac OS ###
 .DS_Store
 
-.idea
-*.iml

app/build.gradle.kts

@@ -0,0 +1,21 @@
+plugins {
+    application
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation(project(":lib"))
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(24)
+    }
+}
+
+application {
+    mainClass = "demo.Main"
+}

app/src/main/java/demo/AsyncExamples.java

@@ -1,8 +1,10 @@
-import async_runtime.Jokio;
-import async_runtime.io.net.ServerSocket;
-import async_runtime.io.net.Socket;
-import future.Future;
-import generators.loadtime.future.Cancellation;
+package demo;
+
+import com.parkertenbroeck.async_runtime.Jokio;
+import com.parkertenbroeck.async_runtime.io.net.ServerSocket;
+import com.parkertenbroeck.async_runtime.io.net.Socket;
+import com.parkertenbroeck.future.Future;
+import com.parkertenbroeck.generators.loadtime.future.Cancellation;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -13,13 +15,16 @@ public class AsyncExamples {
 
     public static Future<Void, RuntimeException> run() throws IOException {
         Jokio.runtime().await().spawn(server());
-
         for(int i = 0; i < 50; i ++){
             var builder = new StringBuilder();
             for(int c = 0; c < 4096; c ++)
                 builder.append((char)((Math.random()*('z'-'a')+'a')));
             Jokio.runtime().await().spawn(verify_echo(builder.toString()));
         }
+        Runnable meow = () -> {
+            System.out.println();
+        };
+        meow.run();
 
         return Future.ret();
     }

app/src/main/java/demo/Lexer.java

@@ -0,0 +1,69 @@
+package demo;
+
+import com.parkertenbroeck.gen.Gen;
+
+public class Lexer {
+    public sealed interface Token{}
+    public enum Punc implements Token {
+        LPar,
+        RPar,
+        Add,
+        Sub,
+        Div,
+        Mul,
+        Equals,
+        Carrot,
+        Comma
+    }
+
+    public record Ident(String ident) implements Token {}
+    public record Numeric(double val) implements Token {}
+
+    public static Gen<Token, Void> parse(String input) {
+        int start;
+        int pos = 0;
+        while(true){
+            if (input.length() <= pos)
+                return Gen.ret();
+            start = pos;
+            char curr = input.charAt(pos++);
+
+            switch (curr){
+                case '(' -> Gen.yield(Punc.LPar);
+                case ')' -> Gen.yield(Punc.RPar);
+                case '+' -> Gen.yield(Punc.Add);
+                case '-' -> Gen.yield(Punc.Sub);
+                case '/' -> Gen.yield(Punc.Div);
+                case '*' -> Gen.yield(Punc.Mul);
+                case ',' -> Gen.yield(Punc.Comma);
+                case '^' -> Gen.yield(Punc.Carrot);
+                case '=' -> Gen.yield(Punc.Equals);
+//                case Character c when Character.isWhitespace(c) -> {}
+//                case Character c when Character.isAlphabetic(c) -> {
+//                    while((Character.isLetter(curr) || Character.isLetterOrDigit(curr))){
+//                        if(pos>=input.length())break;
+//                        curr = input.charAt(pos++);
+//                    }
+//                    Gen.yield(new Ident(input.substring(start, pos-1)));
+//                }
+//                case Character c when '0' <= c && c <= '9' -> {
+//                    boolean exp = false;
+//                    while(('0' <= curr && curr <= '9') || curr == '_' || curr == '.'){
+//                        if(pos>=input.length())break;
+//                        curr = input.charAt(pos++);
+//                        if(curr=='e'||curr=='E'){
+//                            if(exp) throw new RuntimeException("Exponent Already included");
+//                            exp = true;
+//                            if(pos+2>=input.length())
+//                                throw new RuntimeException("Expected another character after exponent");
+//                            curr = input.charAt(++pos); pos++;
+//                        }
+//                    }
+//
+//                    Gen.yield(new Numeric(Double.parseDouble(input.substring(start, pos-1).replace("_", ""))));
+//                }
+                default -> throw new RuntimeException("Invalid char " + curr);
+            }
+        }
+    }
+}

app/src/main/java/demo/Main.java

@@ -1,9 +1,11 @@
-import async_runtime.Jokio;
-import async_runtime.io.fs.File;
-import generators.RT;
-import future.Future;
-import gen.Gen;
-import generators.loadtime.future.Cancellation;
+package demo;
+
+import com.parkertenbroeck.async_runtime.Jokio;
+import com.parkertenbroeck.async_runtime.io.fs.File;
+import com.parkertenbroeck.generators.RT;
+import com.parkertenbroeck.future.Future;
+import com.parkertenbroeck.gen.Gen;
+import com.parkertenbroeck.generators.loadtime.future.Cancellation;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -18,19 +20,8 @@ public class Main implements Runnable {
 
     @Override
     public void run() {
-
-        int value = 0;
-        String meow = "";
-        Function<Integer, String> test = new Function<Integer, String>() {
-            int i = 0;
-            @Override
-            public String apply(Integer i) {
-                return Main.this + meow + value + i;
-            }
-        };
-        System.out.println(test.apply(12));
 //        lexer();
-////        await();
+        await();
 //        try {
 //            System.out.println(new Jokio().blocking(files()));
 //        } catch (IOException ignore) {}
@@ -49,13 +40,21 @@ public class Main implements Runnable {
 //    }
 //
 //
-//    void await(){
-//        try{
-//            new Jokio().blocking(AsyncExamples.run());
-//        }catch (Exception e){
-//            throw new RuntimeException(e);
-//        }
-//    }
+    private static int nya = 0;
+class Meow{
+    void test(){
+        nya = 2;
+    }
+}
+    void await(){
+
+        new Meow().test();
+        try{
+            new Jokio().blocking(AsyncExamples.run());
+        }catch (Exception e){
+            throw new RuntimeException(e);
+        }
+    }
 //
 //
 //    void lexer(){

gradle.properties

@@ -0,0 +1,5 @@
+# This file was generated by the Gradle 'init' task.
+# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+
+org.gradle.configuration-cache=true
+

gradle/libs.versions.toml

@@ -0,0 +1,8 @@
+# This file was generated by the Gradle 'init' task.
+# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
+
+[versions]
+junit-jupiter = "5.12.1"
+
+[libraries]
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,251 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH="\\\"\\\""
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

lib/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+    `java-library`
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    // Use JUnit Jupiter for testing.
+    testImplementation(libs.junit.jupiter)
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(24)
+    }
+}
+
+tasks.named<Test>("test") {
+    // Use JUnit Platform for unit tests.
+    useJUnitPlatform()
+}

lib/src/main/java/com/parkertenbroeck/async_runtime/Delay.java

@@ -1,7 +1,7 @@
-package async_runtime;
+package com.parkertenbroeck.async_runtime;
 
-import future.Future;
-import future.Waker;
+import com.parkertenbroeck.future.Future;
+import com.parkertenbroeck.future.Waker;
 
 import java.util.Timer;
 import java.util.TimerTask;

lib/src/main/java/com/parkertenbroeck/async_runtime/Jokio.java

@@ -1,7 +1,7 @@
-package async_runtime;
+package com.parkertenbroeck.async_runtime;
 
-import future.Future;
-import future.Waker;
+import com.parkertenbroeck.future.Future;
+import com.parkertenbroeck.future.Waker;
 
 import java.util.ArrayDeque;
 import java.util.HashSet;

lib/src/main/java/com/parkertenbroeck/async_runtime/Util.java

@@ -1,6 +1,6 @@
-package async_runtime;
+package com.parkertenbroeck.async_runtime;
 
-import future.Future;
+import com.parkertenbroeck.future.Future;
 
 import java.util.*;
 import java.util.function.Function;

lib/src/main/java/com/parkertenbroeck/async_runtime/io/Readable.java

@@ -1,6 +1,6 @@
-package async_runtime.io;
+package com.parkertenbroeck.async_runtime.io;
 
-import future.Future;
+import com.parkertenbroeck.future.Future;
 
 import java.nio.ByteBuffer;
 

lib/src/main/java/com/parkertenbroeck/async_runtime/io/SelectorThread.java

@@ -1,4 +1,4 @@
-package async_runtime.io;
+package com.parkertenbroeck.async_runtime.io;
 
 import java.io.IOException;
 import java.nio.channels.*;

lib/src/main/java/com/parkertenbroeck/async_runtime/io/Writable.java

@@ -1,6 +1,6 @@
-package async_runtime.io;
+package com.parkertenbroeck.async_runtime.io;
 
-import future.Future;
+import com.parkertenbroeck.future.Future;
 
 import java.nio.ByteBuffer;
 

lib/src/main/java/com/parkertenbroeck/async_runtime/io/fs/File.java

@@ -1,9 +1,9 @@
-package async_runtime.io.fs;
+package com.parkertenbroeck.async_runtime.io.fs;
 
-import async_runtime.io.Readable;
-import async_runtime.io.Writable;
-import future.Future;
-import future.Waker;
+import com.parkertenbroeck.async_runtime.io.Readable;
+import com.parkertenbroeck.async_runtime.io.Writable;
+import com.parkertenbroeck.future.Future;
+import com.parkertenbroeck.future.Waker;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

lib/src/main/java/com/parkertenbroeck/async_runtime/io/net/DatagramSocket.java

@@ -1,10 +1,10 @@
-package async_runtime.io.net;
+package com.parkertenbroeck.async_runtime.io.net;
 
-import async_runtime.io.Readable;
-import async_runtime.io.SelectorThread;
-import async_runtime.io.Writable;
-import future.Future;
-import future.Waker;
+import com.parkertenbroeck.async_runtime.io.Readable;
+import com.parkertenbroeck.async_runtime.io.SelectorThread;
+import com.parkertenbroeck.async_runtime.io.Writable;
+import com.parkertenbroeck.future.Future;
+import com.parkertenbroeck.future.Waker;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

lib/src/main/java/com/parkertenbroeck/async_runtime/io/net/ServerSocket.java

@@ -1,12 +1,9 @@
-package async_runtime.io.net;
+package com.parkertenbroeck.async_runtime.io.net;
 
-import async_runtime.io.Readable;
-import async_runtime.io.SelectorThread;
-import async_runtime.io.Writable;
-import future.Future;
-import future.Waker;
+import com.parkertenbroeck.async_runtime.io.SelectorThread;
+import com.parkertenbroeck.future.Future;
+import com.parkertenbroeck.future.Waker;
 
-import java.io.IO;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;

lib/src/main/java/com/parkertenbroeck/async_runtime/io/net/Socket.java

@@ -1,10 +1,10 @@
-package async_runtime.io.net;
+package com.parkertenbroeck.async_runtime.io.net;
 
-import async_runtime.io.Readable;
-import async_runtime.io.SelectorThread;
-import async_runtime.io.Writable;
-import future.Future;
-import future.Waker;
+import com.parkertenbroeck.async_runtime.io.Readable;
+import com.parkertenbroeck.async_runtime.io.SelectorThread;
+import com.parkertenbroeck.async_runtime.io.Writable;
+import com.parkertenbroeck.future.Future;
+import com.parkertenbroeck.future.Waker;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

lib/src/main/java/com/parkertenbroeck/future/Future.java

@@ -1,4 +1,4 @@
-package future;
+package com.parkertenbroeck.future;
 
 public interface Future<R, E extends Throwable> {
 

lib/src/main/java/com/parkertenbroeck/future/Waker.java

@@ -1,4 +1,4 @@
-package future;
+package com.parkertenbroeck.future;
 
 public interface Waker {
 

lib/src/main/java/com/parkertenbroeck/gen/Gen.java

@@ -1,4 +1,4 @@
-package gen;
+package com.parkertenbroeck.gen;
 
 public interface Gen<Y, R> {
     Res<Y, R> next();

lib/src/main/java/com/parkertenbroeck/generators/RT.java

@@ -1,7 +1,7 @@
-package generators;
+package com.parkertenbroeck.generators;
 
 
-import generators.loadtime.GeneratorClassLoader;
+import com.parkertenbroeck.generators.loadtime.GeneratorClassLoader;
 
 public class RT {
     public static void runWithGeneratorSupport(Class<? extends Runnable> clazz){

lib/src/main/java/com/parkertenbroeck/generators/loadtime/Frame.java

@@ -1,4 +1,4 @@
-package generators.loadtime;
+package com.parkertenbroeck.generators.loadtime;
 
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.instruction.LineNumber;

lib/src/main/java/com/parkertenbroeck/generators/loadtime/FrameTracker.java

@@ -1,4 +1,4 @@
-package generators.loadtime;
+package com.parkertenbroeck.generators.loadtime;
 
 
 import java.lang.classfile.*;

lib/src/main/java/com/parkertenbroeck/generators/loadtime/GeneratorClassLoader.java

@@ -1,16 +1,15 @@
-package generators.loadtime;
+package com.parkertenbroeck.generators.loadtime;
 
-import future.Future;
-import gen.Gen;
-import generators.loadtime.future.FutureSMBuilder;
-import generators.loadtime.gen.GenSMBuilder;
+import com.parkertenbroeck.future.Future;
+import com.parkertenbroeck.gen.Gen;
+import com.parkertenbroeck.generators.loadtime.future.FutureSMBuilder;
+import com.parkertenbroeck.generators.loadtime.gen.GenSMBuilder;
 
 import java.io.IOException;
 import java.lang.classfile.*;
 import java.lang.classfile.attribute.*;
 import java.lang.classfile.constantpool.ClassEntry;
 import java.lang.constant.ClassDesc;
-import java.lang.constant.ConstantDescs;
 import java.lang.reflect.AccessFlag;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -25,8 +24,8 @@ public class GeneratorClassLoader extends ClassLoader {
 
     void add(String name, byte[] def){
         try {
-            Files.createDirectories(Path.of("out/modified/generators/" + name.replace(".", "/")).getParent());
-            Files.write(Path.of("out/modified/generators/" + name.replace(".", "/") + ".class"), def);
+            Files.createDirectories(Path.of("build/modified/generators/" + name.replace(".", "/")).getParent());
+            Files.write(Path.of("build/modified/generators/" + name.replace(".", "/") + ".class"), def);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -73,12 +72,12 @@ public class GeneratorClassLoader extends ClassLoader {
                         builder= null;
                     }
                     if(builder!=null&&builder.hasAnyHandlers()){
-                        add(builder.CD_this.displayName(), builder.buildStateMachine());
+                        add(builder.CD_this.packageName() + "." + builder.CD_this.displayName(), builder.buildStateMachine());
                         cb.withMethod(mem.methodName(), mem.methodType(), mem.flags().flagsMask()&~ClassFile.ACC_SYNCHRONIZED, mb -> {
                             mb.withCode(builder::buildSourceMethodShim);
                         });
                         if(builder.shouldBeInnerClass()){
-                            innerCl.add(InnerClassInfo.of(builder.CD_this, Optional.of(clm.thisClass().asSymbol()), Optional.of(builder.CD_this.displayName()), AccessFlag.PRIVATE, AccessFlag.FINAL, AccessFlag.STATIC));
+                            innerCl.add(InnerClassInfo.of(builder.CD_this, Optional.of(clm.thisClass().asSymbol()), Optional.of(builder.innerClassName)));
                             nestMem.add(ClassDesc.of(builder.CD_this.displayName()));
                         }
                     }else{

lib/src/main/java/com/parkertenbroeck/generators/loadtime/ParamConsumer.java

@@ -1,4 +1,4 @@
-package generators.loadtime;
+package com.parkertenbroeck.generators.loadtime;
 
 import java.lang.constant.ClassDesc;
 

lib/src/main/java/com/parkertenbroeck/generators/loadtime/ReplacementKind.java

@@ -1,4 +1,4 @@
-package generators.loadtime;
+package com.parkertenbroeck.generators.loadtime;
 
 public enum ReplacementKind {
     ImmediateReplacingPop,

lib/src/main/java/com/parkertenbroeck/generators/loadtime/SavedStateTracker.java

@@ -1,10 +1,9 @@
-package generators.loadtime;
+package com.parkertenbroeck.generators.loadtime;
 
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.TypeKind;
 import java.lang.constant.ClassDesc;
 import java.util.ArrayList;
-import java.util.Objects;
 
 public class SavedStateTracker {
     private final ArrayList<SavedState> saved = new ArrayList<>();

lib/src/main/java/com/parkertenbroeck/generators/loadtime/SpecialMethod.java

@@ -1,4 +1,4 @@
-package generators.loadtime;
+package com.parkertenbroeck.generators.loadtime;
 
 import java.lang.constant.ClassDesc;
 import java.lang.constant.MethodTypeDesc;

lib/src/main/java/com/parkertenbroeck/generators/loadtime/SpecialMethodBuilder.java

@@ -1,4 +1,4 @@
-package generators.loadtime;
+package com.parkertenbroeck.generators.loadtime;
 
 import java.lang.classfile.CodeBuilder;
 

lib/src/main/java/com/parkertenbroeck/generators/loadtime/SpecialMethodHandler.java

@@ -1,4 +1,4 @@
-package generators.loadtime;
+package com.parkertenbroeck.generators.loadtime;
 
 import java.lang.classfile.CodeBuilder;
 

lib/src/main/java/com/parkertenbroeck/generators/loadtime/StateBuilder.java

@@ -1,4 +1,4 @@
-package generators.loadtime;
+package com.parkertenbroeck.generators.loadtime;
 
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.Label;

lib/src/main/java/com/parkertenbroeck/generators/loadtime/StateMachineBuilder.java

@@ -1,4 +1,4 @@
-package generators.loadtime;
+package com.parkertenbroeck.generators.loadtime;
 
 import java.lang.classfile.*;
 import java.lang.classfile.attribute.InnerClassInfo;
@@ -60,12 +60,12 @@ public abstract class StateMachineBuilder<T extends StateMachineBuilder<T>> {
         var method_name = src_mem.methodName().stringValue();
         var param_cnd = src_mem.methodTypeSymbol().parameterList().stream().map(
                 desc -> desc.descriptorString()
-                        .replace("/", "__")
-                        .replace(";", "__")
-                        .replace("[", "_$_$_")
+                        .replace("/", "___")
+                        .replace(";", "____")
+                        .replace("[", "_____")
                 )
                 .collect(Collectors.joining("$"));
-        innerClassName = method_name + "$$" + param_cnd + "$$";
+        innerClassName = method_name;
         var name = cdn + "$" +innerClassName;
 
         this.CD_this = ClassDesc.of(src_clm.thisClass().asSymbol().packageName(), name);
@@ -116,7 +116,7 @@ public abstract class StateMachineBuilder<T extends StateMachineBuilder<T>> {
 
             if(shouldBeInnerClass()){
                 src_clm.findAttributes(Attributes.sourceFile()).forEach(clb::with);
-                clb.with(InnerClassesAttribute.of(InnerClassInfo.of(CD_this, Optional.of(src_clm.thisClass().asSymbol()), Optional.of(innerClassName), AccessFlag.PUBLIC, AccessFlag.FINAL, AccessFlag.STATIC)));
+                clb.with(InnerClassesAttribute.of(InnerClassInfo.of(CD_this, Optional.of(src_clm.thisClass().asSymbol()), Optional.of(innerClassName), AccessFlag.PUBLIC)));
                 clb.with(NestHostAttribute.of(src_clm.thisClass()));
             }
 
@@ -128,7 +128,7 @@ public abstract class StateMachineBuilder<T extends StateMachineBuilder<T>> {
             clb.withField(STATE_NAME, ConstantDescs.CD_int, ClassFile.ACC_PRIVATE);
 
             // constructor
-            clb.withMethod(ConstantDescs.INIT_NAME, MTD_init, ClassFile.ACC_PRIVATE, mb -> mb.withCode(cob -> {
+            clb.withMethod(ConstantDescs.INIT_NAME, MTD_init, ClassFile.ACC_PUBLIC, mb -> mb.withCode(cob -> {
                 cob.aload(0).invokespecial(ConstantDescs.CD_Object, ConstantDescs.INIT_NAME, ConstantDescs.MTD_void);
                 params(1, (param, slot, type) -> {
                     cob.aload(0).loadLocal(TypeKind.from(type), slot).putfield(CD_this, param, type);

lib/src/main/java/com/parkertenbroeck/generators/loadtime/future/Cancellation.java

@@ -1,4 +1,4 @@
-package generators.loadtime.future;
+package com.parkertenbroeck.generators.loadtime.future;
 
 import java.lang.annotation.*;
 

lib/src/main/java/com/parkertenbroeck/generators/loadtime/future/FutureSMBuilder.java

@@ -1,8 +1,8 @@
-package generators.loadtime.future;
+package com.parkertenbroeck.generators.loadtime.future;
 
-import future.Future;
-import future.Waker;
-import generators.loadtime.*;
+import com.parkertenbroeck.future.Future;
+import com.parkertenbroeck.future.Waker;
+import com.parkertenbroeck.generators.loadtime.*;
 
 import java.lang.classfile.*;
 import java.lang.classfile.instruction.SwitchCase;

lib/src/main/java/com/parkertenbroeck/generators/loadtime/gen/GenSMBuilder.java

@@ -1,7 +1,7 @@
-package generators.loadtime.gen;
+package com.parkertenbroeck.generators.loadtime.gen;
 
-import gen.Gen;
-import generators.loadtime.*;
+import com.parkertenbroeck.gen.Gen;
+import com.parkertenbroeck.generators.loadtime.*;
 
 import java.lang.classfile.*;
 import java.lang.constant.ClassDesc;

settings.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+    // Apply the foojay-resolver plugin to allow automatic download of JDKs
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
+}
+
+rootProject.name = "generators"
+include("lib", "app")

src/Lexer.java

@@ -1,67 +0,0 @@
-import gen.Gen;
-
-public class Lexer {
-    public sealed interface Token{}
-    public enum Punc implements Token {
-        LPar,
-        RPar,
-        Add,
-        Sub,
-        Div,
-        Mul,
-        Equals,
-        Carrot,
-        Comma
-    }
-
-    public record Ident(String ident) implements Token {}
-    public record Numeric(double val) implements Token {}
-
-    public static Gen<Token, Void> parse(String input) {
-        int start;
-        int pos = 0;
-        while(true){
-            if (input.length() <= pos)
-                return Gen.ret();
-            start = pos;
-            char curr = input.charAt(pos++);
-
-            switch (curr){
-                case '(' -> Gen.yield(Punc.LPar);
-                case ')' -> Gen.yield(Punc.RPar);
-                case '+' -> Gen.yield(Punc.Add);
-                case '-' -> Gen.yield(Punc.Sub);
-                case '/' -> Gen.yield(Punc.Div);
-                case '*' -> Gen.yield(Punc.Mul);
-                case ',' -> Gen.yield(Punc.Comma);
-                case '^' -> Gen.yield(Punc.Carrot);
-                case '=' -> Gen.yield(Punc.Equals);
-                case char c when Character.isWhitespace(c) -> {}
-                case char c when Character.isAlphabetic(c) -> {
-                    while((Character.isLetter(curr) || Character.isLetterOrDigit(curr))){
-                        if(pos>=input.length())break;
-                        curr = input.charAt(pos++);
-                    }
-                    Gen.yield(new Ident(input.substring(start, pos-1)));
-                }
-                case char c when '0' <= c && c <= '9' -> {
-                    boolean exp = false;
-                    while(('0' <= curr && curr <= '9') || curr == '_' || curr == '.'){
-                        if(pos>=input.length())break;
-                        curr = input.charAt(pos++);
-                        if(curr=='e'||curr=='E'){
-                            if(exp) throw new RuntimeException("Exponent Already included");
-                            exp = true;
-                            if(pos+2>=input.length())
-                                throw new RuntimeException("Expected another character after exponent");
-                            curr = input.charAt(++pos); pos++;
-                        }
-                    }
-
-                    Gen.yield(new Numeric(Double.parseDouble(input.substring(start, pos-1).replace("_", ""))));
-                }
-                default -> throw new RuntimeException("Invalid char " + curr);
-            }
-        }
-    }
-}