Address/memory/thread sanitizer.

.editorconfig

@@ -1,25 +0,0 @@
-# EditorConfig is awesome: https://editorconfig.org
-
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-
-[CMakeLists.txt]
-indent_style = space
-indent_size = 4
-
-[*.{c,cc,h}]
-indent_style = tab
-
-[*.{c3}]
-indent_style = tab
-
-[*.{json,toml,yml,gyp}]
-indent_style = space
-indent_size = 2
-
-[*.{py,pyi}]
-indent_style = tab
-

.gitattributes

@@ -1,2 +1,4 @@
 $ cat .gitattributes
 * text=auto
+*.c3 linguist-language=C
+*.c3t linguist-language=C

.github/workflows/main.yml

@@ -8,11 +8,10 @@ on:
 
 env:
   LLVM_RELEASE_VERSION_WINDOWS: 18
-  LLVM_RELEASE_VERSION_MAC: 17
+  LLVM_RELEASE_VERSION_MAC: 18
   LLVM_RELEASE_VERSION_LINUX: 17
-  LLVM_RELEASE_VERSION_OPENBSD: 19
-  LLVM_RELEASE_VERSION_UBUNTU22: 17
-  LLVM_DEV_VERSION: 21
+  LLVM_RELEASE_VERSION_UBUNTU20: 17
+  LLVM_DEV_VERSION: 20
 jobs:
 
   build-msvc:
@@ -52,51 +51,39 @@ jobs:
         run: |
           call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
           cd resources/testproject
-          ..\..\build\${{ matrix.build_type }}\c3c.exe -vvv --emit-llvm run hello_world_win32 --trust=full
-          dir out\llvm\windows-x64
+          ..\..\build\${{ matrix.build_type }}\c3c.exe --debug-log --emit-llvm run hello_world_win32
+          dir build\llvm_ir
           ..\..\build\${{ matrix.build_type }}\c3c.exe clean
-          dir out\llvm\windows-x64
+          dir build\llvm_ir
 
 
       - name: Build testproject lib
         run: |
           cd resources/testproject
           call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-          ..\..\build\${{ matrix.build_type }}\c3c.exe -vvv build hello_world_win32_lib --trust=full
-
-      - name: Compile and run dynlib-test
-        run: |
-          cd resources/examples/dynlib-test
-          ..\..\..\build\${{ matrix.build_type }}\c3c.exe -vv dynamic-lib add.c3
-          ..\..\..\build\${{ matrix.build_type }}\c3c.exe -vv compile-run test.c3 -l ./add.lib          
-
-      - name: Compile and run staticlib-test
-        run: |
-          cd resources/examples/staticlib-test
-          ..\..\..\build\${{ matrix.build_type }}\c3c.exe -vv static-lib add.c3
-          ..\..\..\build\${{ matrix.build_type }}\c3c.exe -vv compile-run test.c3 -l ./add.lib          
+          ..\..\build\${{ matrix.build_type }}\c3c.exe --debug-log build hello_world_win32_lib
 
       - name: Vendor-fetch
         run: |
-          build\${{ matrix.build_type }}\c3c.exe vendor-fetch raylib55
+          build\${{ matrix.build_type }}\c3c.exe vendor-fetch raylib
 
-      - name: Try raylib5
+      - name: Try raylib
         run: |
           cd resources
-          ..\build\${{ matrix.build_type }}\c3c.exe vendor-fetch raylib55
-          ..\build\${{ matrix.build_type }}\c3c.exe compile --lib raylib55 --print-linking examples\raylib\raylib_arkanoid.c3
-          ..\build\${{ matrix.build_type }}\c3c.exe compile --lib raylib55 --print-linking examples\raylib\raylib_snake.c3
-          ..\build\${{ matrix.build_type }}\c3c.exe compile --lib raylib55 --print-linking examples\raylib\raylib_tetris.c3
-
-      - name: Compile run unit tests
-        run: |
-          cd test
-          ..\build\${{ matrix.build_type }}\c3c.exe compile-test unit -O1 -D SLOW_TESTS
+          ..\build\${{ matrix.build_type }}\c3c.exe vendor-fetch raylib
+          ..\build\${{ matrix.build_type }}\c3c.exe compile --lib raylib --wincrt=none examples\raylib\raylib_arkanoid.c3
+          ..\build\${{ matrix.build_type }}\c3c.exe compile --lib raylib --wincrt=none examples\raylib\raylib_snake.c3
+          ..\build\${{ matrix.build_type }}\c3c.exe compile --lib raylib --wincrt=none examples\raylib\raylib_tetris.c3
 
       - name: run compiler tests
         run: |
           cd test
-          ..\build\${{ matrix.build_type }}\c3c.exe compile-run -O1 src/test_suite_runner.c3 -- ..\build\${{ matrix.build_type }}\c3c.exe test_suite/ --no-terminal
+          python3.exe src/tester.py ..\build\${{ matrix.build_type }}\c3c.exe test_suite/
+
+      - name: Compile run unit tests
+        run: |
+          cd test
+          ..\build\${{ matrix.build_type }}\c3c.exe compile-test unit -O1
 
       - name: Test python script
         run: |
@@ -104,7 +91,7 @@ jobs:
           dir msvc_sdk
 
       - name: upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: c3-windows-${{ matrix.build_type }}
           path: |
@@ -113,7 +100,7 @@ jobs:
 
   build-msys2-mingw:
     runs-on: windows-latest
-    if: ${{ false }}
+    # if: ${{ false }}
     strategy:
       # Don't abort runners if a single one fails
       fail-fast: false
@@ -133,18 +120,17 @@ jobs:
           install: git binutils mingw-w64-x86_64-clang mingw-w64-x86_64-ninja mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-python
       - shell: msys2 {0}
         run: |
-            pacman --noconfirm -U https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-llvm-20.1.0-1-any.pkg.tar.zst
-            pacman --noconfirm -U https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-lld-20.1.0-1-any.pkg.tar.zst
+            pacman --noconfirm -U https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-llvm-18.1.8-1-any.pkg.tar.zst
+            pacman --noconfirm -U https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-lld-18.1.8-1-any.pkg.tar.zst
       - name: CMake
         run: |
-          cmake -B build -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_LINKER=lld
+          cmake -B build -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
           cmake --build build
 
       - name: Compile and run some examples
         run: |
           cd resources
           ../build/c3c compile-run --print-linking examples/hello_world_many.c3
-          ../build/c3c compile-run --print-linking examples/process.c3
           ../build/c3c compile-run --print-linking examples/time.c3
           ../build/c3c compile-run --print-linking examples/fannkuch-redux.c3
           ../build/c3c compile-run --print-linking examples/contextfree/boolerr.c3
@@ -155,22 +141,22 @@ jobs:
       - name: Build testproject
         run: |
           cd resources/testproject
-          ../../build/c3c run -vvv --trust=full
+          ../../build/c3c run --debug-log
 
       - name: Vendor-fetch
         run: |
-          ./build/c3c vendor-fetch raylib55
+          ./build/c3c vendor-fetch raylib
 
       - name: Build testproject lib
         run: |
           cd resources/testproject
-          ../../build/c3c build hello_world_lib --cc cc -vvv --trust=full
+          ../../build/c3c build hello_world_lib --cc cc --debug-log
 
       - name: run compiler tests
         run: |
           cd test
-          ../build/c3c.exe compile --target windows-x64 -O1 src/test_suite_runner.c3
-          ./test_suite_runner.exe ../build/c3c.exe test_suite/ --no-terminal
+          python3 src/tester.py ../build/c3c.exe test_suite/
+
 
   build-msys2-clang:
     runs-on: windows-latest
@@ -211,20 +197,20 @@ jobs:
       - name: Build testproject
         run: |
           cd resources/testproject
-          ../../build/c3c run -vvv --trust=full
+          ../../build/c3c run --debug-log
 
       - name: Build testproject lib
         run: |
           cd resources/testproject
-          ../../build/c3c build hello_world_lib -vvv --trust=full
+          ../../build/c3c build hello_world_lib --debug-log
 
       - name: run compiler tests
         run: |
           cd test
-          ../build/c3c.exe compile-run -O1 src/test_suite_runner.c3 -- ../build/c3c.exe test_suite/ --no-terminal
+          python3 src/tester.py ../build/c3c.exe test_suite/
 
   build-linux:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       # Don't abort runners if a single one fails
       fail-fast: false
@@ -274,7 +260,6 @@ jobs:
                 -DCMAKE_OBJCOPY=llvm-objcopy-${{matrix.llvm_version}} \
                 -DCMAKE_STRIP=llvm-strip-${{matrix.llvm_version}} \
                 -DCMAKE_DLLTOOL=llvm-dlltool-${{matrix.llvm_version}} \
-                -DLLVM_ENABLE_LIBXML2=OFF \
                 -DC3_LLVM_VERSION=${{matrix.llvm_version}}
           cmake --build build
       - name: CMake18
@@ -289,7 +274,6 @@ jobs:
                 -DCMAKE_OBJCOPY=llvm-objcopy-${{matrix.llvm_version}} \
                 -DCMAKE_STRIP=llvm-strip-${{matrix.llvm_version}} \
                 -DCMAKE_DLLTOOL=llvm-dlltool-${{matrix.llvm_version}} \
-                -DLLVM_ENABLE_LIBXML2=OFF \
                 -DC3_LLVM_VERSION=${{matrix.llvm_version}}.1
           cmake --build build
 
@@ -327,38 +311,20 @@ jobs:
           ../build/c3c compile-run linux_stack.c3
           ../build/c3c compile-run examples/args.c3 -- foo -bar "baz baz"
 
-      - name: Compile and run dynlib-test
-        run: |
-          cd resources/examples/dynlib-test
-          ../../../build/c3c -vv dynamic-lib add.c3
-          mv add.so libadd.so
-          cc test.c -L. -ladd -Wl,-rpath=.         
-          ./a.out
-          ../../../build/c3c compile-run test.c3 -L . -l add -z -Wl,-rpath=.           
-
-      - name: Compile and run staticlib-test
-        run: |
-          cd resources/examples/staticlib-test
-          ../../../build/c3c -vv static-lib add.c3
-          mv add.a libadd.a
-          cc test.c -L. -ladd         
-          ./a.out
-          ../../../build/c3c compile-run test.c3 -L . -l add           
-
       - name: Compile run unit tests
         run: |
           cd test
-          ../build/c3c compile-test unit -D SLOW_TESTS
+          ../build/c3c compile-test unit
 
       - name: Build testproject
         run: |
           cd resources/testproject
-          ../../build/c3c run -vvv --trust=full
+          ../../build/c3c run --debug-log
 
       - name: Test WASM
         run: |
           cd resources/testfragments
-          ../../build/c3c compile --target wasm32 -g0 --no-entry -Os wasm4.c3
+          ../../build/c3c compile --reloc=none --target wasm32 -g0 --link-libc=no --no-entry -Os wasm4.c3
 
       - name: Install QEMU and Risc-V toolchain
         run: |
@@ -372,7 +338,7 @@ jobs:
       - name: Build testproject direct linker
         run: |
           cd resources/testproject
-          ../../build/c3c run -vvv --linker=builtin --trust=full
+          ../../build/c3c run --debug-log --linker=builtin
 
       - name: Init a library & a project
         run: |
@@ -384,7 +350,7 @@ jobs:
       - name: run compiler tests
         run: |
           cd test
-          ../build/c3c compile-run -O1 src/test_suite_runner.c3 -- ../build/c3c  test_suite/
+          python3 src/tester.py ../build/c3c test_suite/
 
       - name: bundle_output
         if: matrix.llvm_version == env.LLVM_RELEASE_VERSION_LINUX
@@ -393,25 +359,23 @@ jobs:
           cp -r lib c3
           cp msvc_build_libraries.py c3
           cp build/c3c c3
-          cp README.md c3
-          cp releasenotes.md c3
           tar czf c3-linux-${{matrix.build_type}}.tar.gz c3
 
       - name: upload artifacts
         if: matrix.llvm_version == env.LLVM_RELEASE_VERSION_LINUX
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: c3-linux-${{matrix.build_type}}
           path: c3-linux-${{matrix.build_type}}.tar.gz
 
-  build-linux-ubuntu22:
-    runs-on: ubuntu-22.04
+  build-linux-ubuntu20:
+    runs-on: ubuntu-20.04
     strategy:
       # Don't abort runners if a single one fails
       fail-fast: false
       matrix:
         build_type: [Release, Debug]
-        llvm_version: [17, 18, 19, 20]
+        llvm_version: [17, 18, 19]
     steps:
       - uses: actions/checkout@v4
       - name: Install common deps
@@ -442,7 +406,6 @@ jobs:
                 -DCMAKE_OBJCOPY=llvm-objcopy-${{matrix.llvm_version}} \
                 -DCMAKE_STRIP=llvm-strip-${{matrix.llvm_version}} \
                 -DCMAKE_DLLTOOL=llvm-dlltool-${{matrix.llvm_version}} \
-                -DLLVM_ENABLE_LIBXML2=OFF \
                 -DC3_LLVM_VERSION=${{matrix.llvm_version}}
           cmake --build build
       - name: CMake
@@ -457,7 +420,6 @@ jobs:
                 -DCMAKE_OBJCOPY=llvm-objcopy-${{matrix.llvm_version}} \
                 -DCMAKE_STRIP=llvm-strip-${{matrix.llvm_version}} \
                 -DCMAKE_DLLTOOL=llvm-dlltool-${{matrix.llvm_version}} \
-                -DLLVM_ENABLE_LIBXML2=OFF \
                 -DC3_LLVM_VERSION=${{matrix.llvm_version}}.1
           cmake --build build
       - name: Compile and run some examples
@@ -494,49 +456,47 @@ jobs:
       - name: Compile run unit tests
         run: |
           cd test
-          ../build/c3c compile-test unit --sanitize=address -D SLOW_TESTS
+          ../build/c3c compile-test unit
 
       - name: Build testproject
         run: |
           cd resources/testproject
-          ../../build/c3c run -vvv --trust=full
+          ../../build/c3c run --debug-log
 
       - name: Build testproject direct linker
         run: |
           cd resources/testproject
-          ../../build/c3c run -vvv --linker=builtin --trust=full
+          ../../build/c3c run --debug-log --linker=builtin
 
       - name: run compiler tests
         run: |
           cd test
-          ../build/c3c compile-run -O1 src/test_suite_runner.c3 -- ../build/c3c test_suite/
+          python3 src/tester.py ../build/c3c test_suite/
 
       - name: bundle_output
-        if: matrix.llvm_version == env.LLVM_RELEASE_VERSION_UBUNTU22
+        if: matrix.llvm_version == env.LLVM_RELEASE_VERSION_UBUNTU20
         run: |
           mkdir c3
           cp -r lib c3
-          cp README.md c3
-          cp releasenotes.md c3          
           cp msvc_build_libraries.py c3
           cp build/c3c c3
-          tar czf c3-ubuntu-22-${{matrix.build_type}}.tar.gz c3
+          tar czf c3-ubuntu-20-${{matrix.build_type}}.tar.gz c3
 
       - name: upload artifacts
-        if: matrix.llvm_version == env.LLVM_RELEASE_VERSION_UBUNTU22
-        uses: actions/upload-artifact@v4
+        if: matrix.llvm_version == env.LLVM_RELEASE_VERSION_UBUNTU20
+        uses: actions/upload-artifact@v3
         with:
-          name: c3-ubuntu-22-${{matrix.build_type}}
-          path: c3-ubuntu-22-${{matrix.build_type}}.tar.gz
-
+          name: c3-ubuntu-20-${{matrix.build_type}}
+          path: c3-ubuntu-20-${{matrix.build_type}}.tar.gz
+  
   build-with-docker:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         ubuntu_version: [20.04, 22.04]
         build_type: [Release, Debug]
-        llvm_version: [17, 18, 19]
+        llvm_version: [17, 18, 19, 20]
 
     steps:
       - uses: actions/checkout@v4
@@ -588,22 +548,22 @@ jobs:
       - name: Compile run unit tests
         run: |
           cd test
-          ../build/c3c compile-test unit -D SLOW_TESTS
+          ../build/c3c compile-test unit
 
       - name: Build testproject
         run: |
           cd resources/testproject
-          ../../build/c3c run -vvv --trust=full
+          ../../build/c3c run --debug-log
 
       - name: Test WASM
         run: |
           cd resources/testfragments
-          ../../build/c3c compile --reloc=none --target wasm32 -g0 --no-entry -Os wasm4.c3
+          ../../build/c3c compile --reloc=none --target wasm32 -g0 --link-libc=no --no-entry -Os wasm4.c3
 
       - name: Build testproject direct linker
         run: |
           cd resources/testproject
-          ../../build/c3c run -vvv --linker=builtin --trust=full
+          ../../build/c3c run --debug-log --linker=builtin
 
       - name: Init a library & a project
         run: |
@@ -615,7 +575,7 @@ jobs:
       - name: run compiler tests
         run: |
           cd test
-          ../build/c3c compile-run -O1 src/test_suite_runner.c3 -- ../build/c3c test_suite/
+          python3 src/tester.py ../build/c3c test_suite/
 
   build-mac:
     runs-on: macos-latest
@@ -647,7 +607,7 @@ jobs:
 
       - name: Vendor-fetch
         run: |
-          ./build/c3c vendor-fetch raylib55
+          ./build/c3c vendor-fetch raylib
 
       - name: Compile and run some examples
         run: |
@@ -661,47 +621,30 @@ jobs:
           ../build/c3c compile-run -O5 examples/load_world.c3
           ../build/c3c compile-run examples/args.c3 -- foo -bar "baz baz"
 
-      - name: Compile and run dynlib-test
-        run: |
-          cd resources/examples/dynlib-test
-          ../../../build/c3c -vv dynamic-lib add.c3
-          ../../../build/c3c compile-run test.c3 -l ./add.dylib          
-
       - name: Compile run unit tests
         run: |
           cd test
-          ../build/c3c compile-test unit -O1 -D SLOW_TESTS
-
-      - name: Test WASM
-        run: |
-          cd resources/testfragments
-          ../../build/c3c compile --target wasm32 -g0 --no-entry -Os wasm4.c3
+          ../build/c3c compile-test unit
 
       - name: Build testproject
         run: |
           cd resources/testproject
-          ../../build/c3c run -vvv --trust=full
+          ../../build/c3c run --debug-log
 
       - name: Build testproject direct linker
         run: |
           cd resources/testproject
-          ../../build/c3c run -vvv --linker=builtin --trust=full
+          ../../build/c3c run --debug-log --linker=builtin
 
       - name: Build testproject lib
         run: |
           cd resources/testproject
-          ../../build/c3c build hello_world_lib -vvv --trust=full
+          ../../build/c3c build hello_world_lib --debug-log
 
       - name: run compiler tests
         run: |
           cd test
-          ../build/c3c compile -O1 src/test_suite_runner.c3
-          ./test_suite_runner ../build/c3c test_suite/
-
-      - name: run build test suite runner
-        run: |
-          cd test
-          ../build/c3c compile -O1 src/test_suite_runner.c3
+          python3 src/tester.py ../build/c3c test_suite/
 
       - name: bundle_output
         if: matrix.llvm_version == env.LLVM_RELEASE_VERSION_MAC
@@ -709,210 +652,141 @@ jobs:
           mkdir macos
           cp -r lib macos
           cp msvc_build_libraries.py macos
-          cp README.md macos
-          cp releasenotes.md macos          
           cp build/c3c macos
           zip -r c3-macos-${{matrix.build_type}}.zip macos
 
       - name: upload artifacts
         if: matrix.llvm_version == env.LLVM_RELEASE_VERSION_MAC
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: c3-macos-${{matrix.build_type}}
           path: c3-macos-${{matrix.build_type}}.zip
 
-  build-nix:
-    runs-on: ubuntu-22.04
-    strategy:
-      # Don't abort runners if a single one fails
-      fail-fast: false
-      matrix:
-        build_type: [ Release, Debug ]
-        nixpkgs: [ Lock, Latest ]
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Install Nix
-      uses: cachix/install-nix-action@v30
-      with: 
-        github_access_token: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Update flake (if necessary)
-      run: |
-        if [[ matrix.nixpkgs == "Latest" ]]; then 
-          nix flake update
-        fi
-        nix flake info
-
-    - name: Build and check 
-      run: |
-        if [[ ${{ matrix.build_type }} = "Debug" ]]; then 
-          nix build -L ".#c3c-debug-checks" 
-        else 
-          nix build -L ".#c3c-checks"
-        fi
-
-  build-openbsd:
-    runs-on: ubuntu-latest
-    strategy:
-      # Don't abort runners if a single one fails
-      fail-fast: false
-      matrix:
-        build_type: [Release, Debug]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: OpenBSD VM
-        uses: vmactions/openbsd-vm@main
-        with:
-          prepare: |
-            pkg_add cmake llvm-19.1.7p3 ninja
-
-          run: |
-            echo "CMake"
-            cmake -B build \
-              -G Ninja \
-              -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-              -DLLVM_ENABLE_LIBXML2=OFF \
-              -DC3_LLVM_VERSION=${LLVM_RELEASE_VERSION_OPENBSD}
-            cmake --build build
-            echo "Compile and run some examples"
-            cd resources
-            ../build/c3c compile examples/base64.c3
-            ../build/c3c compile examples/binarydigits.c3
-            ../build/c3c compile examples/brainfk.c3
-            ../build/c3c compile examples/factorial_macro.c3
-            ../build/c3c compile examples/fasta.c3
-            ../build/c3c compile examples/gameoflife.c3
-            ../build/c3c compile examples/hash.c3
-            ../build/c3c compile-only examples/levenshtein.c3
-            ../build/c3c compile examples/load_world.c3
-            ../build/c3c compile-only examples/map.c3
-            ../build/c3c compile examples/mandelbrot.c3
-            ../build/c3c compile examples/plus_minus.c3
-            ../build/c3c compile examples/nbodies.c3
-            ../build/c3c compile examples/spectralnorm.c3
-            ../build/c3c compile examples/swap.c3
-            ../build/c3c compile examples/contextfree/boolerr.c3
-            ../build/c3c compile examples/contextfree/dynscope.c3
-            ../build/c3c compile examples/contextfree/guess_number.c3
-            ../build/c3c compile examples/contextfree/multi.c3
-            ../build/c3c compile examples/contextfree/cleanup.c3
-            ../build/c3c compile-run examples/hello_world_many.c3
-            ../build/c3c compile-run examples/time.c3
-            ../build/c3c compile-run examples/fannkuch-redux.c3
-            ../build/c3c compile-run examples/contextfree/boolerr.c3
-            ../build/c3c compile-run examples/load_world.c3
-            ../build/c3c compile-run examples/process.c3
-            ../build/c3c compile-run examples/ls.c3
-            ../build/c3c compile-run examples/args.c3 -- foo -bar "baz baz"
-            cd ..
-            echo "Compile and run dynlib-test"
-            cd resources/examples/dynlib-test
-            ../../../build/c3c -vv dynamic-lib add.c3
-            mv add.so libadd.so
-            cc test.c -L. -ladd -Wl,-rpath=.         
-            ./a.out
-            ../../../build/c3c compile-run test.c3 -L . -l add -z -Wl,-rpath=.
-            cd ../../../
-            echo "Compile and run staticlib-test"
-            cd resources/examples/staticlib-test
-            ../../../build/c3c -vv static-lib add.c3
-            mv add.a libadd.a
-            cc test.c -L. -ladd         
-            ./a.out
-            ../../../build/c3c compile-run test.c3 -L . -l add           
-            cd ../../../
-            echo "Compile run unit tests"
-            cd test
-            ../build/c3c --max-mem 128 compile-test unit -D SLOW_TESTS
-            cd ..
-            echo "Build testproject"
-            cd resources/testproject
-            ../../build/c3c run -vvv --trust=full
-            cd ../../
-            echo "Test WASM"
-            cd resources/testfragments
-            ../../build/c3c compile --target wasm32 -g0 --no-entry -Os wasm4.c3
-            cd ../../
-            echo "Build testproject direct linker"
-            cd resources/testproject
-            ../../build/c3c run -vvv --linker=builtin --trust=full
-            cd ../../
-            echo "Init a library & a project"
-            ./build/c3c init-lib mylib
-            ls mylib.c3l
-            ./build/c3c init myproject
-            ls myproject
-            echo "run compiler tests"
-            cd test
-            ../build/c3c --max-mem 128 compile-run -O1 src/test_suite_runner.c3 -- ../build/c3c  test_suite/
-            cd ..
-
-      - name: bundle_output
-        run: |
-          mkdir c3
-          cp -r lib c3
-          cp msvc_build_libraries.py c3
-          cp build/c3c c3
-          cp README.md c3
-          cp releasenotes.md c3
-          tar czf c3-openbsd-${{matrix.build_type}}.tar.gz c3
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: c3-openbsd-${{matrix.build_type}}
-          path: c3-openbsd-${{matrix.build_type}}.tar.gz
 
   release:
-    runs-on: ubuntu-22.04
-    needs: [build-msvc, build-linux, build-mac, build-linux-ubuntu22]
+    runs-on: ubuntu-latest
+    needs: [build-msvc, build-linux, build-mac]
     if: github.ref == 'refs/heads/master'
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
+      - name: delete tag
+        continue-on-error: true
+        uses: actions/github-script@v6
+        with:
+          script: |
+            github.rest.git.deleteRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: 'tags/latest',
+              sha: context.sha
+            })
+      - name: create tag
+        uses: actions/github-script@v6
+        with:
+          script: |
+            github.rest.git.createRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: 'refs/tags/latest',
+              sha: context.sha
+            })
+
+      - uses: actions/download-artifact@v3
       - run: cp -r lib c3-windows-Release
       - run: cp -r lib c3-windows-Debug
       - run: cp msvc_build_libraries.py c3-windows-Release
       - run: cp msvc_build_libraries.py c3-windows-Debug
-      - run: cp README.md c3-windows-Release
-      - run: cp README.md c3-windows-Debug
-      - run: cp releasenotes.md c3-windows-Release
-      - run: cp releasenotes.md c3-windows-Debug
-      - run: zip -r c3-windows.zip c3-windows-Release
-      - run: zip -r c3-windows-debug.zip c3-windows-Debug
-      - run: mv c3-linux-Release/c3-linux-Release.tar.gz c3-linux-Release/c3-linux.tar.gz
-      - run: mv c3-linux-Debug/c3-linux-Debug.tar.gz c3-linux-Debug/c3-linux-debug.tar.gz
-      - run: mv c3-openbsd-Release/c3-openbsd-Release.tar.gz c3-openbsd-Release/c3-openbsd.tar.gz
-      - run: mv c3-openbsd-Debug/c3-openbsd-Debug.tar.gz c3-openbsd-Debug/c3-openbsd-debug.tar.gz
-      - run: mv c3-ubuntu-22-Release/c3-ubuntu-22-Release.tar.gz c3-ubuntu-22-Release/c3-ubuntu-22.tar.gz
-      - run: mv c3-ubuntu-22-Debug/c3-ubuntu-22-Debug.tar.gz c3-ubuntu-22-Debug/c3-ubuntu-22-debug.tar.gz
-      - run: mv c3-macos-Release/c3-macos-Release.zip c3-macos-Release/c3-macos.zip
-      - run: mv c3-macos-Debug/c3-macos-Debug.zip c3-macos-Debug/c3-macos-debug.zip
-      - run: gh release delete latest-prerelease --cleanup-tag -y || true
-      - run: echo "RELEASE_NAME=latest-prerelease-$(date +'%Y%m%d-%H%M')" >> $GITHUB_ENV
+      - run: zip -r c3-windows-Release.zip c3-windows-Release
+      - run: zip -r c3-windows-Debug.zip c3-windows-Debug
 
       - id: create_release
-        uses: softprops/action-gh-release@v2
+        uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: latest-prerelease
-          name: ${{ env.RELEASE_NAME }}
+          tag_name: latest
+          release_name: latest
           draft: false
           prerelease: true
-          files: |
-            c3-windows.zip
-            c3-windows-debug.zip
-            c3-linux-Release/c3-linux.tar.gz
-            c3-linux-Debug/c3-linux-debug.tar.gz
-            c3-openbsd-Release/c3-openbsd.tar.gz
-            c3-openbsd-Debug/c3-openbsd-debug.tar.gz
-            c3-ubuntu-22-Release/c3-ubuntu-22.tar.gz
-            c3-ubuntu-22-Debug/c3-ubuntu-22-debug.tar.gz
-            c3-macos-Release/c3-macos.zip
-            c3-macos-Debug/c3-macos-debug.zip
+
+      - name: upload windows
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: c3-windows-Release.zip
+          asset_name: c3-windows.zip
+          asset_content_type: application/zip
+
+      - name: upload windows debug
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: c3-windows-Debug.zip
+          asset_name: c3-windows-debug.zip
+          asset_content_type: application/zip
+
+      - name: upload linux
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: c3-linux-Release/c3-linux-Release.tar.gz
+          asset_name: c3-linux.tar.gz
+          asset_content_type: application/gzip
+
+      - name: upload linux debug
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: c3-linux-Debug/c3-linux-Debug.tar.gz
+          asset_name: c3-linux-debug.tar.gz
+          asset_content_type: application/gzip
+
+      - name: upload ubuntu 20
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+
+          asset_path: c3-ubuntu-20-Release/c3-ubuntu-20-Release.tar.gz
+          asset_name: c3-ubuntu-20.tar.gz
+          asset_content_type: application/gzip
+
+      - name: upload ubuntu 20 debug
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: c3-ubuntu-20-Debug/c3-ubuntu-20-Debug.tar.gz
+          asset_name: c3-ubuntu-20-debug.tar.gz
+          asset_content_type: application/gzip
+
+      - name: upload macos
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: c3-macos-Release/c3-macos-Release.zip
+          asset_name: c3-macos.zip
+          asset_content_type: application/zip
+
+      - name: upload macos debug
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: c3-macos-Debug/c3-macos-Debug.zip
+          asset_name: c3-macos-debug.zip
+          asset_content_type: application/zip

.gitignore

@@ -19,7 +19,6 @@
 
 # Libraries
 *.lib
-*.tlb
 *.a
 *.la
 *.lo
@@ -71,18 +70,3 @@ out/
 
 # Emacs files
 TAGS
-
-# Clangd LSP files
-/.cache/
-/compile_commands.json
-
-# 'nix build' resulting symlink
-result
-
-# macOS
-.DS_Store
-
-# tests
-/test/tmp/*
-/test/testrun
-/test/test_suite_runner

CMakeLists.txt

@@ -1,13 +1,5 @@
 cmake_minimum_required(VERSION 3.20)
 
-set(C3_LLVM_MIN_VERSION 17)
-set(C3_LLVM_MAX_VERSION 21)
-set(C3_LLVM_DEFAULT_VERSION 19)
-
-if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-    message(FATAL_ERROR "In-tree build detected, please build in a separate directory")
-endif()
-
 # Grab the version
 file(READ "src/version.h" ver)
 if (NOT ${ver} MATCHES "COMPILER_VERSION \"([0-9]+.[0-9]+.[0-9]+)\"")
@@ -15,20 +7,8 @@ if (NOT ${ver} MATCHES "COMPILER_VERSION \"([0-9]+.[0-9]+.[0-9]+)\"")
 endif()
 
 # Set the project and version
-project(c3c VERSION ${CMAKE_MATCH_1} LANGUAGES C CXX)
-message("Configuring C3C ${CMAKE_PROJECT_VERSION} for ${CMAKE_SYSTEM_NAME}")
-
-# Helper functions
-function(c3_print_variables)
-    set(msg "")
-    foreach(var ${ARGN})
-        if(msg)
-            string(APPEND msg " ; ")
-        endif()
-        string(APPEND msg "${c3_print_prefix}${var}=\"${${var}}\"")
-    endforeach()
-    message(STATUS "${msg}")
-endfunction()
+project(c3c VERSION ${CMAKE_MATCH_1})
+message("C3C version: ${CMAKE_PROJECT_VERSION}")
 
 # Avoid warning for FetchContent
 if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
@@ -36,7 +16,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
 endif()
 
 if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    if (WIN32)
+    if (MSVC)
         set(CMAKE_INSTALL_LIBDIR "c:\\c3c\\lib")
         set(CMAKE_INSTALL_BINDIR "c:\\c3c")
     else ()
@@ -56,41 +36,33 @@ set(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 17)
 
-# Use /MT or /MTd
-set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-
 if(MSVC)
     message(STATUS "MSVC version ${MSVC_VERSION}")
-    add_compile_options(/utf-8)
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /O2 /EHsc")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /O2 /EHsc")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /EHa")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Od /Zi /EHa")
 else()
-    add_compile_options(-gdwarf-3 -fno-exceptions)
-
-    # add_compile_options(-fsanitize=address,undefined)
-    # add_link_options(-fsanitize=address,undefined)
+    if (true)
+        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -fno-exceptions")
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -gdwarf-3 -fno-exceptions")
+        set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -gdwarf-3 -O3 -fno-exceptions")
+        set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -gdwarf-3 -fno-exceptions")
+    else()
+        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -gdwarf-3 -O3 -fsanitize=undefined,address -fno-exceptions")
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -gdwarf-3 -O1 -fsanitize=undefined,address -fno-exceptions")
+        set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -gdwarf-3 -O3 -fsanitize=undefined,address -fno-exceptions")
+        set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -gdwarf-3 -O1 -fsanitize=undefined,address -fno-exceptions")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined,address -fno-exceptions")
+    endif()
 endif()
 
-# Options
-set(C3_LINK_DYNAMIC         OFF      CACHE BOOL   "Link dynamically with LLVM/LLD libs")
-set(C3_WITH_LLVM            ON       CACHE BOOL   "Build with LLVM")
-set(C3_LLVM_VERSION         "auto"   CACHE STRING "Use LLVM version [default: auto]")
-set(C3_USE_MIMALLOC         OFF      CACHE BOOL   "Use built-in mimalloc")
-set(C3_MIMALLOC_TAG         "v1.7.3" CACHE STRING "Used version of mimalloc")
-set(C3_USE_TB               OFF      CACHE BOOL   "Use TB")
-set(C3_LLD_DIR              ""       CACHE STRING "Use custom LLD directory")
-set(C3_ENABLE_CLANGD_LSP    OFF      CACHE BOOL   "Enable/Disable output of compile commands during generation")
-set(LLVM_CRT_LIBRARY_DIR    ""       CACHE STRING "Use custom llvm's compiler-rt directory")
+option(C3_LINK_DYNAMIC "link dynamically with LLVM/LLD libs")
 
-set(C3_OPTIONS
-        C3_LINK_DYNAMIC
-        C3_WITH_LLVM
-        C3_LLVM_VERSION
-        C3_USE_MIMALLOC
-        C3_MIMALLOC_TAG
-        C3_USE_TB
-        C3_LLD_DIR
-        C3_ENABLE_CLANGD_LSP
-        LLVM_CRT_LIBRARY_DIR
-)
+set(C3_LLVM_VERSION "auto" CACHE STRING "Use LLVM version [default: auto]")
+option(C3_USE_MIMALLOC "Use built-in mimalloc" OFF)
+option(C3_USE_TB "Use TB" OFF)
+set(C3_MIMALLOC_TAG "v1.7.3" CACHE STRING "Used version of mimalloc")
 
 set(C3_USE_MIMALLOC OFF)
 if(C3_USE_MIMALLOC)
@@ -99,15 +71,20 @@ if(C3_USE_MIMALLOC)
     option(MI_PADDING OFF)
     option(MI_DEBUG_FULL OFF)
     FetchContent_Declare(
-            mimalloc
-            GIT_REPOSITORY https://github.com/microsoft/mimalloc.git
-            GIT_TAG ${C3_MIMALLOC_TAG}
+    mimalloc
+    GIT_REPOSITORY https://github.com/microsoft/mimalloc.git
+    GIT_TAG ${C3_MIMALLOC_TAG}
     )
     FetchContent_MakeAvailable(mimalloc)
 endif()
 if (NOT WIN32)
     find_package(CURL)
 endif()
+if (NOT C3_LLVM_VERSION STREQUAL "auto")
+    if (${C3_LLVM_VERSION} VERSION_LESS 17 OR ${C3_LLVM_VERSION} VERSION_GREATER 20)
+        message(FATAL_ERROR "LLVM ${C3_LLVM_VERSION} is not supported!")
+    endif()
+endif()
 
 find_package(Git QUIET)
 if(C3_USE_TB AND GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
@@ -124,199 +101,150 @@ if(C3_USE_TB AND GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
     endif()
 endif()
 
-# Clangd LSP support
-if(C3_ENABLE_CLANGD_LSP)
-    set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-    execute_process(
-            COMMAND ${CMAKE_COMMAND} -E create_symlink
-            ${CMAKE_BINARY_DIR}/compile_commands.json
-            ${CMAKE_SOURCE_DIR}/compile_commands.json
+if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+    if (C3_LLVM_VERSION STREQUAL "auto")
+        set(C3_LLVM_VERSION "18")
+    endif()
+    FetchContent_Declare(
+            LLVM_Windows
+            URL https://github.com/c3lang/win-llvm/releases/download/llvm_18_1_8_with_rt/llvm-18.1.8-windows-amd64-msvc17-libcmt.7z
     )
-endif(C3_ENABLE_CLANGD_LSP)
-
-if(C3_WITH_LLVM)
-    if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
-        if (C3_LLVM_VERSION STREQUAL "auto")
-            set(C3_LLVM_VERSION ${C3_LLVM_DEFAULT_VERSION})
-        endif()
-        FetchContent_Declare(
-                LLVM_Windows
-                URL https://github.com/c3lang/win-llvm/releases/download/llvm_19_1_5/llvm-19.1.5-windows-amd64-msvc17-libcmt.7z
-        )
-        FetchContent_Declare(
-                LLVM_Windows_debug
-                URL https://github.com/c3lang/win-llvm/releases/download/llvm_19_1_5/llvm-19.1.5-windows-amd64-msvc17-libcmt-dbg.7z
-        )
-        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-            message("Loading Windows LLVM debug libraries, this may take a while...")
-            FetchContent_MakeAvailable(LLVM_Windows_debug)
-            set(llvm_dir ${llvm_windows_debug_SOURCE_DIR})
-        else()
-            message("Loading Windows LLVM libraries, this may take a while...")
-            FetchContent_MakeAvailable(LLVM_Windows)
-            set(llvm_dir ${llvm_windows_SOURCE_DIR})
-        endif()
-        message("Loaded Windows LLVM libraries into ${llvm_dir}")
-        set(CMAKE_SYSTEM_PREFIX_PATH ${llvm_dir} ${CMAKE_SYSTEM_PREFIX_PATH})
+    FetchContent_Declare(
+            LLVM_Windows_debug
+            URL https://github.com/c3lang/win-llvm/releases/download/llvm_18_1_8_with_rt/llvm-18.1.8-windows-amd64-msvc17-libcmt-dbg.7z
+    )
+    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+        message("Loading Windows LLVM debug libraries, this may take a while...")
+        FetchContent_MakeAvailable(LLVM_Windows_debug)
+        set(llvm_dir ${llvm_windows_debug_SOURCE_DIR})
+    else()
+        message("Loading Windows LLVM libraries, this may take a while...")
+        FetchContent_MakeAvailable(LLVM_Windows)
+        set(llvm_dir ${llvm_windows_SOURCE_DIR})
+    endif()
+    set(CMAKE_SYSTEM_PREFIX_PATH ${llvm_dir} ${CMAKE_SYSTEM_PREFIX_PATH})
 
+    find_package(LLVM REQUIRED CONFIG)
+    find_package(LLD REQUIRED CONFIG)
+else()
+    if (NOT C3_LLVM_VERSION STREQUAL "auto")
+        find_package(LLVM ${C3_LLVM_VERSION} REQUIRED CONFIG)
+    else()
         find_package(LLVM REQUIRED CONFIG)
-        find_package(LLD REQUIRED CONFIG)
-    else()
-        # Add paths for LLVM CMake files of version 19 and higher as they follow a new installation 
-        # layout and are now in /usr/lib/llvm/*/lib/cmake/llvm/ rather than /usr/lib/cmake/llvm/
-        # 
-        # Because of CMAKE_FIND_PACKAGE_SORT_ORDER CMAKE_FIND_PACKAGE_SORT_DIRECTION,
-        # the newest version will always be found first.
-        c3_print_variables(CMAKE_PREFIX_PATH)
-        if (DEFINED LLVM_DIR) 
-            message(STATUS "Looking for LLVM CMake files in user-specified directory ${LLVM_DIR}")
-        else()
-            file (GLOB LLVM_CMAKE_PATHS "/usr/lib/llvm/*/lib/cmake/llvm/")
-            list (APPEND CMAKE_PREFIX_PATH ${LLVM_CMAKE_PATHS} "/usr/lib/")
-            message(STATUS "No LLVM_DIR specified, searching default directories ${CMAKE_PREFIX_PATH}")
-        endif()
-
-        if (NOT C3_LLVM_VERSION STREQUAL "auto")
-            find_package(LLVM ${C3_LLVM_VERSION} REQUIRED CONFIG)
-        else()
-            find_package(LLVM REQUIRED CONFIG)
-        endif()
     endif()
-
-    if (EXISTS /opt/homebrew/lib)
-        list(APPEND LLVM_LIBRARY_DIRS /opt/homebrew/lib)
-    endif()
-
-    if (EXISTS /usr/lib)
-        # Some systems (such as Alpine Linux) seem to put some of the relevant
-        # LLVM files in /usr/lib, but this doesn't seem to be included in the
-        # value of LLVM_LIBRARY_DIRS.
-        list(APPEND LLVM_LIBRARY_DIRS /usr/lib)
-    endif()
-
-    list(REMOVE_DUPLICATES LLVM_LIBRARY_DIRS)
-
-    message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
-    message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
-    message(STATUS "LLVM libraries located in: ${LLVM_LIBRARY_DIRS}")
-
-    if (${LLVM_PACKAGE_VERSION} VERSION_LESS C3_LLVM_MIN_VERSION OR
-        ${LLVM_PACKAGE_VERSION} VERSION_GREATER C3_LLVM_MAX_VERSION)
-        message(FATAL_ERROR "LLVM ${LLVM_PACKAGE_VERSION} is not supported! LLVM version between ${C3_LLVM_MIN_VERSION} and ${C3_LLVM_MAX_VERSION} is required.")
-    endif()
-
-    if(LLVM_ENABLE_RTTI)
-        message(STATUS "LLVM was built with RTTI")
-    else()
-        message(STATUS "LLVM was not built with RTTI")
-    endif()
-
-    string(REPLACE "." ";" VERSION_LIST ${LLVM_PACKAGE_VERSION})
-    list(GET VERSION_LIST 0 LLVM_MAJOR_VERSION)
-
-    include_directories(${LLVM_INCLUDE_DIRS})
-    link_directories(${LLVM_LIBRARY_DIRS})
-    add_definitions(${LLVM_DEFINITIONS})
-
-    if(NOT C3_LINK_DYNAMIC)
-        set(LLVM_LINK_COMPONENTS
-                AllTargetsAsmParsers
-                AllTargetsCodeGens
-                AllTargetsDescs
-                AllTargetsDisassemblers
-                AllTargetsInfos
-                Analysis
-                AsmPrinter
-                BitReader
-                Core
-                DebugInfoPDB
-                InstCombine
-                IrReader
-                LibDriver
-                Linker
-                LTO
-                MC
-                MCDisassembler
-                native
-                nativecodegen
-                Object
-                Option
-                ScalarOpts
-                Support
-                Target
-                TransformUtils
-                WindowsManifest
-                WindowsDriver
-        )
-
-        llvm_map_components_to_libnames(llvm_libs ${LLVM_LINK_COMPONENTS})
-
-        if(NOT ${C3_LLD_DIR} EQUAL "" AND EXISTS ${C3_LLD_DIR})
-            list(APPEND LLVM_LIBRARY_DIRS ${C3_LLD_DIR})
-            list(REMOVE_DUPLICATES LLVM_LIBRARY_DIRS)
-        endif()
-
-        message(STATUS "Looking for static lld libraries in ${LLVM_LIBRARY_DIRS}")
-
-        # These don't seem to be reliable on windows.
-        find_library(LLD_COFF NAMES liblldCOFF.dylib lldCOFF.lib lldCOFF.a liblldCOFF.dll.a liblldCOFF.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH REQUIRED)
-        find_library(LLD_COMMON NAMES liblldCommon.dylib lldCommon.lib lldCommon.a liblldCommon.dll.a liblldCommon.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH REQUIRED)
-        find_library(LLD_ELF NAMES liblldELF.dylib lldELF.lib lldELF.a liblldELF.dll.a liblldELF.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH REQUIRED)
-        if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-            find_library(LLD_MACHO NAMES liblldMachO.dylib lldMachO.lib lldMachO.a liblldMachO.dll.a liblldMachO.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH REQUIRED)
-        else()
-            set(LLD_MACHO "")
-        endif()
-        find_library(LLD_MINGW NAMES liblldMinGW.dylib lldMinGW.lib lldMinGW.a liblldMinGW.dll.a liblldMinGW.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH REQUIRED)
-        find_library(LLD_WASM NAMES liblldWasm.dylib lldWasm.lib lldWasm.a liblldWasm.dll.a liblldWasm.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH REQUIRED)
-    else()
-        message(STATUS "Looking for shared lld libraries in ${LLVM_LIBRARY_DIRS}")
-
-        find_library(LLVM NAMES libLLVM.so PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH REQUIRED)
-        set(llvm_libs ${LLVM})
-
-        # These don't seem to be reliable on windows.
-        find_library(LLD_COFF NAMES liblldCOFF.so PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH REQUIRED)
-        find_library(LLD_COMMON NAMES liblldCommon.so PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH REQUIRED)
-        find_library(LLD_ELF NAMES liblldELF.so PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH REQUIRED)
-        if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-            find_library(LLD_MACHO NAMES liblldMachO.so PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH REQUIRED)
-        else()
-            set(LLD_MACHO "")
-        endif()
-        find_library(LLD_MINGW NAMES liblldMinGW.so PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH REQUIRED)
-        find_library(LLD_WASM NAMES liblldWasm.so PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH REQUIRED)
-    endif()
-
-    # find_library(LLD_LOONG NAMES libLLVMLoongArchCodeGen.lib libLLVMLoongArchAsmParser.lib libLLVMLoongArchCodeGen.a libLLVMLoongArchAsmParser.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
-    set(lld_libs
-            ${LLD_COFF}
-            ${LLD_WASM}
-            ${LLD_MINGW}
-            ${LLD_ELF}
-            ${LLD_MACHO}
-            ${LLD_COMMON}
-    )
-
-    if (APPLE)
-        set(lld_libs ${lld_libs} xar)
-        find_file(RT_ASAN_DYNAMIC NAMES libclang_rt.asan_osx_dynamic.dylib PATHS "${LLVM_LIBRARY_DIR}/clang/${LLVM_MAJOR_VERSION}/lib/darwin" ${LLVM_CRT_LIBRARY_DIR})
-        find_file(RT_TSAN_DYNAMIC NAMES libclang_rt.tsan_osx_dynamic.dylib PATHS "${LLVM_LIBRARY_DIR}/clang/${LLVM_MAJOR_VERSION}/lib/darwin" ${LLVM_CRT_LIBRARY_DIR})
-        find_file(RT_UBSAN_DYNAMIC NAMES libclang_rt.ubsan_osx_dynamic.dylib PATHS "${LLVM_LIBRARY_DIR}/clang/${LLVM_MAJOR_VERSION}/lib/darwin" ${LLVM_CRT_LIBRARY_DIR})
-        find_file(RT_LSAN_DYNAMIC NAMES libclang_rt.lsan_osx_dynamic.dylib PATHS "${LLVM_LIBRARY_DIR}/clang/${LLVM_MAJOR_VERSION}/lib/darwin" ${LLVM_CRT_LIBRARY_DIR})
-        set(sanitizer_runtime_libraries
-                ${RT_ASAN_DYNAMIC}
-                ${RT_TSAN_DYNAMIC}
-                # Unused
-                # ${RT_UBSAN_DYNAMIC}
-                # ${RT_LSAN_DYNAMIC}
-        )
-    endif()
-
-    message(STATUS "Linking to llvm libs ${llvm_libs}")
-    message(STATUS "Linking to lld libs ${lld_libs}")
 endif()
 
+message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
+message(STATUS "Libraries located in: ${LLVM_LIBRARY_DIRS}")
+
+if (NOT LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 15.0)
+    message(FATAL_ERROR "LLVM version 15.0 or later is required.")
+endif()
+
+if(LLVM_ENABLE_RTTI)
+    message(STATUS "LLVM was built with RTTI")
+else()
+    message(STATUS "LLVM was not built with RTTI")
+endif()
+
+string(REPLACE "." ";" VERSION_LIST ${LLVM_PACKAGE_VERSION})
+list(GET VERSION_LIST 0 LLVM_MAJOR_VERSION)
+
+include_directories(${LLVM_INCLUDE_DIRS})
+link_directories(${LLVM_LIBRARY_DIRS})
+add_definitions(${LLVM_DEFINITIONS})
+
+if(NOT C3_LINK_DYNAMIC)
+    set(LLVM_LINK_COMPONENTS
+	    AllTargetsAsmParsers
+	    AllTargetsCodeGens
+	    AllTargetsDescs
+	    AllTargetsDisassemblers
+	    AllTargetsInfos
+	    Analysis
+	    AsmPrinter
+	    BitReader
+	    Core
+	    DebugInfoPDB
+	    InstCombine
+	    IrReader
+	    LibDriver
+	    Linker
+	    LTO
+	    MC
+	    MCDisassembler
+	    native
+	    nativecodegen
+	    Object
+	    Option
+	    ScalarOpts
+	    Support
+	    Target
+	    TransformUtils
+	    WindowsManifest
+	    WindowsDriver
+    )
+
+    llvm_map_components_to_libnames(llvm_libs ${LLVM_LINK_COMPONENTS})
+
+    # These don't seem to be reliable on windows.
+    message(STATUS "using find_library")
+    find_library(LLD_COFF NAMES lldCOFF.lib lldCOFF.a liblldCOFF.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
+    find_library(LLD_COMMON NAMES lldCommon.lib lldCommon.a liblldCommon.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
+    find_library(LLD_ELF NAMES lldELF.lib lldELF.a liblldELF.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
+    find_library(LLD_MACHO NAMES lldMachO.lib lldMachO.a liblldMachO.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
+    find_library(LLD_MINGW NAMES lldMinGW.lib lldMinGW.a liblldMinGW.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
+    find_library(LLD_WASM NAMES lldWasm.lib lldWasm.a liblldWasm.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
+else()
+    find_library(LLVM NAMES libLLVM.so PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
+    set(llvm_libs ${LLVM})
+
+    # These don't seem to be reliable on windows.
+    message(STATUS "using find_library")
+    find_library(LLD_COFF NAMES liblldCOFF.so PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
+    find_library(LLD_COMMON NAMES liblldCommon.so PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
+    find_library(LLD_ELF NAMES liblldELF.so PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
+    find_library(LLD_MACHO NAMES liblldMachO.so PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
+    find_library(LLD_MINGW NAMES liblldMinGW.so PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
+    find_library(LLD_WASM NAMES liblldWasm.so PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
+endif()
+
+if (NOT(${CMAKE_BINARY_DIR} EQUAL ${CMAKE_SOURCE_DIR}))
+    file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/lib)
+    file(COPY ${CMAKE_SOURCE_DIR}/lib DESTINATION ${CMAKE_BINARY_DIR})
+endif()
+
+find_library(LLD_LOONG NAMES libLLVMLoongArchCodeGen.lib libLLVMLoongArchAsmParser.lib libLLVMLoongArchCodeGen.a libLLVMLoongArchAsmParser.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH)
+set(lld_libs
+    ${LLD_COFF}
+    ${LLD_COMMON}
+    ${LLD_WASM}
+    ${LLD_MINGW}
+    ${LLD_ELF}
+    ${LLD_MACHO}
+    )
+
+if (APPLE)
+    set(lld_libs ${lld_libs} xar)
+    find_file(RT_ASAN_DYNAMIC NAMES libclang_rt.asan_osx_dynamic.dylib PATHS "${LLVM_LIBRARY_DIRS}/clang/${LLVM_MAJOR_VERSION}/lib/darwin")
+    find_file(RT_TSAN_DYNAMIC NAMES libclang_rt.tsan_osx_dynamic.dylib PATHS "${LLVM_LIBRARY_DIRS}/clang/${LLVM_MAJOR_VERSION}/lib/darwin")
+    find_file(RT_UBSAN_DYNAMIC NAMES libclang_rt.ubsan_osx_dynamic.dylib PATHS "${LLVM_LIBRARY_DIRS}/clang/${LLVM_MAJOR_VERSION}/lib/darwin")
+    find_file(RT_LSAN_DYNAMIC NAMES libclang_rt.lsan_osx_dynamic.dylib PATHS "${LLVM_LIBRARY_DIRS}/clang/${LLVM_MAJOR_VERSION}/lib/darwin")
+    set(sanitizer_runtime_libraries
+            ${RT_ASAN_DYNAMIC}
+            ${RT_TSAN_DYNAMIC}
+            # Unused
+            # ${RT_UBSAN_DYNAMIC}
+            # ${RT_LSAN_DYNAMIC}
+        )
+endif()
+
+message(STATUS "linking to llvm libs ${lld_libs}")
+message(STATUS "Found lld libs ${lld_libs}")
+
+
+add_library(c3c_wrappers STATIC wrapper/src/wrapper.cpp)
 add_library(miniz STATIC dependencies/miniz/miniz.c)
 
 add_executable(c3c
@@ -340,6 +268,7 @@ add_executable(c3c
         src/compiler/json_output.c
         src/compiler/lexer.c
         src/compiler/linker.c
+        src/compiler/llvm_codegen.c
         src/compiler/abi/c_abi_aarch64.c
         src/compiler/abi/c_abi.c
         src/compiler/abi/c_abi_riscv.c
@@ -347,6 +276,14 @@ add_executable(c3c
         src/compiler/abi/c_abi_win64.c
         src/compiler/abi/c_abi_x64.c
         src/compiler/abi/c_abi_x86.c
+        src/compiler/llvm_codegen_debug_info.c
+        src/compiler/llvm_codegen_expr.c
+        src/compiler/llvm_codegen_function.c
+        src/compiler/llvm_codegen_instr.c
+        src/compiler/llvm_codegen_module.c
+        src/compiler/llvm_codegen_stmt.c
+        src/compiler/llvm_codegen_type.c
+        src/compiler/llvm_codegen_value.c
         src/compiler/module.c
         src/compiler/number.c
         src/compiler/parse_expr.c
@@ -388,66 +325,19 @@ add_executable(c3c
         src/utils/whereami.c
         src/utils/cpus.c
         src/utils/unzipper.c
-        src/compiler/c_codegen.c
         src/compiler/decltable.c
         src/compiler/mac_support.c
+        src/compiler/llvm_codegen_storeload.c
         src/compiler/windows_support.c
         src/compiler/codegen_asm.c
         src/compiler/asm_target.c
+        src/compiler/llvm_codegen_builtins.c
         src/compiler/expr.c
         src/utils/time.c
         src/utils/http.c
         src/compiler/sema_liveness.c
-        src/build/common_build.c
-        src/compiler/sema_const.c
-        ${CMAKE_BINARY_DIR}/git_hash.h
-)
+        src/build/common_build.c)
 
-if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
-    # We are inside of a git repository so rebuilding the hash every time something changes.
-    add_custom_command(
-            OUTPUT ${CMAKE_BINARY_DIR}/git_hash.h
-            COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_LIST_DIR}/git_hash.cmake"
-            DEPENDS "${CMAKE_CURRENT_LIST_DIR}/.git")
-else()
-    # We are NOT inside of a git repository. Building the has only once.
-    add_custom_command(
-            OUTPUT ${CMAKE_BINARY_DIR}/git_hash.h
-            COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_LIST_DIR}/git_hash.cmake")
-endif()
-
-if(C3_WITH_LLVM)
-    target_sources(c3c PRIVATE
-            src/compiler/llvm_codegen.c
-            src/compiler/llvm_codegen_debug_info.c
-            src/compiler/llvm_codegen_expr.c
-            src/compiler/llvm_codegen_function.c
-            src/compiler/llvm_codegen_instr.c
-            src/compiler/llvm_codegen_module.c
-            src/compiler/llvm_codegen_stmt.c
-            src/compiler/llvm_codegen_type.c
-            src/compiler/llvm_codegen_value.c
-            src/compiler/llvm_codegen_storeload.c
-            src/compiler/llvm_codegen_builtins.c)
-
-    target_compile_definitions(c3c PUBLIC LLVM_AVAILABLE=1)
-    add_library(c3c_wrappers STATIC wrapper/src/wrapper.cpp)
-    if (MSVC)
-        target_compile_options(c3c PRIVATE
-                "$<$<CONFIG:Debug>:/EHa>"
-                "$<$<CONFIG:Release>:/EHsc>")
-    endif()
-else()
-    target_sources(c3c PRIVATE src/utils/hostinfo.c)
-    target_compile_definitions(c3c PUBLIC LLVM_AVAILABLE=0)
-endif()
-
-target_include_directories(c3c PRIVATE
-        "${CMAKE_SOURCE_DIR}/src/"
-        "${CMAKE_BINARY_DIR}")
-
-target_include_directories(miniz PUBLIC
-        "${CMAKE_SOURCE_DIR}/dependencies/miniz/")
 
 if (C3_USE_TB)
     file(GLOB tilde-sources
@@ -461,7 +351,7 @@ if (C3_USE_TB)
             tilde-backend/src/tb/x64/*.c
             tilde-backend/src/tb/wasm/*.c
             tilde-backend/src/tb/aarch64/*.c
-    )
+            )
     target_sources(c3c PRIVATE
             src/compiler/tilde_codegen.c
             src/compiler/tilde_codegen_instr.c
@@ -481,29 +371,24 @@ if (C3_USE_TB)
 
     target_include_directories(c3c PRIVATE
             "${CMAKE_SOURCE_DIR}/tilde-backend/include/")
-
 else()
-
     target_compile_definitions(c3c PUBLIC TB_AVAILABLE=0)
-
 endif()
 
-if(C3_WITH_LLVM)
-    target_link_libraries(c3c ${llvm_libs} miniz c3c_wrappers ${lld_libs})
 
-    target_include_directories(c3c PRIVATE
-            "${CMAKE_SOURCE_DIR}/wrapper/include/")
+target_include_directories(c3c PRIVATE
+        "${CMAKE_SOURCE_DIR}/src/"
+        "${CMAKE_SOURCE_DIR}/wrapper/include/")
 
-    target_include_directories(c3c_wrappers PRIVATE
-            "${CMAKE_SOURCE_DIR}/wrapper/include/")
 
-    target_link_libraries(c3c_wrappers ${llvm_libs} ${lld_libs})
+target_include_directories(c3c_wrappers PRIVATE
+        "${CMAKE_SOURCE_DIR}/wrapper/include/")
 
-else()
+target_include_directories(miniz PUBLIC
+        "${CMAKE_SOURCE_DIR}/dependencies/miniz/")
 
-    target_link_libraries(c3c ${llvm_libs} miniz ${lld_libs})
-
-endif()
+target_link_libraries(c3c_wrappers ${llvm_libs} ${lld_libs})
+target_link_libraries(c3c ${llvm_libs} miniz c3c_wrappers ${lld_libs})
 
 if(C3_USE_MIMALLOC)
     target_link_libraries(c3c mimalloc-static)
@@ -513,129 +398,72 @@ if (WIN32)
     target_link_libraries(c3c Winhttp.lib)
 endif()
 
-if(MINGW)
-    message("Increase stack for msys")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--stack,8388608")
-endif ()
-
 if (CURL_FOUND)
     target_link_libraries(c3c ${CURL_LIBRARIES})
-    target_include_directories(c3c PRIVATE ${CURL_INCLUDE_DIRS})
+    target_include_directories(c3c PRIVATE ${CURL_INCLUDES})
     target_compile_definitions(c3c PUBLIC CURL_FOUND=1)
 else()
     target_compile_definitions(c3c PUBLIC CURL_FOUND=0)
 endif()
 
-
 if(MSVC)
-    target_compile_options(c3c PRIVATE
-        /wd4068
-        /wd4090
-        /WX
-        /Wv:18
-    )
-
-    if(C3_WITH_LLVM)
-        target_compile_options(c3c_wrappers PUBLIC
-            /wd4624
-            /wd4267
-            /wd4244
-            /WX
-            /Wv:18
-        )
-        if(NOT LLVM_ENABLE_RTTI)
-            target_compile_options(c3c_wrappers PUBLIC /GR-)
+    message("Adding MSVC options")
+    target_compile_options(c3c PRIVATE /wd4068 /wd4090 /WX /Wv:18)
+    target_compile_options(c3c_wrappers PUBLIC /wd4624 /wd4267 /wd4244 /WX /Wv:18)
+    if (NOT LLVM_ENABLE_RTTI)
+        target_compile_options(c3c_wrappers PUBLIC /GR-)
+    endif()
+    target_link_options(c3c_wrappers PUBLIC /ignore:4099)
+    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+        target_compile_options(c3c PUBLIC /MTd)
+        target_compile_options(c3c_wrappers PUBLIC /MTd)
+        target_compile_options(miniz PUBLIC /MTd)
+        if (C3_USE_TB)
+            target_compile_options(tilde-backend PUBLIC /MTd)
+        endif()
+    else()
+        target_compile_options(c3c PUBLIC /MT)
+        target_compile_options(c3c_wrappers PUBLIC /MT)
+        target_compile_options(miniz PUBLIC /MT)
+        if (C3_USE_TB)
+            target_compile_options(tilde-backend PUBLIC /MT)
         endif()
-        target_link_options(c3c_wrappers PUBLIC /ignore:4099)
-    endif()
-
-    if(C3_WITH_LLVM)
-        set(clang_lib_dir ${llvm_dir}/lib/clang/${C3_LLVM_VERSION}/lib/windows)
-        set(sanitizer_runtime_libraries
-                ${clang_lib_dir}/clang_rt.asan-x86_64.lib
-                ${clang_lib_dir}/clang_rt.asan_dynamic-x86_64.lib
-                ${clang_lib_dir}/clang_rt.asan_dynamic-x86_64.dll
-                ${clang_lib_dir}/clang_rt.asan_dynamic_runtime_thunk-x86_64.lib)
     endif()
+    set(clang_lib_dir ${llvm_dir}/lib/clang/${C3_LLVM_VERSION}/lib/windows)
+    set(sanitizer_runtime_libraries
+        ${clang_lib_dir}/clang_rt.asan-x86_64.lib
+        ${clang_lib_dir}/clang_rt.asan_dynamic-x86_64.lib
+        ${clang_lib_dir}/clang_rt.asan_dynamic-x86_64.dll
+        ${clang_lib_dir}/clang_rt.asan_dynamic_runtime_thunk-x86_64.lib)
 else()
-    if (C3_WITH_LLVM AND NOT LLVM_ENABLE_RTTI)
+    message(STATUS "using gcc/clang warning switches")
+    target_link_options(c3c PRIVATE -pthread)
+    if (NOT LLVM_ENABLE_RTTI)
         target_compile_options(c3c_wrappers PRIVATE -fno-rtti)
     endif()
-    target_compile_options(c3c PRIVATE
-        -pthread
-        -Wall
-        -Werror
-        -Wno-unknown-pragmas
-        -Wno-unused-result
-        -Wno-unused-function
-        -Wno-unused-variable
-        -Wno-unused-parameter
-    )
-    target_link_options(c3c PRIVATE -pthread)
+    target_compile_options(c3c PRIVATE -pthread -Wall -Werror -Wno-unknown-pragmas -Wno-unused-result
+            -Wno-unused-function -Wno-unused-variable -Wno-unused-parameter)
 endif()
 
 install(TARGETS c3c DESTINATION bin)
 install(DIRECTORY lib/ DESTINATION lib/c3)
 
-# Man page install (OSX/Linux only)
-if (NOT WIN32)
-    install(FILES c3c.1 DESTINATION "share/man/man1")
-endif()
-
-# Copy stdlib
-if (NOT ${CMAKE_BINARY_DIR} EQUAL ${CMAKE_SOURCE_DIR})
-    file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/lib)
-    file(COPY ${CMAKE_SOURCE_DIR}/lib DESTINATION ${CMAKE_BINARY_DIR})
-endif()
-
-if (C3_WITH_LLVM AND DEFINED sanitizer_runtime_libraries)
+if (DEFINED sanitizer_runtime_libraries)
     add_custom_command(TARGET c3c POST_BUILD
-            COMMAND "${CMAKE_COMMAND}" -E rm -rf -- $<TARGET_FILE_DIR:c3c>/c3c_rt
-            COMMAND "${CMAKE_COMMAND}" -E make_directory $<TARGET_FILE_DIR:c3c>/c3c_rt
-            COMMAND "${CMAKE_COMMAND}" -E copy ${sanitizer_runtime_libraries} $<TARGET_FILE_DIR:c3c>/c3c_rt
-            VERBATIM
-            COMMENT "Copying sanitizer runtime libraries to output directory")
+        COMMAND "${CMAKE_COMMAND}" -E rm -rf -- $<TARGET_FILE_DIR:c3c>/c3c_rt
+        COMMAND "${CMAKE_COMMAND}" -E make_directory $<TARGET_FILE_DIR:c3c>/c3c_rt
+        COMMAND "${CMAKE_COMMAND}" -E copy ${sanitizer_runtime_libraries} $<TARGET_FILE_DIR:c3c>/c3c_rt
+        VERBATIM
+        COMMENT "Copying sanitizer runtime libraries to output directory")
 
     if (APPLE)
         # Change LC_ID_DYLIB to be rpath-based instead of having an absolute path
         add_custom_command(TARGET c3c POST_BUILD
-                COMMAND find $<TARGET_FILE_DIR:c3c>/c3c_rt -type f -name "*.dylib" -execdir ${LLVM_TOOLS_BINARY_DIR}/llvm-install-name-tool -id @rpath/{} {} $<SEMICOLON>
-                VERBATIM)
+            COMMAND find $<TARGET_FILE_DIR:c3c>/c3c_rt -type f -name "*.dylib" -execdir ${LLVM_TOOLS_BINARY_DIR}/llvm-install-name-tool -id @rpath/{} {} $<SEMICOLON>
+            VERBATIM)
     endif()
 
     install(DIRECTORY $<TARGET_FILE_DIR:c3c>/c3c_rt/ DESTINATION bin/c3c_rt)
 endif()
 
 feature_summary(WHAT ALL)
-
-message(STATUS "Building ${CMAKE_PROJECT_NAME} with the following configuration:")
-
-set(c3_print_prefix "  ")
-
-foreach(option IN LISTS C3_OPTIONS)
-    if (DEFINED ${option})
-        c3_print_variables(${option})
-    endif()
-endforeach()
-
-foreach(flag_var
-        CMAKE_BUILD_TYPE
-        CMAKE_C_COMPILER
-        CMAKE_CXX_COMPILER
-        CMAKE_LINKER
-        CMAKE_OBJCOPY
-        CMAKE_STRIP
-        CMAKE_DLLTOOL)
-    c3_print_variables(${flag_var})
-endforeach()
-
-message(STATUS "Build flags:")
-foreach(flag_var
-        CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
-        CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
-        CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-        CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-    c3_print_variables(${flag_var})
-endforeach()
-
-message(STATUS "Output to: \"${CMAKE_BINARY_DIR}\"")

CMakePresets.json

@@ -1,57 +0,0 @@
-{
-    "version": 3,
-    "configurePresets": [
-        {
-            "name": "windows-base",
-            "hidden": true,
-            "architecture": {
-                "value": "x64"
-            },
-            "toolset": {
-                "value": "host=x64"
-            }
-        },
-        {
-            "name": "windows-vs-2022-release",
-            "generator": "Visual Studio 17 2022",
-            "displayName": "Windows x64 Visual Studio 17 2022",
-            "inherits": "windows-base",
-            "binaryDir": "build",
-            "cacheVariables": {
-                "CMAKE_CONFIGURATION_TYPES": "Release;RelWithDebInfo",
-                "CMAKE_BUILD_TYPE": "Release"
-            }
-        },
-        {
-            "name": "windows-vs-2022-debug",
-            "generator": "Visual Studio 17 2022",
-            "displayName": "Windows x64 Visual Studio 17 2022 (Debug)",
-            "inherits": "windows-base",
-            "binaryDir": "build-debug",
-            "cacheVariables": {
-                "CMAKE_CONFIGURATION_TYPES": "Debug",
-                "CMAKE_BUILD_TYPE": "Debug"
-            }
-        }
-    ],
-    "buildPresets": [
-        {
-            "name": "windows-vs-2022-debug",
-            "displayName": "Debug",
-            "configurePreset": "windows-vs-2022-debug",
-            "configuration": "Debug"
-        },
-        {
-            "name": "windows-vs-2022-release",
-            "displayName": "Release",
-            "configurePreset": "windows-vs-2022-release",
-            "configuration": "Release"
-        },
-        {
-            "name": "windows-vs-2022-release-with-debug-info",
-            "displayName": "RelWithDebInfo",
-            "configurePreset": "windows-vs-2022-release",
-            "configuration": "RelWithDebInfo"
-        }
-    ]
-}

CODESTYLE.md

@@ -74,7 +74,7 @@ No space inside parenthesis:
 
 ### Tab vs spaces
 
-Use tabs for indentation, no CRLF in the source.
+Recommendation: tabs, 4 spaces wide. No CRLF in the source.
 
 ### If, braces and new lines
 
@@ -147,114 +147,4 @@ Iterating over the elements are done using `VECEACH`.
 ### Scratch buffer for strings.
 
 There is a scratch buffer for strings in the `global_context` prefer using that
-one with related functions when working on temporary strings.
-
-# C3 Standard library style guide.
-
-When contributing to the standard library please try your best to adhere to the
-following style requirements to ensure a consistent style in the stdlib and to
-facilitate accepting PRs more quickly.
-
-### Braces are placed on the next line
-
-**NO:**
-```c
-fn void foo(String bar) {
-  @pool() {
-    ...
-  };
-} 
-```
-
-**YES:**
-```c
-fn void foo(String bar)
-{
-  @pool() 
-  {
-    ...
-  };
-}
-```
-
-### Indentation with tabs
-
-Use tab for indentation, not spaces, no CRLF in the sources 
-
-### Type names
-
-Use `PascalCase` not `Ada_Case` for type names.
-
-**YES:**
-```c
-enum MyEnum
-{
-  ABC,
-  DEF
-}  
-```
-
-**NO:**
-```c
-enum My_Enum
-{
-  ABC,
-  DEF
-}  
-```
-
-### Type names when binding to OS libraries
-
-When doing bindings (for instance, adding declarations referring to Win32 APIs),
-try to retain the original name when possible. If it isn't possible use (consistently)
-one of two options:
-
-1. Prefix: `HANDLE` -> `Win32_HANDLE`
-2. Change the first letter to upper case: `mode_t` -> `Mode_t`
-
-### Variables, function, methods and globals
-
-Use `snake_case`, not `camelCase`.
-
-**YES:**
-```c
-int some_global = 1;
-
-fn void open_file(String special_file)
-{
-  ...
-}
-```
-
-**NO:**
-```c
-int someGlobal = 1;
-
-fn void openFile(String specialFile)
-{
-  ...
-}
-```
-
-### Variables, function, methods and globals when binding to OS libraries
-
-When doing bindings (for instance, adding declarations referring to Win32 APIs),
-try to retain the original name when possible. If it isn't possible use (consistently)
-one of two options:
-
-1. Prefix: `win32_GetWindowLongPtrW`. However, this is usually only recommended if it is builtin.
-2. Change first character to lower case: `GetWindowLongPtrW` -> `getWindowLongPtrW`
-
-### Use `self` as the first method argument
-
-Unless there is a strong reason not to, use `self` for the first parameter in a method.
-
-### The allocator argument
-
-Prefer always calling the allocator parameter `allocator`, and make it the first regular
-argument.
-
-## Add tests to your changes
-
-If you add or fix things, then there should always be tests in `test/unit/stdlib` to verify
-the functionality.
+one with related functions when working on temporary strings.

CONTRIBUTING.md

@@ -1,70 +0,0 @@
-# How to contribute to C3
-
-The C3 project consists of
-
-1. The C3 language itself.
-2. The C3 compiler, called c3c.
-3. The C3 standard library
-4. Various tools, such as the editor plugins
-
-## 1. How to contribute to the C3 language
-
-The C3 language is essentially the language specification. You can contribute to the language by:
-
-1. Filing enhancement requests for changes to the language.
-2. Offering feedback on existing features, on Discord or by filing issues.
-3. Help working on the language specification.
-4. Help working on the grammar.
-
-## 2. How to contribute to the C3 compiler
-
-The C3 compiler consists for the compiler itself + test suites for testing the compiler. 
-You can contribute by:
-
-1. File bugs (by far the most important thing).
-2. Suggest improved diagnostics / error messages.
-3. Refactoring existing code (needs deep understanding of the compiler).
-4. Add support for more architectures.
-5. Add support for more backends.
-
-## 3. How to contribute to the standard library
-
-The standard library is the library itself + test suites for testing the standard library.
-You can contribute by:
-
-1. Filing bugs on the standard library.
-2. Write additional unit tests.
-3. Suggest new functionality by filing an issue.
-4. Work on stdlib additions.
-5. Fix bugs in the stdlib
-6. Maintain a section of the standard library
-
-### How to work on small stdlib additions
-
-If there is just a matter of adding a function or two to an existing module, a pull request
-is sufficient. However, please make sure that:
-
-1. It follows the guidelines for the code to ensure a uniform experience (naming standard, indentation, braces etc).
-2. Add a line in the release notes about the change.
-3. Make sure it has unit tests.
-
-### How to work on non-trivial additions to the stdlib
-
-Regardless whether an addition is approved for inclusion or not, it needs to incubate:
-
-1. First implement it standalone, showing that it’s working well and has a solid design. This has the advantage of people being able to contribute or even create competing implementations
-2. Once it is considered finished it can be proposed for inclusion.
-
-This will greatly help improving the quality of additions.
-
-Note that any new addition needs a full set of unit tests before being included into the standard library.
-
-### Maintain a part of the standard library
-
-A single maintainer is insufficient for a standard library, instead we need one or more maintainer
-for each module. The maintainer(s) will review pull requests and actively work on making the module
-pristine with the highest possible quality.
-
-## 4. How to contribute to various tools
-
-In general, file a pull request. Depending on who maintains it, rules may differ.

README.md

@@ -8,19 +8,15 @@ for programmers who like C.
 
 Precompiled binaries for the following operating systems are available:
  
-- Windows x64 [download](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-windows.zip), [install instructions](#installing-on-windows-with-precompiled-binaries).
-- Debian x64 [download](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-linux.tar.gz), [install instructions](#installing-on-debian-with-precompiled-binaries).
-- Ubuntu x86 [download](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-ubuntu-20.tar.gz), [install instructions](#installing-on-ubuntu-with-precompiled-binaries).
-- MacOS Arm64 [download](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-macos.zip), [install instructions](#installing-on-macos-with-precompiled-binaries).
-- OpenBSD x64 [download](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-openbsd.tar.gz), [install instructions](#installing-on-openbsd-with-precompiled-binaries).
+- Windows x64 [download](https://github.com/c3lang/c3c/releases/download/latest/c3-windows.zip), [install instructions](#installing-on-windows-with-precompiled-binaries).
+- Debian x64 [download](https://github.com/c3lang/c3c/releases/download/latest/c3-linux.tar.gz), [install instructions](#installing-on-debian-with-precompiled-binaries).
+- MacOS x64 [download](https://github.com/c3lang/c3c/releases/download/latest/c3-macos.zip), [install instructions](#installing-on-mac-with-precompiled-binaries).
 
 The manual for C3 can be found at [www.c3-lang.org](http://www.c3-lang.org).
 
 ![vkQuake](https://github.com/c3lang/c3c/blob/master/resources/images/vkQuake.png?raw=true)
 
-Thanks to full ABI compatibility with C, it's possible to mix C and C3 in the same project with no effort. As a demonstration, vkQuake was compiled with a small portion of the code converted to C3 and compiled with the c3c compiler. (The aging fork can be found at https://github.com/c3lang/vkQuake)
-
-A non-curated list of user written projects and other resources can be found [here](https://github.com/c3lang/c3-showcase).
+Thanks to full ABI compatibility with C, it's possible to mix C and C3 in the same project with no effort. As a demonstration, vkQuake was compiled with a small portion of the code converted to C3 and compiled with the c3c compiler. (The fork can be found at https://github.com/c3lang/vkQuake)
 
 ### Design Principles
 - Procedural "get things done"-type of language.
@@ -36,10 +32,10 @@ whole new language.
 
 ### Example code
 
-The following code shows [generic modules](https://c3-lang.org/generic-programming/generics/) (more examples can be found at https://c3-lang.org/language-overview/examples/). 
+The following code shows [generic modules](https://c3-lang.org/references/docs/generics/) (more examples can be found at https://c3-lang.org/references/docs/examples/). 
 
-```cpp
-module stack {Type};
+```c++
+module stack (<Type>);
 // Above: the parameterized type is applied to the entire module.
 
 struct Stack
@@ -58,7 +54,7 @@ fn void Stack.push(Stack* this, Type element)
     if (this.capacity == this.size)
     {
         this.capacity *= 2;
-        if (this.capacity < 16) this.capacity = 16;
+		if (this.capacity < 16) this.capacity = 16;
         this.elems = realloc(this.elems, Type.sizeof * this.capacity);
     }
     this.elems[this.size++] = element;
@@ -83,13 +79,13 @@ import stack;
 
 // Define our new types, the first will implicitly create 
 // a complete copy of the entire Stack module with "Type" set to "int"
-alias IntStack = Stack {int};
+def IntStack = Stack(<int>);
 // The second creates another copy with "Type" set to "double"
-alias DoubleStack = Stack {double};
+def DoubleStack = Stack(<double>);
 
-// If we had added "alias IntStack2 = Stack {int}"
+// If we had added "define IntStack2 = Stack(<int>)"
 // no additional copy would have been made (since we already
-// have an parameterization of Stack {int} so it would
+// have an parameterization of Stack(<int>)) so it would
 // be same as declaring IntStack2 an alias of IntStack
 
 // Importing an external C function is straightforward
@@ -127,7 +123,6 @@ fn void main()
 - New semantic macro system
 - Module based name spacing
 - Slices
-- Operator overloading
 - Compile time reflection
 - Enhanced compile time execution
 - Generics based on generic modules
@@ -142,10 +137,9 @@ fn void main()
 
 ### Current status
 
-The current stable version of the compiler is **version 0.7.4**.
+The current stable version of the compiler is **version 0.6.1**.
 
-The upcoming 0.7.x releases will focus on expanding the standard library,
-fixing bugs and improving compile time analysis. 
+The upcoming 0.6.x releases will focus on expanding the standard library.
 Follow the issues [here](https://github.com/c3lang/c3c/issues).
 
 If you have suggestions on how to improve the language, either [file an issue](https://github.com/c3lang/c3c/issues) 
@@ -177,14 +171,12 @@ The compiler is currently verified to compile on Linux, Windows and MacOS.
 | NetBSD x86               | Untested                      | Untested                | No          | Yes      | Untested | Yes*       |
 | NetBSD x64               | Untested                      | Untested                | No          | Yes      | Untested | Yes*       |
 | OpenBSD x86              | Untested                      | Untested                | No          | Yes      | Untested | Yes*       |
-| OpenBSD x64              | Yes*                          | Yes                     | Yes*        | Yes      | Untested | Yes*       |
+| OpenBSD x64              | Untested                      | Untested                | No          | Yes      | Untested | Yes*       |
 | MCU x86                  | No                            | Untested                | No          | No       | No       | Yes*       |
 | Wasm32                   | No                            | Yes                     | No          | No       | No       | No         |
 | Wasm64                   | No                            | Untested                | No          | No       | No       | No         |
 
-*\* Inline asm is still a work in progress*<br>
-*\* OpenBSD 7.7 is the only tested version*<br>
-*\* OpenBSD has limited stacktrace, needs to be tested further*
+*\* Inline asm is still a work in progress*
 
 More platforms will be supported in the future.
 
@@ -200,55 +192,32 @@ More platforms will be supported in the future.
 
 ### Installing
 
-This installs the latest prerelease build, as opposed to the latest released version.
-
 #### Installing on Windows with precompiled binaries
-1. Download the zip file: [https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-windows.zip](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-windows.zip)
-(debug version [here](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-windows-debug.zip))
+1. Download the zip file: [https://github.com/c3lang/c3c/releases/download/latest/c3-windows.zip](https://github.com/c3lang/c3c/releases/download/latest/c3-windows.zip) 
+(debug version [here](https://github.com/c3lang/c3c/releases/download/latest/c3-windows-debug.zip))
 2. Unzip exe and standard lib.
 3. If you don't have Visual Studio 17 installed you can either do so, or run the `msvc_build_libraries.py` Python script which will download the necessary files to compile on Windows. 
 4. Run `c3c.exe`.
 
 #### Installing on Debian with precompiled binaries
-1. Download tar file: [https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-linux.tar.gz](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-linux.tar.gz)
-   (debug version [here](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-linux-debug.tar.gz))
+1. Download tar file: [https://github.com/c3lang/c3c/releases/download/latest/c3-linux.tar.gz](https://github.com/c3lang/c3c/releases/download/latest/c3-linux.tar.gz)
+   (debug version [here](https://github.com/c3lang/c3c/releases/download/latest/c3-linux-debug.tar.gz))
 2. Unpack executable and standard lib.
 3. Run `./c3c`.
 
-#### Installing on Ubuntu with precompiled binaries
-1. Download tar file: [https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-ubuntu-20.tar.gz](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-ubuntu-20.tar.gz)
-   (debug version [here](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-ubuntu-20-debug.tar.gz))
-2. Unpack executable and standard lib.
-3. Run `./c3c`.
-
-#### Installing on MacOS with precompiled binaries
+#### Installing on Mac with precompiled binaries
 1. Make sure you have XCode with command line tools installed.
-2. Download the zip file: [https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-macos.zip](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-macos.zip)
-   (debug version [here](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-macos-debug.zip))
+2. Download the zip file: [https://github.com/c3lang/c3c/releases/download/latest/c3-macos.zip](https://github.com/c3lang/c3c/releases/download/latest/c3-macos.zip)
+   (debug version [here](https://github.com/c3lang/c3c/releases/download/latest/c3-macos-debug.zip))
 3. Unzip executable and standard lib.
 4. Run `./c3c`.
 
 (*Note that there is a known issue with debug symbol generation on MacOS 13, see [issue #1086](https://github.com/c3lang/c3c/issues/1086))
 
-#### Installing on OpenBSD with precompiled binaries
-1. Download tar file: [https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-openbsd.tar.gz](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-openbsd.tar.gz)
-   (debug version [here](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-openbsd-debug.tar.gz))
-2. Unpack executable and standard lib.
-3. Run `./c3c`.
-
-(*Note that this is specifically for OpenBSD 7.7, running it on any other version is prone to ABI breaks)
-
 #### Installing on Arch Linux
-Arch includes c3c in the official 'extra' repo. It can be easily installed the usual way:
+There is an AUR package for the c3c compiler : [c3c-git](https://aur.archlinux.org/packages/c3c-git).
 
-```sh
-sudo pacman -S c3c
-# or paru -S c3c
-# or yay -S c3c
-# or aura -A c3c
-```
-
-There is also an AUR package for the c3c compiler : [c3c-git](https://aur.archlinux.org/packages/c3c-git).
+Due to some issues with the LLVM packaged for Arch Linux, the AUR package will download and use LLVM 16 for Ubuntu-23.04 to compile the c3c compiler.
 
 You can use your AUR package manager:
 ```sh
@@ -266,13 +235,20 @@ makepkg -si
 
 #### Building via Docker
 
-You can build `c3c` using an Ubuntu container. By default, the script will build through Ubuntu 22.04. You can specify the version by passing the `UBUNTU_VERSION` environment variable.
+You can build `c3c` using either an Ubuntu 18.04 or 20.04 container:
 
 ```
-UBUNTU_VERSION=20.04 ./build-with-docker.sh
+./build-with-docker.sh 18
 ```
 
-See the `build-with-docker.sh` script for more information on other configurable environment variables.
+Replace `18` with `20` to build through Ubuntu 20.04.
+
+For a release build specify:
+```
+./build-with-docker.sh 20 Release
+```
+
+A `c3c` executable will be found under `bin/`.
 
 #### Installing on OS X using Homebrew
 
@@ -285,14 +261,6 @@ See the `build-with-docker.sh` script for more information on other configurable
 8. Set up CMake build for debug: `cmake ..`
 9. Build: `cmake --build .`
 
-#### Installing on Windows using Scoop
-
-c3c is included in 'Main' bucket.
-
-```sh
-scoop install c3
-```
-
 #### Getting started with a "hello world"
 
 Create a `main.c3` file with:
@@ -321,39 +289,32 @@ called `hello_world` or `hello_world.exe`depending on platform.
 
 #### Compiling on Windows
 
-1. Make sure you have Visual Studio 17 2022 installed or alternatively install the "Buildtools for Visual Studio" (https://aka.ms/vs/17/release/vs_BuildTools.exe) and then select "Desktop development with C++"
+1. Make sure you have Visual Studio 17 2022 installed or alternatively install the "Buildtools for Visual Studio" (https://aka.ms/vs/17/release/vs_BuildTools.exe) and then select "Desktop development with C++" (there is also `c3c/resources/install_win_reqs.bat` to automate this)
 2. Install CMake
 3. Clone the C3C github repository: `git clone https://github.com/c3lang/c3c.git`
-4. Enter the C3C directory: `cd c3c`.
-5. Set up the CMake build: `cmake --preset windows-vs-2022-release`
-6. Build: `cmake --build --preset windows-vs-2022-release`
+4. Enter the C3C directory `cd c3c`.
+5. Set up the CMake build `cmake -B build -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release`
+6. Build: `cmake --build build --config Release`
+7. You should now have the c3c.exe
 
-You should now have a `c3c` executable in `build\Release`.
+You should now have a `c3c` executable.
 
-You can try it out by running some sample code: `c3c.exe compile ../../resources/examples/hash.c3`
-
-Building `c3c` using Visual Studio Code is also supported when using the `CMake Tools` extension. Simply select the `Windows x64 Visual Studio 17 2022` configure preset and build.
+You can try it out by running some sample code: `c3c.exe compile ../resources/examples/hash.c3`
 
 *Note that if you run into linking issues when building, make sure that you are using the latest version of VS17.*
 
-#### Compiling on Windows (Debug)
 
-Debug build requires a different set of LLVM libraries to be loaded for which a separate CMake configuration is used to avoid conflicts.
-1. Configure: `cmake --preset windows-vs-2022-debug`
-2. Build: `cmake --build --preset windows-vs-2022-debug`
-
-You should now have a `c3c` executable in `build-debug\Debug`.
-
-#### Compiling on Ubuntu 24.04 LTS
+#### Compiling on Ubuntu 20.10
 
 1. Make sure you have a C compiler that handles C11 and a C++ compiler, such as GCC or Clang. Git also needs to be installed.
-2. Install LLVM 18 `sudo apt-get install cmake git clang zlib1g zlib1g-dev libllvm18 llvm llvm-dev llvm-runtime liblld-dev liblld-18 libpolly-18-dev`
-3. Clone the C3C github repository: `git clone https://github.com/c3lang/c3c.git`
-4. Enter the C3C directory `cd c3c`.
-5. Create a build directory `mkdir build`
-6. Change directory to the build directory `cd build`
-7. Set up CMake build: `cmake ..`
-8. Build: `cmake --build .`
+2. Install CMake: `sudo apt install cmake`
+3. Install LLVM 17+ (or greater: C3C supports LLVM 17+): `sudo apt-get install clang-17 zlib1g zlib1g-dev libllvm17 llvm-17 llvm-17-dev llvm-17-runtime liblld-17-dev liblld-17`
+4. Clone the C3C github repository: `git clone https://github.com/c3lang/c3c.git`
+5. Enter the C3C directory `cd c3c`.
+6. Create a build directory `mkdir build`
+7. Change directory to the build directory `cd build`
+8. Set up CMake build: `cmake ..`
+9. Build: `cmake --build .`
 
 You should now have a `c3c` executable.
 
@@ -362,7 +323,7 @@ You can try it out by running some sample code: `./c3c compile ../resources/exam
 
 #### Compiling on Void Linux
 
-1. As root, ensure that all project dependencies are installed: `xbps-install git cmake llvm17 llvm17-devel lld17-devel libcurl-devel ncurses-devel zlib-devel libzstd-devel libxml2-devel`
+1. As root, ensure that all project dependencies are installed: `xbps-install git cmake llvm17 lld17-devel libcurl-devel ncurses-devel zlib-devel libzstd-devel libxml2-devel`
 2. Clone the C3C repository: `git clone https://github.com/c3lang/c3c.git`
     - If you only need the latest commit, you may want to make a shallow clone instead: `git clone https://github.com/c3lang/c3c.git --depth=1`
 3. Enter the directory: `cd c3c`
@@ -375,37 +336,6 @@ Your c3c executable should have compiled properly. You may want to test it: `./c
 For a sytem-wide installation, run the following as root: `cmake --install .`
 
 
-#### Compiling on Fedora
-
-1. Install required project dependencies: `dnf install cmake clang git llvm llvm-devel lld lld-devel ncurses-devel`
-2. Optionally, install additional dependencies: `dnf install libcurl-devel zlib-devel libzstd-devel libxml2-devel libffi-devel`
-3. Clone the C3C repository: `git clone https://github.com/c3lang/c3c.git`
-    - If you only need the latest commit, you may want to make a shallow clone: `git clone https://github.com/c3lang/c3c.git --depth=1`
-4. Enter the C3C directory: `cd c3c`
-5. Create a build directory and navigate into it: `mkdir build && cd build`
-6. Create the CMake build cache. The Fedora repositories provide `.so` libraries for lld, so you need to set the C3_LINK_DYNAMIC flag: `cmake .. -DC3_LINK_DYNAMIC=1`
-7. Build the project: `cmake --build .`
-
-The c3c binary should be created in the build directory. You can try it out by running some sample code: `./c3c compile ../resources/examples/hash.c3`
-
-#### Compiling on Arch Linux
-
-1. Install required project dependencies: `sudo pacman -S curl lld llvm-libs clang cmake git libedit llvm`
-2. Clone the C3C repository: `git clone https://github.com/c3lang/c3c.git`
-    - If you only need the latest commit, you may want to make a shallow clone: `git clone https://github.com/c3lang/c3c.git --depth=1`
-3. Enter the C3C directory: `cd c3c`
-4. Create the CMake build cache:
-```bash
-cmake -B build \
-    -D C3_LINK_DYNAMIC=ON \
-    -D CMAKE_BUILD_TYPE=Release
-```
-5. Build the project: `make -C build`.
-
-After compilation, the `c3c` binary will be located in the `build` directory. You can test it by compiling an example: `./build/c3c compile resources/examples/ls.c3`.
-
-6. To install the compiler globally: `sudo cmake --install build`
-
 #### Compiling on other Linux / Unix variants
 
 1. Install CMake.
@@ -439,18 +369,3 @@ Editor plugins can be found at https://github.com/c3lang/editor-plugins.
 3. Run tests and see that they pass. (Recommended settings: `c3c compile-test -O0 test/unit`.
    - in this example `test/unit/` is the relative path to the test directory, so adjust as required)
 4. Make a pull request for the new tests.
-
-## Thank yous
-
-A huge **THANK YOU** goes out to all contributors and sponsors.
-
-A special thank you to sponsors [Zack Puhl](https://github.com/NotsoanoNimus) and [konimarti](https://github.com/konimarti) for going the extra mile.
-
-And honorable mention goes to past sponsors:
-[Ygor Pontelo](https://github.com/ygorpontelo), [Simone Raimondi](https://github.com/SRaimondi),
-[Jan Válek](https://github.com/jan-valek), [Pierre Curto](https://github.com/pierrec), 
-[Caleb-o](https://github.com/Caleb-o) and [devdad](https://github.com/devdad)
-
-## Star History
-
-[![Star History Chart](https://api.star-history.com/svg?repos=c3lang/c3c&type=Date)](https://www.star-history.com/#c3lang/c3c&Date)

benchmarks/stdlib/hash/non_crypto_shootout.c3

@@ -1,94 +0,0 @@
-// Copyright (c) 2025 Zack Puhl <github@xmit.xyz>. All rights reserved.
-// Use of this source code is governed by the MIT license
-// a copy of which can be found in the LICENSE_STDLIB file.
-module non_crypto_benchmarks;
-
-
-const usz COMMON_ITERATIONS = 1 << 18;
-
-const char[] COMMON_1 = { 0xA5 };
-const char[] COMMON_4 = { 0xA5, 0xA5, 0xA5, 0xA5, };
-const char[] COMMON_8 = { [0..7] = 0xA5 };
-const char[] COMMON_16 = { [0..15] = 0xA5 };
-const char[] COMMON_32 = { [0..31] = 0xA5 };
-const char[] COMMON_64 = { [0..63] = 0xA5 };
-const char[] COMMON_128 = { [0..127] = 0xA5 };
-const char[] COMMON_1024 = { [0..1023] = 0xA5 };
-
-
-fn void initialize_bench() @init
-{
-	set_benchmark_warmup_iterations(3);
-	set_benchmark_max_iterations(COMMON_ITERATIONS + 3);
-}
-
-
-// =======================================================================================
-module non_crypto_benchmarks @benchmark;
-
-import std::hash;
-
-
-fn void fnv64a_1() => fnv64a::hash(COMMON_1);
-fn void fnv32a_1() => fnv32a::hash(COMMON_1);
-fn void wyhash2_1() => wyhash2::hash(COMMON_1);
-fn void metro64_1() => metro64::hash(COMMON_1);
-fn void metro128_1() => metro128::hash(COMMON_1);
-fn void a5hash_1() => a5hash::hash(COMMON_1);
-fn void komi_1() => komi::hash(COMMON_1);
-
-fn void fnv64a_4() => fnv64a::hash(COMMON_4);
-fn void fnv32a_4() => fnv32a::hash(COMMON_4);
-fn void wyhash2_4() => wyhash2::hash(COMMON_4);
-fn void metro64_4() => metro64::hash(COMMON_4);
-fn void metro128_4() => metro128::hash(COMMON_4);
-fn void a5hash_4() => a5hash::hash(COMMON_4);
-fn void komi_4() => komi::hash(COMMON_4);
-
-fn void fnv64a_8() => fnv64a::hash(COMMON_8);
-fn void fnv32a_8() => fnv32a::hash(COMMON_8);
-fn void wyhash2_8() => wyhash2::hash(COMMON_8);
-fn void metro64_8() => metro64::hash(COMMON_8);
-fn void metro128_8() => metro128::hash(COMMON_8);
-fn void a5hash_8() => a5hash::hash(COMMON_8);
-fn void komi_8() => komi::hash(COMMON_8);
-
-fn void fnv64a_16() => fnv64a::hash(COMMON_16);
-fn void fnv32a_16() => fnv32a::hash(COMMON_16);
-fn void wyhash2_16() => wyhash2::hash(COMMON_16);
-fn void metro64_16() => metro64::hash(COMMON_16);
-fn void metro128_16() => metro128::hash(COMMON_16);
-fn void a5hash_16() => a5hash::hash(COMMON_16);
-fn void komi_16() => komi::hash(COMMON_16);
-
-fn void fnv64a_32() => fnv64a::hash(COMMON_32);
-fn void fnv32a_32() => fnv32a::hash(COMMON_32);
-// NOTE: wyhash2 cannot be used on inputs > 16 bytes.
-fn void metro64_32() => metro64::hash(COMMON_32);
-fn void metro128_32() => metro128::hash(COMMON_32);
-fn void a5hash_32() => a5hash::hash(COMMON_32);
-fn void komi_32() => komi::hash(COMMON_32);
-
-fn void fnv64a_64() => fnv64a::hash(COMMON_64);
-fn void fnv32a_64() => fnv32a::hash(COMMON_64);
-// NOTE: wyhash2 cannot be used on inputs > 16 bytes.
-fn void metro64_64() => metro64::hash(COMMON_64);
-fn void metro128_64() => metro128::hash(COMMON_64);
-fn void a5hash_64() => a5hash::hash(COMMON_64);
-fn void komi_64() => komi::hash(COMMON_64);
-
-fn void fnv64a_128() => fnv64a::hash(COMMON_128);
-fn void fnv32a_128() => fnv32a::hash(COMMON_128);
-// NOTE: wyhash2 cannot be used on inputs > 16 bytes.
-fn void metro64_128() => metro64::hash(COMMON_128);
-fn void metro128_128() => metro128::hash(COMMON_128);
-fn void a5hash_128() => a5hash::hash(COMMON_128);
-fn void komi_128() => komi::hash(COMMON_128);
-
-fn void fnv64a_1024() => fnv64a::hash(COMMON_1024);
-fn void fnv32a_1024() => fnv32a::hash(COMMON_1024);
-// NOTE: wyhash2 cannot be used on inputs > 16 bytes.
-fn void metro64_1024() => metro64::hash(COMMON_1024);
-fn void metro128_1024() => metro128::hash(COMMON_1024);
-fn void a5hash_1024() => a5hash::hash(COMMON_1024);
-fn void komi_1024() => komi::hash(COMMON_1024);

benchmarks/stdlib/sort/quicksort.c3

@@ -1,69 +0,0 @@
-module sort_bench;
-
-import std::sort;
-
-fn void init() @init
-{
-    set_benchmark_warmup_iterations(5);
-    set_benchmark_max_iterations(10_000);
-}
-
-fn void quicksort_bench() @benchmark
-{
-	// test set: 500 numbers between 0 and 99;
-	int[] data = {
-		71, 28, 2, 13, 62, 10, 54, 78, 63, 86,
-		33, 65, 89, 51, 58, 0, 51, 16, 87, 30,
-		89, 14, 52, 41, 88, 25, 83, 91, 56, 86,
-		14, 64, 76, 18, 39, 24, 79, 62, 34, 58,
-		90, 24, 56, 73, 85, 82, 79, 63, 47, 69,
-		78, 29, 49, 28, 43, 47, 56, 53, 79, 56,
-		19, 63, 29, 52, 71, 93, 61, 46, 30, 11,
-		21, 26, 37, 86, 93, 74, 62, 0, 41, 17,
-		26, 27, 34, 11, 54, 69, 72, 44, 74, 3,
-		61, 62, 80, 90, 3, 82, 16, 12, 28, 1,
-		2, 49, 4, 44, 57, 86, 63, 74, 33, 41,
-		76, 77, 56, 57, 56, 88, 74, 71, 6, 59,
-		40, 42, 94, 55, 21, 17, 17, 63, 21, 83,
-		73, 19, 39, 88, 93, 74, 21, 0, 63, 45,
-		69, 66, 22, 68, 86, 86, 85, 67, 8, 50,
-		23, 98, 64, 80, 64, 36, 40, 30, 73, 36,
-		23, 14, 1, 77, 82, 8, 18, 73, 37, 86,
-		29, 70, 27, 87, 64, 81, 13, 0, 4, 83,
-		90, 17, 71, 66, 38, 39, 54, 22, 86, 18,
-		84, 66, 77, 25, 64, 93, 80, 91, 2, 92,
-		47, 32, 90, 16, 46, 29, 56, 87, 70, 73,
-		89, 41, 5, 54, 93, 63, 16, 39, 71, 84,
-		74, 91, 69, 59, 49, 87, 74, 37, 75, 83,
-		77, 19, 51, 44, 79, 62, 94, 20, 24, 83,
-		37, 70, 57, 32, 93, 8, 29, 11, 7, 92,
-		8, 23, 20, 21, 7, 70, 28, 20, 96, 6,
-		50, 58, 30, 61, 66, 42, 50, 54, 64, 7,
-		10, 53, 63, 44, 16, 39, 83, 73, 3, 29,
-		97, 32, 36, 68, 84, 64, 73, 5, 29, 13,
-		48, 3, 84, 65, 75, 68, 66, 22, 39, 33,
-		39, 24, 27, 85, 18, 34, 3, 63, 32, 9,
-		29, 66, 24, 90, 75, 50, 11, 95, 47, 14,
-		92, 1, 76, 45, 76, 41, 55, 54, 38, 67,
-		43, 40, 5, 61, 97, 11, 61, 24, 92, 24,
-		76, 53, 60, 34, 78, 80, 70, 75, 30, 90,
-		65, 99, 80, 61, 94, 75, 63, 67, 10, 35,
-		23, 42, 31, 48, 14, 68, 84, 14, 79, 1,
-		25, 94, 23, 53, 49, 69, 44, 73, 63, 51,
-		44, 96, 88, 51, 94, 24, 64, 72, 59, 81,
-		73, 93, 14, 35, 9, 53, 25, 48, 50, 88,
-		46, 97, 67, 40, 27, 17, 2, 42, 11, 82,
-		0, 46, 44, 38, 31, 88, 63, 88, 10, 82,
-		77, 61, 24, 39, 27, 33, 10, 91, 69, 22,
-		42, 74, 71, 13, 32, 56, 12, 46, 81, 74,
-		17, 26, 45, 50, 76, 84, 76, 36, 43, 65,
-		81, 64, 0, 49, 70, 11, 76, 19, 60, 55,
-		15, 98, 31, 91, 56, 8, 97, 9, 3, 94,
-		3, 88, 7, 2, 3, 98, 10, 51, 21, 79,
-		99, 3, 8, 76, 52, 13, 40, 90, 85, 15,
-		70, 77, 43, 30, 4, 89, 18, 21, 59, 17,
-	};
-	sort::quicksort(data);
-}
-
-

c3c.1

@@ -1,552 +0,0 @@
-.TH "c3c" "1" "2024-10-27" "C3 Compiler" "User Commands"
-.SH NAME
-c3c \- Compiler for the C3 programming language
-
-.SH SYNOPSIS
-.B c3c
-[\fIoptions\fR ...] \fIcommand\fR [\fIargs\fR ...]
-
-.SH DESCRIPTION
-.B c3c
-is the compiler for the C3 language, providing commands for compilation, project
-management, testing, and distribution. The available commands allow users to 
-compile files, initialize projects, build targets, run benchmarks, clean build 
-files, and more.
-
-.SH COMMANDS
-.PP
-.B c3c compile 
-\fIfile1\fR [\fIfile2\fR ...]
-.RS
-Compile files without a project into an executable.
-.RE
-.PP
-.B c3c init 
-\fIproject name\fR
-.RS
-Initialize a new project structure.
-.RE
-.PP
-.B c3c init-lib 
-\fIlibrary name\fR
-.RS
-Initialize a new library structure.
-.RE
-.PP
-.B c3c build 
-[\fItarget\fR]
-.RS
-Build the target in the current project.
-.RE
-.PP
-.B c3c benchmark
-.RS
-Run the benchmarks in the current project.
-.RE
-.PP
-.B c3c test
-.RS
-Run the unit tests in the current project.
-.RE
-.PP
-.B c3c clean
-.RS
-Clean all build files.
-.RE
-.PP
-.B c3c run 
-[\fItarget\fR] [-- [\fIarg1\fR ...]]
-.RS
-Run (and build if needed) the target in the current project.
-.RE
-.PP
-.B c3c dist 
-[\fItarget\fR]
-.RS
-Clean and build a target for distribution.
-.RE
-.PP
-.B c3c directives 
-[\fItarget\fR]
-.RS
-Generate documentation for the target.
-.RE
-.PP
-.B c3c bench 
-[\fItarget\fR]
-.RS
-Benchmark a target.
-.RE
-.PP
-.B c3c clean-run 
-[\fItarget\fR] [-- [\fIarg1\fR ...]]
-.RS
-Clean, then run the target.
-.RE
-.PP
-.B c3c compile-run 
-\fIfile1\fR [\fIfile2\fR ...] [-- [\fIarg1\fR ...]]
-.RS
-Compile files then immediately run the result.
-.RE
-.PP
-.B c3c compile-only 
-\fIfile1\fR [\fIfile2\fR ...]
-.RS
-Compile files but do not perform linking.
-.RE
-.PP
-.B c3c compile-benchmark 
-\fIfile1\fR [\fIfile2\fR ...]
-.RS
-Compile files into an executable and run benchmarks.
-.RE
-.PP
-.B c3c compile-test 
-\fIfile1\fR [\fIfile2\fR ...]
-.RS
-Compile files into an executable and run unit tests.
-.RE
-.PP
-.B c3c static-lib 
-\fIfile1\fR [\fIfile2\fR ...]
-.RS
-Compile files without a project into a static library.
-.RE
-.PP
-.B c3c dynamic-lib 
-\fIfile1\fR [\fIfile2\fR ...]
-.RS
-Compile files without a project into a dynamic library.
-.RE
-.PP
-.B c3c headers 
-\fIfile1\fR [\fIfile2\fR ...]
-.RS
-Analyze files and generate C headers for public methods.
-.RE
-.PP
-.B c3c vendor-fetch 
-\fIlibrary\fR ...
-.RS
-Fetch one or more libraries from the vendor collection.
-.RE
-.PP
-.B c3c project 
-\fIsubcommand\fR ...
-.RS
-Manipulate or view project files.
-.RE
-
-.SH OPTIONS
-.PP
-.B --stdlib 
-\fIdir\fR
-.RS
-Use this directory as the C3 standard library path.
-.RE
-.PP
-.B --no-entry
-.RS
-Do not generate (or require) a main function.
-.RE
-.PP
-.B --libdir 
-\fIdir\fR
-.RS
-Add this directory to the C3 library search paths.
-.RE
-.PP
-.B --lib 
-\fIname\fR
-.RS
-Add this library to the compilation.
-.RE
-.PP
-.B --path 
-\fIdir\fR
-.RS
-Use this as the base directory for the current command.
-.RE
-.PP
-.B --template 
-\fItemplate\fR
-.RS
-Select template for 'init': "exe", "static-lib", "dynamic-lib" or a path.
-.RE
-.PP
-.B --about
-Prints a short description of C3.
-.PP
-.B --symtab 
-\fIvalue\fR
-.RS
-Sets the preferred symtab size.
-.RE
-.PP
-.B --max-mem 
-\fIvalue\fR
-.RS
-Sets the preferred max memory size.
-.RE
-.PP
-.B --run-once
-.RS
-After running the output file, delete it immediately.
-.RE
-.PP
-.B -V, --version
-Print version information.
-.PP
-.B -E
-Lex only.
-.PP
-.B -P
-Only parse and output the AST as JSON.
-.PP
-.B -C
-Only lex, parse and check.
-.PP
-.B -
-\fIcode\fR...
-.RS
-Read code from standard in.
-.RE
-.PP
-.B -o 
-\fIfile\fR
-.RS
-Write output to \fIfile\fR.
-.RE
-.PP
-.B -O0
-Safe, no optimizations, emit debug info.
-.PP
-.B -O1
-Safe, high optimization, emit debug info.
-.PP
-.B -O2
-Unsafe, high optimization, emit debug info.
-.PP
-.B -O3
-Unsafe, high optimization, single module, emit debug info.
-.PP
-.B -O4
-Unsafe, highest optimization, relaxed maths, single module, emit debug info, no panic messages.
-.PP
-.B -O5
-Unsafe, highest optimization, fast maths, single module, emit debug info, no panic messages, no backtrace.
-.PP
-.B -Os
-Unsafe, high optimization, small code, single module, no debug info, no panic messages.
-.PP
-.B -Oz
-Unsafe, high optimization, tiny code, single module, no debug info, no panic messages, no backtrace.
-.PP
-.B -D 
-\fIname\fR
-.RS
-Add feature flag \fIname\fR.
-.RE
-.PP
-.B -U 
-\fIname\fR
-.RS
-Remove feature flag \fIname\fR.
-.RE
-.PP
-.B --trust=
-\fIoption\fR
-.RS
-Trust level: none (default), include ($include allowed), full ($exec / exec allowed).
-.RE
-.PP
-.B --output-dir 
-\fIdir\fR
-.RS
-Override general output directory.
-.RE
-.PP
-.B --threads 
-\fInumber\fR
-.RS
-Set the number of threads to use for compilation.
-.RE
-.PP
-.B --show-backtrace=
-\fIyes|no\fR
-.RS
-Show detailed backtrace on segfaults.
-.RE
-
-.PP
-.B -g
-Emit debug info.
-.PP
-.B -g0
-Emit no debug info.
-
-
-.PP
-.B -l 
-\fIlibrary\fR
-.RS
-Link with the library provided.
-.RE
-.PP
-.B -L 
-\fIlibrary\fR \fIdir\fR
-.RS
-Append the directory to the linker search paths.
-.RE
-.PP
-.B -z 
-\fIargument\fR
-.RS
-Send the \fIargument\fR as a parameter to the linker.
-.RE
-.PP
-.B --cc 
-\fIpath\fR
-.RS
-Set C compiler (for C files in projects and use as system linker).
-.RE
-.PP
-.B --linker=
-\fIoption\fR [\fIpath\fR]
-.RS
-Specify the linker: builtin, cc, custom (default is 'cc'). 'Custom' requires a path.
-.RE
-
-.PP
-.B --use-stdlib=
-\fIyes|no\fR
-.RS
-Include the standard library (default: yes).
-.RE
-.PP
-.B --link-libc=
-\fIyes|no\fR
-.RS
-Link libc and other default libraries (default: yes).
-.RE
-.PP
-.B --emit-stdlib=
-\fIyes|no\fR
-.RS
-Output files for the standard library (default: yes).
-.RE
-.PP
-.B --panicfn 
-\fIname\fR
-.RS
-Override the panic function name.
-.RE
-.PP
-.B --testfn 
-\fIname\fR
-.RS
-Override the test runner function name.
-.RE
-.PP
-.B --benchfn 
-\fIname\fR
-.RS
-Override the benchmark runner function name.
-.RE
-
-.PP
-.B --reloc=
-\fIoption\fR
-.RS
-Specify the relocation model: none, pic, PIC, pie, PIE.
-.RE
-.PP
-.B --x86cpu=
-\fIoption\fR
-.RS
-Set general level of x64 CPU: baseline, ssse3, sse4, avx1, avx2-v1, avx2-v2 (Skylake/Zen1+), avx512 (Icelake/Zen4+), native.
-.RE
-.PP
-.B --x86vec=
-\fIoption\fR
-.RS
-Set maximum type of vector use: none, mmx, sse, avx, avx512, default.
-.RE
-.PP
-.B --riscvfloat=
-\fIoption\fR
-.RS
-Set type of RISC-V float support: none, float, double.
-.RE
-.PP
-.B --memory-env=
-\fIoption\fR
-.RS
-Set the memory environment: normal, small, tiny, none.
-.RE
-.PP
-.B --strip-unused=
-\fIyes|no\fR
-.RS
-Strip unused code and globals from the output (default: yes).
-.RE
-.PP
-.B --fp-math=
-\fIoption\fR
-.RS
-Specify floating-point math behavior: strict, relaxed, fast.
-.RE
-.PP
-.B --win64-simd=
-\fIoption\fR
-.RS
-Windows SIMD ABI: array, full.
-.RE
-
-.PP
-.B --debug-stats
-Print debug statistics.
-.PP
-.B --print-linking
-Print linker arguments.
-.PP
-.B --debug-log
-Print debug logging to stdout.
-
-
-.PP
-.B --benchmarking
-Run built-in benchmarks.
-.PP
-.B --testing
-Run built-in tests.
-
-
-.PP
-.B --list-attributes
-List all attributes.
-.PP
-.B --list-builtins
-List all builtins.
-.PP
-.B --list-keywords
-List all keywords.
-.PP
-.B --list-operators
-List all operators.
-.PP
-.B --list-precedence
-List operator precedence order.
-.PP
-.B --list-project-properties
-List all available keys used in project.json files.
-.PP
-.B --list-manifest-properties
-List all available keys used in manifest.json files.
-.PP
-.B --list-targets
-List all architectures the compiler supports.
-.PP
-.B --list-type-properties
-List all type properties.
-
-
-.PP
-.B --print-output
-Print the object files created to stdout.
-.PP
-.B --print-input
-Print inputted C3 files to stdout.
-
-
-.PP
-.B --winsdk 
-\fIdir\fR
-.RS
-Set the directory for Windows system library files for cross-compilation.
-.RE
-.PP
-.B --wincrt=
-\fIoption\fR
-.RS
-Windows CRT linking: none, static-debug, static, dynamic-debug (default if debug info enabled), dynamic (default).
-.RE
-.PP
-.B --windef 
-\fIfile\fR
-.RS
-Use Windows 'def' file for function exports instead of 'dllexport'.
-.RE
-
-.PP
-.B --macossdk 
-\fIdir\fR
-.RS
-Set the directory for the MacOS SDK for cross-compilation.
-.RE
-.PP
-.B --macos-min-version 
-\fIver\fR
-.RS
-Set the minimum MacOS version to compile for.
-.RE
-.PP
-.B --macos-sdk-version 
-\fIver\fR
-.RS
-Set the MacOS SDK version to compile for.
-.RE
-
-.PP
-.B --linux-crt 
-\fIdir\fR
-.RS
-Set the directory to use for finding crt1.o and related files.
-.RE
-.PP
-.B --linux-crtbegin 
-\fIdir\fR
-.RS
-Set the directory to use for finding crtbegin.o and related files.
-.RE
-
-.PP
-.B --vector-conv=
-\fIoption\fR
-.RS
-Set vector conversion behavior: default, old.
-.RE
-.PP
-.B --sanitize=
-\fIoption\fR
-.RS
-Enable a sanitizer: address, memory, thread.
-.RE
-
-.SH EXAMPLES
-.PP
-Create a project:
-.RS
-.B c3c init new_project
-.RE
-.PP
-Create a library project:
-.RS
-.B c3c init-lib new_library
-.RE
-.PP
-Compile a file:
-.RS
-.B c3c compile main.c3
-.RE
-.PP
-Build the current project:
-.RS
-.B c3c build
-.RE
-.PP
-Run tests for the current project:
-.RS
-.B c3c test
-.RE

flake.lock

@@ -1,61 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1738297584,
-        "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "9189ac18287c599860e878e905da550aa6dec1cd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,44 +0,0 @@
-{
-  description = "C3 compiler flake";
-
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixpkgs-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
-
-  outputs = { self, ... } @ inputs: inputs.flake-utils.lib.eachDefaultSystem 
-  (system: 
-    let pkgs = import inputs.nixpkgs { inherit system; }; 
-        call = set: pkgs.callPackage ./nix/default.nix ( 
-          set // { 
-            rev = self.rev or "unknown"; 
-          } 
-        );
-    in {
-      packages = {
-        default = self.packages.${system}.c3c;
-
-        c3c = call {};
-        
-        c3c-checks = pkgs.callPackage ./nix/default.nix { 
-          checks = true; 
-        };
-
-        c3c-debug = pkgs.callPackage ./nix/default.nix { 
-          debug = true; 
-        };
-
-        c3c-debug-checks = pkgs.callPackage ./nix/default.nix { 
-          debug = true; 
-          checks = true; 
-        };
-      };
-
-      devShells = {
-        default = pkgs.callPackage ./nix/shell.nix {
-          c3c = self.packages.${system}.c3c-debug; 
-        };
-      };
-    }
-  );
-}

git_hash.cmake

@@ -1,15 +0,0 @@
-find_package(Git QUIET)
-
-set(GIT_HASH "unknown")
-
-if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git")
-    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-                    OUTPUT_VARIABLE GIT_HASH
-                    OUTPUT_STRIP_TRAILING_WHITESPACE
-                    COMMAND_ERROR_IS_FATAL ANY)
-endif()
-
-message("Git Hash: ${GIT_HASH}")
-
-file(WRITE ${CMAKE_BINARY_DIR}/git_hash.h "#pragma once\n#define GIT_HASH \"${GIT_HASH}\"\n")

lib/std/ascii.c3

@@ -1,42 +1,77 @@
-<* This module is scheduled for removal, use std::core::ascii *>
 module std::ascii;
 
 macro bool in_range_m(c, start, len) => (uint)(c - start) < len;
-macro bool is_lower_m(c)  => in_range_m(c, 0x61, 26);
-macro bool is_upper_m(c)  => in_range_m(c, 0x41, 26);
-macro bool is_digit_m(c)  => in_range_m(c, 0x30, 10);
+macro bool is_lower_m(c) => in_range_m(c, 0x61, 26);
+macro bool is_upper_m(c) => in_range_m(c, 0x41, 26);
+macro bool is_digit_m(c) => in_range_m(c, 0x30, 10);
 macro bool is_bdigit_m(c) => in_range_m(c, 0x30, 2);
 macro bool is_odigit_m(c) => in_range_m(c, 0x30, 8);
 macro bool is_xdigit_m(c) => in_range_m(c | 32, 0x61, 6) || is_digit_m(c);
-macro bool is_alpha_m(c)  => in_range_m(c | 32, 0x61, 26);
-macro bool is_print_m(c)  => in_range_m(c, 0x20, 95);
-macro bool is_graph_m(c)  => in_range_m(c, 0x21, 94);
-macro bool is_space_m(c)  => in_range_m(c, 0x9, 5) || c == 0x20;
-macro bool is_alnum_m(c)  => is_alpha_m(c) || is_digit_m(c);
-macro bool is_punct_m(c)  => !is_alnum_m(c) && is_graph_m(c);
-macro bool is_blank_m(c)  => c == 0x20 || c == 0x9;
-macro bool is_cntrl_m(c)  => c < 0x20 || c == 0x7f;
+macro bool is_alpha_m(c) => in_range_m(c | 32, 0x61, 26);
+macro bool is_print_m(c) => in_range_m(c, 0x20, 95);
+macro bool is_graph_m(c) => in_range_m(c, 0x21, 94);
+macro bool is_space_m(c) => in_range_m(c, 0x9, 5) || c == 0x20;
+macro bool is_alnum_m(c) => is_alpha_m(c) || is_digit_m(c);
+macro bool is_punct_m(c) => !is_alnum_m(c) && is_graph_m(c);
+macro bool is_blank_m(c) => c == 0x20 || c == 0x9;
+macro bool is_cntrl_m(c) => c < 0x20 || c == 0x7f;
 macro to_lower_m(c) => is_upper_m(c) ? c + 0x20 : c;
 macro to_upper_m(c) => is_lower_m(c) ? c - 0x20 : c;
 
 fn bool in_range(char c, char start, char len) => in_range_m(c, start, len);
+fn bool is_lower(char c) => is_lower_m(c);
+fn bool is_upper(char c) => is_upper_m(c);
+fn bool is_digit(char c) => is_digit_m(c);
+fn bool is_bdigit(char c) => is_bdigit_m(c);
+fn bool is_odigit(char c) => is_odigit_m(c);
+fn bool is_xdigit(char c) => is_xdigit_m(c);
+fn bool is_alpha(char c) => is_alpha_m(c);
+fn bool is_print(char c) => is_print_m(c);
+fn bool is_graph(char c) => is_graph_m(c);
+fn bool is_space(char c) => is_space_m(c);
+fn bool is_alnum(char c) => is_alnum_m(c);
+fn bool is_punct(char c) => is_punct_m(c);
+fn bool is_blank(char c) => is_blank_m(c);
+fn bool is_cntrl(char c) => is_cntrl_m(c);
+fn char to_lower(char c) => (char)to_lower_m(c);
+fn char to_upper(char c) => (char)to_upper_m(c);
 
 fn bool char.in_range(char c, char start, char len) => in_range_m(c, start, len);
+fn bool char.is_lower(char c) => is_lower_m(c);
+fn bool char.is_upper(char c) => is_upper_m(c);
+fn bool char.is_digit(char c) => is_digit_m(c);
+fn bool char.is_bdigit(char c) => is_bdigit_m(c);
+fn bool char.is_odigit(char c) => is_odigit_m(c);
+fn bool char.is_xdigit(char c) => is_xdigit_m(c);
+fn bool char.is_alpha(char c) => is_alpha_m(c);
+fn bool char.is_print(char c) => is_print_m(c);
+fn bool char.is_graph(char c) => is_graph_m(c);
+fn bool char.is_space(char c) => is_space_m(c);
+fn bool char.is_alnum(char c) => is_alnum_m(c);
+fn bool char.is_punct(char c) => is_punct_m(c);
+fn bool char.is_blank(char c) => is_blank_m(c);
+fn bool char.is_cntrl(char c) => is_cntrl_m(c);
+fn char char.to_lower(char c) => (char)to_lower_m(c);
+fn char char.to_upper(char c) => (char)to_upper_m(c);
+/**
+ * @require c.is_xdigit()
+ **/
+fn char char.from_hex(char c) => c.is_digit() ? c - '0' : 10 + (c | 0x20) - 'a';
 
 fn bool uint.in_range(uint c, uint start, uint len) => in_range_m(c, start, len);
-fn bool uint.is_lower(uint c)  @deprecated => is_lower_m(c);
-fn bool uint.is_upper(uint c)  @deprecated => is_upper_m(c);
-fn bool uint.is_digit(uint c)  @deprecated => is_digit_m(c);
-fn bool uint.is_bdigit(uint c) @deprecated => is_bdigit_m(c);
-fn bool uint.is_odigit(uint c) @deprecated => is_odigit_m(c);
-fn bool uint.is_xdigit(uint c) @deprecated => is_xdigit_m(c);
-fn bool uint.is_alpha(uint c)  @deprecated => is_alpha_m(c);
-fn bool uint.is_print(uint c)  @deprecated => is_print_m(c);
-fn bool uint.is_graph(uint c)  @deprecated => is_graph_m(c);
-fn bool uint.is_space(uint c)  @deprecated => is_space_m(c);
-fn bool uint.is_alnum(uint c)  @deprecated => is_alnum_m(c);
-fn bool uint.is_punct(uint c)  @deprecated => is_punct_m(c);
-fn bool uint.is_blank(uint c)  @deprecated => is_blank_m(c);
-fn bool uint.is_cntrl(uint c)  @deprecated => is_cntrl_m(c);
-fn uint uint.to_lower(uint c)  @deprecated => (uint)to_lower_m(c);
-fn uint uint.to_upper(uint c)  @deprecated => (uint)to_upper_m(c);
+fn bool uint.is_lower(uint c) => is_lower_m(c);
+fn bool uint.is_upper(uint c) => is_upper_m(c);
+fn bool uint.is_digit(uint c) => is_digit_m(c);
+fn bool uint.is_bdigit(uint c) => is_bdigit_m(c);
+fn bool uint.is_odigit(uint c) => is_odigit_m(c);
+fn bool uint.is_xdigit(uint c) => is_xdigit_m(c);
+fn bool uint.is_alpha(uint c) => is_alpha_m(c);
+fn bool uint.is_print(uint c) => is_print_m(c);
+fn bool uint.is_graph(uint c) => is_graph_m(c);
+fn bool uint.is_space(uint c) => is_space_m(c);
+fn bool uint.is_alnum(uint c) => is_alnum_m(c);
+fn bool uint.is_punct(uint c) => is_punct_m(c);
+fn bool uint.is_blank(uint c) => is_blank_m(c);
+fn bool uint.is_cntrl(uint c) => is_cntrl_m(c);
+fn uint uint.to_lower(uint c) => (uint)to_lower_m(c);
+fn uint uint.to_upper(uint c) => (uint)to_upper_m(c);

lib/std/atomic.c3

@@ -1,19 +1,19 @@
-// Copyright (c) 2023-2025 Eduardo José Gómez Hernández. All rights reserved.
+// Copyright (c) 2023 Eduardo José Gómez Hernández. All rights reserved.
 // Use of this source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
-module std::atomic::types{Type};
+module std::atomic::types(<Type>);
 
 struct Atomic
 {
 	Type data;
 }
 
-<*
- Loads data atomically, by default this uses SEQ_CONSISTENT ordering.
-
- @param ordering : "The ordering, cannot be release or acquire-release."
- @require ordering != RELEASE && ordering != ACQUIRE_RELEASE : "Release and acquire-release are not valid for load"
-*>
+/**
+ * Loads data atomically, by default this uses SEQ_CONSISTENT ordering.
+ *
+ * @param ordering "The ordering, cannot be release or acquire-release."
+ * @require ordering != RELEASE && ordering != ACQUIRE_RELEASE : "Release and acquire-release are not valid for load"
+ **/
 macro Type Atomic.load(&self, AtomicOrdering ordering = SEQ_CONSISTENT)
 {
 	Type* data = &self.data;
@@ -28,12 +28,12 @@ macro Type Atomic.load(&self, AtomicOrdering ordering = SEQ_CONSISTENT)
 		case RELEASE: unreachable("Invalid ordering.");
 	}
 }
-<*
- Stores data atomically, by default this uses SEQ_CONSISTENT ordering.
-
- @param ordering : "The ordering, cannot be acquire or acquire-release."
- @require ordering != ACQUIRE && ordering != ACQUIRE_RELEASE : "Acquire and acquire-release are not valid for store"
-*>
+/**
+ * Stores data atomically, by default this uses SEQ_CONSISTENT ordering.
+ *
+ * @param ordering "The ordering, cannot be acquire or acquire-release."
+ * @require ordering != ACQUIRE && ordering != ACQUIRE_RELEASE : "Acquire and acquire-release are not valid for store"
+ **/
 macro void Atomic.store(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTENT)
 {
 	Type* data = &self.data;
@@ -76,7 +76,7 @@ macro Type Atomic.div(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTEN
 macro Type Atomic.max(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTENT)
 {
 	Type* data = &self.data;
-	return @atomic_exec(atomic::fetch_max, data, value, ordering);
+	return @atomic_exec(atomic::fetch_div, data, value, ordering);
 }
 
 macro Type Atomic.min(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTENT)
@@ -85,49 +85,36 @@ macro Type Atomic.min(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTEN
 	return @atomic_exec(atomic::fetch_min, data, value, ordering);
 }
 
-macro Type Atomic.or(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTENT) @if(types::flat_kind(Type) != FLOAT)
+macro Type Atomic.or(&self, uint value, AtomicOrdering ordering = SEQ_CONSISTENT) @if(!types::is_float(Type))
 {
 	Type* data = &self.data;
 	return @atomic_exec(atomic::fetch_or, data, value, ordering);
 }
 
-macro Type Atomic.xor(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTENT) @if(types::flat_kind(Type) != FLOAT)
+fn Type Atomic.xor(&self, uint value, AtomicOrdering ordering = SEQ_CONSISTENT) @if(!types::is_float(Type))
 {
 	Type* data = &self.data;
 	return @atomic_exec(atomic::fetch_xor, data, value, ordering);
 }
 
-macro Type Atomic.and(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTENT) @if(types::flat_kind(Type) != FLOAT)
+macro Type Atomic.and(&self, uint value, AtomicOrdering ordering = SEQ_CONSISTENT) @if(!types::is_float(Type))
 {
 	Type* data = &self.data;
 	return @atomic_exec(atomic::fetch_and, data, value, ordering);
 }
 
-macro Type Atomic.shr(&self, Type amount, AtomicOrdering ordering = SEQ_CONSISTENT) @if(types::flat_kind(Type) != FLOAT)
+macro Type Atomic.shift_right(&self, uint amount, AtomicOrdering ordering = SEQ_CONSISTENT) @if(!types::is_float(Type))
 {
 	Type* data = &self.data;
 	return @atomic_exec(atomic::fetch_shift_right, data, amount, ordering);
 }
 
-macro Type Atomic.shl(&self, Type amount, AtomicOrdering ordering = SEQ_CONSISTENT) @if(types::flat_kind(Type) != FLOAT)
+macro Type Atomic.shift_left(&self, uint amount, AtomicOrdering ordering = SEQ_CONSISTENT) @if(!types::is_float(Type))
 {
 	Type* data = &self.data;
 	return @atomic_exec(atomic::fetch_shift_left, data, amount, ordering);
 }
 
-macro Type Atomic.set(&self, AtomicOrdering ordering = SEQ_CONSISTENT) @if(types::flat_kind(Type) == BOOL)
-{
-	Type* data = &self.data;
-	return @atomic_exec_no_arg(atomic::flag_set, data, ordering);
-}
-
-macro Type Atomic.clear(&self, AtomicOrdering ordering = SEQ_CONSISTENT) @if(types::flat_kind(Type) == BOOL)
-{
-	Type* data = &self.data;
-
-	return @atomic_exec_no_arg(atomic::flag_clear, data, ordering);
-}
-
 macro @atomic_exec(#func, data, value, ordering) @local
 {
 	switch(ordering) 
@@ -141,61 +128,19 @@ macro @atomic_exec(#func, data, value, ordering) @local
 	}
 }
 
-macro @atomic_exec_no_arg(#func, data, ordering) @local
-{
-	switch(ordering)
-	{
-		case RELAXED: return #func(data, RELAXED);
-		case ACQUIRE: return #func(data, ACQUIRE);
-		case RELEASE: return #func(data, RELEASE);
-		case ACQUIRE_RELEASE: return #func(data, ACQUIRE_RELEASE);
-		case SEQ_CONSISTENT: return #func(data, SEQ_CONSISTENT);
-		default: unreachable("Ordering may not be non-atomic or unordered.");
-	}
-}
-
 module std::atomic;
 import std::math;
 
-macro bool @is_native_atomic_value(#value) @private
-{
-	return is_native_atomic_type($typeof(#value));
-}
-
-macro bool is_native_atomic_type($Type)
-{
-	$if $Type.sizeof > void*.sizeof:
-		return false;
-	$else
-		$switch $Type.kindof:
-			$case SIGNED_INT:
-			$case UNSIGNED_INT:
-			$case POINTER:
-			$case FUNC:
-			$case FLOAT:
-			$case BOOL:
-				return true;
-			$case DISTINCT:
-			$case CONST_ENUM:
-				return is_native_atomic_type($Type.inner);
-			$default:
-				return false;
-		$endswitch
-	$endif
-}
-
-<*
- @param [&inout] ptr : "the variable or dereferenced pointer to the data."
- @param [in] y : "the value to be added to ptr."
- @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
- @return "returns the old value of ptr"
-
- @require !$alignment || math::is_power_of_2($alignment) : "Alignment must be a power of two."
- @require $defined(*ptr) : "Expected a pointer"
- @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
- @require $defined(*ptr + y) : "+ must be defined between the values."
- @require $ordering != NOT_ATOMIC && $ordering != UNORDERED : "Acquire ordering is not valid."
-*>
+/**
+ * @param [&in] ptr "the variable or dereferenced pointer to the data."
+ * @param [in] y "the value to be added to ptr."
+ * @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ * @return "returns the old value of ptr"
+ *
+ * @require !$alignment || math::is_power_of_2($alignment) "Alignment must be a power of two."
+ * @require types::is_int($typeof(*ptr)) || types::is_float($typeof(*ptr)) "Only integer/float pointers may be used."
+ * @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ **/
 macro fetch_add(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatile = false, usz $alignment = 0)
 {
 	$if $alignment == 0:
@@ -204,18 +149,16 @@ macro fetch_add(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatil
 	return $$atomic_fetch_add(ptr, y, $volatile, $ordering.ordinal, $alignment);
 }
 
-<*
- @param [&inout] ptr : "the variable or dereferenced pointer to the data."
- @param [in] y : "the value to be subtracted from ptr."
- @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
- @return "returns the old value of ptr"
-
- @require !$alignment || math::is_power_of_2($alignment) : "Alignment must be a power of two."
- @require $defined(*ptr) : "Expected a pointer"
- @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
- @require $defined(*ptr - y) : "- must be defined between the values."
- @require $ordering != NOT_ATOMIC && $ordering != UNORDERED : "Acquire ordering is not valid."
-*>
+/**
+ * @param [&in] ptr "the variable or dereferenced pointer to the data."
+ * @param [in] y "the value to be added to ptr."
+ * @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ * @return "returns the old value of ptr"
+ * 
+ * @require !$alignment || math::is_power_of_2($alignment) "Alignment must be a power of two."
+ * @require types::is_int($typeof(*ptr)) || types::is_float($typeof(*ptr)) "Only integer/float pointers may be used."
+ * @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ **/
 macro fetch_sub(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatile = false, usz $alignment = 0)
 {
 	$if $alignment == 0:
@@ -224,25 +167,23 @@ macro fetch_sub(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatil
 	return $$atomic_fetch_sub(ptr, y, $volatile, $ordering.ordinal, $alignment);
 }
 
-<*
- @param [&inout] ptr : "the variable or dereferenced pointer to the data."
- @param [in] y : "the value to be multiplied with ptr."
- @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
- @return "returns the old value of ptr"
-
- @require $defined(*ptr) : "Expected a pointer"
- @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
- @require $defined(*ptr * y) : "* must be defined between the values."
- @require $ordering != NOT_ATOMIC && $ordering != UNORDERED : "Acquire ordering is not valid."
-*>
+/**
+ * @param [&in] ptr "the variable or dereferenced pointer to the data."
+ * @param [in] y "the value to be added to ptr."
+ * @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ * @return "returns the old value of ptr"
+ * 
+ * @require types::is_int($typeof(*ptr)) || types::is_float($typeof(*ptr)) "Only integer/float pointers may be used."
+ * @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ **/
 macro fetch_mul(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 {
 	var $load_ordering = $ordering;
 	$if $ordering == RELEASE || $ordering == ACQUIRE_RELEASE:
-	    $load_ordering = SEQ_CONSISTENT;
+	    $load_ordering = AtomicOrdering.SEQ_CONSISTENT;
 	$endif
 	
-	var $StorageType = types::lower_to_atomic_compatible_type($typeof(*ptr));
+	var $StorageType = $typefrom(types::lower_to_atomic_compatible_type($typeof(*ptr)));
 
 	$StorageType* storage_ptr = ($StorageType*)ptr;
 
@@ -252,37 +193,34 @@ macro fetch_mul(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 	$StorageType storage_old_value;
 	$StorageType storage_new_value;
 
-	do
-	{
+
+	do {
 		storage_old_value = $$atomic_load(storage_ptr, false, $load_ordering.ordinal);
 		old_value = bitcast(storage_old_value, $typeof(*ptr));
 		new_value = old_value * y;
 		storage_new_value = bitcast(new_value, $StorageType);
-	}
-	while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
+	} while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
 
 	return old_value;
 }
 
-<*
- @param [&inout] ptr : "the variable or dereferenced pointer to the data."
- @param [in] y : "the value to divide ptr by."
- @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
- @return "returns the old value of ptr"
-
- @require $defined(*ptr) : "Expected a pointer"
- @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
- @require $defined(*ptr * y) : "/ must be defined between the values."
- @require $ordering != NOT_ATOMIC && $ordering != UNORDERED : "Acquire ordering is not valid."
-*>
+/**
+ * @param [&in] ptr "the variable or dereferenced pointer to the data."
+ * @param [in] y "the value to be added to ptr."
+ * @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ * @return "returns the old value of ptr"
+ * 
+* @require types::is_int($typeof(*ptr)) || types::is_float($typeof(*ptr)) "Only integer/float pointers may be used."
+* @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ **/
 macro fetch_div(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 {
 	var $load_ordering = $ordering;
 	$if $ordering == RELEASE || $ordering == ACQUIRE_RELEASE:
-	    $load_ordering = SEQ_CONSISTENT;
+	    $load_ordering = AtomicOrdering.SEQ_CONSISTENT;
 	$endif
 	
-	var $StorageType = types::lower_to_atomic_compatible_type($typeof(*ptr));
+	var $StorageType = $typefrom(types::lower_to_atomic_compatible_type($typeof(*ptr)));
 
 	$StorageType* storage_ptr = ($StorageType*)ptr;
 
@@ -292,89 +230,163 @@ macro fetch_div(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 	$StorageType storage_old_value;
 	$StorageType storage_new_value;
 	
-	do
-	{
+	do {
 		storage_old_value = $$atomic_load(storage_ptr, false, $load_ordering.ordinal);
 		old_value = bitcast(storage_old_value, $typeof(*ptr));
 		new_value = old_value / y;
 		storage_new_value = bitcast(new_value, $StorageType);
-	}
-	while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
+	} while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
 
 	return old_value;
 }
 
-<*
- @param [&inout] ptr : "the variable or dereferenced pointer to the data."
- @param [in] y : "the value to perform a bitwise or with."
- @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
- @return "returns the old value of ptr"
-
- @require !$alignment || math::is_power_of_2($alignment) : "Alignment must be a power of two."
- @require $defined(*ptr) : "Expected a pointer"
- @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
- @require $defined(*ptr | y) : "| must be defined between the values."
- @require $ordering != NOT_ATOMIC && $ordering != UNORDERED : "Acquire ordering is not valid."
-*>
+/**
+ * @param [&in] ptr "the variable or dereferenced pointer to the data."
+ * @param [in] y "the value to be added to ptr."
+ * @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ * @return "returns the old value of ptr"
+ * 
+ * @require !$alignment || math::is_power_of_2($alignment) "Alignment must be a power of two."
+ * @require types::is_int($typeof(*ptr)) "Only integer pointers may be used."
+ * @require types::is_int($typeof(y)) "The value for or must be an int"
+ * @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ **/
 macro fetch_or(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatile = false, usz $alignment = 0)
 {
-	return $$atomic_fetch_or(ptr, y, $volatile, $ordering.ordinal, $alignment);
+	$if	types::is_int($typeof(*ptr)):
+		return $$atomic_fetch_or(ptr, y, $volatile, $ordering.ordinal, $alignment);
+	$endif
+
+	var $load_ordering = $ordering;
+	$if $ordering == RELEASE || $ordering == ACQUIRE_RELEASE:
+	    $load_ordering = AtomicOrdering.SEQ_CONSISTENT;
+	$endif
+	
+	var $StorageType = $typefrom(types::lower_to_atomic_compatible_type($typeof(*ptr)));
+
+	$StorageType* storage_ptr = ($StorageType*)ptr;
+
+	$typeof(*ptr) old_value;
+	$typeof(*ptr) new_value;
+
+	$StorageType storage_old_value;
+	$StorageType storage_new_value;
+	$StorageType storage_y = ($StorageType)y;
+	
+	do {
+		storage_old_value = $$atomic_load(storage_ptr, false, $load_ordering.ordinal);
+		old_value = bitcast(storage_old_value, $typeof(*ptr));
+		new_value = storage_old_value | storage_y;
+		storage_new_value = bitcast(new_value, $StorageType);
+	} while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
+
+	return old_value;
 }
 
-<*
- @param [&inout] ptr : "the variable or dereferenced pointer to the data."
- @param [in] y : "the value to perform a bitwise xor with."
- @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
- @return "returns the old value of ptr"
-
- @require !$alignment || math::is_power_of_2($alignment) : "Alignment must be a power of two."
- @require $defined(*ptr) : "Expected a pointer"
- @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
- @require $defined(*ptr ^ y) : "^ must be defined between the values."
- @require $ordering != NOT_ATOMIC && $ordering != UNORDERED : "Acquire ordering is not valid."
-*>
+/**
+ * @param [&in] ptr "the variable or dereferenced pointer to the data."
+ * @param [in] y "the value to be added to ptr."
+ * @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ * @return "returns the old value of ptr"
+ * 
+ * @require !$alignment || math::is_power_of_2($alignment) "Alignment must be a power of two."
+ * @require types::is_int($typeof(*ptr)) "Only integer pointers may be used."
+ * @require types::is_int($typeof(y)) "The value for or must be an int"
+ * @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ **/
 macro fetch_xor(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatile = false, usz $alignment = 0)
 {
-	return $$atomic_fetch_xor(ptr, y, $volatile, $ordering.ordinal, $alignment);
+	$if	types::is_int($typeof(*ptr)):
+		return $$atomic_fetch_xor(ptr, y, $volatile, $ordering.ordinal, $alignment);
+	$endif
+
+	var $load_ordering = $ordering;
+	$if $ordering == RELEASE || $ordering == ACQUIRE_RELEASE:
+	    $load_ordering = AtomicOrdering.SEQ_CONSISTENT;
+	$endif
+	
+	var $StorageType = $typefrom(types::lower_to_atomic_compatible_type($typeof(*ptr)));
+
+	$StorageType* storage_ptr = ($StorageType*)ptr;
+
+	$typeof(*ptr) old_value;
+	$typeof(*ptr) new_value;
+
+	$StorageType storage_old_value;
+	$StorageType storage_new_value;
+	$StorageType storage_y = ($StorageType)y;
+	
+	do {
+		storage_old_value = $$atomic_load(storage_ptr, false, $load_ordering.ordinal);
+		old_value = bitcast(storage_old_value, $typeof(*ptr));
+		new_value = storage_old_value ^ storage_y;
+		storage_new_value = bitcast(new_value, $StorageType);
+	} while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
+
+	return old_value;
 }
 
-<*
- @param [&inout] ptr : "the variable or dereferenced pointer to the data."
- @param [in] y : "the value to perform a bitwise and with."
- @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
- @return "returns the old value of ptr"
-
- @require !$alignment || math::is_power_of_2($alignment) : "Alignment must be a power of two."
- @require $defined(*ptr) : "Expected a pointer"
- @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
- @require $defined(*ptr ^ y) : "& must be defined between the values."
- @require $ordering != NOT_ATOMIC && $ordering != UNORDERED : "Acquire ordering is not valid."
-*>
+/**
+ * @param [&in] ptr "the variable or dereferenced pointer to the data."
+ * @param [in] y "the value to be added to ptr."
+ * @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ * @return "returns the old value of ptr"
+ * 
+ * @require !$alignment || math::is_power_of_2($alignment) "Alignment must be a power of two."
+ * @require types::is_int($typeof(*ptr)) "Only integer pointers may be used."
+ * @require types::is_int($typeof(y)) "The value for or must be an int"
+ * @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ **/
 macro fetch_and(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatile = false, usz $alignment = 0)
 {
-	return $$atomic_fetch_and(ptr, y, $volatile, $ordering.ordinal, $alignment);
+	$if	types::is_int($typeof(*ptr)):
+		return $$atomic_fetch_and(ptr, y, $volatile, $ordering.ordinal, $alignment);
+	$endif
+
+	var $load_ordering = $ordering;
+	$if $ordering == RELEASE || $ordering == ACQUIRE_RELEASE:
+	    $load_ordering = AtomicOrdering.SEQ_CONSISTENT;
+	$endif
+	
+	var $StorageType = $typefrom(types::lower_to_atomic_compatible_type($typeof(*ptr)));
+
+	$StorageType* storage_ptr = ($StorageType*)ptr;
+
+	$typeof(*ptr) old_value;
+	$typeof(*ptr) new_value;
+
+	$StorageType storage_old_value;
+	$StorageType storage_new_value;
+	$StorageType storage_y = ($StorageType)y;
+	
+	do {
+		storage_old_value = $$atomic_load(storage_ptr, false, $load_ordering.ordinal);
+		old_value = bitcast(storage_old_value, $typeof(*ptr));
+		new_value = storage_old_value & storage_y;
+		storage_new_value = bitcast(new_value, $StorageType);
+	} while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
+
+	return old_value;
 }
 
-<*
- @param [&inout] ptr : "the variable or dereferenced pointer to the data."
- @param [in] y : "the value to shift ptr by."
- @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
- @return "returns the old value of ptr"
-
- @require $defined(*ptr) : "Expected a pointer"
- @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
- @require types::is_int($typeof(*ptr)) : "Only integer pointers may be used."
- @require types::is_int($typeof(y)) : "The value for shift right must be an integer"
- @require $ordering != NOT_ATOMIC && $ordering != UNORDERED : "Acquire ordering is not valid."
-*>
+/**
+ * @param [&in] ptr "the variable or dereferenced pointer to the data."
+ * @param [in] y "the value to be added to ptr."
+ * @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ * @return "returns the old value of ptr"
+ * 
+ * @require types::is_int($typeof(*ptr)) "Only integer pointers may be used."
+ * @require types::is_int($typeof(y)) "The value for or must be an int"
+ * @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ **/
 macro fetch_shift_right(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 {
 	var $load_ordering = $ordering;
 	$if $ordering == RELEASE || $ordering == ACQUIRE_RELEASE:
-	    $load_ordering = SEQ_CONSISTENT;
+	    $load_ordering = AtomicOrdering.SEQ_CONSISTENT;
 	$endif
 	
-	var $StorageType = types::lower_to_atomic_compatible_type($typeof(*ptr));
+	var $StorageType = $typefrom(types::lower_to_atomic_compatible_type($typeof(*ptr)));
 
 	$StorageType* storage_ptr = ($StorageType*)ptr;
 
@@ -385,38 +397,34 @@ macro fetch_shift_right(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 	$StorageType storage_new_value;
 	$StorageType storage_y = ($StorageType)y;
 	
-	do
-	{
+	do {
 		storage_old_value = $$atomic_load(storage_ptr, false, $load_ordering.ordinal);
 		old_value = bitcast(storage_old_value, $typeof(*ptr));
 		new_value = storage_old_value >> storage_y;
 		storage_new_value = bitcast(new_value, $StorageType);
-	}
-	while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
+	} while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
 
 	return old_value;
 }
 
-<*
- @param [&inout] ptr : "the variable or dereferenced pointer to the data."
- @param [in] y : "the value to shift ptr by."
- @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
- @return "returns the old value of ptr"
-
- @require $defined(*ptr) : "Expected a pointer"
- @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
- @require types::is_int($typeof(*ptr)) : "Only integer pointers may be used."
- @require types::is_int($typeof(y)) : "The value for shift left must be an integer"
- @require $ordering != NOT_ATOMIC && $ordering != UNORDERED : "Acquire ordering is not valid."
-*>
+/**
+ * @param [&in] ptr "the variable or dereferenced pointer to the data."
+ * @param [in] y "the value to be added to ptr."
+ * @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ * @return "returns the old value of ptr"
+ * 
+ * @require types::is_int($typeof(*ptr)) "Only integer pointers may be used."
+ * @require types::is_int($typeof(y)) "The value for or must be an int"
+ * @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ **/
 macro fetch_shift_left(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 {
 	var $load_ordering = $ordering;
 	$if $ordering == RELEASE || $ordering == ACQUIRE_RELEASE:
-	    $load_ordering = SEQ_CONSISTENT;
+	    $load_ordering = AtomicOrdering.SEQ_CONSISTENT;
 	$endif
 	
-	var $StorageType = types::lower_to_atomic_compatible_type($typeof(*ptr));
+	var $StorageType = $typefrom(types::lower_to_atomic_compatible_type($typeof(*ptr)));
 
 	$StorageType* storage_ptr = ($StorageType*)ptr;
 
@@ -427,84 +435,65 @@ macro fetch_shift_left(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 	$StorageType storage_new_value;
 	$StorageType storage_y = ($StorageType)y;
 	
-	do
-	{
+	do {
 		storage_old_value = $$atomic_load(storage_ptr, false, $load_ordering.ordinal);
 		old_value = bitcast(storage_old_value, $typeof(*ptr));
 		new_value = storage_old_value << storage_y;
 		storage_new_value = bitcast(new_value, $StorageType);
-	}
-	while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
+	} while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
 
 	return old_value;
 }
 
-<*
- @param [&inout] ptr : "the variable or dereferenced pointer to the data."
- @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
- @return "returns the old value of ptr"
-
- @require $defined(*ptr) : "Expected a pointer"
- @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
- @require types::flat_kind($typeof(*ptr)) == BOOL : "Only bool pointers may be used."
-
- @require $ordering != NOT_ATOMIC && $ordering != UNORDERED : "Acquire ordering is not valid."
-*>
+/**
+ * @param [&in] ptr "the variable or dereferenced pointer to the data."
+ * @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ * @return "returns the old value of ptr"
+ * 
+ * @require types::is_int($typeof(*ptr)) "Only integer pointers may be used."
+ * @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ **/
 macro flag_set(ptr, AtomicOrdering $ordering = SEQ_CONSISTENT)
 {
 	$typeof(*ptr) old_value;
 	$typeof(*ptr) new_value = true;
-	var $load_ordering = $ordering;
-	$if $ordering == RELEASE || $ordering == ACQUIRE_RELEASE:
-	    $load_ordering = SEQ_CONSISTENT;
-	$endif
-	do
-	{
-		old_value = $$atomic_load(ptr, false, $load_ordering.ordinal);
-	}
-	while (mem::compare_exchange(ptr, old_value, new_value, $ordering, $load_ordering) != old_value);
 
+	do {
+		old_value = $$atomic_load(ptr, false, $ordering.ordinal);
+	} while (mem::compare_exchange(ptr, old_value, new_value, $ordering, $load_ordering) != old_value);
+	
 	return old_value;
 }
 
-<*
- @param [&inout] ptr : "the variable or dereferenced pointer to the data."
- @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
- @return "returns the old value of ptr"
-
- @require $defined(*ptr) : "Expected a pointer"
- @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
- @require types::flat_kind($typeof(*ptr)) == BOOL : "Only bool pointers may be used."
- @require $ordering != NOT_ATOMIC && $ordering != UNORDERED : "Acquire ordering is not valid."
-*>
+/**
+ * @param [&in] ptr "the variable or dereferenced pointer to the data."
+ * @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ * @return "returns the old value of ptr"
+ * 
+ * @require types::is_int($typeof(*ptr)) "Only integer pointers may be used."
+ * @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ **/
 macro flag_clear(ptr, AtomicOrdering $ordering = SEQ_CONSISTENT)
 {
 	$typeof(*ptr) old_value;
 	$typeof(*ptr) new_value = false;
-	var $load_ordering = $ordering;
-	$if $ordering == RELEASE || $ordering == ACQUIRE_RELEASE:
-	    $load_ordering = SEQ_CONSISTENT;
-	$endif
-	do
-	{
-		old_value = $$atomic_load(ptr, false, $load_ordering.ordinal);
-	}
-	while (mem::compare_exchange(ptr, old_value, new_value, $ordering, $load_ordering) != old_value);
+
+	do {
+		old_value = $$atomic_load(ptr, false, $ordering.ordinal);
+	} while (mem::compare_exchange(ptr, old_value, new_value, $ordering, $load_ordering) != old_value);
 
 	return old_value;
 }
 
-<*
- @param [&in] ptr : "the variable or dereferenced pointer to the data."
- @param [in] y : "the value to be compared to ptr."
- @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
- @return "returns the old value of ptr"
-
- @require $defined(*ptr) : "Expected a pointer"
- @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
- @require $defined(*ptr > y) : "Only values that are comparable with > may be used"
- @require $ordering != NOT_ATOMIC && $ordering != UNORDERED : "Acquire ordering is not valid."
-*>
+/**
+ * @param [&in] ptr "the variable or dereferenced pointer to the data."
+ * @param [in] y "the value to be added to ptr."
+ * @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ * @return "returns the old value of ptr"
+ * 
+ * @require types::is_int($typeof(*ptr)) || types::is_float($typeof(*ptr)) "Only integer/float pointers may be used."
+ * @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ **/
 macro fetch_max(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatile = false, usz $alignment = 0)
 {
 	$if $alignment == 0:
@@ -513,17 +502,15 @@ macro fetch_max(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatil
 	return $$atomic_fetch_max(ptr, y, $volatile, $ordering.ordinal, $alignment);
 }
 
-<*
- @param [&in] ptr : "the variable or dereferenced pointer to the data."
- @param [in] y : "the value to be compared to ptr."
- @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
- @return "returns the old value of ptr"
-
- @require $defined(*ptr) : "Expected a pointer"
- @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
- @require $defined(*ptr > y) : "Only values that are comparable with > may be used"
- @require $ordering != NOT_ATOMIC && $ordering != UNORDERED : "Acquire ordering is not valid."
-*>
+/**
+ * @param [&in] ptr "the variable or dereferenced pointer to the data."
+ * @param [in] y "the value to be added to ptr."
+ * @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ * @return "returns the old value of ptr"
+ * 
+ * @require types::is_int($typeof(*ptr)) || types::is_float($typeof(*ptr)) "Only integer/float pointers may be used."
+ * @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ **/
 macro fetch_min(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatile = false, usz $alignment = 0)
 {
 	$if $alignment == 0:

lib/std/atomic_nolibc.c3

@@ -3,9 +3,8 @@
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::atomic;
 
-macro @__atomic_compare_exchange_ordering_failure(ptr, expected, desired, $success, failure, $alignment)
-{
-	switch (failure)
+macro @__atomic_compare_exchange_ordering_failure(ptr, expected, desired, $success, failure, $alignment) {
+	switch(failure)
 	{
 		case AtomicOrdering.RELAXED.ordinal: return $$compare_exchange(ptr, expected, desired, false, false, $success, AtomicOrdering.RELAXED.ordinal, $alignment);
 		case AtomicOrdering.ACQUIRE.ordinal: return $$compare_exchange(ptr, expected, desired, false, false, $success, AtomicOrdering.ACQUIRE.ordinal, $alignment);
@@ -17,7 +16,7 @@ macro @__atomic_compare_exchange_ordering_failure(ptr, expected, desired, $succe
 
 macro @__atomic_compare_exchange_ordering_success(ptr, expected, desired, success, failure, $alignment)
 {
-	switch (success)
+	switch(success)
 	{
 		case AtomicOrdering.RELAXED.ordinal: return @__atomic_compare_exchange_ordering_failure(ptr, expected, desired, AtomicOrdering.RELAXED.ordinal, failure, $alignment);
 		case AtomicOrdering.ACQUIRE.ordinal: return @__atomic_compare_exchange_ordering_failure(ptr, expected, desired, AtomicOrdering.ACQUIRE.ordinal, failure, $alignment);
@@ -29,7 +28,7 @@ macro @__atomic_compare_exchange_ordering_success(ptr, expected, desired, succes
 	return 0;
 }
 
-fn CInt __atomic_compare_exchange(CInt size, any ptr, any expected, any desired, CInt success, CInt failure) @weak @export("__atomic_compare_exchange")
+fn CInt __atomic_compare_exchange(CInt size, any ptr, any expected, any desired, CInt success, CInt failure) @extern("__atomic_compare_exchange") @export
 {
 	switch (size)
 	{

lib/std/bits.c3

@@ -1,13 +1,13 @@
 module std::bits;
 
-<*
- @require types::is_intlike($typeof(i)) : `The input must be an integer or integer vector`
-*>
+/**
+ * @require types::is_intlike($typeof(i)) `The input must be an integer or integer vector`
+ **/
 macro reverse(i) => $$bitreverse(i);
 
-<*
- @require types::is_intlike($typeof(i)) : `The input must be an integer or integer vector`
-*>
+/**
+ * @require types::is_intlike($typeof(i)) `The input must be an integer or integer vector`
+ **/
 macro bswap(i) @builtin => $$bswap(i);
 
 macro uint[<*>].popcount(self) => $$popcount(self);

lib/std/collections/anylist.c3

@@ -1,23 +1,12 @@
-// Copyright (c) 2024-2025 Christoffer Lerno. All rights reserved.
+// Copyright (c) 2024 Christoffer Lerno. All rights reserved.
 // Use of self source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::collections::anylist;
 import std::io,std::math;
 
-alias AnyPredicate = fn bool(any value);
-alias AnyTest = fn bool(any type, any context);
+def AnyPredicate = fn bool(any value);
+def AnyTest = fn bool(any type, any context);
 
-<*
- The AnyList contains a heterogenous set of types. Anything placed in the
- list will shallowly copied in order to be stored as an `any`. This means
- that the list will copy and free its elements.
-
- However, because we're getting `any` values back when we pop, those operations
- need to take an allocator, as we can only copy then pop then return the copy.
-
- If we're not doing pop, then things are easier, since we can just hand over
- the existing any.
-*>
 struct AnyList (Printable)
 {
 	usz size;
@@ -27,14 +16,11 @@ struct AnyList (Printable)
 }
 
 
-<*
- Initialize the list. If not initialized then it will use the temp allocator
- when something is pushed to it.
-
- @param [&inout] allocator : "The allocator to use"
- @param initial_capacity : "The initial capacity to reserve, defaults to 16"
-*>
-fn AnyList* AnyList.init(&self, Allocator allocator, usz initial_capacity = 16)
+/**
+ * @param initial_capacity "The initial capacity to reserve"
+ * @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
+ **/
+fn AnyList* AnyList.new_init(&self, usz initial_capacity = 16, Allocator allocator = allocator::heap())
 {
 	self.allocator = allocator;
 	self.size = 0;
@@ -51,374 +37,17 @@ fn AnyList* AnyList.init(&self, Allocator allocator, usz initial_capacity = 16)
 	return self;
 }
 
-<*
- Initialize the list using the temp allocator.
-
- @param initial_capacity : "The initial capacity to reserve"
-*>
-fn AnyList* AnyList.tinit(&self, usz initial_capacity = 16)
+/**
+ * Initialize the list using the temp allocator.
+ *
+ * @param initial_capacity "The initial capacity to reserve"
+ **/
+fn AnyList* AnyList.temp_init(&self, usz initial_capacity = 16)
 {
-	return self.init(tmem, initial_capacity) @inline;
+	return self.new_init(initial_capacity, allocator::temp()) @inline;
 }
 
-fn bool AnyList.is_initialized(&self) @inline => self.allocator != null;
-
-<*
- Push an element on the list by cloning it.
-*>
-macro void AnyList.push(&self, element)
-{
-	if (!self.allocator) self.allocator = tmem;
-	self._append(allocator::clone(self.allocator, element));
-}
-
-<*
- Free a retained element removed using *_retained.
-*>
-fn void AnyList.free_element(&self, any element) @inline
-{
-	allocator::free(self.allocator, element.ptr);
-}
-
-<*
- Pop a value who's type is known. If the type is incorrect, this
- will still pop the element.
-
- @param $Type : "The type we assume the value has"
- @return "The last value as the type given"
- @return? TYPE_MISMATCH, NO_MORE_ELEMENT
-*>
-macro AnyList.pop(&self, $Type)
-{
-	if (!self.size) return NO_MORE_ELEMENT?;
-	defer self.free_element(self.entries[self.size]);
-	return *anycast(self.entries[--self.size], $Type);
-}
-
-<*
- Copy the last value, pop it and return the copy of it.
-
- @param [&inout] allocator : "The allocator to use for copying"
- @return "A copy of the last value if it exists"
- @return? NO_MORE_ELEMENT
-*>
-fn any? AnyList.copy_pop(&self, Allocator allocator)
-{
-	if (!self.size) return NO_MORE_ELEMENT?;
-	defer self.free_element(self.entries[self.size]);
-	return allocator::clone_any(allocator, self.entries[--self.size]);
-}
-
-
-<*
- Copy the last value, pop it and return the copy of it.
-
- @return "A temp copy of the last value if it exists"
- @return? NO_MORE_ELEMENT
-*>
-fn any? AnyList.tcopy_pop(&self) => self.copy_pop(tmem);
-
-
-<*
- Pop the last value. It must later be released using `list.free_element()`.
-
- @return "The last value if it exists"
- @return? NO_MORE_ELEMENT
-*>
-fn any? AnyList.pop_retained(&self)
-{
-	if (!self.size) return NO_MORE_ELEMENT?;
-	return self.entries[--self.size];
-}
-
-<*
- Remove all elements in the list.
-*>
-fn void AnyList.clear(&self)
-{
-	for (usz i = 0; i < self.size; i++)
-	{
-		self.free_element(self.entries[i]);
-	}
-	self.size = 0;
-}
-
-<*
- Pop a value who's type is known. If the type is incorrect, this
- will still pop the element.
-
- @param $Type : "The type we assume the value has"
- @return "The first value as the type given"
- @return? TYPE_MISMATCH, NO_MORE_ELEMENT
-*>
-macro AnyList.pop_first(&self, $Type)
-{
-	if (!self.size) return NO_MORE_ELEMENT?;
-	defer self.remove_at(0);
-	return *anycast(self.entries[0], $Type);
-}
-
-<*
- Pop the first value. It must later be released using `list.free_element()`.
-
- @return "The first value if it exists"
- @return? NO_MORE_ELEMENT
-*>
-fn any? AnyList.pop_first_retained(&self)
-{
-	if (!self.size) return NO_MORE_ELEMENT?;
-	defer self.remove_at(0);
-	return self.entries[0];
-}
-
-
-<*
- Copy the first value, pop it and return the copy of it.
-
- @param [&inout] allocator : "The allocator to use for copying"
- @return "A copy of the first value if it exists"
- @return? NO_MORE_ELEMENT
-*>
-fn any? AnyList.copy_pop_first(&self, Allocator allocator)
-{
-	if (!self.size) return NO_MORE_ELEMENT?;
-	defer self.free_element(self.entries[self.size]);
-	defer self.remove_at(0);
-	return allocator::clone_any(allocator, self.entries[0]);
-}
-
-<*
- Copy the first value, pop it and return the temp copy of it.
-
- @return "A temp copy of the first value if it exists"
- @return? NO_MORE_ELEMENT
-*>
-fn any? AnyList.tcopy_pop_first(&self) => self.copy_pop_first(tmem);
-
-<*
- Remove the element at the particular index.
-
- @param index : "The index of the element to remove"
- @require index < self.size
-*>
-fn void AnyList.remove_at(&self, usz index)
-{
-	if (!--self.size || index == self.size) return;
-	self.free_element(self.entries[index]);
-	self.entries[index .. self.size - 1] = self.entries[index + 1 .. self.size];
-}
-
-<*
- Add all the elements in another AnyList.
-
- @param [&in] other_list : "The list to add"
-*>
-fn void AnyList.add_all(&self, AnyList* other_list)
-{
-	if (!other_list.size) return;
-	self.reserve(other_list.size);
-	foreach (value : other_list)
-	{
-		self.entries[self.size++] = allocator::clone_any(self.allocator, value);
-	}
-}
-
-<*
- Reverse the order of the elements in the list.
-*>
-fn void AnyList.reverse(&self)
-{
-	if (self.size < 2) return;
-	usz half = self.size / 2U;
-	usz end = self.size - 1;
-	for (usz i = 0; i < half; i++)
-	{
-		self.swap(i, end - i);
-	}
-}
-
-<*
- Return a view of the data as a slice.
-
- @return "The slice view"
-*>
-fn any[] AnyList.array_view(&self)
-{
-	return self.entries[:self.size];
-}
-
-<*
- Push an element to the front of the list.
-
- @param value : "The value to push to the list"
-*>
-macro void AnyList.push_front(&self, value)
-{
-	self.insert_at(0, value);
-}
-
-<*
- Insert an element at a particular index.
-
- @param index : "the index where the element should be inserted"
- @param type : "the value to insert"
- @require index <= self.size : "The index is out of bounds"
-*>
-macro void AnyList.insert_at(&self, usz index, type)
-{
-	if (index == self.size)
-	{
-		self.push(type);
-		return;
-	}
-	any value = allocator::copy(self.allocator, type);
-	self._insert_at(self, index, value);
-}
-
-<*
- Remove the last element in the list. The list may not be empty.
-
- @require self.size > 0 : "The list was already empty"
-*>
-fn void AnyList.remove_last(&self)
-{
-	self.free_element(self.entries[--self.size]);
-}
-
-<*
- Remove the first element in the list, the list may not be empty.
-
- @require self.size > 0
-*>
-fn void AnyList.remove_first(&self)
-{
-	self.remove_at(0);
-}
-
-<*
- Return the first element by value, assuming it is the given type.
-
- @param $Type : "The type of the first element"
- @return "The first element"
- @return? TYPE_MISMATCH, NO_MORE_ELEMENT
-*>
-macro AnyList.first(&self, $Type)
-{
-	return *anycast(self.first_any(), $Type);
-}
-
-<*
- Return the first element
-
- @return "The first element"
- @return? NO_MORE_ELEMENT
-*>
-fn any? AnyList.first_any(&self) @inline
-{
-	return self.size ? self.entries[0] : NO_MORE_ELEMENT?;
-}
-
-<*
- Return the last element by value, assuming it is the given type.
-
- @param $Type : "The type of the last element"
- @return "The last element"
- @return? TYPE_MISMATCH, NO_MORE_ELEMENT
-*>
-macro AnyList.last(&self, $Type)
-{
-	return *anycast(self.last_any(), $Type);
-}
-
-<*
- Return the last element
-
- @return "The last element"
- @return? NO_MORE_ELEMENT
-*>
-fn any? AnyList.last_any(&self) @inline
-{
-	return self.size ? self.entries[self.size - 1] : NO_MORE_ELEMENT?;
-}
-
-<*
- Return whether the list is empty.
-
- @return "True if the list is empty"
-*>
-fn bool AnyList.is_empty(&self) @inline
-{
-	return !self.size;
-}
-
-<*
- Return the length of the list.
-
- @return "The number of elements in the list"
-*>
-fn usz AnyList.len(&self) @operator(len) @inline
-{
-	return self.size;
-}
-
-<*
- Return an element in the list by value, assuming it is the given type.
-
- @param index : "The index of the element to retrieve"
- @param $Type : "The type of the element"
- @return "The element at the index"
- @return? TYPE_MISMATCH, NO_MORE_ELEMENT
- @require index < self.size : "Index out of range"
-*>
-macro AnyList.get(&self, usz index, $Type)
-{
-	return *anycast(self.entries[index], $Type);
-}
-
-<*
- Return an element in the list.
-
- @param index : "The index of the element to retrieve"
- @return "The element at the index"
- @return? TYPE_MISMATCH, NO_MORE_ELEMENT
- @require index < self.size : "Index out of range"
-*>
-fn any AnyList.get_any(&self, usz index) @inline @operator([])
-{
-	return self.entries[index];
-}
-
-<*
- Completely free and clear a list.
-*>
-fn void AnyList.free(&self)
-{
-	if (!self.allocator) return;
-	self.clear();
-	allocator::free(self.allocator, self.entries);
-	self.capacity = 0;
-	self.entries = null;
-}
-
-<*
- Swap two elements in a list.
-
- @param i : "Index of one of the elements"
- @param j : "Index of the other element"
- @require i < self.size : "The first index is out of range"
- @require j < self.size : "The second index is out of range"
-*>
-fn void AnyList.swap(&self, usz i, usz j)
-{
-	any temp = self.entries[i];
-	self.entries[i] = self.entries[j];
-	self.entries[j] = temp;
-}
-
-<*
- Print the list to a formatter.
-*>
-fn usz? AnyList.to_format(&self, Formatter* formatter) @dynamic
+fn usz! AnyList.to_format(&self, Formatter* formatter) @dynamic
 {
 	switch (self.size)
 	{
@@ -438,109 +67,184 @@ fn usz? AnyList.to_format(&self, Formatter* formatter) @dynamic
 	}
 }
 
-<*
- Remove any elements matching the predicate.
-
- @param filter : "The function to determine if it should be removed or not"
- @return "the number of deleted elements"
-*>
-fn usz AnyList.remove_if(&self, AnyPredicate filter)
+fn String AnyList.to_new_string(&self, Allocator allocator = allocator::heap()) @dynamic
 {
-	return self._remove_if(filter, false);
+	return string::new_format("%s", *self, .allocator = allocator);
 }
 
-<*
- Retain the elements matching the predicate.
-
- @param selection : "The function to determine if it should be kept or not"
- @return "the number of deleted elements"
-*>
-fn usz AnyList.retain_if(&self, AnyPredicate selection)
+fn String AnyList.to_tstring(&self)
 {
-	return self._remove_if(selection, true);
+	return string::tformat("%s", *self);
 }
 
-<*
- Remove any elements matching the predicate.
-
- @param filter : "The function to determine if it should be removed or not"
- @param context : "The context to the function"
- @return "the number of deleted elements"
-*>
-fn usz AnyList.remove_using_test(&self, AnyTest filter, any context)
+/**
+ * Push an element on the list by cloning it.
+ **/
+macro void AnyList.push(&self, element)
 {
-	return self._remove_using_test(filter, false, context);
+	if (!self.allocator) self.allocator = allocator::heap();
+	self.append_internal(allocator::clone(self.allocator, element));
 }
 
-<*
- Retain any elements matching the predicate.
-
- @param selection : "The function to determine if it should be retained or not"
- @param context : "The context to the function"
- @return "the number of deleted elements"
-*>
-fn usz AnyList.retain_using_test(&self, AnyTest selection, any context)
-{
-	return self._remove_using_test(selection, true, context);
-}
-
-
-<*
- Reserve memory so that at least the `min_capacity` exists.
-
- @param min_capacity : "The min capacity to hold"
-*>
-fn void AnyList.reserve(&self, usz min_capacity)
-{
-	if (!min_capacity) return;
-	if (self.capacity >= min_capacity) return;
-	if (!self.allocator) self.allocator = tmem;
-	min_capacity = math::next_power_of_2(min_capacity);
-	self.entries = allocator::realloc(self.allocator, self.entries, any.sizeof * min_capacity);
-	self.capacity = min_capacity;
-}
-
-<*
- Set the element at any index.
-
- @param index : "The index where to set the value."
- @param value : "The value to set"
- @require index <= self.size : "Index out of range"
-*>
-macro void AnyList.set(&self, usz index, value)
-{
-	if (index == self.size)
-	{
-		self.push(value);
-		return;
-	}
-	self.free_element(self.entries[index]);
-	self.entries[index] = allocator::copy(self.allocator, value);
-}
-
-// -- private
-
-fn void AnyList.ensure_capacity(&self, usz added = 1) @inline @private
-{
-	usz new_size = self.size + added;
-	if (self.capacity >= new_size) return;
-
-	assert(new_size < usz.max / 2U);
-	usz new_capacity = self.capacity ? 2U * self.capacity : 16U;
-	while (new_capacity < new_size) new_capacity *= 2U;
-	self.reserve(new_capacity);
-}
-
-fn void AnyList._append(&self, any element) @local
+fn void AnyList.append_internal(&self, any element) @local
 {
 	self.ensure_capacity();
 	self.entries[self.size++] = element;
 }
 
-<*
- @require index < self.size
-*>
-fn void AnyList._insert_at(&self, usz index, any value) @local
+/**
+ * Free a retained element removed using *_retained.
+ **/
+fn void AnyList.free_element(&self, any element) @inline
+{
+	allocator::free(self.allocator, element.ptr);
+}
+
+/**
+ * Pop a value who's type is known. If the type is incorrect, this
+ * will still pop the element.
+ *
+ * @return! CastResult.TYPE_MISMATCH, IteratorResult.NO_MORE_ELEMENT
+ **/
+macro AnyList.pop(&self, $Type)
+{
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	defer self.free_element(self.entries[self.size]);
+	return *anycast(self.entries[--self.size], $Type);
+}
+
+/**
+ * Pop the last value and allocate the copy using the given allocator.
+ * @return! IteratorResult.NO_MORE_ELEMENT
+ **/
+fn any! AnyList.new_pop(&self, Allocator allocator = allocator::heap())
+{
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	defer self.free_element(self.entries[self.size]);
+	return allocator::clone_any(allocator, self.entries[--self.size]);
+}
+
+/**
+ * Pop the last value and allocate the copy using the temp allocator
+ * @return! IteratorResult.NO_MORE_ELEMENT
+ **/
+fn any! AnyList.temp_pop(&self) => self.new_pop(allocator::temp());
+
+/**
+ * Pop the last value. It must later be released using list.free_element()
+ * @return! IteratorResult.NO_MORE_ELEMENT
+ **/
+fn any! AnyList.pop_retained(&self)
+{
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	return self.entries[--self.size];
+}
+
+fn void AnyList.clear(&self)
+{
+	for (usz i = 0; i < self.size; i++)
+	{
+		self.free_element(self.entries[i]);
+	}
+	self.size = 0;
+}
+
+/**
+ * Same as pop() but pops the first value instead.
+ **/
+macro AnyList.pop_first(&self, $Type)
+{
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	defer self.remove_at(0);
+	return *anycast(self.entries[0], $Type);
+}
+
+/**
+ * Same as pop_retained() but pops the first value instead.
+ **/
+fn any! AnyList.pop_first_retained(&self)
+{
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	defer self.remove_at(0);
+	return self.entries[0];
+}
+
+/**
+ * Same as new_pop() but pops the first value instead.
+ **/
+fn any! AnyList.new_pop_first(&self, Allocator allocator = allocator::heap())
+{
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	defer self.free_element(self.entries[self.size]);
+	defer self.remove_at(0);
+	return allocator::clone_any(allocator, self.entries[0]);
+}
+
+/**
+ * Same as temp_pop() but pops the first value instead.
+ **/
+fn any! AnyList.temp_pop_first(&self) => self.new_pop_first(allocator::temp());
+
+/**
+ * @require index < self.size
+ **/
+fn void AnyList.remove_at(&self, usz index)
+{
+	if (!--self.size || index == self.size) return;
+	self.free_element(self.entries[index]);
+	self.entries[index .. self.size - 1] = self.entries[index + 1 .. self.size];
+}
+
+fn void AnyList.add_all(&self, AnyList* other_list)
+{
+	if (!other_list.size) return;
+	self.reserve(other_list.size);
+	foreach (value : other_list)
+	{
+		self.entries[self.size++] = allocator::clone_any(self.allocator, value);
+	}
+}
+
+/**
+ * Reverse the elements in a list.
+ **/
+fn void AnyList.reverse(&self)
+{
+	if (self.size < 2) return;
+	usz half = self.size / 2U;
+	usz end = self.size - 1;
+	for (usz i = 0; i < half; i++)
+	{
+		self.swap(i, end - i);
+	}
+}
+
+fn any[] AnyList.array_view(&self)
+{
+	return self.entries[:self.size];
+}
+
+/**
+ * Push an element to the front of the list.
+ **/
+macro void AnyList.push_front(&self, type)
+{
+	self.insert_at(0, type);
+}
+
+/**
+ * @require index < self.size
+ **/
+macro void AnyList.insert_at(&self, usz index, type) @local
+{
+	any value = allocator::copy(self.allocator, type);
+	self.insert_at_internal(self, index, value);
+}
+
+/**
+ * @require index < self.size
+ **/
+fn void AnyList.insert_at_internal(&self, usz index, any value) @local
 {
 	self.ensure_capacity();
 	for (usz i = self.size; i > index; i--)
@@ -551,6 +255,139 @@ fn void AnyList._insert_at(&self, usz index, any value) @local
 	self.entries[index] = value;
 }
 
+
+/**
+ * @require self.size > 0
+ **/
+fn void AnyList.remove_last(&self)
+{
+	self.free_element(self.entries[--self.size]);
+}
+
+/**
+ * @require self.size > 0
+ **/
+fn void AnyList.remove_first(&self)
+{
+	self.remove_at(0);
+}
+
+macro AnyList.first(&self, $Type)
+{
+	return *anycast(self.first_any(), $Type);
+}
+
+fn any! AnyList.first_any(&self) @inline
+{
+	return self.size ? self.entries[0] : IteratorResult.NO_MORE_ELEMENT?;
+}
+
+macro AnyList.last(&self, $Type)
+{
+	return *anycast(self.last_any(), $Type);
+}
+
+fn any! AnyList.last_any(&self) @inline
+{
+	return self.size ? self.entries[self.size - 1] : IteratorResult.NO_MORE_ELEMENT?;
+}
+
+fn bool AnyList.is_empty(&self) @inline
+{
+	return !self.size;
+}
+
+fn usz AnyList.len(&self) @operator(len) @inline
+{
+	return self.size;
+}
+
+/**
+ * @require index < self.size "Index out of range"
+ **/
+macro AnyList.get(&self, usz index, $Type)
+{
+	return *anycast(self.entries[index], $Type);
+}
+
+/**
+ * @require index < self.size "Index out of range"
+ **/
+fn any AnyList.get_any(&self, usz index) @inline
+{
+	return self.entries[index];
+}
+
+fn void AnyList.free(&self)
+{
+	if (!self.allocator) return;
+	self.clear();
+	allocator::free(self.allocator, self.entries);
+	self.capacity = 0;
+	self.entries = null;
+}
+
+fn void AnyList.swap(&self, usz i, usz j)
+{
+	any temp = self.entries[i];
+	self.entries[i] = self.entries[j];
+	self.entries[j] = temp;
+}
+
+/**
+ * @param filter "The function to determine if it should be removed or not"
+ * @return "the number of deleted elements"
+ **/
+fn usz AnyList.remove_if(&self, AnyPredicate filter)
+{
+	return self._remove_if(filter, false);
+}
+
+/**
+ * @param selection "The function to determine if it should be kept or not"
+ * @return "the number of deleted elements"
+ **/
+fn usz AnyList.retain_if(&self, AnyPredicate selection)
+{
+	return self._remove_if(selection, true);
+}
+
+macro usz AnyList._remove_if(&self, AnyPredicate filter, bool $invert) @local
+{
+	usz size = self.size;
+	for (usz i = size, usz k = size; k > 0; k = i)
+	{
+		// Find last index of item to be deleted.
+		$if $invert:
+			while (i > 0 && !filter(&self.entries[i - 1])) i--;
+		$else
+			while (i > 0 && filter(&self.entries[i - 1])) i--;
+		$endif
+		// Remove the items from this index up to the one not to be deleted.
+		usz n = self.size - k;
+		for (usz j = i; j < k; j++) self.free_element(self.entries[j]);
+		self.entries[i:n] = self.entries[k:n];
+		self.size -= k - i;
+		// Find last index of item not to be deleted.
+		$if $invert:
+			while (i > 0 && filter(&self.entries[i - 1])) i--;
+		$else
+			while (i > 0 && !filter(&self.entries[i - 1])) i--;
+		$endif
+	}
+	return size - self.size;
+}
+
+fn usz AnyList.remove_using_test(&self, AnyTest filter, any context)
+{
+	return self._remove_using_test(filter, false, context);
+}
+
+fn usz AnyList.retain_using_test(&self, AnyTest filter, any context)
+{
+	return self._remove_using_test(filter, true, context);
+}
+
 macro usz AnyList._remove_using_test(&self, AnyTest filter, bool $invert, ctx) @local
 {
 	usz size = self.size;
@@ -577,28 +414,45 @@ macro usz AnyList._remove_using_test(&self, AnyTest filter, bool $invert, ctx) @
 	return size - self.size;
 }
 
-macro usz AnyList._remove_if(&self, AnyPredicate filter, bool $invert) @local
+/**
+ * Reserve at least min_capacity
+ **/
+fn void AnyList.reserve(&self, usz min_capacity)
 {
-	usz size = self.size;
-	for (usz i = size, usz k = size; k > 0; k = i)
-	{
-		// Find last index of item to be deleted.
-		$if $invert:
-			while (i > 0 && !filter(&self.entries[i - 1])) i--;
-		$else
-			while (i > 0 && filter(&self.entries[i - 1])) i--;
-		$endif
-		// Remove the items from this index up to the one not to be deleted.
-		usz n = self.size - k;
-		for (usz j = i; j < k; j++) self.free_element(self.entries[j]);
-		self.entries[i:n] = self.entries[k:n];
-		self.size -= k - i;
-		// Find last index of item not to be deleted.
-		$if $invert:
-			while (i > 0 && filter(&self.entries[i - 1])) i--;
-		$else
-			while (i > 0 && !filter(&self.entries[i - 1])) i--;
-		$endif
-	}
-	return size - self.size;
+	if (!min_capacity) return;
+	if (self.capacity >= min_capacity) return;
+	if (!self.allocator) self.allocator = allocator::heap();
+	min_capacity = math::next_power_of_2(min_capacity);
+	self.entries = allocator::realloc(self.allocator, self.entries, any.sizeof * min_capacity);
+	self.capacity = min_capacity;
+}
+
+macro any AnyList.@item_at(&self, usz index) @operator([])
+{
+	return self.entries[index];
+}
+
+/**
+ * @require index <= self.size "Index out of range"
+ **/
+macro void AnyList.set(&self, usz index, value)
+{
+	if (index == self.size)
+	{
+		self.push(value);
+		return;
+	}
+	self.free_element(self.entries[index]);
+	self.entries[index] = allocator::copy(self.allocator, value);
+}
+
+fn void AnyList.ensure_capacity(&self, usz added = 1) @inline @private
+{
+	usz new_size = self.size + added;
+	if (self.capacity >= new_size) return;
+
+	assert(new_size < usz.max / 2U);
+	usz new_capacity = self.capacity ? 2U * self.capacity : 16U;
+	while (new_capacity < new_size) new_capacity *= 2U;
+	self.reserve(new_capacity);
 }

lib/std/collections/bitset.c3

@@ -1,22 +1,18 @@
-// Copyright (c) 2023-2025 C3 team. All rights reserved.
-// Use of self source code is governed by the MIT license
-// a copy of which can be found in the LICENSE_STDLIB file.
-<*
- @require SIZE > 0 : "The size of the bitset in bits must be at least 1"
-*>
-module std::collections::bitset {SIZE};
+/**
+ * @require SIZE > 0
+ **/
+module std::collections::bitset(<SIZE>);
 
-const BITS = uint.sizeof * 8;
+def Type = uint;
+
+const BITS = Type.sizeof * 8;
 const SZ = (SIZE + BITS - 1) / BITS;
 
 struct BitSet
 {
-	uint[SZ] data;
+	Type[SZ] data;
 }
 
-<*
- @return "The number of bits set"
-*>
 fn usz BitSet.cardinality(&self)
 {
 	usz n;
@@ -27,13 +23,9 @@ fn usz BitSet.cardinality(&self)
 	return n;
 }
 
-<*
- Set a bit in the bitset.
-
- @param i : "The index to set"
-
- @require i < SIZE : "Index was out of range"
-*>
+/**
+ * @require i < SIZE
+ **/
 fn void BitSet.set(&self, usz i)
 {
 	usz q = i / BITS;
@@ -41,88 +33,9 @@ fn void BitSet.set(&self, usz i)
 	self.data[q] |= 1 << r;
 }
 
-<*
- Perform xor over all bits, mutating itself
-
- @param set : "The bit set to xor with"
- @return "The resulting bit set"
-*>
-macro BitSet BitSet.xor_self(&self, BitSet set) @operator(^=)
-{
-	foreach (i, &x : self.data) *x ^= set.data[i];
-	return *self;
-}
-
-<*
- Perform xor over all bits, returning a new bit set.
-
- @param set : "The bit set to xor with"
- @return "The resulting bit set"
-*>
-fn BitSet BitSet.xor(&self, BitSet set) @operator(^)
-{
-	BitSet new_set @noinit;
-	foreach (i, x : self.data) new_set.data[i] = x ^ set.data[i];
-	return new_set;
-}
-
-<*
- Perform or over all bits, returning a new bit set.
-
- @param set : "The bit set to xor with"
- @return "The resulting bit set"
-*>
-fn BitSet BitSet.or(&self, BitSet set) @operator(|)
-{
-	BitSet new_set @noinit;
-	foreach (i, x : self.data) new_set.data[i] = x | set.data[i];
-	return new_set;
-}
-
-<*
- Perform or over all bits, mutating itself
-
- @param set : "The bit set to xor with"
- @return "The resulting bit set"
-*>
-macro BitSet BitSet.or_self(&self, BitSet set) @operator(|=)
-{
-	foreach (i, &x : self.data) *x |= set.data[i];
-	return *self;
-}
-
-<*
- Perform & over all bits, returning a new bit set.
-
- @param set : "The bit set to xor with"
- @return "The resulting bit set"
-*>
-fn BitSet BitSet.and(&self, BitSet set) @operator(&)
-{
-	BitSet new_set @noinit;
-	foreach (i, x : self.data) new_set.data[i] = x & set.data[i];
-	return new_set;
-}
-
-<*
- Perform & over all bits, mutating itself.
-
- @param set : "The bit set to xor with"
- @return "The resulting bit set"
-*>
-macro BitSet BitSet.and_self(&self, BitSet set) @operator(&=)
-{
-	foreach (i, &x : self.data) *x &= set.data[i];
-	return *self;
-}
-
-<*
- Unset (clear) a bit in the bitset.
-
- @param i : "The index to set"
-
- @require i < SIZE : "Index was out of range"
-*>
+/**
+ * @require i < SIZE
+ **/
 fn void BitSet.unset(&self, usz i)
 {
 	usz q = i / BITS;
@@ -130,13 +43,9 @@ fn void BitSet.unset(&self, usz i)
 	self.data[q] &= ~(1 << r);
 }
 
-<*
- Get a particular bit in the bitset
-
- @param i : "The index of the bit"
-
- @require i < SIZE : "Index was out of range"
-*>
+/**
+ * @require i < SIZE
+ **/
 fn bool BitSet.get(&self, usz i) @operator([]) @inline
 {
 	usz q = i / BITS;
@@ -149,48 +58,43 @@ fn usz BitSet.len(&self) @operator(len) @inline
 	return SZ * BITS;
 }
 
-<*
- Change a particular bit in the bitset
-
- @param i : "The index of the bit"
- @param value : "The value to set the bit to"
-
- @require i < SIZE : "Index was out of range"
-*>
+/**
+ * @require i < SIZE
+ **/
 fn void BitSet.set_bool(&self, usz i, bool value) @operator([]=) @inline
 {
 	if (value) return self.set(i);
 	self.unset(i);
 }
 
-<*
- @require Type.kindof == UNSIGNED_INT
-*>
-module std::collections::growablebitset{Type};
+/**
+ * @require Type.kindof == UNSIGNED_INT
+ **/
+module std::collections::growablebitset(<Type>);
 import std::collections::list;
 
 const BITS = Type.sizeof * 8;
 
-alias GrowableBitSetList = List{Type};
+def GrowableBitSetList = List(<Type>);
 
 struct GrowableBitSet
 {
 	GrowableBitSetList data;
 }
 
-<*
- @param initial_capacity
- @param [&inout] allocator : "The allocator to use, defaults to the heap allocator"
-*>
-fn GrowableBitSet* GrowableBitSet.init(&self, Allocator allocator, usz initial_capacity = 1)
+/**
+ * @param initial_capacity
+ * @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
+ **/
+fn GrowableBitSet* GrowableBitSet.new_init(&self, usz initial_capacity = 1, Allocator allocator = allocator::heap())
 {
-	self.data.init(allocator, initial_capacity);
+	self.data.new_init(initial_capacity, allocator);
 	return self;
 }
 
-fn GrowableBitSet* GrowableBitSet.tinit(&self, usz initial_capacity = 1)
+fn GrowableBitSet* GrowableBitSet.temp_init(&self, usz initial_capacity = 1)
 {
-	return self.init(tmem, initial_capacity) @inline;
+	return self.new_init(initial_capacity, allocator::temp()) @inline;
 }
 
 fn void GrowableBitSet.free(&self)
@@ -213,10 +117,15 @@ fn void GrowableBitSet.set(&self, usz i)
 	usz q = i / BITS;
 	usz r = i % BITS;
 	usz current_len = self.data.len();
-	while (q >= current_len)
+	if (q >= current_len)
 	{
-		self.data.push(0);
-		current_len++;
+		usz n = q + 1;
+		self.data.reserve(n);
+		if (n - 1 >= current_len)
+		{
+			self.data.entries[current_len .. (n - 1)] = 0;
+		}
+		self.data.size = n;
 	}
 	self.data.set(q, self.data[q] | (1 << r));
 }

lib/std/collections/elastic_array.c3

@@ -1,14 +1,14 @@
 // Copyright (c) 2021-2024 Christoffer Lerno. All rights reserved.
 // Use of self source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
-<*
- @require MAX_SIZE >= 1 : `The size must be at least 1 element big.`
-*>
-module std::collections::elastic_array {Type, MAX_SIZE};
+/**
+ * @require MAX_SIZE >= 1 `The size must be at least 1 element big.`
+ **/
+module std::collections::elastic_array(<Type, MAX_SIZE>);
 import std::io, std::math, std::collections::list_common;
 
-alias ElementPredicate = fn bool(Type *type);
-alias ElementTest = fn bool(Type *type, any context);
+def ElementPredicate = fn bool(Type *type);
+def ElementTest = fn bool(Type *type, any context);
 const ELEMENT_IS_EQUATABLE = types::is_equatable_type(Type);
 const ELEMENT_IS_POINTER = Type.kindof == POINTER;
 macro type_is_overaligned() => Type.alignof > mem::DEFAULT_MEM_ALIGNMENT;
@@ -19,7 +19,7 @@ struct ElasticArray (Printable)
 	Type[MAX_SIZE] entries;
 }
 
-fn usz? ElasticArray.to_format(&self, Formatter* formatter) @dynamic
+fn usz! ElasticArray.to_format(&self, Formatter* formatter) @dynamic
 {
 	switch (self.size)
 	{
@@ -39,28 +39,33 @@ fn usz? ElasticArray.to_format(&self, Formatter* formatter) @dynamic
 	}
 }
 
+fn String ElasticArray.to_string(&self, Allocator allocator) @dynamic
+{
+	return string::new_format("%s", *self, .allocator = allocator);
+}
+
 fn String ElasticArray.to_tstring(&self)
 {
 	return string::tformat("%s", *self);
 }
 
-fn void? ElasticArray.push_try(&self, Type element) @inline
+fn void! ElasticArray.push_try(&self, Type element) @inline
 {
-	if (self.size == MAX_SIZE) return mem::OUT_OF_MEMORY?;
+	if (self.size == MAX_SIZE) return AllocationFailure.OUT_OF_MEMORY?;
 	self.entries[self.size++] = element;
 }
 
-<*
- @require self.size < MAX_SIZE : `Tried to exceed the max size`
-*>
+/**
+ * @require self.size < MAX_SIZE `Tried to exceed the max size`
+ **/
 fn void ElasticArray.push(&self, Type element) @inline
 {
 	self.entries[self.size++] = element;
 }
 
-fn Type? ElasticArray.pop(&self)
+fn Type! ElasticArray.pop(&self)
 {
-	if (!self.size) return NO_MORE_ELEMENT?;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	return self.entries[--self.size];
 }
 
@@ -69,28 +74,28 @@ fn void ElasticArray.clear(&self)
 	self.size = 0;
 }
 
-<*
- @require self.size > 0
-*>
-fn Type? ElasticArray.pop_first(&self)
+/**
+ * @require self.size > 0
+ **/
+fn Type! ElasticArray.pop_first(&self)
 {
-	if (!self.size) return NO_MORE_ELEMENT?;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	defer self.remove_at(0);
 	return self.entries[0];
 }
 
-<*
- @require index < self.size
-*>
+/**
+ * @require index < self.size
+ **/
 fn void ElasticArray.remove_at(&self, usz index)
 {
 	if (!--self.size || index == self.size) return;
 	self.entries[index .. self.size - 1] = self.entries[index + 1 .. self.size];
 }
 
-<*
- @require other_list.size + self.size <= MAX_SIZE
-*>
+/**
+ * @require other_list.size + self.size <= MAX_SIZE
+ **/
 fn void ElasticArray.add_all(&self, ElasticArray* other_list)
 {
 	if (!other_list.size) return;
@@ -100,10 +105,10 @@ fn void ElasticArray.add_all(&self, ElasticArray* other_list)
 	}
 }
 
-<*
- Add as many elements as possible to the new array,
- returning the number of elements that didn't fit.
-*>
+/**
+ * Add as many elements as possible to the new array,
+ * returning the number of elements that didn't fit.
+ **/
 fn usz ElasticArray.add_all_to_limit(&self, ElasticArray* other_list)
 {
 	if (!other_list.size) return 0;
@@ -115,12 +120,12 @@ fn usz ElasticArray.add_all_to_limit(&self, ElasticArray* other_list)
 	return 0;
 }
 
-<*
- Add as many values from this array as possible, returning the
- number of elements that didn't fit.
-
- @param [in] array
-*>
+/**
+ * Add as many values from this array as possible, returning the
+ * number of elements that didn't fit.
+ *
+ * @param [in] array
+ **/
 fn usz ElasticArray.add_array_to_limit(&self, Type[] array)
 {
 	if (!array.len) return 0;
@@ -132,13 +137,13 @@ fn usz ElasticArray.add_array_to_limit(&self, Type[] array)
 	return 0;
 }
 
-<*
- Add the values of an array to this list.
-
- @param [in] array
- @require array.len + self.size <= MAX_SIZE : `Size would exceed max.`
- @ensure self.size >= array.len
-*>
+/**
+ * Add the values of an array to this list.
+ *
+ * @param [in] array
+ * @require array.len + self.size <= MAX_SIZE `Size would exceed max.`
+ * @ensure self.size >= array.len
+ **/
 fn void ElasticArray.add_array(&self, Type[] array)
 {
 	if (!array.len) return;
@@ -150,34 +155,34 @@ fn void ElasticArray.add_array(&self, Type[] array)
 
 
 
-<*
- IMPORTANT The returned array must be freed using free_aligned.
-*>
-fn Type[] ElasticArray.to_aligned_array(&self, Allocator allocator)
+/**
+ * IMPORTANT The returned array must be freed using free_aligned.
+ **/
+fn Type[] ElasticArray.to_new_aligned_array(&self, Allocator allocator = allocator::heap())
 {
-	return list_common::list_to_aligned_array(Type, self, allocator);
+	return list_common::list_to_new_aligned_array(Type, self, allocator);
 }
 
-<*
- @require !type_is_overaligned() : "This function is not available on overaligned types"
-*>
-macro Type[] ElasticArray.to_array(&self, Allocator allocator)
+/**
+ * @require !type_is_overaligned() : "This function is not available on overaligned types"
+ **/
+macro Type[] ElasticArray.to_new_array(&self, Allocator allocator = allocator::heap())
 {
-	return list_common::list_to_array(Type, self, allocator);
+	return list_common::list_to_new_array(Type, self, allocator);
 }
 
 fn Type[] ElasticArray.to_tarray(&self)
 {
 	$if type_is_overaligned():
-	return self.to_aligned_array(tmem);
+	return self.to_new_aligned_array(allocator::temp());
 	$else
-	return self.to_array(tmem);
+	return self.to_new_array(allocator::temp());
 	$endif;
 }
 
-<*
- Reverse the elements in a list.
-*>
+/**
+ * Reverse the elements in a list.
+ **/
 fn void ElasticArray.reverse(&self)
 {
 	list_common::list_reverse(self);
@@ -188,35 +193,35 @@ fn Type[] ElasticArray.array_view(&self)
 	return self.entries[:self.size];
 }
 
-<*
- @require self.size < MAX_SIZE : `List would exceed max size`
-*>
+/**
+ * @require self.size < MAX_SIZE `List would exceed max size`
+ **/
 fn void ElasticArray.push_front(&self, Type type) @inline
 {
 	self.insert_at(0, type);
 }
 
-<*
- @require self.size < MAX_SIZE : `List would exceed max size`
-*>
-fn void? ElasticArray.push_front_try(&self, Type type) @inline
+/**
+ * @require self.size < MAX_SIZE `List would exceed max size`
+ **/
+fn void! ElasticArray.push_front_try(&self, Type type) @inline
 {
 	return self.insert_at_try(0, type);
 }
 
-<*
- @require index <= self.size
-*>
-fn void? ElasticArray.insert_at_try(&self, usz index, Type value)
+/**
+ * @require index <= self.size
+ **/
+fn void! ElasticArray.insert_at_try(&self, usz index, Type value)
 {
-	if (self.size == MAX_SIZE) return mem::OUT_OF_MEMORY?;
+	if (self.size == MAX_SIZE) return AllocationFailure.OUT_OF_MEMORY?;
 	self.insert_at(index, value);
 }
 
-<*
- @require self.size < MAX_SIZE : `List would exceed max size`
- @require index <= self.size
-*>
+/**
+ * @require self.size < MAX_SIZE `List would exceed max size`
+ * @require index <= self.size
+ **/
 fn void ElasticArray.insert_at(&self, usz index, Type type)
 {
 	for (usz i = self.size; i > index; i--)
@@ -227,35 +232,35 @@ fn void ElasticArray.insert_at(&self, usz index, Type type)
 	self.entries[index] = type;
 }
 
-<*
- @require index < self.size
-*>
+/**
+ * @require index < self.size
+ **/
 fn void ElasticArray.set_at(&self, usz index, Type type)
 {
 	self.entries[index] = type;
 }
 
-fn void? ElasticArray.remove_last(&self) @maydiscard
+fn void! ElasticArray.remove_last(&self) @maydiscard
 {
-	if (!self.size) return NO_MORE_ELEMENT?;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	self.size--;
 }
 
-fn void? ElasticArray.remove_first(&self) @maydiscard
+fn void! ElasticArray.remove_first(&self) @maydiscard
 {
-	if (!self.size) return NO_MORE_ELEMENT?;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	self.remove_at(0);
 }
 
-fn Type? ElasticArray.first(&self)
+fn Type! ElasticArray.first(&self)
 {
-	if (!self.size) return NO_MORE_ELEMENT?;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	return self.entries[0];
 }
 
-fn Type? ElasticArray.last(&self)
+fn Type! ElasticArray.last(&self)
 {
-	if (!self.size) return NO_MORE_ELEMENT?;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	return self.entries[self.size - 1];
 }
 
@@ -284,19 +289,19 @@ fn void ElasticArray.swap(&self, usz i, usz j)
 	@swap(self.entries[i], self.entries[j]);
 }
 
-<*
- @param filter : "The function to determine if it should be removed or not"
- @return "the number of deleted elements"
-*>
+/**
+ * @param filter "The function to determine if it should be removed or not"
+ * @return "the number of deleted elements"
+ **/
 fn usz ElasticArray.remove_if(&self, ElementPredicate filter)
 {
 	return list_common::list_remove_if(self, filter, false);
 }
 
-<*
- @param selection : "The function to determine if it should be kept or not"
- @return "the number of deleted elements"
-*>
+/**
+ * @param selection "The function to determine if it should be kept or not"
+ * @return "the number of deleted elements"
+ **/
 fn usz ElasticArray.retain_if(&self, ElementPredicate selection)
 {
 	return list_common::list_remove_if(self, selection, true);
@@ -330,22 +335,22 @@ fn void ElasticArray.set(&self, usz index, Type value) @operator([]=)
 
 
 // Functions for equatable types
-fn usz? ElasticArray.index_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
+fn usz! ElasticArray.index_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
 {
 	foreach (i, v : self)
 	{
 		if (equals(v, type)) return i;
 	}
-	return NOT_FOUND?;
+	return SearchResult.MISSING?;
 }
 
-fn usz? ElasticArray.rindex_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
+fn usz! ElasticArray.rindex_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
 {
 	foreach_r (i, v : self)
 	{
 		if (equals(v, type)) return i;
 	}
-	return NOT_FOUND?;
+	return SearchResult.MISSING?;
 }
 
 fn bool ElasticArray.equals(&self, ElasticArray other_list) @if(ELEMENT_IS_EQUATABLE)
@@ -358,13 +363,13 @@ fn bool ElasticArray.equals(&self, ElasticArray other_list) @if(ELEMENT_IS_EQUAT
 	return true;
 }
 
-<*
- Check for presence of a value in a list.
-
- @param [&in] self : "the list to find elements in"
- @param value : "The value to search for"
- @return "True if the value is found, false otherwise"
-*>
+/**
+ * Check for presence of a value in a list.
+ *
+ * @param [&in] self "the list to find elements in"
+ * @param value "The value to search for"
+ * @return "True if the value is found, false otherwise"
+ **/
 fn bool ElasticArray.contains(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 {
 	foreach (i, v : self)
@@ -374,31 +379,31 @@ fn bool ElasticArray.contains(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 	return false;
 }
 
-<*
- @param [&inout] self : "The list to remove elements from"
- @param value : "The value to remove"
- @return "true if the value was found"
-*>
+/**
+ * @param [&inout] self "The list to remove elements from"
+ * @param value "The value to remove"
+ * @return "true if the value was found"
+ **/
 fn bool ElasticArray.remove_last_item(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 {
 	return @ok(self.remove_at(self.rindex_of(value)));
 }
 
-<*
- @param [&inout] self : "The list to remove elements from"
- @param value : "The value to remove"
- @return "true if the value was found"
-*>
+/**
+ * @param [&inout] self "The list to remove elements from"
+ * @param value "The value to remove"
+ * @return "true if the value was found"
+ **/
 fn bool ElasticArray.remove_first_item(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 {
 	return @ok(self.remove_at(self.index_of(value)));
 }
 
-<*
- @param [&inout] self : "The list to remove elements from"
- @param value : "The value to remove"
- @return "the number of deleted elements."
-*>
+/**
+ * @param [&inout] self "The list to remove elements from"
+ * @param value "The value to remove"
+ * @return "the number of deleted elements."
+ **/
 fn usz ElasticArray.remove_item(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 {
 	return list_common::list_remove_item(self, value);
@@ -412,10 +417,10 @@ fn void ElasticArray.remove_all_from(&self, ElasticArray* other_list) @if(ELEMEN
 	foreach (v : other_list) self.remove_item(v);
 }
 
-<*
- @param [&in] self
- @return "The number non-null values in the list"
-*>
+/**
+ * @param [&in] self
+ * @return "The number non-null values in the list"
+ **/
 fn usz ElasticArray.compact_count(&self) @if(ELEMENT_IS_POINTER)
 {
 	usz vals = 0;

lib/std/collections/enummap.c3

@@ -1,12 +1,8 @@
-<*
- @require Enum.kindof == TypeKind.ENUM : "Only enums may be used with an enummap"
-*>
-module std::collections::enummap{Enum, ValueType};
+module std::collections::enummap(<Enum, ValueType>);
 import std::io;
-
 struct EnumMap (Printable)
 {
-	ValueType[Enum.values.len] values;
+	ValueType[Enum.len] values;
 }
 
 fn void EnumMap.init(&self, ValueType init_value)
@@ -17,30 +13,40 @@ fn void EnumMap.init(&self, ValueType init_value)
 	}
 }
 
-fn usz? EnumMap.to_format(&self, Formatter* formatter) @dynamic
+fn usz! EnumMap.to_format(&self, Formatter* formatter) @dynamic
 {
 	usz n = formatter.print("{ ")!;
 	foreach (i, &value : self.values)
 	{
 		if (i != 0) formatter.print(", ")!;
-		n += formatter.printf("%s: %s", Enum.from_ordinal(i), *value)!;
+		n += formatter.printf("%s: %s", (Enum)i, *value)!;
 	}
 	n += formatter.print(" }")!;
 	return n;
 }
 
-<*
- @return "The total size of this map, which is the same as the number of enum values"
- @pure
-*>
+fn String EnumMap.to_new_string(&self, Allocator allocator = allocator::heap()) @dynamic
+{
+	return string::new_format("%s", *self, .allocator = allocator);
+}
+
+fn String EnumMap.to_tstring(&self) @dynamic
+{
+	return string::tformat("%s", *self);
+}
+
+/**
+ * @return "The total size of this map, which is the same as the number of enum values"
+ * @pure
+ **/
 fn usz EnumMap.len(&self) @operator(len) @inline
 {
 	return self.values.len;
 }
 
-<*
- @return "Retrieve a value given the underlying enum, if there is no entry, then the zero value for the value is returned."
-*>
+/**
+ * @return "Retrieve a value given the underlying enum, if there is no entry, then the zero value for the value is returned."
+ **/
 fn ValueType EnumMap.get(&self, Enum key) @operator([]) @inline
 {
 	return self.values[key.ordinal];

lib/std/collections/enumset.c3

@@ -2,24 +2,23 @@
 // Use of self source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
 
-<*
- @require Enum.kindof == TypeKind.ENUM : "Only enums may be used with an enumset"
-*>
-module std::collections::enumset{Enum};
+/**
+ * @require Enum.kindof == TypeKind.ENUM : "Only enums maybe be used with an enumset"
+ **/
+module std::collections::enumset(<Enum>);
 import std::io;
 
-const ENUM_COUNT @private = Enum.values.len;
-alias EnumSetType @private = $typefrom(type_for_enum_elements(ENUM_COUNT));
+def EnumSetType = $typefrom(private::type_for_enum_elements(Enum.elements)) @private;
 
-const IS_CHAR_ARRAY = ENUM_COUNT > 128;
-typedef EnumSet (Printable) = EnumSetType;
+const IS_CHAR_ARRAY = Enum.elements > 128;
+distinct EnumSet (Printable) = EnumSetType;
 
 fn void EnumSet.add(&self, Enum v)
 {
 	$if IS_CHAR_ARRAY:
-		(*self)[(usz)v.ordinal / 8] |= (char)(1u << ((usz)v.ordinal % 8));
+		(*self)[(usz)v / 8] |= (char)(1u << ((usz)v % 8));
 	$else
-		*self = (EnumSet)((EnumSetType)*self | 1u << (EnumSetType)v.ordinal);
+		*self = (EnumSet)((EnumSetType)*self | 1u << (EnumSetType)v);
 	$endif
 }
 
@@ -36,11 +35,11 @@ fn bool EnumSet.remove(&self, Enum v)
 {
 	$if IS_CHAR_ARRAY:
 		if (!self.has(v) @inline) return false;
-		(*self)[(usz)v.ordinal / 8] &= (char)~(1u << ((usz)v.ordinal % 8));
+		(*self)[(usz)v / 8] &= (char)~(1u << ((usz)v % 8));
 		return true;
 	$else
 		EnumSetType old = (EnumSetType)*self;
-		EnumSetType new = old & ~(1u << (EnumSetType)v.ordinal);
+		EnumSetType new = old & ~(1u << (EnumSetType)v);
 		*self = (EnumSet)new;
 		return old != new;
 	$endif
@@ -49,9 +48,9 @@ fn bool EnumSet.remove(&self, Enum v)
 fn bool EnumSet.has(&self, Enum v)
 {
 	$if IS_CHAR_ARRAY:
-		return (bool)(((*self)[(usz)v.ordinal / 8] << ((usz)v.ordinal % 8)) & 0x01);
+		return (bool)(((*self)[(usz)v / 8] << ((usz)v % 8)) & 0x01);
 	$else
-		return ((EnumSetType)*self & (1u << (EnumSetType)v.ordinal)) != 0;
+		return ((EnumSetType)*self & (1u << (EnumSetType)v)) != 0;
 	$endif
 }
 
@@ -127,7 +126,7 @@ fn EnumSet EnumSet.xor_of(&self, EnumSet s)
 	$endif
 }
 
-fn usz? EnumSet.to_format(&set, Formatter* formatter) @dynamic
+fn usz! EnumSet.to_format(&set, Formatter* formatter) @dynamic
 {
 	usz n = formatter.print("[")!;
 	bool found;
@@ -142,9 +141,21 @@ fn usz? EnumSet.to_format(&set, Formatter* formatter) @dynamic
 	return n;
 }
 
-macro typeid type_for_enum_elements(usz $elements) @local
+fn String EnumSet.to_new_string(&set, Allocator allocator = allocator::heap()) @dynamic
 {
-	$switch:
+	return string::new_format("%s", *set, .allocator = allocator);
+}
+
+fn String EnumSet.to_tstring(&set) @dynamic
+{
+	return string::tformat("%s", *set);
+}
+
+module std::collections::enumset::private;
+
+macro typeid type_for_enum_elements(usz $elements)
+{
+	$switch
 		$case ($elements > 128):
 			return char[($elements + 7) / 8].typeid;
 		$case ($elements > 64):

lib/std/collections/hashmap.c3

@@ -1,32 +1,10 @@
 // Copyright (c) 2023 Christoffer Lerno. All rights reserved.
 // Use of this source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
-<*
- @require $defined((Key){}.hash()) : `No .hash function found on the key`
-*>
-module std::collections::map{Key, Value};
+module std::collections::map(<Key, Value>);
 import std::math;
-import std::io @norecurse;
 
-const uint DEFAULT_INITIAL_CAPACITY = 16;
-const uint MAXIMUM_CAPACITY = 1u << 31;
-const float DEFAULT_LOAD_FACTOR = 0.75;
-const VALUE_IS_EQUATABLE = Value.is_eq;
-const bool COPY_KEYS = types::implements_copy(Key);
-
-const Allocator MAP_HEAP_ALLOCATOR = (Allocator)&dummy;
-
-const HashMap ONHEAP = { .allocator = MAP_HEAP_ALLOCATOR };
-
-struct Entry
-{
-	uint hash;
-	Key key;
-	Value value;
-	Entry* next;
-}
-
-struct HashMap (Printable)
+struct HashMap
 {
 	Entry*[] table;
 	Allocator allocator;
@@ -35,15 +13,14 @@ struct HashMap (Printable)
 	float load_factor;
 }
 
-
-<*
- @param [&inout] allocator : "The allocator to use"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn HashMap* HashMap.init(&self, Allocator allocator, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
+/**
+ * @param [&inout] allocator "The allocator to use"
+ * @require capacity > 0 "The capacity must be 1 or higher"
+ * @require load_factor > 0.0 "The load factor must be higher than 0"
+ * @require !self.allocator "Map was already initialized"
+ * @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
+ **/
+fn HashMap* HashMap.new_init(&self, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR, Allocator allocator = allocator::heap())
 {
 	capacity = math::next_power_of_2(capacity);
 	self.allocator = allocator;
@@ -53,112 +30,46 @@ fn HashMap* HashMap.init(&self, Allocator allocator, uint capacity = DEFAULT_INI
 	return self;
 }
 
-<*
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn HashMap* HashMap.tinit(&self, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
+/**
+ * @require capacity > 0 "The capacity must be 1 or higher"
+ * @require load_factor > 0.0 "The load factor must be higher than 0"
+ * @require !self.allocator "Map was already initialized"
+ * @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
+ **/
+fn HashMap* HashMap.temp_init(&self, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
 {
-	return self.init(tmem, capacity, load_factor) @inline;
-}
-
-<*
- @param [&inout] allocator : "The allocator to use"
- @require $vacount % 2 == 0 : "There must be an even number of arguments provided for keys and values"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-macro HashMap* HashMap.init_with_key_values(&self, Allocator allocator, ..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	self.init(allocator, capacity, load_factor);
-	$for var $i = 0; $i < $vacount; $i += 2:
-		self.set($vaarg[$i], $vaarg[$i + 1]);
-	$endfor
-	return self;
-}
-
-<*
- @require $vacount % 2 == 0 : "There must be an even number of arguments provided for keys and values"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-macro HashMap* HashMap.tinit_with_key_values(&self, ..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	return self.init_with_key_values(tmem, $vasplat, capacity: capacity, load_factor: load_factor);
-}
-
-<*
- @param [in] keys : "The keys for the HashMap entries"
- @param [in] values : "The values for the HashMap entries"
- @param [&inout] allocator : "The allocator to use"
- @require keys.len == values.len : "Both keys and values arrays must be the same length"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn HashMap* HashMap.init_from_keys_and_values(&self, Allocator allocator, Key[] keys, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	assert(keys.len == values.len);
-	self.init(allocator, capacity, load_factor);
-	for (usz i = 0; i < keys.len; i++)
-	{
-		self.set(keys[i], values[i]);
-	}
-	return self;
+	return self.new_init(capacity, load_factor, allocator::temp()) @inline;
 }
 
 
-<*
- @param [in] keys : "The keys for the HashMap entries"
- @param [in] values : "The values for the HashMap entries"
- @require keys.len == values.len : "Both keys and values arrays must be the same length"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn HashMap* HashMap.tinit_from_keys_and_values(&self, Key[] keys, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	return self.init_from_keys_and_values(tmem, keys, values, capacity, load_factor);
-}
-
-<*
- Has this hash map been initialized yet?
-
- @param [&in] map : "The hash map we are testing"
- @return "Returns true if it has been initialized, false otherwise"
-*>
+/**
+ * Has this hash map been initialized yet?
+ *
+ * @param [&in] map "The hash map we are testing"
+ * @return "Returns true if it has been initialized, false otherwise"
+ **/
 fn bool HashMap.is_initialized(&map)
 {
-	return map.allocator && map.allocator.ptr != &dummy;
+	return (bool)map.allocator;
 }
 
-<*
- @param [&inout] allocator : "The allocator to use"
- @param [&in] other_map : "The map to copy from."
- @require !self.is_initialized() : "Map was already initialized"
-*>
-fn HashMap* HashMap.init_from_map(&self, Allocator allocator, HashMap* other_map)
+/**
+ * @param [&inout] allocator "The allocator to use"
+ * @param [&in] other_map "The map to copy from."
+ **/
+fn HashMap* HashMap.new_init_from_map(&self, HashMap* other_map, Allocator allocator = allocator::heap())
 {
-	self.init(allocator, other_map.table.len, other_map.load_factor);
+	self.new_init(other_map.table.len, other_map.load_factor, allocator);
 	self.put_all_for_create(other_map);
 	return self;
 }
 
-<*
- @param [&in] other_map : "The map to copy from."
- @require !map.is_initialized() : "Map was already initialized"
-*>
-fn HashMap* HashMap.tinit_from_map(&map, HashMap* other_map)
+/**
+ * @param [&in] other_map "The map to copy from."
+ **/
+fn HashMap* HashMap.temp_init_from_map(&map, HashMap* other_map)
 {
-	return map.init_from_map(tmem, other_map) @inline;
+	return map.new_init_from_map(other_map, allocator::temp()) @inline;
 }
 
 fn bool HashMap.is_empty(&map) @inline
@@ -171,32 +82,32 @@ fn usz HashMap.len(&map) @inline
 	return map.count;
 }
 
-fn Value*? HashMap.get_ref(&map, Key key)
+fn Value*! HashMap.get_ref(&map, Key key)
 {
-	if (!map.count) return NOT_FOUND?;
+	if (!map.count) return SearchResult.MISSING?;
 	uint hash = rehash(key.hash());
 	for (Entry *e = map.table[index_for(hash, map.table.len)]; e != null; e = e.next)
 	{
 		if (e.hash == hash && equals(key, e.key)) return &e.value;
 	}
-	return NOT_FOUND?;
+	return SearchResult.MISSING?;
 }
 
-fn Entry*? HashMap.get_entry(&map, Key key)
+fn Entry*! HashMap.get_entry(&map, Key key)
 {
-	if (!map.count) return NOT_FOUND?;
+	if (!map.count) return SearchResult.MISSING?;
 	uint hash = rehash(key.hash());
 	for (Entry *e = map.table[index_for(hash, map.table.len)]; e != null; e = e.next)
 	{
 		if (e.hash == hash && equals(key, e.key)) return e;
 	}
-	return NOT_FOUND?;
+	return SearchResult.MISSING?;
 }
 
-<*
- Get the value or update and
- @require @assignable_to(#expr, Value)
-*>
+/**
+ * Get the value or update and
+ * @require $assignable(#expr, Value)
+ **/
 macro Value HashMap.@get_or_set(&map, Key key, Value #expr)
 {
 	if (!map.count)
@@ -216,7 +127,7 @@ macro Value HashMap.@get_or_set(&map, Key key, Value #expr)
 	return val;
 }
 
-fn Value? HashMap.get(&map, Key key) @operator([])
+fn Value! HashMap.get(&map, Key key) @operator([])
 {
 	return *map.get_ref(key) @inline;
 }
@@ -229,15 +140,10 @@ fn bool HashMap.has_key(&map, Key key)
 fn bool HashMap.set(&map, Key key, Value value) @operator([]=)
 {
 	// If the map isn't initialized, use the defaults to initialize it.
-    switch (map.allocator.ptr)
-    {
-    	case &dummy:
-    	    map.init(mem);
-    	case null:
-    	    map.tinit();
-    	default:
-    		break;
-    }
+	if (!map.allocator)
+	{
+		map.new_init();
+	}
 	uint hash = rehash(key.hash());
 	uint index = index_for(hash, map.table.len);
 	for (Entry *e = map.table[index]; e != null; e = e.next)
@@ -252,9 +158,9 @@ fn bool HashMap.set(&map, Key key, Value value) @operator([]=)
 	return false;
 }
 
-fn void? HashMap.remove(&map, Key key) @maydiscard
+fn void! HashMap.remove(&map, Key key) @maydiscard
 {
-	if (!map.remove_entry_for_key(key)) return NOT_FOUND?;
+	if (!map.remove_entry_for_key(key)) return SearchResult.MISSING?;
 }
 
 fn void HashMap.clear(&map)
@@ -279,32 +185,28 @@ fn void HashMap.clear(&map)
 
 fn void HashMap.free(&map)
 {
-	if (!map.is_initialized()) return;
+	if (!map.allocator) return;
 	map.clear();
 	map.free_internal(map.table.ptr);
 	map.table = {};
 }
 
-fn Key[] HashMap.tkeys(&self)
+fn Key[] HashMap.key_tlist(&map)
 {
-	return self.keys(tmem) @inline;
+	return map.key_new_list(allocator::temp()) @inline;
 }
 
-fn Key[] HashMap.keys(&self, Allocator allocator)
+fn Key[] HashMap.key_new_list(&map, Allocator allocator = allocator::heap())
 {
-	if (!self.count) return {};
+	if (!map.count) return {};
 
-	Key[] list = allocator::alloc_array(allocator, Key, self.count);
+	Key[] list = allocator::alloc_array(allocator, Key, map.count);
 	usz index = 0;
-	foreach (Entry* entry : self.table)
+	foreach (Entry* entry : map.table)
 	{
 		while (entry)
 		{
-			$if COPY_KEYS:
-				list[index++] = entry.key.copy(allocator);
-			$else
-				list[index++] = entry.key;
-			$endif
+			list[index++] = entry.key;
 			entry = entry.next;
 		}
 	}
@@ -313,36 +215,37 @@ fn Key[] HashMap.keys(&self, Allocator allocator)
 
 macro HashMap.@each(map; @body(key, value))
 {
-	map.@each_entry(; Entry* entry)
-	{
+	map.@each_entry(; Entry* entry) {
 		@body(entry.key, entry.value);
 	};
 }
 
 macro HashMap.@each_entry(map; @body(entry))
 {
-	if (!map.count) return;
-	foreach (Entry* entry : map.table)
+	if (map.count)
 	{
-		while (entry)
+		foreach (Entry* entry : map.table)
 		{
-			@body(entry);
-			entry = entry.next;
+			while (entry)
+			{
+				@body(entry);
+				entry = entry.next;
+			}
 		}
 	}
 }
 
-fn Value[] HashMap.tvalues(&map)
+fn Value[] HashMap.value_tlist(&map)
 {
-	return map.values(tmem) @inline;
+	return map.value_new_list(allocator::temp()) @inline;
 }
 
-fn Value[] HashMap.values(&self, Allocator allocator)
+fn Value[] HashMap.value_new_list(&map, Allocator allocator = allocator::heap())
 {
-	if (!self.count) return {};
-	Value[] list = allocator::alloc_array(allocator, Value, self.count);
+	if (!map.count) return {};
+	Value[] list = allocator::alloc_array(allocator, Value, map.count);
 	usz index = 0;
-	foreach (Entry* entry : self.table)
+	foreach (Entry* entry : map.table)
 	{
 		while (entry)
 		{
@@ -367,21 +270,6 @@ fn bool HashMap.has_value(&map, Value v) @if(VALUE_IS_EQUATABLE)
 	return false;
 }
 
-fn HashMapIterator HashMap.iter(&self)
-{
-	return { .map = self, .index = -1 };
-}
-
-fn HashMapValueIterator HashMap.value_iter(&self)
-{
-	return { .map = self, .index = -1 };
-}
-
-fn HashMapKeyIterator HashMap.key_iter(&self)
-{
-	return { .map = self, .index = -1 };
-}
-
 // --- private methods
 
 fn void HashMap.add_entry(&map, uint hash, Key key, Value value, uint bucket_index) @private
@@ -413,18 +301,6 @@ fn void HashMap.resize(&map, uint new_capacity) @private
 	map.threshold = (uint)(new_capacity * map.load_factor);
 }
 
-fn usz? HashMap.to_format(&self, Formatter* f) @dynamic
-{
-	usz len;
-	len += f.print("{ ")!;
-	self.@each_entry(; Entry* entry)
-	{
-		if (len > 2) len += f.print(", ")!;
-		len += f.printf("%s: %s", entry.key, entry.value)!;
-    };
-	return len + f.print(" }");
-}
-
 fn void HashMap.transfer(&map, Entry*[] new_table) @private
 {
 	Entry*[] src = map.table;
@@ -449,11 +325,8 @@ fn void HashMap.put_all_for_create(&map, HashMap* other_map) @private
 	if (!other_map.count) return;
 	foreach (Entry *e : other_map.table)
 	{
-		while (e)
-		{
-			map.put_for_create(e.key, e.value);
-			e = e.next;
-		}
+		if (!e) continue;
+		map.put_for_create(e.key, e.value);
 	}
 }
 
@@ -479,7 +352,6 @@ fn void HashMap.free_internal(&map, void* ptr) @inline @private
 
 fn bool HashMap.remove_entry_for_key(&map, Key key) @private
 {
-	if (!map.count) return false;
 	uint hash = rehash(key.hash());
 	uint i = index_for(hash, map.table.len);
 	Entry* prev = map.table[i];
@@ -526,67 +398,3 @@ fn void HashMap.free_entry(&self, Entry *entry) @local
 	self.free_internal(entry);
 }
 
-
-struct HashMapIterator
-{
-	HashMap* map;
-	int top_index;
-	int index;
-	Entry* current_entry;
-}
-
-typedef HashMapValueIterator = HashMapIterator;
-typedef HashMapKeyIterator = HashMapIterator;
-
-
-<*
- @require idx < self.map.count
-*>
-fn Entry HashMapIterator.get(&self, usz idx) @operator([])
-{
-	if (idx < self.index)
-	{
-		self.top_index = 0;
-		self.current_entry = null;
-		self.index = -1;
-	}
-	while (self.index != idx)
-	{
-		if (self.current_entry)
-		{
-			self.current_entry = self.current_entry.next;
-			if (self.current_entry) self.index++;
-			continue;
-		}
-		self.current_entry = self.map.table[self.top_index++];
-		if (self.current_entry) self.index++;
-	}
-	return *self.current_entry;
-}
-
-fn Value HashMapValueIterator.get(&self, usz idx) @operator([])
-{
-	return ((HashMapIterator*)self).get(idx).value;
-}
-
-fn Key HashMapKeyIterator.get(&self, usz idx) @operator([])
-{
-	return ((HashMapIterator*)self).get(idx).key;
-}
-
-fn usz HashMapValueIterator.len(self) @operator(len) => self.map.count;
-fn usz HashMapKeyIterator.len(self) @operator(len) => self.map.count;
-fn usz HashMapIterator.len(self) @operator(len) => self.map.count;
-
-fn uint rehash(uint hash) @inline @private
-{
-	hash ^= (hash >> 20) ^ (hash >> 12);
-	return hash ^ ((hash >> 7) ^ (hash >> 4));
-}
-
-macro uint index_for(uint hash, uint capacity) @private
-{
-	return hash & (capacity - 1);
-}
-
-int dummy @local;

lib/std/collections/hashset.c3

@@ -1,636 +0,0 @@
-<*
- @require $defined((Value){}.hash()) : `No .hash function found on the value`
-*>
-module std::collections::set {Value};
-import std::math;
-import std::io @norecurse;
-
-const uint DEFAULT_INITIAL_CAPACITY = 16;
-const uint MAXIMUM_CAPACITY = 1u << 31;
-const float DEFAULT_LOAD_FACTOR = 0.75;
-
-const Allocator SET_HEAP_ALLOCATOR = (Allocator)&dummy;
-
-<* Copy the ONHEAP allocator to initialize to a set that is heap allocated *>
-const HashSet ONHEAP = { .allocator = SET_HEAP_ALLOCATOR };
-
-struct Entry 
-{
-	uint hash;
-	Value value;
-	Entry* next;
-}
-
-struct HashSet (Printable) 
-{
-	Entry*[] table;
-	Allocator allocator;
-	usz count; 		// Number of elements
-	usz threshold; 	// Resize limit
-	float load_factor;
-}
-
-fn int HashSet.len(&self) @operator(len) => (int) self.count;
-
-<*
- @param [&inout] allocator : "The allocator to use"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Set was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn HashSet* HashSet.init(&self, Allocator allocator, usz capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR) 
-{
-	capacity = math::next_power_of_2(capacity);
-	self.allocator = allocator;
-	self.threshold = (usz) (capacity * load_factor);
-	self.load_factor = load_factor;
-	self.table = allocator::new_array(allocator, Entry*, capacity);
-	return self;
-}
-
-<*
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Set was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn HashSet* HashSet.tinit(&self, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	return self.init(tmem, capacity, load_factor) @inline;
-}
-
-<*
- @param [&inout] allocator : "The allocator to use"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Set was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-macro HashSet* HashSet.init_with_values(&self, Allocator allocator, ..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	self.init(allocator, capacity, load_factor);
-	$for var $i = 0; $i < $vacount; $i++:
-		self.add($vaarg[$i]);
-	$endfor
-	return self;
-}
-
-<*
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Set was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-macro HashSet* HashSet.tinit_with_values(&self, ..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	return self.init_with_values(tmem, $vasplat, capacity: capacity, load_factor: load_factor);
-}
-
-<*
- @param [in] values : "The values for the HashSet"
- @param [&inout] allocator : "The allocator to use"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Set was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn HashSet* HashSet.init_from_values(&self, Allocator allocator, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	self.init(allocator, capacity, load_factor);
-	foreach (v : values) self.add(v);
-	return self;
-}
-
-<*
- @param [in] values : "The values for the HashSet entries"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Set was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn HashSet* HashSet.tinit_from_values(&self, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	return self.init_from_values(tmem, values, capacity, load_factor);
-}
-
-<*
- Has this hash set been initialized yet?
-
- @param [&in] set : "The hash set we are testing"
- @return "Returns true if it has been initialized, false otherwise"
-*>
-fn bool HashSet.is_initialized(&set)
-{
-	return set.allocator && set.allocator.ptr != &dummy;
-}
-
-<*
- @param [&inout] allocator : "The allocator to use"
- @param [&in] other_set : "The set to copy from."
- @require !self.is_initialized() : "Set was already initialized"
-*>
-fn HashSet* HashSet.init_from_set(&self, Allocator allocator, HashSet* other_set)
-{
-	self.init(allocator, other_set.table.len, other_set.load_factor);
-	self.put_all_for_create(other_set);
-	return self;
-}
-
-<*
- @param [&in] other_set : "The set to copy from."
- @require !set.is_initialized() : "Set was already initialized"
-*>
-fn HashSet* HashSet.tinit_from_set(&set, HashSet* other_set)
-{
-	return set.init_from_set(tmem, other_set) @inline;
-}
-
-<*
- Check if the set is empty
-
- @return "true if it is empty"
- @pure
-*>
-fn bool HashSet.is_empty(&set) @inline
-{
-	return !set.count;
-}
-
-<*
- Add all elements in the slice to the set.
-
- @param [in] list
- @return "The number of new elements added"
- @ensure total <= list.len
-*>
-fn usz HashSet.add_all(&set, Value[] list)
-{
-	usz total;
-	foreach (v : list)
-	{
-		if (set.add(v)) total++;
-	}
-	return total;
-}
-
-<*
- @param [&in] other
- @return "The number of new elements added"
- @ensure return <= other.count
-*>
-fn usz HashSet.add_all_from(&set, HashSet* other)
-{
-	usz total;
-	other.@each(;Value value)
-	{
-		if (set.add(value)) total++;
-	};
-	return total;
-}
-
-<*
- @param value : "The value to add"
- @return "true if the value didn't exist in the set"
-*>
-fn bool HashSet.add(&set, Value value)
-{
-	// If the set isn't initialized, use the defaults to initialize it.
-	switch (set.allocator.ptr)
-	{
-		case &dummy:
-			set.init(mem);
-		case null:
-			set.tinit();
-		default:
-			break;
-	}
-	uint hash = rehash(value.hash());
-	uint index = index_for(hash, set.table.len);
-	for (Entry *e = set.table[index]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(value, e.value)) return false;
-	}
-	set.add_entry(hash, value, index);
-	return true;
-}
-
-<*
- Iterate over all the values in the set
-*>
-macro HashSet.@each(set; @body(value))
-{
-	if (!set.count) return;
-	foreach (Entry* entry : set.table)
-	{
-		while (entry)
-		{
-			@body(entry.value);
-			entry = entry.next;
-		}
-	}
-}
-
-<*
- Check if the set contains the given value.
-
- @param value : "The value to check"
- @return "true if it exists in the set"
-*>
-fn bool HashSet.contains(&set, Value value)
-{
-	if (!set.count) return false;
-	uint hash = rehash(value.hash());
-	for (Entry *e = set.table[index_for(hash, set.table.len)]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(value, e.value)) return true;
-	}
-	return false;
-}
-
-<*
- Remove a single value from the set.
-
- @param value : "The value to remove"
- @return? NOT_FOUND : "If the entry is not found"
-*>
-fn void? HashSet.remove(&set, Value value) @maydiscard
-{
-	if (!set.remove_entry_for_value(value)) return NOT_FOUND?;
-}
-
-fn usz HashSet.remove_all(&set, Value[] values)
-{
-	usz total;
-	foreach (v : values)
-	{
-		if (set.remove_entry_for_value(v)) total++;
-	}
-	return total;
-}
-
-<*
- @param [&in] other : "Other set"
-*>
-fn usz HashSet.remove_all_from(&set, HashSet* other)
-{
-	usz total;
-	other.@each(;Value val)
-    {
-		if (set.remove_entry_for_value(val)) total++;
-    };
-    return total;
-}
-
-<*
- Free all memory allocated by the hash set.
-*>
-fn void HashSet.free(&set) 
-{
-	if (!set.is_initialized()) return;
-	set.clear();
-	set.free_internal(set.table.ptr);
-	*set = {};
-}
-
-<*
- Clear all elements from the set while keeping the underlying storage
-
- @ensure set.count == 0
-*>
-fn void HashSet.clear(&set)
-{
-	if (!set.count) return;
-
-	foreach (Entry** &entry_ref : set.table)
-	{
-		Entry* entry = *entry_ref;
-		if (!entry) continue;
-
-		Entry *next = entry.next;
-		while (next)
-		{
-			Entry *to_delete = next;
-			next = next.next;
-			set.free_entry(to_delete);
-		}
-
-		set.free_entry(entry);
-		*entry_ref = null;
-	}
-	set.count = 0;
-}
-
-fn void HashSet.reserve(&set, usz capacity)
-{
-	if (capacity > set.threshold)
-	{
-		set.resize(math::next_power_of_2(capacity));
-	}
-}
-
-
-
-// --- Set Operations ---
-
-<*
- Returns the union of two sets (A | B)
-
- @param [&in] other : "The other set to union with"
- @param [&inout] allocator : "Allocator for the new set"
- @return "A new set containing the union of both sets"
-*>
-fn HashSet HashSet.set_union(&self, Allocator allocator, HashSet* other)
-{
-	usz new_capacity = math::next_power_of_2(self.count + other.count);
-	HashSet result;
-	result.init(allocator, new_capacity, self.load_factor);
-	result.add_all_from(self);
-	result.add_all_from(other);
-	return result;
-}
-
-fn HashSet HashSet.tset_union(&self, HashSet* other) => self.set_union(tmem, other);
-
-<*
- Returns the intersection of the two sets (A & B)
-
- @param [&in] other : "The other set to intersect with"
- @param [&inout] allocator : "Allocator for the new set"
- @return "A new set containing the intersection of both sets"
-*>
-fn HashSet HashSet.intersection(&self, Allocator allocator, HashSet* other)
-{
-	HashSet result;
-	result.init(allocator, math::min(self.table.len, other.table.len), self.load_factor);
-
-	// Iterate through the smaller set for efficiency
-	HashSet* smaller = self.count <= other.count ? self : other;
-	HashSet* larger = self.count > other.count ? self : other;
-
-	smaller.@each(;Value value)
-	{
-		if (larger.contains(value)) result.add(value);
-	};
-
-	return result;
-}
-
-fn HashSet HashSet.tintersection(&self, HashSet* other) => self.intersection(tmem, other);
-
-<*
- Return this set - other, so (A & ~B)
-
- @param [&in] other : "The other set to compare with"
- @param [&inout] allocator : "Allocator for the new set"
- @return "A new set containing elements in this set but not in the other"
-*>
-fn HashSet HashSet.difference(&self, Allocator allocator, HashSet* other)
-{
-	HashSet result;
-	result.init(allocator, self.table.len, self.load_factor);
-	self.@each(;Value value)
-	{
-		if (!other.contains(value))
-		{
-			result.add(value);
-		}
-	};
-	return result;
-}
-
-fn HashSet HashSet.tdifference(&self, HashSet* other) => self.difference(tmem, other) @inline;
-
-<*
- Return (A ^ B)
-
- @param [&in] other : "The other set to compare with"
- @param [&inout] allocator : "Allocator for the new set"
- @return "A new set containing elements in this set or the other, but not both"
-*>
-fn HashSet HashSet.symmetric_difference(&self, Allocator allocator, HashSet* other)
-{
-	HashSet result;
-	result.init(allocator, self.table.len, self.load_factor);
-	result.add_all_from(self);
-	other.@each(;Value value)
-	{
-		if (!result.add(value))
-		{
-			result.remove(value);
-		}
-	};
-	return result;
-}
-
-fn HashSet HashSet.tsymmetric_difference(&self, HashSet* other) => self.symmetric_difference(tmem, other) @inline;
-
-<*
- Check if this hash set is a subset of another set.
-
- @param [&in] other : "The other set to check against"
- @return "True if all elements of this set are in the other set"
-*>
-fn bool HashSet.is_subset(&self, HashSet* other)
-{
-	if (self.count == 0) return true;
-	if (self.count > other.count) return false;
-
-	self.@each(;Value value)
-	{
-		if (!other.contains(value)) return false;
-	};
-	return true;
-}
-
-
-// --- private methods
-
-fn void HashSet.add_entry(&set, uint hash, Value value, uint bucket_index) @private
-{
-	Entry* entry = allocator::new(set.allocator, Entry, { .hash = hash, .value = value, .next = set.table[bucket_index] });
-	set.table[bucket_index] = entry;
-	if (set.count++ >= set.threshold)
-	{
-		set.resize(set.table.len * 2);
-	}
-}
-
-fn void HashSet.resize(&self, usz new_capacity) @private
-{
-	Entry*[] old_table = self.table;
-	usz old_capacity = old_table.len;
-	if (old_capacity == MAXIMUM_CAPACITY)
-	{
-		self.threshold = uint.max;
-		return;
-	}
-	Entry*[] new_table = allocator::new_array(self.allocator, Entry*, new_capacity);
-	self.transfer(new_table);
-	self.table = new_table;
-	self.free_internal(old_table.ptr);
-	self.threshold = (uint)(new_capacity * self.load_factor);
-}
-
-fn usz? HashSet.to_format(&self, Formatter* f) @dynamic
-{
-	usz len;
-	len += f.print("{ ")!;
-	self.@each(; Value value)
-	{
-		if (len > 2) len += f.print(", ")!;
-		len += f.printf("%s", value)!;
-	};
-	return len + f.print(" }");
-}
-
-fn void HashSet.transfer(&self, Entry*[] new_table) @private
-{
-	Entry*[] src = self.table;
-	uint new_capacity = new_table.len;
-	foreach (uint j, Entry *e : src)
-	{
-		if (!e) continue;
-		do
-		{
-			Entry* next = e.next;
-			uint i = index_for(e.hash, new_capacity);
-			e.next = new_table[i];
-			new_table[i] = e;
-			e = next;
-		}
-		while (e);
-	}
-}
-
-fn void HashSet.put_all_for_create(&set, HashSet* other_set) @private
-{
-	if (!other_set.count) return;
-	foreach (Entry *e : other_set.table)
-	{
-		while (e)
-		{
-			set.put_for_create(e.value);
-			e = e.next;
-		}
-	}
-}
-
-fn void HashSet.put_for_create(&set, Value value) @private
-{
-	uint hash = rehash(value.hash());
-	uint i = index_for(hash, set.table.len);
-	for (Entry *e = set.table[i]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(value, e.value))
-		{
-			// Value already exists, no need to do anything
-			return;
-		}
-	}
-	set.create_entry(hash, value, i);
-}
-
-fn void HashSet.free_internal(&self, void* ptr) @inline @private
-{
-	allocator::free(self.allocator, ptr);
-}
-
-fn void HashSet.create_entry(&set, uint hash, Value value, int bucket_index) @private
-{
-	Entry* entry = allocator::new(set.allocator, Entry, {
-		.hash = hash,
-		.value = value,
-		.next = set.table[bucket_index]
-	});
-	set.table[bucket_index] = entry;
-	set.count++;
-}
-
-<*
- Removes the entry for the specified value if present
- @return "true if found and removed, false otherwise"
-*>
-fn bool HashSet.remove_entry_for_value(&set, Value value) @private
-{
-	if (!set.count) return false;
-	uint hash = rehash(value.hash());
-	uint i = index_for(hash, set.table.len);
-	Entry* prev = set.table[i];
-	Entry* e = prev;
-	while (e)
-	{
-		Entry *next = e.next;
-		if (e.hash == hash && equals(value, e.value))
-		{
-			set.count--;
-			if (prev == e)
-			{
-				set.table[i] = next;
-			}
-			else
-			{
-				prev.next = next;
-			}
-			set.free_entry(e);
-			return true;
-		}
-		prev = e;
-		e = next;
-	}
-
-	return false;
-}
-
-fn void HashSet.free_entry(&set, Entry *entry) @private
-{
-	allocator::free(set.allocator, entry);
-}
-
-struct HashSetIterator
-{
-	HashSet* set;
-	usz bucket_index;
-	Entry* current;
-}
-
-fn HashSetIterator HashSet.iter(&set) => { .set = set, .bucket_index = 0, .current = null };
-
-fn Value? HashSetIterator.next(&self)
-{
-	if (self.current)
-	{
-		Value value = self.current.value;
-		self.current = self.current.next;
-		return value;
-	}
-
-	while (self.bucket_index < self.set.table.len)
-	{
-		self.current = self.set.table[self.bucket_index++];
-		if (self.current)
-		{
-			Value value = self.current.value;
-			self.current = self.current.next;
-			return value;
-		}
-	}
-
-	return NOT_FOUND?;
-}
-
-fn usz HashSetIterator.len(&self) @operator(len)
-{
-	return self.set.count;
-}
-
-<* @pure *>
-fn uint rehash(uint hash) @inline @private
-{
-	hash ^= (hash >> 20) ^ (hash >> 12);
-	return hash ^ ((hash >> 7) ^ (hash >> 4));
-}
-
-macro uint index_for(uint hash, uint capacity) @private => hash & (capacity - 1);
-
-int dummy @local;

lib/std/collections/linked_hashmap.c3

@@ -1,645 +0,0 @@
-// Copyright (c) 2023 Christoffer Lerno. All rights reserved.
-// Use of this source code is governed by the MIT license
-// a copy of which can be found in the LICENSE_STDLIB file.
-<*
- @require $defined((Key){}.hash()) : `No .hash function found on the key`
-*>
-module std::collections::map{Key, Value};
-import std::math;
-import std::io @norecurse;
-
-const LinkedHashMap LINKEDONHEAP = { .allocator = MAP_HEAP_ALLOCATOR };
-
-struct LinkedEntry
-{
-	uint hash;
-	Key key;
-	Value value;
-	LinkedEntry* next;		// For bucket chain
-	LinkedEntry* before;	// Previous in insertion order
-	LinkedEntry* after;		// Next in insertion order
-}
-
-struct LinkedHashMap (Printable)
-{
-	LinkedEntry*[] table;
-	Allocator allocator;
-	usz count;
-	usz threshold;
-	float load_factor;
-	LinkedEntry* head;		// First inserted LinkedEntry
-	LinkedEntry* tail;		// Last inserted LinkedEntry
-}
-
-
-<*
- @param [&inout] allocator : "The allocator to use"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn LinkedHashMap* LinkedHashMap.init(&self, Allocator allocator, usz capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	capacity = math::next_power_of_2(capacity);
-	self.allocator = allocator;
-	self.load_factor = load_factor;
-	self.threshold = (usz)(capacity * load_factor);
-	self.table = allocator::new_array(allocator, LinkedEntry*, capacity);
-	self.head = null;
-	self.tail = null;
-	return self;
-}
-
-<*
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn LinkedHashMap* LinkedHashMap.tinit(&self, usz capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	return self.init(tmem, capacity, load_factor) @inline;
-}
-
-<*
- @param [&inout] allocator : "The allocator to use"
- @require $vacount % 2 == 0 : "There must be an even number of arguments provided for keys and values"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-macro LinkedHashMap* LinkedHashMap.init_with_key_values(&self, Allocator allocator, ..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	self.init(allocator, capacity, load_factor);
-	$for var $i = 0; $i < $vacount; $i += 2:
-		self.set($vaarg[$i], $vaarg[$i + 1]);
-	$endfor
-	return self;
-}
-
-<*
- @require $vacount % 2 == 0 : "There must be an even number of arguments provided for keys and values"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-macro LinkedHashMap* LinkedHashMap.tinit_with_key_values(&self, ..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	return self.init_with_key_values(tmem, $vasplat, capacity: capacity, load_factor: load_factor);
-}
-
-<*
- @param [in] keys : "The keys for the LinkedHashMap entries"
- @param [in] values : "The values for the LinkedHashMap entries"
- @param [&inout] allocator : "The allocator to use"
- @require keys.len == values.len : "Both keys and values arrays must be the same length"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn LinkedHashMap* LinkedHashMap.init_from_keys_and_values(&self, Allocator allocator, Key[] keys, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	assert(keys.len == values.len);
-	self.init(allocator, capacity, load_factor);
-	for (usz i = 0; i < keys.len; i++)
-	{
-		self.set(keys[i], values[i]);
-	}
-	return self;
-}
-
-<*
- @param [in] keys : "The keys for the LinkedHashMap entries"
- @param [in] values : "The values for the LinkedHashMap entries"
- @require keys.len == values.len : "Both keys and values arrays must be the same length"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn LinkedHashMap* LinkedHashMap.tinit_from_keys_and_values(&self, Key[] keys, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	return self.init_from_keys_and_values(tmem, keys, values, capacity, load_factor);
-}
-
-<*
- Has this hash map been initialized yet?
-
- @param [&in] map : "The hash map we are testing"
- @return "Returns true if it has been initialized, false otherwise"
-*>
-fn bool LinkedHashMap.is_initialized(&map)
-{
-	return map.allocator && map.allocator.ptr != &dummy;
-}
-
-<*
- @param [&inout] allocator : "The allocator to use"
- @param [&in] other_map : "The map to copy from."
- @require !self.is_initialized() : "Map was already initialized"
-*>
-fn LinkedHashMap* LinkedHashMap.init_from_map(&self, Allocator allocator, LinkedHashMap* other_map)
-{
-	self.init(allocator, other_map.table.len, other_map.load_factor);
-	self.put_all_for_create(other_map);
-	return self;
-}
-
-<*
- @param [&in] other_map : "The map to copy from."
- @require !map.is_initialized() : "Map was already initialized"
-*>
-fn LinkedHashMap* LinkedHashMap.tinit_from_map(&map, LinkedHashMap* other_map)
-{
-	return map.init_from_map(tmem, other_map) @inline;
-}
-
-fn bool LinkedHashMap.is_empty(&map) @inline
-{
-	return !map.count;
-}
-
-fn usz LinkedHashMap.len(&map) @inline => map.count;
-
-fn Value*? LinkedHashMap.get_ref(&map, Key key)
-{
-	if (!map.count) return NOT_FOUND?;
-	uint hash = rehash(key.hash());
-	for (LinkedEntry *e = map.table[index_for(hash, map.table.len)]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(key, e.key)) return &e.value;
-	}
-	return NOT_FOUND?;
-}
-
-fn LinkedEntry*? LinkedHashMap.get_entry(&map, Key key)
-{
-	if (!map.count) return NOT_FOUND?;
-	uint hash = rehash(key.hash());
-	for (LinkedEntry *e = map.table[index_for(hash, map.table.len)]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(key, e.key)) return e;
-	}
-	return NOT_FOUND?;
-}
-
-<*
- Get the value or update and
- @require @assignable_to(#expr, Value)
-*>
-macro Value LinkedHashMap.@get_or_set(&map, Key key, Value #expr)
-{
-	if (!map.count)
-	{
-		Value val = #expr;
-		map.set(key, val);
-		return val;
-	}
-	uint hash = rehash(key.hash());
-	uint index = index_for(hash, map.table.len);
-	for (LinkedEntry *e = map.table[index]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(key, e.key)) return e.value;
-	}
-	Value val = #expr;
-	map.add_entry(hash, key, val, index);
-	return val;
-}
-
-fn Value? LinkedHashMap.get(&map, Key key) @operator([]) => *map.get_ref(key) @inline;
-
-fn bool LinkedHashMap.has_key(&map, Key key) => @ok(map.get_ref(key));
-
-fn bool LinkedHashMap.set(&map, Key key, Value value) @operator([]=)
-{
-	// If the map isn't initialized, use the defaults to initialize it.
-	switch (map.allocator.ptr)
-	{
-		case &dummy:
-			map.init(mem);
-		case null:
-			map.tinit();
-		default:
-			break;
-	}
-	uint hash = rehash(key.hash());
-	uint index = index_for(hash, map.table.len);
-	for (LinkedEntry *e = map.table[index]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(key, e.key))
-		{
-			e.value = value;
-			return true;
-		}
-	}
-	map.add_entry(hash, key, value, index);
-	return false;
-}
-
-fn void? LinkedHashMap.remove(&map, Key key) @maydiscard
-{
-	if (!map.remove_entry_for_key(key)) return NOT_FOUND?;
-}
-
-fn void LinkedHashMap.clear(&map)
-{
-	if (!map.count) return;
-	
-	LinkedEntry* entry = map.head;
-	while (entry)
-	{
-		LinkedEntry* next = entry.after;
-		map.free_entry(entry);
-		entry = next;
-	}
-	
-	foreach (LinkedEntry** &bucket : map.table)
-	{
-		*bucket = null;
-	}
-	
-	map.count = 0;
-	map.head = null;
-	map.tail = null;
-}
-
-fn void LinkedHashMap.free(&map)
-{
-	if (!map.is_initialized()) return;
-	map.clear();
-	map.free_internal(map.table.ptr);
-	map.table = {};
-}
-
-fn Key[] LinkedHashMap.tkeys(&self)
-{
-	return self.keys(tmem) @inline;
-}
-
-fn Key[] LinkedHashMap.keys(&self, Allocator allocator)
-{
-	if (!self.count) return {};
-	
-	Key[] list = allocator::alloc_array(allocator, Key, self.count);
-	usz index = 0;
-	
-	LinkedEntry* entry = self.head;
-	while (entry)
-	{
-		$if COPY_KEYS:
-			list[index++] = entry.key.copy(allocator);
-		$else
-			list[index++] = entry.key;
-		$endif
-		entry = entry.after;
-	}
-	return list;
-}
-
-macro LinkedHashMap.@each(map; @body(key, value))
-{
-	map.@each_entry(; LinkedEntry* entry)
-	{
-		@body(entry.key, entry.value);
-	};
-}
-
-macro LinkedHashMap.@each_entry(map; @body(entry))
-{
-	LinkedEntry* entry = map.head;
-	while (entry)
-	{
-		@body(entry);
-		entry = entry.after;
-	}
-}
-
-fn Value[] LinkedHashMap.tvalues(&map) => map.values(tmem) @inline;
-
-fn Value[] LinkedHashMap.values(&self, Allocator allocator)
-{
-	if (!self.count) return {};
-	Value[] list = allocator::alloc_array(allocator, Value, self.count);
-	usz index = 0;
-	LinkedEntry* entry = self.head;
-	while (entry)
-	{
-		list[index++] = entry.value;
-		entry = entry.after;
-	}
-	return list;
-}
-
-fn bool LinkedHashMap.has_value(&map, Value v) @if(VALUE_IS_EQUATABLE)
-{
-	if (!map.count) return false;
-	
-	LinkedEntry* entry = map.head;
-	while (entry)
-	{
-		if (equals(v, entry.value)) return true;
-		entry = entry.after;
-	}
-	return false;
-}
-
-fn LinkedHashMapIterator LinkedHashMap.iter(&self) => { .map = self, .current = self.head, .started = false };
-
-fn LinkedHashMapValueIterator LinkedHashMap.value_iter(&self) => { .map = self, .current = self.head, .started = false };
-
-fn LinkedHashMapKeyIterator LinkedHashMap.key_iter(&self) => { .map = self, .current = self.head, .started = false };
-
-fn bool LinkedHashMapIterator.next(&self)
-{
-	if (!self.started)
-	{
-		self.current = self.map.head;
-		self.started = true;
-	}
-	else if (self.current)
-	{
-		self.current = self.current.after;
-	}
-	return self.current != null;
-}
-
-fn LinkedEntry*? LinkedHashMapIterator.get(&self)
-{
-	return self.current ? self.current : NOT_FOUND?;
-}
-
-fn Value*? LinkedHashMapValueIterator.get(&self)
-{
-	return self.current ? &self.current.value : NOT_FOUND?;
-}
-
-fn Key*? LinkedHashMapKeyIterator.get(&self)
-{
-	return self.current ? &self.current.key : NOT_FOUND?;
-}
-
-fn bool LinkedHashMapIterator.has_next(&self)
-{
-	if (!self.started) return self.map.head != null;
-	return self.current && self.current.after != null;
-}
-
-// --- private methods
-
-fn void LinkedHashMap.add_entry(&map, uint hash, Key key, Value value, uint bucket_index) @private
-{
-	$if COPY_KEYS:
-	key = key.copy(map.allocator);
-	$endif
-	
-	LinkedEntry* entry = allocator::new(map.allocator, LinkedEntry, {
-		.hash = hash,
-		.key = key,
-		.value = value,
-		.next = map.table[bucket_index],
-		.before = map.tail,
-		.after = null
-	});
-	
-	// Update bucket chain
-	map.table[bucket_index] = entry;
-	
-	// Update linked list
-	if (map.tail)
-	{
-		map.tail.after = entry;
-		entry.before = map.tail;
-	}
-	else
-	{
-		map.head = entry;
-	}
-	map.tail = entry;
-	
-	if (map.count++ >= map.threshold)
-	{
-		map.resize(map.table.len * 2);
-	}
-}
-
-fn void LinkedHashMap.resize(&map, uint new_capacity) @private
-{
-	LinkedEntry*[] old_table = map.table;
-	uint old_capacity = old_table.len;
-	
-	if (old_capacity == MAXIMUM_CAPACITY)
-	{
-		map.threshold = uint.max;
-		return;
-	}
-	
-	LinkedEntry*[] new_table = allocator::new_array(map.allocator, LinkedEntry*, new_capacity);
-	map.table = new_table;
-	map.threshold = (uint)(new_capacity * map.load_factor);
-	
-	// Rehash all entries - linked list order remains unchanged
-	foreach (uint i, LinkedEntry *e : old_table)
-	{
-		if (!e) continue;
-		
-		// Split the bucket chain into two chains based on new bit
-		LinkedEntry* lo_head = null;
-		LinkedEntry* lo_tail = null;
-		LinkedEntry* hi_head = null;
-		LinkedEntry* hi_tail = null;
-		
-		do
-		{
-			LinkedEntry* next = e.next;
-			if ((e.hash & old_capacity) == 0)
-			{
-				if (!lo_tail)
-				{
-					lo_head = e;
-				}
-				else
-				{
-					lo_tail.next = e;
-				}
-				lo_tail = e;
-			}
-			else
-			{
-				if (!hi_tail)
-				{
-					hi_head = e;
-				}
-				else
-				{
-					hi_tail.next = e;
-				}
-				hi_tail = e;
-			}
-			e.next = null;
-			e = next;
-		}
-		while (e);
-		
-		if (lo_tail)
-		{
-			lo_tail.next = null;
-			new_table[i] = lo_head;
-		}
-		if (hi_tail)
-		{
-			hi_tail.next = null;
-			new_table[i + old_capacity] = hi_head;
-		}
-	}
-	
-	map.free_internal(old_table.ptr);
-}
-
-fn usz? LinkedHashMap.to_format(&self, Formatter* f) @dynamic
-{
-	usz len;
-	len += f.print("{ ")!;
-	self.@each_entry(; LinkedEntry* entry)
-	{
-		if (len > 2) len += f.print(", ")!;
-		len += f.printf("%s: %s", entry.key, entry.value)!;
-	};
-	return len + f.print(" }");
-}
-
-fn void LinkedHashMap.transfer(&map, LinkedEntry*[] new_table) @private
-{
-	LinkedEntry*[] src = map.table;
-	uint new_capacity = new_table.len;
-	foreach (uint j, LinkedEntry *e : src)
-	{
-		if (!e) continue;
-		do
-		{
-			LinkedEntry* next = e.next;
-			uint i = index_for(e.hash, new_capacity);
-			e.next = new_table[i];
-			new_table[i] = e;
-			e = next;
-		}
-		while (e);
-	}
-}
-
-fn void LinkedHashMap.put_all_for_create(&map, LinkedHashMap* other_map) @private
-{
-	if (!other_map.count) return;
-	other_map.@each(; Key key, Value value) {
-		map.set(key, value);
-	};
-}
-
-fn void LinkedHashMap.put_for_create(&map, Key key, Value value) @private
-{
-	uint hash = rehash(key.hash());
-	uint i = index_for(hash, map.table.len);
-	for (LinkedEntry *e = map.table[i]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(key, e.key))
-		{
-			e.value = value;
-			return;
-		}
-	}
-	map.create_entry(hash, key, value, i);
-}
-
-fn void LinkedHashMap.free_internal(&map, void* ptr) @inline @private
-{
-	allocator::free(map.allocator, ptr);
-}
-
-fn bool LinkedHashMap.remove_entry_for_key(&map, Key key) @private
-{
-	if (!map.count) return false;
-	
-	uint hash = rehash(key.hash());
-	uint i = index_for(hash, map.table.len);
-	LinkedEntry* prev = null;
-	LinkedEntry* e = map.table[i];
-	
-	while (e)
-	{
-		if (e.hash == hash && equals(key, e.key))
-		{
-			if (prev)
-			{
-				prev.next = e.next;
-			}
-			else
-			{
-				map.table[i] = e.next;
-			}
-			
-			if (e.before)
-			{
-				e.before.after = e.after;
-			}
-			else
-			{
-				map.head = e.after;
-			}
-			
-			if (e.after)
-			{
-				e.after.before = e.before;
-			}
-			else
-			{
-				map.tail = e.before;
-			}
-			
-			map.count--;
-			map.free_entry(e);
-			return true;
-		}
-		prev = e;
-		e = e.next;
-	}
-	return false;
-}
-
-fn void LinkedHashMap.create_entry(&map, uint hash, Key key, Value value, int bucket_index) @private
-{
-	LinkedEntry *e = map.table[bucket_index];
-	$if COPY_KEYS:
-	key = key.copy(map.allocator);
-	$endif
-	LinkedEntry* entry = allocator::new(map.allocator, LinkedEntry, { .hash = hash, .key = key, .value = value, .next = map.table[bucket_index] });
-	map.table[bucket_index] = entry;
-	map.count++;
-}
-
-fn void LinkedHashMap.free_entry(&self, LinkedEntry *entry) @local
-{
-	$if COPY_KEYS:
-	allocator::free(self.allocator, entry.key);
-	$endif
-	self.free_internal(entry);
-}
-
-
-struct LinkedHashMapIterator
-{
-	LinkedHashMap* map;
-	LinkedEntry* current;
-	bool started;
-}
-
-typedef LinkedHashMapValueIterator = inline LinkedHashMapIterator;
-typedef LinkedHashMapKeyIterator = inline LinkedHashMapIterator;
-
-fn usz LinkedHashMapValueIterator.len(self) @operator(len) => self.map.count;
-fn usz LinkedHashMapKeyIterator.len(self) @operator(len) => self.map.count;
-fn usz LinkedHashMapIterator.len(self) @operator(len) => self.map.count;
-
-int dummy @local;

lib/std/collections/linked_hashset.c3

@@ -1,723 +0,0 @@
-<*
- @require $defined((Value){}.hash()) : `No .hash function found on the value`
-*>
-module std::collections::set {Value};
-import std::math;
-import std::io @norecurse;
-
-const LinkedHashSet LINKEDONHEAP = { .allocator = SET_HEAP_ALLOCATOR };
-
-struct LinkedEntry
-{
-	uint hash;
-	Value value;
-	LinkedEntry* next;	  // For bucket chain
-	LinkedEntry* before;	// Previous in insertion order
-	LinkedEntry* after;	 // Next in insertion order
-}
-
-struct LinkedHashSet (Printable)
-{
-	LinkedEntry*[] table;
-	Allocator allocator;
-	usz count;			  // Number of elements
-	usz threshold;		  // Resize limit
-	float load_factor;
-	LinkedEntry* head;	  // First inserted LinkedEntry
-	LinkedEntry* tail;	  // Last inserted LinkedEntry
-}
-
-fn int LinkedHashSet.len(&self) @operator(len) => (int) self.count;
-
-<*
- @param [&inout] allocator : "The allocator to use"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Set was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn LinkedHashSet* LinkedHashSet.init(&self, Allocator allocator, usz capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	capacity = math::next_power_of_2(capacity);
-	self.allocator = allocator;
-	self.threshold = (usz)(capacity * load_factor);
-	self.load_factor = load_factor;
-	self.table = allocator::new_array(allocator, LinkedEntry*, capacity);
-	
-	self.head = null;
-	self.tail = null;
-	return self;
-}
-
-<*
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Set was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn LinkedHashSet* LinkedHashSet.tinit(&self, usz capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	return self.init(tmem, capacity, load_factor) @inline;
-}
-
-<*
- @param [&inout] allocator : "The allocator to use"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Set was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-macro LinkedHashSet* LinkedHashSet.init_with_values(&self, Allocator allocator, ..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	self.init(allocator, capacity, load_factor);
-	$for var $i = 0; $i < $vacount; $i++:
-		self.add($vaarg[$i]);
-	$endfor
-	return self;
-}
-
-<*
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Set was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-macro LinkedHashSet* LinkedHashSet.tinit_with_values(&self, ..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	return self.init_with_values(tmem, $vasplat, capacity: capacity, load_factor: load_factor);
-}
-
-<*
- @param [in] values : "The values for the LinkedHashSet"
- @param [&inout] allocator : "The allocator to use"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Set was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn LinkedHashSet* LinkedHashSet.init_from_values(&self, Allocator allocator, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	self.init(allocator, capacity, load_factor);
-	foreach (v : values) self.add(v);
-	return self;
-}
-
-<*
- @param [in] values : "The values for the LinkedHashSet entries"
- @require capacity > 0 : "The capacity must be 1 or higher"
- @require load_factor > 0.0 : "The load factor must be higher than 0"
- @require !self.is_initialized() : "Set was already initialized"
- @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
-*>
-fn LinkedHashSet* LinkedHashSet.tinit_from_values(&self, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	return self.init_from_values(tmem, values, capacity, load_factor);
-}
-
-<*
- Has this linked hash set been initialized yet?
-
- @param [&in] set : "The linked hash set we are testing"
- @return "Returns true if it has been initialized, false otherwise"
-*>
-fn bool LinkedHashSet.is_initialized(&set)
-{
-	return set.allocator && set.allocator.ptr != &dummy;
-}
-
-<*
- @param [&inout] allocator : "The allocator to use"
- @param [&in] other_set : "The set to copy from."
- @require !self.is_initialized() : "Set was already initialized"
-*>
-fn LinkedHashSet* LinkedHashSet.init_from_set(&self, Allocator allocator, LinkedHashSet* other_set)
-{
-	self.init(allocator, other_set.table.len, other_set.load_factor);
-	LinkedEntry* entry = other_set.head;
-	while (entry) // Save insertion order
-	{
-		self.put_for_create(entry.value);
-		entry = entry.after;
-	}
-	return self;
-}
-
-<*
- @param [&in] other_set : "The set to copy from."
- @require !set.is_initialized() : "Set was already initialized"
-*>
-fn LinkedHashSet* LinkedHashSet.tinit_from_set(&set, LinkedHashSet* other_set)
-{
-	return set.init_from_set(tmem, other_set) @inline;
-}
-
-<*
- Check if the set is empty
-
- @return "true if it is empty"
- @pure
-*>
-fn bool LinkedHashSet.is_empty(&set) @inline
-{
-	return !set.count;
-}
-
-<*
- Add all elements in the slice to the set.
-
- @param [in] list
- @return "The number of new elements added"
- @ensure total <= list.len
-*>
-fn usz LinkedHashSet.add_all(&set, Value[] list)
-{
-	usz total;
-	foreach (v : list)
-	{
-		if (set.add(v)) total++;
-	}
-	return total;
-}
-
-<*
- @param [&in] other
- @return "The number of new elements added"
- @ensure return <= other.count
-*>
-fn usz LinkedHashSet.add_all_from(&set, LinkedHashSet* other)
-{
-	usz total;
-	other.@each(;Value value)
-	{
-		if (set.add(value)) total++;
-	};
-	return total;
-}
-
-<*
- @param value : "The value to add"
- @return "true if the value didn't exist in the set"
-*>
-fn bool LinkedHashSet.add(&set, Value value)
-{
-	// If the set isn't initialized, use the defaults to initialize it.
-	switch (set.allocator.ptr)
-	{
-		case &dummy:
-			set.init(mem);
-		case null:
-			set.tinit();
-		default:
-			break;
-	}
-	uint hash = rehash(value.hash());
-	uint index = index_for(hash, set.table.len);
-	for (LinkedEntry *e = set.table[index]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(value, e.value)) return false;
-	}
-	set.add_entry(hash, value, index);
-	return true;
-}
-
-<*
- Iterate over all the values in the set
-*>
-macro LinkedHashSet.@each(set; @body(value))
-{
-	if (!set.count) return;
-    LinkedEntry* entry = set.head;
-	while (entry)
-	{
-		@body(entry.value);
-		entry = entry.after;
-	}
-}
-
-<*
- Check if the set contains the given value.
-
- @param value : "The value to check"
- @return "true if it exists in the set"
-*>
-fn bool LinkedHashSet.contains(&set, Value value)
-{
-	if (!set.count) return false;
-	uint hash = rehash(value.hash());
-	for (LinkedEntry *e = set.table[index_for(hash, set.table.len)]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(value, e.value)) return true;
-	}
-	return false;
-}
-
-<*
- Remove a single value from the set.
-
- @param value : "The value to remove"
- @return? NOT_FOUND : "If the entry is not found"
-*>
-fn void? LinkedHashSet.remove(&set, Value value) @maydiscard
-{
-	if (!set.remove_entry_for_value(value)) return NOT_FOUND?;
-}
-
-fn usz LinkedHashSet.remove_all(&set, Value[] values)
-{
-	usz total;
-	foreach (v : values)
-	{
-		if (set.remove_entry_for_value(v)) total++;
-	}
-	return total;
-}
-
-<*
- @param [&in] other : "Other set"
-*>
-fn usz LinkedHashSet.remove_all_from(&set, LinkedHashSet* other)
-{
-	usz total;
-	other.@each(;Value val)
-    {
-		if (set.remove_entry_for_value(val)) total++;
-    };
-    return total;
-}
-
-<*
- Free all memory allocated by the hash set.
-*>
-fn void LinkedHashSet.free(&set)
-{
-	if (!set.is_initialized()) return;
-	set.clear();
-	set.free_internal(set.table.ptr);
-	set.table = {};
-}
-
-<*
- Clear all elements from the set while keeping the underlying storage
-
- @ensure set.count == 0
-*>
-fn void LinkedHashSet.clear(&set)
-{
-	if (!set.count) return;
-	
-	LinkedEntry* entry = set.head;
-	while (entry)
-	{
-		LinkedEntry* next = entry.after;
-		set.free_entry(entry);
-		entry = next;
-	}
-	
-	foreach (LinkedEntry** &bucket : set.table)
-	{
-		*bucket = null;
-	}
-	
-	set.count = 0;
-	set.head = null;
-	set.tail = null;
-}
-
-fn void LinkedHashSet.reserve(&set, usz capacity)
-{
-	if (capacity > set.threshold)
-	{
-		set.resize(math::next_power_of_2(capacity));
-	}
-}
-
-// --- Set Operations ---
-
-<*
- Returns the union of two sets (A | B)
-
- @param [&in] other : "The other set to union with"
- @param [&inout] allocator : "Allocator for the new set"
- @return "A new set containing the union of both sets"
-*>
-fn LinkedHashSet LinkedHashSet.set_union(&self, Allocator allocator, LinkedHashSet* other)
-{
-	usz new_capacity = math::next_power_of_2(self.count + other.count);
-	LinkedHashSet result;
-	result.init(allocator, new_capacity, self.load_factor);
-	result.add_all_from(self);
-	result.add_all_from(other);
-	return result;
-}
-
-fn LinkedHashSet LinkedHashSet.tset_union(&self, LinkedHashSet* other) => self.set_union(tmem, other) @inline;
-
-<*
- Returns the intersection of the two sets (A & B)
-
- @param [&in] other : "The other set to intersect with"
- @param [&inout] allocator : "Allocator for the new set"
- @return "A new set containing the intersection of both sets"
-*>
-fn LinkedHashSet LinkedHashSet.intersection(&self, Allocator allocator, LinkedHashSet* other)
-{
-	LinkedHashSet result;
-	result.init(allocator, math::min(self.table.len, other.table.len), self.load_factor);
-	
-	// Iterate through the smaller set for efficiency
-	LinkedHashSet* smaller = self.count <= other.count ? self : other;
-	LinkedHashSet* larger = self.count > other.count ? self : other;
-	
-	smaller.@each(;Value value) 
-    {
-		if (larger.contains(value)) result.add(value);
-	};
-	
-	return result;
-}
-
-fn LinkedHashSet LinkedHashSet.tintersection(&self, LinkedHashSet* other) => self.intersection(tmem, other) @inline;
-
-<*
- Return this set - other, so (A & ~B)
-
- @param [&in] other : "The other set to compare with"
- @param [&inout] allocator : "Allocator for the new set"
- @return "A new set containing elements in this set but not in the other"
-*>
-fn LinkedHashSet LinkedHashSet.difference(&self, Allocator allocator, LinkedHashSet* other)
-{
-	LinkedHashSet result;
-	result.init(allocator, self.table.len, self.load_factor);
-	self.@each(;Value value)
-	{
-		if (!other.contains(value))
-		{
-			result.add(value);
-		}
-	};
-	return result;
-}
-
-fn LinkedHashSet LinkedHashSet.tdifference(&self, LinkedHashSet* other) => self.difference(tmem, other) @inline;
-
-<*
- Return (A ^ B)
-
- @param [&in] other : "The other set to compare with"
- @param [&inout] allocator : "Allocator for the new set"
- @return "A new set containing elements in this set or the other, but not both"
-*>
-fn LinkedHashSet LinkedHashSet.symmetric_difference(&self, Allocator allocator, LinkedHashSet* other)
-{
-	LinkedHashSet result;
-	result.init(allocator, self.table.len, self.load_factor);
-	result.add_all_from(self);
-	other.@each(;Value value)
-	{
-		if (!result.add(value))
-		{
-			result.remove(value);
-		}
-	};
-	return result;
-}
-
-fn LinkedHashSet LinkedHashSet.tsymmetric_difference(&self, LinkedHashSet* other) => self.symmetric_difference(tmem, other) @inline;
-
-<*
- Check if this hash set is a subset of another set.
-
- @param [&in] other : "The other set to check against"
- @return "True if all elements of this set are in the other set"
-*>
-fn bool LinkedHashSet.is_subset(&self, LinkedHashSet* other)
-{
-	if (self.count == 0) return true;
-	if (self.count > other.count) return false;
-	
-	self.@each(; Value value) {
-		if (!other.contains(value)) return false;
-	};
-	return true;
-}
-
-// --- private methods
-
-fn void LinkedHashSet.add_entry(&set, uint hash, Value value, uint bucket_index) @private
-{
-	LinkedEntry* entry = allocator::new(set.allocator, LinkedEntry, {
-		.hash = hash,
-		.value = value,
-		.next = set.table[bucket_index],
-		.before = set.tail,
-		.after = null
-	});
-	
-	// Update bucket chain
-	set.table[bucket_index] = entry;
-	
-	// Update linked list
-	if (set.tail)
-	{
-		set.tail.after = entry;
-		entry.before = set.tail;
-	}
-	else
-	{
-		set.head = entry;
-	}
-	set.tail = entry;
-	
-	if (set.count++ >= set.threshold)
-	{
-		set.resize(set.table.len * 2);
-	}
-}
-
-fn void LinkedHashSet.resize(&set, usz new_capacity) @private
-{
-	LinkedEntry*[] old_table = set.table;
-	usz old_capacity = old_table.len;
-	
-	if (old_capacity == MAXIMUM_CAPACITY)
-	{
-		set.threshold = uint.max;
-		return;
-	}
-	
-	LinkedEntry*[] new_table = allocator::new_array(set.allocator, LinkedEntry*, new_capacity);
-	set.table = new_table;
-	set.threshold = (uint)(new_capacity * set.load_factor);
-	
-	// Rehash all entries - linked list order remains unchanged
-	foreach (uint i, LinkedEntry *e : old_table)
-	{
-		if (!e) continue;
-		
-		// Split the bucket chain into two chains based on new bit
-		LinkedEntry* lo_head = null;
-		LinkedEntry* lo_tail = null;
-		LinkedEntry* hi_head = null;
-		LinkedEntry* hi_tail = null;
-		
-		do
-		{
-			LinkedEntry* next = e.next;
-			if ((e.hash & old_capacity) == 0)
-			{
-				if (!lo_tail)
-				{
-					lo_head = e;
-				}
-				else
-				{
-					lo_tail.next = e;
-				}
-				lo_tail = e;
-			}
-			else
-			{
-				if (!hi_tail)
-				{
-					hi_head = e;
-				}
-				else
-				{
-					hi_tail.next = e;
-				}
-				hi_tail = e;
-			}
-			e.next = null;
-			e = next;
-		}
-		while (e);
-		
-		if (lo_tail)
-		{
-			lo_tail.next = null;
-			new_table[i] = lo_head;
-		}
-		if (hi_tail)
-		{
-			hi_tail.next = null;
-			new_table[i + old_capacity] = hi_head;
-		}
-	}
-	
-	set.free_internal(old_table.ptr);
-}
-
-fn usz? LinkedHashSet.to_format(&self, Formatter* f) @dynamic
-{
-	usz len;
-	len += f.print("{ ")!;
-	self.@each(; Value value)
-	{
-		if (len > 2) len += f.print(", ")!;
-		len += f.printf("%s", value)!;
-	};
-	return len + f.print(" }");
-}
-
-fn void LinkedHashSet.transfer(&set, LinkedEntry*[] new_table) @private
-{
-	LinkedEntry*[] src = set.table;
-	uint new_capacity = new_table.len;
-	foreach (uint j, LinkedEntry *e : src)
-	{
-		if (!e) continue;
-		do
-		{
-			LinkedEntry* next = e.next;
-			uint i = index_for(e.hash, new_capacity);
-			e.next = new_table[i];
-			new_table[i] = e;
-			e = next;
-		}
-		while (e);
-	}
-}
-
-fn void LinkedHashSet.put_for_create(&set, Value value) @private
-{
-	uint hash = rehash(value.hash());
-	uint i = index_for(hash, set.table.len);
-	for (LinkedEntry *e = set.table[i]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(value, e.value))
-		{
-			// Value already exists, no need to do anything
-			return;
-		}
-	}
-	set.create_entry(hash, value, i);
-}
-
-fn void LinkedHashSet.free_internal(&set, void* ptr) @inline @private
-{
-	allocator::free(set.allocator, ptr);
-}
-
-fn void LinkedHashSet.create_entry(&set, uint hash, Value value, int bucket_index) @private
-{
-	LinkedEntry* entry = allocator::new(set.allocator, LinkedEntry, { 
-		.hash = hash, 
-		.value = value, 
-		.next = set.table[bucket_index],
-		.before = set.tail,
-		.after = null
-	});
-	
-	set.table[bucket_index] = entry;
-	
-	// Update linked list
-	if (set.tail)
-	{
-		set.tail.after = entry;
-		entry.before = set.tail;
-	}
-	else
-	{
-		set.head = entry;
-	}
-	set.tail = entry;
-	
-	set.count++;
-}
-
-fn bool LinkedHashSet.remove_entry_for_value(&set, Value value) @private
-{
-	if (!set.count) return false;
-	
-	uint hash = rehash(value.hash());
-	uint i = index_for(hash, set.table.len);
-	LinkedEntry* prev = null;
-	LinkedEntry* e = set.table[i];
-	
-	while (e)
-	{
-		if (e.hash == hash && equals(value, e.value))
-		{
-			if (prev)
-			{
-				prev.next = e.next;
-			}
-			else
-			{
-				set.table[i] = e.next;
-			}
-			
-			if (e.before)
-			{
-				e.before.after = e.after;
-			}
-			else
-			{
-				set.head = e.after;
-			}
-			
-			if (e.after)
-			{
-				e.after.before = e.before;
-			}
-			else
-			{
-				set.tail = e.before;
-			}
-			
-			set.count--;
-			set.free_entry(e);
-			return true;
-		}
-		prev = e;
-		e = e.next;
-	}
-	return false;
-}
-
-fn void LinkedHashSet.free_entry(&set, LinkedEntry *entry) @private
-{
-	allocator::free(set.allocator, entry);
-}
-
-struct LinkedHashSetIterator
-{
-	LinkedHashSet* set;
-	LinkedEntry* current;
-	bool started;
-}
-
-fn LinkedHashSetIterator LinkedHashSet.iter(&set) => { .set = set, .current = set.head, .started = false };
-
-fn bool LinkedHashSetIterator.next(&self)
-{
-	if (!self.started)
-	{
-		self.current = self.set.head;
-		self.started = true;
-	}
-	else if (self.current)
-	{
-		self.current = self.current.after;
-	}
-	return self.current != null;
-}
-
-fn Value*? LinkedHashSetIterator.get(&self)
-{
-	return self.current ? &self.current.value : NOT_FOUND?;
-}
-
-fn bool LinkedHashSetIterator.has_next(&self)
-{
-	if (!self.started) return self.set.head != null;
-	return self.current && self.current.after != null;
-}
-
-fn usz LinkedHashSetIterator.len(&self) @operator(len) 
-{
-    return self.set.count;
-}
-
-int dummy @local;

lib/std/collections/linkedlist.c3

@@ -1,7 +1,7 @@
 // Copyright (c) 2021-2024 Christoffer Lerno. All rights reserved.
 // Use of self source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
-module std::collections::linkedlist{Type};
+module std::collections::linkedlist(<Type>);
 
 const ELEMENT_IS_EQUATABLE = types::is_equatable_type(Type);
 
@@ -20,26 +20,25 @@ struct LinkedList
 	Node *_last;
 }
 
-<*
- @param [&inout] allocator : "The allocator to use, defaults to the heap allocator"
- @return "the initialized list"
-*>
-fn LinkedList* LinkedList.init(&self, Allocator allocator)
+/**
+ * @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
+ * @return "the initialized list"
+ **/
+fn LinkedList* LinkedList.new_init(&self, Allocator allocator = allocator::heap())
 {
 	*self = { .allocator = allocator };
 	return self;
 }
 
-fn LinkedList* LinkedList.tinit(&self)
+
+fn LinkedList* LinkedList.temp_init(&self)
 {
-	return self.init(tmem) @inline;
+	return self.new_init(allocator::temp()) @inline;
 }
 
-fn bool LinkedList.is_initialized(&self) @inline => self.allocator != null;
-
-<*
- @require self.is_initialized()
-*>
+/**
+ * @require self.allocator
+ **/
 macro void LinkedList.free_node(&self, Node* node) @private
 {
 	allocator::free(self.allocator, node);
@@ -47,7 +46,7 @@ macro void LinkedList.free_node(&self, Node* node) @private
 
 macro Node* LinkedList.alloc_node(&self) @private
 {
-	if (!self.allocator) self.allocator = tmem;
+	if (!self.allocator) self.allocator = allocator::heap();
 	return allocator::alloc(self.allocator, Node);
 }
 
@@ -85,18 +84,18 @@ fn void LinkedList.push(&self, Type value)
 	self.size++;
 }
 
-fn Type? LinkedList.peek(&self) => self.first() @inline;
-fn Type? LinkedList.peek_last(&self) => self.last() @inline;
+fn Type! LinkedList.peek(&self) => self.first() @inline;
+fn Type! LinkedList.peek_last(&self) => self.last() @inline;
 
-fn Type? LinkedList.first(&self)
+fn Type! LinkedList.first(&self)
 {
-	if (!self._first) return NO_MORE_ELEMENT?;
+	if (!self._first) return IteratorResult.NO_MORE_ELEMENT?;
 	return self._first.value;
 }
 
-fn Type? LinkedList.last(&self)
+fn Type! LinkedList.last(&self)
 {
-	if (!self._last) return NO_MORE_ELEMENT?;
+	if (!self._last) return IteratorResult.NO_MORE_ELEMENT?;
 	return self._last.value;
 }
 
@@ -117,9 +116,9 @@ fn void LinkedList.clear(&self)
 
 fn usz LinkedList.len(&self) @inline => self.size;
 
-<*
- @require index < self.size
-*>
+/**
+ * @require index < self.size
+ **/
 macro Node* LinkedList.node_at_index(&self, usz index)
 {
 	if (index * 2 >= self.size)
@@ -133,33 +132,33 @@ macro Node* LinkedList.node_at_index(&self, usz index)
 	while (index--) node = node.next;
 	return node;
 }
-<*
- @require index < self.size
-*>
+/**
+ * @require index < self.size
+ **/
 fn Type LinkedList.get(&self, usz index)
 {
 	return self.node_at_index(index).value;
 }
 
-<*
- @require index < self.size
-*>
+/**
+ * @require index < self.size
+ **/
 fn void LinkedList.set(&self, usz index, Type element)
 {
 	self.node_at_index(index).value = element;
 }
 
-<*
- @require index < self.size
-*>
+/**
+ * @require index < self.size
+ **/
 fn void LinkedList.remove_at(&self, usz index)
 {
 	self.unlink(self.node_at_index(index));
 }
 
-<*
- @require index <= self.size
-*>
+/**
+ * @require index <= self.size
+ **/
 fn void LinkedList.insert_at(&self, usz index, Type element)
 {
 	switch (index)
@@ -172,9 +171,9 @@ fn void LinkedList.insert_at(&self, usz index, Type element)
 			self.link_before(self.node_at_index(index), element);
 	}
 }
-<*
- @require succ != null
-*>
+/**
+ * @require succ != null
+ **/
 fn void LinkedList.link_before(&self, Node *succ, Type value) @private
 {
 	Node* pred = succ.prev;
@@ -192,9 +191,9 @@ fn void LinkedList.link_before(&self, Node *succ, Type value) @private
 	self.size++;
 }
 
-<*
- @require self._first != null
-*>
+/**
+ * @require self._first
+ **/
 fn void LinkedList.unlink_first(&self) @private
 {
 	Node* f = self._first;
@@ -231,34 +230,29 @@ fn usz LinkedList.remove(&self, Type t) @if(ELEMENT_IS_EQUATABLE)
 	return start - self.size;
 }
 
-fn Type? LinkedList.pop(&self)
+fn Type! LinkedList.pop(&self)
 {
-	if (!self._last) return NO_MORE_ELEMENT?;
+	if (!self._last) return IteratorResult.NO_MORE_ELEMENT?;
 	defer self.unlink_last();
 	return self._last.value;
 }
 
-fn bool LinkedList.is_empty(&self)
+fn Type! LinkedList.pop_front(&self)
 {
-	return !self._first;
-}
-
-fn Type? LinkedList.pop_front(&self)
-{
-	if (!self._first) return NO_MORE_ELEMENT?;
+	if (!self._first) return IteratorResult.NO_MORE_ELEMENT?;
 	defer self.unlink_first();
 	return self._first.value;
 }
 
-fn void? LinkedList.remove_last(&self) @maydiscard
+fn void! LinkedList.remove_last(&self) @maydiscard
 {
-	if (!self._first) return NO_MORE_ELEMENT?;
+	if (!self._first) return IteratorResult.NO_MORE_ELEMENT?;
 	self.unlink_last();
 }
 
-fn void? LinkedList.remove_first(&self) @maydiscard
+fn void! LinkedList.remove_first(&self) @maydiscard
 {
-	if (!self._first) return NO_MORE_ELEMENT?;
+	if (!self._first) return IteratorResult.NO_MORE_ELEMENT?;
 	self.unlink_first();
 }
 
@@ -288,9 +282,9 @@ fn bool LinkedList.remove_last_match(&self, Type t)  @if(ELEMENT_IS_EQUATABLE)
 	}
 	return false;
 }
-<*
- @require self._last != null
-*>
+/**
+ * @require self._last
+ **/
 fn void LinkedList.unlink_last(&self) @inline @private
 {
 	Node* l = self._last;
@@ -308,9 +302,9 @@ fn void LinkedList.unlink_last(&self) @inline @private
 	self.size--;
 }
 
-<*
- @require x != null
-*>
+/**
+ * @require x != null
+ **/
 fn void LinkedList.unlink(&self, Node* x) @private
 {
 	Node* next = x.next;

lib/std/collections/list.c3

@@ -1,18 +1,14 @@
 // Copyright (c) 2021-2024 Christoffer Lerno. All rights reserved.
 // Use of self source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
-module std::collections::list{Type};
+module std::collections::list(<Type>);
 import std::io, std::math, std::collections::list_common;
 
-alias ElementPredicate = fn bool(Type *type);
-alias ElementTest = fn bool(Type *type, any context);
+def ElementPredicate = fn bool(Type *type);
+def ElementTest = fn bool(Type *type, any context);
 const ELEMENT_IS_EQUATABLE = types::is_equatable_type(Type);
 const ELEMENT_IS_POINTER = Type.kindof == POINTER;
 
-const Allocator LIST_HEAP_ALLOCATOR = (Allocator)&dummy;
-
-const List ONHEAP = { .allocator = LIST_HEAP_ALLOCATOR };
-
 macro type_is_overaligned() => Type.alignof > mem::DEFAULT_MEM_ALIGNMENT;
 
 struct List (Printable)
@@ -23,11 +19,11 @@ struct List (Printable)
 	Type *entries;
 }
 
-<*
- @param initial_capacity : "The initial capacity to reserve"
- @param [&inout] allocator : "The allocator to use, defaults to the heap allocator"
-*>
-fn List* List.init(&self, Allocator allocator, usz initial_capacity = 16)
+/**
+ * @param initial_capacity "The initial capacity to reserve"
+ * @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
+ **/
+fn List* List.new_init(&self, usz initial_capacity = 16, Allocator allocator = allocator::heap())
 {
 	self.allocator = allocator;
 	self.size = 0;
@@ -37,47 +33,46 @@ fn List* List.init(&self, Allocator allocator, usz initial_capacity = 16)
 	return self;
 }
 
-
-<*
- Initialize the list using the temp allocator.
-
- @param initial_capacity : "The initial capacity to reserve"
-*>
-fn List* List.tinit(&self, usz initial_capacity = 16)
+/**
+ * Initialize the list using the temp allocator.
+ *
+ * @param initial_capacity "The initial capacity to reserve"
+ **/
+fn List* List.temp_init(&self, usz initial_capacity = 16)
 {
-	return self.init(tmem, initial_capacity) @inline;
+	return self.new_init(initial_capacity, allocator::temp()) @inline;
 }
 
-<*
- Initialize a new list with an array.
-
- @param [in] values : `The values to initialize the list with.`
- @require self.size == 0 : "The List must be empty"
-*>
-fn List* List.init_with_array(&self, Allocator allocator, Type[] values)
+/**
+ * Initialize a new list with an array.
+ *
+ * @param [in] values `The values to initialize the list with.`
+ * @require self.size == 0 "The List must be empty"
+ **/
+fn List* List.new_init_with_array(&self, Type[] values, Allocator allocator = allocator::heap())
 {
-	self.init(allocator, values.len) @inline;
+	self.new_init(values.len, allocator) @inline;
 	self.add_array(values) @inline;
 	return self;
 }
 
-<*
- Initialize a temporary list with an array.
-
- @param [in] values : `The values to initialize the list with.`
- @require self.size == 0 : "The List must be empty"
-*>
-fn List* List.tinit_with_array(&self, Type[] values)
+/**
+ * Initialize a temporary list with an array.
+ *
+ * @param [in] values `The values to initialize the list with.`
+ * @require self.size == 0 "The List must be empty"
+ **/
+fn List* List.temp_init_with_array(&self, Type[] values)
 {
-	self.tinit(values.len) @inline;
+	self.temp_init(values.len) @inline;
 	self.add_array(values) @inline;
 	return self;
 }
 
-<*
- @require !self.is_initialized() : "The List must not be allocated"
-*>
-fn void List.init_wrapping_array(&self, Allocator allocator, Type[] types)
+/**
+ * @require self.capacity == 0 "The List must not be allocated"
+ **/
+fn void List.init_wrapping_array(&self, Type[] types, Allocator allocator = allocator::heap())
 {
 	self.allocator = allocator;
 	self.capacity = types.len;
@@ -85,9 +80,7 @@ fn void List.init_wrapping_array(&self, Allocator allocator, Type[] types)
 	self.set_size(types.len);
 }
 
-fn bool List.is_initialized(&self) @inline => self.allocator != null && self.allocator != (Allocator)&dummy;
-
-fn usz? List.to_format(&self, Formatter* formatter) @dynamic
+fn usz! List.to_format(&self, Formatter* formatter) @dynamic
 {
 	switch (self.size)
 	{
@@ -107,15 +100,25 @@ fn usz? List.to_format(&self, Formatter* formatter) @dynamic
 	}
 }
 
+fn String List.to_new_string(&self, Allocator allocator = allocator::heap()) @dynamic
+{
+	return string::new_format("%s", *self, .allocator = allocator);
+}
+
+fn String List.to_tstring(&self)
+{
+	return string::tformat("%s", *self);
+}
+
 fn void List.push(&self, Type element) @inline
 {
 	self.reserve(1);
 	self.entries[self.set_size(self.size + 1)] = element;
 }
 
-fn Type? List.pop(&self)
+fn Type! List.pop(&self)
 {
-	if (!self.size) return NO_MORE_ELEMENT?;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	defer self.set_size(self.size - 1);
 	return self.entries[self.size - 1];
 }
@@ -125,16 +128,19 @@ fn void List.clear(&self)
 	self.set_size(0);
 }
 
-fn Type? List.pop_first(&self)
+/**
+ * @require self.size > 0
+ **/
+fn Type! List.pop_first(&self)
 {
-	if (!self.size) return NO_MORE_ELEMENT?;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	defer self.remove_at(0);
 	return self.entries[0];
 }
 
-<*
- @require index < self.size : `Removed element out of bounds`
-*>
+/**
+ * @require index < self.size
+ **/
 fn void List.remove_at(&self, usz index)
 {
 	self.set_size(self.size - 1);
@@ -154,34 +160,34 @@ fn void List.add_all(&self, List* other_list)
 }
 
 
-<*
- IMPORTANT The returned array must be freed using free_aligned.
-*>
-fn Type[] List.to_aligned_array(&self, Allocator allocator)
+/**
+ * IMPORTANT The returned array must be freed using free_aligned.
+ **/
+fn Type[] List.to_new_aligned_array(&self, Allocator allocator = allocator::heap())
 {
-	return list_common::list_to_aligned_array(Type, self, allocator);
+	return list_common::list_to_new_aligned_array(Type, self, allocator);
 }
 
-<*
- @require !type_is_overaligned() : "This function is not available on overaligned types"
-*>
-macro Type[] List.to_array(&self, Allocator allocator)
+/**
+ * @require !type_is_overaligned() : "This function is not available on overaligned types"
+ **/
+macro Type[] List.to_new_array(&self, Allocator allocator = allocator::heap())
 {
-	return list_common::list_to_array(Type, self, allocator);
+	return list_common::list_to_new_array(Type, self, allocator);
 }
 
 fn Type[] List.to_tarray(&self)
 {
 	$if type_is_overaligned():
-	return self.to_aligned_array(tmem);
+	return self.to_new_aligned_array(allocator::temp());
 	$else
-	return self.to_array(tmem);
+	return self.to_new_array(allocator::temp());
 	$endif;
 }
 
-<*
- Reverse the elements in a list.
-*>
+/**
+ * Reverse the elements in a list.
+ **/
 fn void List.reverse(&self)
 {
 	list_common::list_reverse(self);
@@ -192,12 +198,12 @@ fn Type[] List.array_view(&self)
 	return self.entries[:self.size];
 }
 
-<*
- Add the values of an array to this list.
-
- @param [in] array
- @ensure self.size >= array.len
-*>
+/**
+ * Add the values of an array to this list.
+ *
+ * @param [in] array
+ * @ensure self.size >= array.len
+ **/
 fn void List.add_array(&self, Type[] array)
 {
 	if (!array.len) return;
@@ -211,49 +217,49 @@ fn void List.push_front(&self, Type type) @inline
 	self.insert_at(0, type);
 }
 
-<*
- @require index <= self.size : `Insert was out of bounds`
-*>
+/**
+ * @require index <= self.size
+ **/
 fn void List.insert_at(&self, usz index, Type type)
 {
 	self.reserve(1);
-	self.set_size(self.size + 1);
-	for (isz i = self.size - 1; i > index; i--)
+	for (usz i = self.size; i > index; i--)
 	{
 		self.entries[i] = self.entries[i - 1];
 	}
+	self.set_size(self.size + 1);
 	self.entries[index] = type;
 }
 
-<*
- @require index < self.size
-*>
+/**
+ * @require index < self.size
+ **/
 fn void List.set_at(&self, usz index, Type type)
 {
 	self.entries[index] = type;
 }
 
-fn void? List.remove_last(&self) @maydiscard
+fn void! List.remove_last(&self) @maydiscard
 {
-	if (!self.size) return NO_MORE_ELEMENT?;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	self.set_size(self.size - 1);
 }
 
-fn void? List.remove_first(&self) @maydiscard
+fn void! List.remove_first(&self) @maydiscard
 {
-	if (!self.size) return NO_MORE_ELEMENT?;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	self.remove_at(0);
 }
 
-fn Type? List.first(&self)
+fn Type! List.first(&self)
 {
-	if (!self.size) return NO_MORE_ELEMENT?;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	return self.entries[0];
 }
 
-fn Type? List.last(&self)
+fn Type! List.last(&self)
 {
-	if (!self.size) return NO_MORE_ELEMENT?;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	return self.entries[self.size - 1];
 }
 
@@ -272,9 +278,6 @@ fn usz List.len(&self) @operator(len) @inline
 	return self.size;
 }
 
-<*
- @require index < self.size : `Access out of bounds`
-*>
 fn Type List.get(&self, usz index) @inline
 {
 	return self.entries[index];
@@ -282,7 +285,7 @@ fn Type List.get(&self, usz index) @inline
 
 fn void List.free(&self)
 {
-	if (!self.allocator || self.allocator.ptr == &dummy || !self.capacity) return;
+	if (!self.allocator || !self.capacity) return;
 
 	self.pre_free(); // Remove sanitizer annotation
 
@@ -296,27 +299,24 @@ fn void List.free(&self)
 	self.entries = null;
 }
 
-<*
- @require i < self.size && j < self.size : `Access out of bounds`
-*>
 fn void List.swap(&self, usz i, usz j)
 {
 	@swap(self.entries[i], self.entries[j]);
 }
 
-<*
- @param filter : "The function to determine if it should be removed or not"
- @return "the number of deleted elements"
-*>
+/**
+ * @param filter "The function to determine if it should be removed or not"
+ * @return "the number of deleted elements"
+ **/
 fn usz List.remove_if(&self, ElementPredicate filter)
 {
 	return list_common::list_remove_if(self, filter, false);
 }
 
-<*
- @param selection : "The function to determine if it should be kept or not"
- @return "the number of deleted elements"
-*>
+/**
+ * @param selection "The function to determine if it should be kept or not"
+ * @return "the number of deleted elements"
+ **/
 fn usz List.retain_if(&self, ElementPredicate selection)
 {
 	return list_common::list_remove_if(self, selection, true);
@@ -325,8 +325,7 @@ fn usz List.retain_if(&self, ElementPredicate selection)
 fn usz List.remove_using_test(&self, ElementTest filter, any context)
 {
 	usz old_size = self.size;
-	defer
-	{
+	defer {
 		if (old_size != self.size) self._update_size_change(old_size, self.size);
 	}
 	return list_common::list_remove_using_test(self, filter, false, context);
@@ -347,23 +346,13 @@ fn void List.ensure_capacity(&self, usz min_capacity) @local
 {
 	if (!min_capacity) return;
 	if (self.capacity >= min_capacity) return;
-
-	// Get a proper allocator
-	switch (self.allocator.ptr)
-	{
-		case &dummy:
-			self.allocator = mem;
-		case null:
-			self.allocator = tmem;
-		default:
-			break;
-	}
+	if (!self.allocator) self.allocator = allocator::heap();
 
 	self.pre_free(); // Remove sanitizer annotation
 
 	min_capacity = math::next_power_of_2(min_capacity);
 	$if type_is_overaligned():
-		self.entries = allocator::realloc_aligned(self.allocator, self.entries, Type.sizeof * min_capacity, alignment: Type[1].alignof)!!;
+		self.entries = allocator::realloc_aligned(self.allocator, self.entries, Type.sizeof * min_capacity, .alignment = Type[1].alignof)!!;
 	$else
 		self.entries = allocator::realloc(self.allocator, self.entries, Type.sizeof * min_capacity);
 	$endif;
@@ -372,25 +361,16 @@ fn void List.ensure_capacity(&self, usz min_capacity) @local
 	self.post_alloc(); // Add sanitizer annotation
 }
 
-<*
- @require index < self.size : `Access out of bounds`
-*>
 macro Type List.@item_at(&self, usz index) @operator([])
 {
 	return self.entries[index];
 }
 
-<*
- @require index < self.size : `Access out of bounds`
-*>
 fn Type* List.get_ref(&self, usz index) @operator(&[]) @inline
 {
 	return &self.entries[index];
 }
 
-<*
- @require index < self.size : `Access out of bounds`
-*>
 fn void List.set(&self, usz index, Type value) @operator([]=)
 {
 	self.entries[index] = value;
@@ -410,17 +390,14 @@ fn void List.reserve(&self, usz added)
 fn void List._update_size_change(&self,usz old_size, usz new_size)
 {
 	if (old_size == new_size) return;
-	$if env::ADDRESS_SANITIZER:
-		if (self.allocator.ptr != &allocator::LIBC_ALLOCATOR) return;
-		sanitizer::annotate_contiguous_container(self.entries,
+	sanitizer::annotate_contiguous_container(self.entries,
 	                                         &self.entries[self.capacity],
 	                                         &self.entries[old_size],
 	                                         &self.entries[new_size]);
-	$endif
 }
-<*
- @require new_size == 0 || self.capacity != 0
-*>
+/**
+ * @require new_size == 0 || self.capacity != 0
+ **/
 fn usz List.set_size(&self, usz new_size) @inline @private
 {
 	usz old_size = self.size;
@@ -435,9 +412,9 @@ macro void List.pre_free(&self) @private
 	self._update_size_change(self.size, self.capacity);
 }
 
-<*
- @require self.capacity > 0
-*>
+/**
+ * @require self.capacity
+ **/
 macro void List.post_alloc(&self) @private
 {
 	self._update_size_change(self.capacity, self.size);
@@ -446,22 +423,22 @@ macro void List.post_alloc(&self) @private
 // Functions for equatable types
 
 
-fn usz? List.index_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
+fn usz! List.index_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
 {
 	foreach (i, v : self)
 	{
 		if (equals(v, type)) return i;
 	}
-	return NOT_FOUND?;
+	return SearchResult.MISSING?;
 }
 
-fn usz? List.rindex_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
+fn usz! List.rindex_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
 {
 	foreach_r (i, v : self)
 	{
 		if (equals(v, type)) return i;
 	}
-	return NOT_FOUND?;
+	return SearchResult.MISSING?;
 }
 
 fn bool List.equals(&self, List other_list) @if(ELEMENT_IS_EQUATABLE)
@@ -474,13 +451,13 @@ fn bool List.equals(&self, List other_list) @if(ELEMENT_IS_EQUATABLE)
 	return true;
 }
 
-<*
- Check for presence of a value in a list.
-
- @param [&in] self : "the list to find elements in"
- @param value : "The value to search for"
- @return "True if the value is found, false otherwise"
-*>
+/**
+ * Check for presence of a value in a list.
+ *
+ * @param [&in] self "the list to find elements in"
+ * @param value "The value to search for"
+ * @return "True if the value is found, false otherwise"
+ **/
 fn bool List.contains(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 {
 	foreach (i, v : self)
@@ -490,30 +467,30 @@ fn bool List.contains(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 	return false;
 }
 
-<*
- @param [&inout] self : "The list to remove elements from"
- @param value : "The value to remove"
- @return "true if the value was found"
-*>
+/**
+ * @param [&inout] self "The list to remove elements from"
+ * @param value "The value to remove"
+ * @return "true if the value was found"
+ **/
 fn bool List.remove_last_item(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 {
 	return @ok(self.remove_at(self.rindex_of(value)));
 }
 
-<*
- @param [&inout] self : "The list to remove elements from"
- @param value : "The value to remove"
- @return "true if the value was found"
-*>
+/**
+ * @param [&inout] self "The list to remove elements from"
+ * @param value "The value to remove"
+ * @return "true if the value was found"
+ **/
 fn bool List.remove_first_item(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 {
 	return @ok(self.remove_at(self.index_of(value)));
 }
-<*
- @param [&inout] self : "The list to remove elements from"
- @param value : "The value to remove"
- @return "the number of deleted elements."
-*>
+/**
+ * @param [&inout] self "The list to remove elements from"
+ * @param value "The value to remove"
+ * @return "the number of deleted elements."
+ **/
 fn usz List.remove_item(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 {
 	usz old_size = self.size;
@@ -535,10 +512,10 @@ fn void List.remove_all_from(&self, List* other_list) @if(ELEMENT_IS_EQUATABLE)
 	foreach (v : other_list) self.remove_item(v);
 }
 
-<*
- @param [&in] self
- @return "The number non-null values in the list"
-*>
+/**
+ * @param [&in] self
+ * @return "The number non-null values in the list"
+ **/
 fn usz List.compact_count(&self) @if(ELEMENT_IS_POINTER)
 {
 	usz vals = 0;
@@ -555,4 +532,35 @@ fn usz List.compact(&self) @if(ELEMENT_IS_POINTER)
 	return list_common::list_compact(self);
 }
 
-int dummy @local;
+// --> Deprecated
+
+/**
+ * @param [&inout] self "The list to remove elements from"
+ * @param value "The value to remove"
+ * @return "true if the value was found"
+ **/
+fn bool List.remove_last_match(&self, Type value) @if(ELEMENT_IS_EQUATABLE) @deprecated
+{
+	return self.remove_last_item(value) @inline;
+}
+
+/**
+ * @param [&inout] self "The list to remove elements from"
+ * @param value "The value to remove"
+ * @return "true if the value was found"
+ **/
+fn bool List.remove_first_match(&self, Type value) @if(ELEMENT_IS_EQUATABLE) @deprecated
+{
+	return self.remove_first_item(value) @inline;
+}
+
+
+/**
+ * @param [&inout] self "The list to remove elements from"
+ * @param value "The value to remove"
+ * @return "the number of deleted elements."
+ **/
+fn usz List.remove_all_matches(&self, Type value) @if(ELEMENT_IS_EQUATABLE) @deprecated
+{
+	return self.remove_item(value) @inline;
+}

lib/std/collections/list_common.c3

@@ -1,19 +1,19 @@
 module std::collections::list_common;
 
-<*
- IMPORTANT The returned array must be freed using free_aligned.
-*>
-macro list_to_aligned_array($Type, self, Allocator allocator)
+/**
+ * IMPORTANT The returned array must be freed using free_aligned.
+ **/
+macro list_to_new_aligned_array($Type, self, Allocator allocator)
 {
-	if (!self.size) return ($Type[]){};
+	if (!self.size) return $Type[] {};
 	$Type[] result = allocator::alloc_array_aligned(allocator, $Type, self.size);
 	result[..] = self.entries[:self.size];
 	return result;
 }
 
-macro list_to_array($Type, self, Allocator allocator)
+macro list_to_new_array($Type, self, Allocator allocator)
 {
-	if (!self.size) return ($Type[]){};
+	if (!self.size) return $Type[] {};
 	$Type[] result = allocator::alloc_array(allocator, $Type, self.size);
 	result[..] = self.entries[:self.size];
 	return result;

lib/std/collections/map.c3

@@ -0,0 +1,434 @@
+// Copyright (c) 2023 Christoffer Lerno. All rights reserved.
+// Use of this source code is governed by the MIT license
+// a copy of which can be found in the LICENSE_STDLIB file.
+module std::collections::map(<Key, Value>);
+import std::math;
+
+const uint DEFAULT_INITIAL_CAPACITY = 16;
+const uint MAXIMUM_CAPACITY = 1u << 31;
+const float DEFAULT_LOAD_FACTOR = 0.75;
+const VALUE_IS_EQUATABLE = Value.is_eq;
+const bool COPY_KEYS = types::implements_copy(Key);
+
+distinct Map = void*;
+
+struct MapImpl
+{
+	Entry*[] table;
+	Allocator allocator;
+	uint count; // Number of elements
+	uint threshold; // Resize limit
+	float load_factor;
+}
+
+/**
+ * @require capacity > 0 "The capacity must be 1 or higher"
+ * @require load_factor > 0.0 "The load factor must be higher than 0"
+ * @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
+ **/
+fn Map new(uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR, Allocator allocator = allocator::heap())
+{
+	MapImpl* map = allocator::alloc(allocator, MapImpl);
+	_init(map, capacity, load_factor, allocator);
+	return (Map)map;
+}
+
+/**
+ * @require capacity > 0 "The capacity must be 1 or higher"
+ * @require load_factor > 0.0 "The load factor must be higher than 0"
+ * @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
+ **/
+fn Map temp(uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
+{
+	MapImpl* map = mem::temp_alloc(MapImpl);
+	_init(map, capacity, load_factor, allocator::temp());
+	return (Map)map;
+}
+
+/**
+ * @param [&in] other_map "The map to copy from."
+ **/
+fn Map new_from_map(Map other_map, Allocator allocator = null)
+{
+	MapImpl* other_map_impl = (MapImpl*)other_map;
+	if (!other_map_impl)
+	{
+		if (allocator) return new(.allocator = allocator);
+		return null;
+	}
+	MapImpl* map = (MapImpl*)new(other_map_impl.table.len, other_map_impl.load_factor, allocator ?: allocator::heap());
+	if (!other_map_impl.count) return (Map)map;
+	foreach (Entry *e : other_map_impl.table)
+    {
+    	if (!e) continue;
+    	map._put_for_create(e.key, e.value);
+    }
+	return (Map)map;
+}
+
+/**
+ * @param [&in] other_map "The map to copy from."
+ **/
+fn Map temp_from_map(Map other_map)
+{
+	return new_from_map(other_map, allocator::temp());
+}
+
+fn bool Map.is_empty(map) @inline
+{
+	return !map || !((MapImpl*)map).count;
+}
+
+fn usz Map.len(map) @inline
+{
+	return map ? ((MapImpl*)map).count : 0;
+}
+
+fn Value*! Map.get_ref(self, Key key)
+{
+	MapImpl *map = (MapImpl*)self;
+	if (!map || !map.count) return SearchResult.MISSING?;
+	uint hash = rehash(key.hash());
+	for (Entry *e = map.table[index_for(hash, map.table.len)]; e != null; e = e.next)
+	{
+		if (e.hash == hash && equals(key, e.key)) return &e.value;
+	}
+	return SearchResult.MISSING?;
+}
+
+fn Entry*! Map.get_entry(map, Key key)
+{
+	MapImpl *map_impl = (MapImpl*)map;
+	if (!map_impl || !map_impl.count) return SearchResult.MISSING?;
+	uint hash = rehash(key.hash());
+	for (Entry *e = map_impl.table[index_for(hash, map_impl.table.len)]; e != null; e = e.next)
+	{
+		if (e.hash == hash && equals(key, e.key)) return e;
+	}
+	return SearchResult.MISSING?;
+}
+
+/**
+ * Get the value or update and
+ * @require $assignable(#expr, Value)
+ **/
+macro Value Map.@get_or_set(&self, Key key, Value #expr)
+{
+	MapImpl *map = (MapImpl*)*self;
+	if (!map || !map.count)
+	{
+		Value val = #expr;
+		map.set(key, val);
+		return val;
+	}
+	uint hash = rehash(key.hash());
+	uint index = index_for(hash, map.table.len);
+	for (Entry *e = map.table[index]; e != null; e = e.next)
+	{
+		if (e.hash == hash && equals(key, e.key)) return e.value;
+	}
+	Value val = #expr;
+	map.add_entry(hash, key, val, index);
+	return val;
+}
+
+fn Value! Map.get(map, Key key) @operator([])
+{
+	return *map.get_ref(key) @inline;
+}
+
+fn bool Map.has_key(map, Key key)
+{
+	return @ok(map.get_ref(key));
+}
+
+macro Value Map.set_value_return(&map, Key key, Value value) @operator([]=)
+{
+	map.set(key, value);
+	return value;
+}
+
+fn bool Map.set(&self, Key key, Value value)
+{
+	// If the map isn't initialized, use the defaults to initialize it.
+	if (!*self) *self = new();
+	MapImpl* map = (MapImpl*)*self;
+	uint hash = rehash(key.hash());
+	uint index = index_for(hash, map.table.len);
+	for (Entry *e = map.table[index]; e != null; e = e.next)
+	{
+		if (e.hash == hash && equals(key, e.key))
+		{
+			e.value = value;
+			return true;
+		}
+	}
+	map._add_entry(hash, key, value, index);
+	return false;
+}
+
+fn void! Map.remove(map, Key key) @maydiscard
+{
+	if (!map || !((MapImpl*)map)._remove_entry_for_key(key)) return SearchResult.MISSING?;
+}
+
+fn void Map.clear(self)
+{
+	MapImpl* map = (MapImpl*)self;
+	if (!map || !map.count) return;
+	foreach (Entry** &entry_ref : map.table)
+	{
+		Entry* entry = *entry_ref;
+		if (!entry) continue;
+		Entry *next = entry.next;
+		while (next)
+		{
+			Entry *to_delete = next;
+			next = next.next;
+			map._free_entry(to_delete);
+		}
+		map._free_entry(entry);
+		*entry_ref = null;
+	}
+	map.count = 0;
+}
+
+fn void Map.free(self)
+{
+	if (!self) return;
+	MapImpl* map = (MapImpl*)self;
+	self.clear();
+	map._free_internal(map.table.ptr);
+	map.table = {};
+	allocator::free(map.allocator, map);
+}
+
+fn Key[] Map.temp_keys_list(map)
+{
+	return map.new_keys_list(allocator::temp()) @inline;
+}
+
+fn Key[] Map.new_keys_list(self, Allocator allocator = allocator::heap())
+{
+	MapImpl* map = (MapImpl*)self;
+	if (!map || !map.count) return {};
+
+	Key[] list = allocator::alloc_array(allocator, Key, map.count);
+	usz index = 0;
+	foreach (Entry* entry : map.table)
+	{
+		while (entry)
+		{
+			list[index++] = entry.key;
+			entry = entry.next;
+		}
+	}
+	return list;
+}
+
+macro Map.@each(map; @body(key, value))
+{
+	map.@each_entry(; Entry* entry) {
+		@body(entry.key, entry.value);
+	};
+}
+
+macro Map.@each_entry(self; @body(entry))
+{
+	MapImpl *map = (MapImpl*)self;
+	if (!map || !map.count) return;
+	foreach (Entry* entry : map.table)
+	{
+		while (entry)
+		{
+			@body(entry);
+			entry = entry.next;
+		}
+	}
+}
+
+fn Value[] Map.temp_values_list(map)
+{
+	return map.new_values_list(allocator::temp()) @inline;
+}
+
+fn Value[] Map.new_values_list(self, Allocator allocator = allocator::heap())
+{
+	MapImpl* map = (MapImpl*)self;
+	if (!map || !map.count) return {};
+	Value[] list = allocator::alloc_array(allocator, Value, map.count);
+	usz index = 0;
+	foreach (Entry* entry : map.table)
+	{
+		while (entry)
+		{
+			list[index++] = entry.value;
+			entry = entry.next;
+		}
+	}
+	return list;
+}
+
+fn bool Map.has_value(self, Value v) @if(VALUE_IS_EQUATABLE)
+{
+	MapImpl* map = (MapImpl*)self;
+	if (!map || !map.count) return false;
+	foreach (Entry* entry : map.table)
+	{
+		while (entry)
+		{
+			if (equals(v, entry.value)) return true;
+			entry = entry.next;
+		}
+	}
+	return false;
+}
+
+// --- private methods
+
+fn void MapImpl._add_entry(&map, uint hash, Key key, Value value, uint bucket_index) @private
+{
+	$if COPY_KEYS:
+	key = key.copy(map.allocator);
+	$endif
+	Entry* entry = allocator::new(map.allocator, Entry, { .hash = hash, .key = key, .value = value, .next = map.table[bucket_index] });
+	map.table[bucket_index] = entry;
+	if (map.count++ >= map.threshold)
+	{
+		map._resize(map.table.len * 2);
+	}
+}
+
+fn void MapImpl._resize(&map, uint new_capacity) @private
+{
+	Entry*[] old_table = map.table;
+	uint old_capacity = old_table.len;
+	if (old_capacity == MAXIMUM_CAPACITY)
+	{
+		map.threshold = uint.max;
+		return;
+	}
+	Entry*[] new_table = allocator::new_array(map.allocator, Entry*, new_capacity);
+	map._transfer(new_table);
+	map.table = new_table;
+	map._free_internal(old_table.ptr);
+	map.threshold = (uint)(new_capacity * map.load_factor);
+}
+
+fn uint rehash(uint hash) @inline @private
+{
+	hash ^= (hash >> 20) ^ (hash >> 12);
+	return hash ^ ((hash >> 7) ^ (hash >> 4));
+}
+
+macro uint index_for(uint hash, uint capacity) @private
+{
+	return hash & (capacity - 1);
+}
+
+fn void MapImpl._transfer(&map, Entry*[] new_table) @private
+{
+	Entry*[] src = map.table;
+	uint new_capacity = new_table.len;
+	foreach (uint j, Entry *e : src)
+	{
+		if (!e) continue;
+		do
+		{
+			Entry* next = e.next;
+			uint i = index_for(e.hash, new_capacity);
+			e.next = new_table[i];
+			new_table[i] = e;
+			e = next;
+		}
+		while (e);
+	}
+}
+
+fn void _init(MapImpl* impl, uint capacity, float load_factor, Allocator allocator) @private
+{
+	capacity = math::next_power_of_2(capacity);
+	*impl = {
+		.allocator = allocator,
+    	.load_factor = load_factor,
+    	.threshold = (uint)(capacity * load_factor),
+    	.table = allocator::new_array(allocator, Entry*, capacity)
+	};
+}
+
+fn void MapImpl._put_for_create(&map, Key key, Value value) @private
+{
+	uint hash = rehash(key.hash());
+	uint i = index_for(hash, map.table.len);
+	for (Entry *e = map.table[i]; e != null; e = e.next)
+	{
+		if (e.hash == hash && equals(key, e.key))
+		{
+			e.value = value;
+			return;
+		}
+	}
+	map._create_entry(hash, key, value, i);
+}
+
+fn void MapImpl._free_internal(&map, void* ptr) @inline @private
+{
+	allocator::free(map.allocator, ptr);
+}
+
+fn bool MapImpl._remove_entry_for_key(&map, Key key) @private
+{
+	if (!map.count) return false;
+	uint hash = rehash(key.hash());
+	uint i = index_for(hash, map.table.len);
+	Entry* prev = map.table[i];
+	Entry* e = prev;
+	while (e)
+	{
+		Entry *next = e.next;
+		if (e.hash == hash && equals(key, e.key))
+		{
+			map.count--;
+			if (prev == e)
+			{
+				map.table[i] = next;
+			}
+			else
+			{
+				prev.next = next;
+			}
+			map._free_entry(e);
+			return true;
+		}
+		prev = e;
+		e = next;
+	}
+	return false;
+}
+
+fn void MapImpl._create_entry(&map, uint hash, Key key, Value value, int bucket_index) @private
+{
+	Entry *e = map.table[bucket_index];
+	$if COPY_KEYS:
+	key = key.copy(map.allocator);
+	$endif
+	Entry* entry = allocator::new(map.allocator, Entry, { .hash = hash, .key = key, .value = value, .next = map.table[bucket_index] });
+	map.table[bucket_index] = entry;
+	map.count++;
+}
+
+fn void MapImpl._free_entry(&self, Entry *entry) @local
+{
+	$if COPY_KEYS:
+	allocator::free(self.allocator, entry.key);
+	$endif
+	self._free_internal(entry);
+}
+
+struct Entry
+{
+	uint hash;
+	Key key;
+	Value value;
+	Entry* next;
+}

lib/std/collections/maybe.c3

@@ -1,28 +1,11 @@
-module std::collections::maybe{Type};
-import std::io;
+module std::collections::maybe(<Type>);
 
-struct Maybe (Printable)
+struct Maybe
 {
 	Type value;
 	bool has_value;
 }
 
-fn usz? Maybe.to_format(&self, Formatter* f) @dynamic
-{
-	if (self.has_value) return f.printf("[%s]", self.value);
-	return f.printf("[EMPTY]");
-}
-
-fn void Maybe.set(&self, Type val)
-{
-	*self = { .value = val, .has_value = true };
-}
-
-fn void Maybe.reset(&self)
-{
-	*self = {};
-}
-
 fn Maybe value(Type val)
 {
 	return { .value = val, .has_value = true };
@@ -30,16 +13,7 @@ fn Maybe value(Type val)
 
 const Maybe EMPTY = { };
 
-macro Type? Maybe.get(self)
+macro Type! Maybe.get(self)
 {
-	return self.has_value ? self.value : NOT_FOUND?;
-}
-
-fn bool Maybe.equals(self, Maybe other) @operator(==) @if(types::is_equatable_type(Type))
-{
-	if (self.has_value)
-	{
-		return other.has_value && equals(self.value, other.value);
-	}
-	return !other.has_value;
+	return self.has_value ? self.value : SearchResult.MISSING?;
 }

lib/std/collections/object.c3

@@ -25,7 +25,7 @@ struct Object (Printable)
 }
 
 
-fn usz? Object.to_format(&self, Formatter* formatter) @dynamic
+fn usz! Object.to_format(&self, Formatter* formatter) @dynamic
 {
 	switch (self.type)
 	{
@@ -50,7 +50,7 @@ fn usz? Object.to_format(&self, Formatter* formatter) @dynamic
 			usz n = formatter.printf("{")!;
 			@stack_mem(1024; Allocator mem)
 			{
-				foreach (i, key : self.map.keys(mem))
+				foreach (i, key : self.map.key_new_list(mem))
 				{
 					if (i > 0) n += formatter.printf(",")!;
 					n += formatter.printf(`"%s":`, key)!;
@@ -63,11 +63,11 @@ fn usz? Object.to_format(&self, Formatter* formatter) @dynamic
 			switch (self.type.kindof)
 			{
 				case SIGNED_INT:
-					return formatter.printf("%d", (int128)self.i)!;
+					return formatter.printf("%d", self.i)!;
 				case UNSIGNED_INT:
 					return formatter.printf("%d", (uint128)self.i)!;
 				case FLOAT:
-					return formatter.printf("%g", self.f)!;
+					return formatter.printf("%d", self.f)!;
 				case ENUM:
 					return formatter.printf("%d", self.i)!;
 				default:
@@ -128,9 +128,9 @@ fn void Object.free(&self)
 			self.array.free();
 		case ObjectInternalMap:
 			self.map.@each_entry(; ObjectInternalMapEntry* entry) {
+				allocator::free(self.allocator, entry.key);
 				entry.value.free();
 			};
-			self.map.free();
 		default:
 			break;
 	}
@@ -148,49 +148,49 @@ fn bool Object.is_int(&self) @inline => self.type == int128.typeid;
 fn bool Object.is_keyable(&self) => self.is_empty() || self.is_map();
 fn bool Object.is_indexable(&self) => self.is_empty() || self.is_array();
 
-<*
- @require self.is_keyable()
-*>
+/**
+ * @require self.is_keyable()
+ **/
 fn void Object.init_map_if_needed(&self) @private
 {
 	if (self.is_empty())
 	{
 		self.type = ObjectInternalMap.typeid;
-		self.map.init(self.allocator);
+		self.map.new_init(.allocator = self.allocator);
 	}
 }
 
-<*
- @require self.is_indexable()
-*>
+/**
+ * @require self.is_indexable()
+ **/
 fn void Object.init_array_if_needed(&self) @private
 {
 	if (self.is_empty())
 	{
 		self.type = ObjectInternalList.typeid;
-		self.array.init(self.allocator);
+		self.array.new_init(.allocator = self.allocator);
 	}
 }
 
-<*
- @require self.is_keyable()
-*>
+/**
+ * @require self.is_keyable()
+ **/
 fn void Object.set_object(&self, String key, Object* new_object) @private
 {
 	self.init_map_if_needed();
-	Object*? val = self.map.get_entry(key).value;
-	defer (void)val.free();
-	self.map.set(key, new_object);
+	ObjectInternalMapEntry*! entry = self.map.get_entry(key);
+	defer
+	{
+		(void)allocator::free(self.allocator, entry.key);
+		(void)entry.value.free();
+	}
+	self.map.set(key.copy(self.map.allocator), new_object);
 }
 
-<*
- @require self.allocator != null : "This object is not properly initialized, was it really created using 'new'"
- @require !@typeis(value, void*) ||| value == null : "void pointers cannot be stored in an object"
-*>
 macro Object* Object.object_from_value(&self, value) @private
 {
 	var $Type = $typeof(value);
-	$switch:
+	$switch
 		$case types::is_int($Type):
 			return new_int(value, self.allocator);
 		$case types::is_float($Type):
@@ -202,8 +202,9 @@ macro Object* Object.object_from_value(&self, value) @private
 		$case $Type.typeid == Object*.typeid:
 			return value;
 		$case $Type.typeid == void*.typeid:
+			if (value != null) return CastResult.TYPE_MISMATCH?;
 			return &NULL_OBJECT;
-		$case @assignable_to(value, String):
+		$case $assignable(value, String):
 			return new_string(value, self.allocator);
 		$default:
 			$error "Unsupported object type.";
@@ -218,9 +219,9 @@ macro Object* Object.set(&self, String key, value)
 	return val;
 }
 
-<*
- @require self.is_indexable()
-*>
+/**
+ * @require self.is_indexable()
+ **/
 macro Object* Object.set_at(&self, usz index, String key, value)
 {
 	Object* val = self.object_from_value(value);
@@ -228,10 +229,10 @@ macro Object* Object.set_at(&self, usz index, String key, value)
 	return val;
 }
 
-<*
- @require self.is_indexable()
- @ensure return != null
-*>
+/**
+ * @require self.is_indexable()
+ * @ensure return != null
+ **/
 macro Object* Object.push(&self, value)
 {
 	Object* val = self.object_from_value(value);
@@ -239,42 +240,42 @@ macro Object* Object.push(&self, value)
 	return val;
 }
 
-<*
- @require self.is_keyable()
-*>
-fn Object*? Object.get(&self, String key) => self.is_empty() ? NOT_FOUND? : self.map.get(key);
+/**
+ * @require self.is_keyable()
+ **/
+fn Object*! Object.get(&self, String key) => self.is_empty() ? SearchResult.MISSING? : self.map.get(key);
 
 
 fn bool Object.has_key(&self, String key) => self.is_map() && self.map.has_key(key);
 
-<*
- @require self.is_indexable()
-*>
+/**
+ * @require self.is_indexable()
+ **/
 fn Object* Object.get_at(&self, usz index)
 {
 	return self.array.get(index);
 }
 
-<*
- @require self.is_indexable()
-*>
+/**
+ * @require self.is_indexable()
+ **/
 fn usz Object.get_len(&self)
 {
 	return self.array.len();
 }
 
-<*
- @require self.is_indexable()
-*>
+/**
+ * @require self.is_indexable()
+ **/
 fn void Object.push_object(&self, Object* to_append)
 {
 	self.init_array_if_needed();
 	self.array.push(to_append);
 }
 
-<*
- @require self.is_indexable()
-*>
+/**
+ * @require self.is_indexable()
+ **/
 fn void Object.set_object_at(&self, usz index, Object* to_set)
 {
 	self.init_array_if_needed();
@@ -291,9 +292,9 @@ fn void Object.set_object_at(&self, usz index, Object* to_set)
 	self.array.set_at(index, to_set);
 }
 
-<*
- @require $Type.kindof.is_int() : "Expected an integer type."
-*>
+/**
+ * @require $Type.kindof.is_int() "Expected an integer type."
+ **/
 macro get_integer_value(Object* value, $Type)
 {
 	if (value.is_float())
@@ -308,118 +309,118 @@ macro get_integer_value(Object* value, $Type)
 			return ($Type)value.s.to_uint128();
 		$endif
 	}
-	if (!value.is_int()) return string::MALFORMED_INTEGER?;
+	if (!value.is_int()) return NumberConversion.MALFORMED_INTEGER?;
 	return ($Type)value.i;
 }
 
 
-<*
- @require self.is_indexable()
- @require $Type.kindof.is_int() : "Expected an integer type"
-*>
+/**
+ * @require self.is_indexable()
+ * @require $Type.kindof.is_int() : "Expected an integer type"
+ **/
 macro Object.get_integer_at(&self, $Type, usz index) @private
 {
 	return get_integer_value(self.get_at(index), $Type);
 }
 
-<*
- @require self.is_keyable()
- @require $Type.kindof.is_int() : "Expected an integer type"
-*>
+/**
+ * @require self.is_keyable()
+ * @require $Type.kindof.is_int() : "Expected an integer type"
+ **/
 macro Object.get_integer(&self, $Type, String key) @private
 {
 	return get_integer_value(self.get(key), $Type);
 }
 
-fn ichar? Object.get_ichar(&self, String key) => self.get_integer(ichar, key);
-fn short? Object.get_short(&self, String key) => self.get_integer(short, key);
-fn int? Object.get_int(&self, String key) => self.get_integer(int, key);
-fn long? Object.get_long(&self, String key) => self.get_integer(long, key);
-fn int128? Object.get_int128(&self, String key) => self.get_integer(int128, key);
+fn ichar! Object.get_ichar(&self, String key) => self.get_integer(ichar, key);
+fn short! Object.get_short(&self, String key) => self.get_integer(short, key);
+fn int! Object.get_int(&self, String key) => self.get_integer(int, key);
+fn long! Object.get_long(&self, String key) => self.get_integer(long, key);
+fn int128! Object.get_int128(&self, String key) => self.get_integer(int128, key);
 
-fn ichar? Object.get_ichar_at(&self, usz index) => self.get_integer_at(ichar, index);
-fn short? Object.get_short_at(&self, usz index) => self.get_integer_at(short, index);
-fn int? Object.get_int_at(&self, usz index) => self.get_integer_at(int, index);
-fn long? Object.get_long_at(&self, usz index) => self.get_integer_at(long, index);
-fn int128? Object.get_int128_at(&self, usz index) => self.get_integer_at(int128, index);
+fn ichar! Object.get_ichar_at(&self, usz index) => self.get_integer_at(ichar, index);
+fn short! Object.get_short_at(&self, usz index) => self.get_integer_at(short, index);
+fn int! Object.get_int_at(&self, usz index) => self.get_integer_at(int, index);
+fn long! Object.get_long_at(&self, usz index) => self.get_integer_at(long, index);
+fn int128! Object.get_int128_at(&self, usz index) => self.get_integer_at(int128, index);
 
-fn char? Object.get_char(&self, String key) => self.get_integer(ichar, key);
-fn short? Object.get_ushort(&self, String key) => self.get_integer(ushort, key);
-fn uint? Object.get_uint(&self, String key) => self.get_integer(uint, key);
-fn ulong? Object.get_ulong(&self, String key) => self.get_integer(ulong, key);
-fn uint128? Object.get_uint128(&self, String key) => self.get_integer(uint128, key);
+fn char! Object.get_char(&self, String key) => self.get_integer(ichar, key);
+fn short! Object.get_ushort(&self, String key) => self.get_integer(ushort, key);
+fn uint! Object.get_uint(&self, String key) => self.get_integer(uint, key);
+fn ulong! Object.get_ulong(&self, String key) => self.get_integer(ulong, key);
+fn uint128! Object.get_uint128(&self, String key) => self.get_integer(uint128, key);
 
-fn char? Object.get_char_at(&self, usz index) => self.get_integer_at(char, index);
-fn ushort? Object.get_ushort_at(&self, usz index) => self.get_integer_at(ushort, index);
-fn uint? Object.get_uint_at(&self, usz index) => self.get_integer_at(uint, index);
-fn ulong? Object.get_ulong_at(&self, usz index) => self.get_integer_at(ulong, index);
-fn uint128? Object.get_uint128_at(&self, usz index) => self.get_integer_at(uint128, index);
+fn char! Object.get_char_at(&self, usz index) => self.get_integer_at(char, index);
+fn ushort! Object.get_ushort_at(&self, usz index) => self.get_integer_at(ushort, index);
+fn uint! Object.get_uint_at(&self, usz index) => self.get_integer_at(uint, index);
+fn ulong! Object.get_ulong_at(&self, usz index) => self.get_integer_at(ulong, index);
+fn uint128! Object.get_uint128_at(&self, usz index) => self.get_integer_at(uint128, index);
 
-<*
- @require self.is_keyable()
-*>
-fn String? Object.get_string(&self, String key)
+/**
+ * @require self.is_keyable()
+ **/
+fn String! Object.get_string(&self, String key)
 {
 	Object* value = self.get(key)!;
-	if (!value.is_string()) return TYPE_MISMATCH?;
+	if (!value.is_string()) return CastResult.TYPE_MISMATCH?;
 	return value.s;
 }
 
-<*
- @require self.is_indexable()
-*>
-fn String? Object.get_string_at(&self, usz index)
+/**
+ * @require self.is_indexable()
+ **/
+fn String! Object.get_string_at(&self, usz index)
 {
 	Object* value = self.get_at(index);
-	if (!value.is_string()) return TYPE_MISMATCH?;
+	if (!value.is_string()) return CastResult.TYPE_MISMATCH?;
 	return value.s;
 }
 
-<*
- @require self.is_keyable()
-*>
-macro String? Object.get_enum(&self, $EnumType, String key)
+/**
+ * @require self.is_keyable()
+ **/
+macro String! Object.get_enum(&self, $EnumType, String key)
 {
 	Object value = self.get(key)!;
-	if ($EnumType.typeid != value.type) return TYPE_MISMATCH?;
+	if ($EnumType.typeid != value.type) return CastResult.TYPE_MISMATCH?;
 	return ($EnumType)value.i;
 }
 
-<*
- @require self.is_indexable()
-*>
-macro String? Object.get_enum_at(&self, $EnumType, usz index)
+/**
+ * @require self.is_indexable()
+ **/
+macro String! Object.get_enum_at(&self, $EnumType, usz index)
 {
 	Object value = self.get_at(index);
-	if ($EnumType.typeid != value.type) return TYPE_MISMATCH?;
+	if ($EnumType.typeid != value.type) return CastResult.TYPE_MISMATCH?;
 	return ($EnumType)value.i;
 }
 
-<*
- @require self.is_keyable()
-*>
-fn bool? Object.get_bool(&self, String key)
+/**
+ * @require self.is_keyable()
+ **/
+fn bool! Object.get_bool(&self, String key)
 {
 	Object* value = self.get(key)!;
-	if (!value.is_bool()) return TYPE_MISMATCH?;
+	if (!value.is_bool()) return CastResult.TYPE_MISMATCH?;
 	return value.b;
 }
 
 
-<*
- @require self.is_indexable()
-*>
-fn bool? Object.get_bool_at(&self, usz index)
+/**
+ * @require self.is_indexable()
+ **/
+fn bool! Object.get_bool_at(&self, usz index)
 {
 	Object* value = self.get_at(index);
-	if (!value.is_bool()) return TYPE_MISMATCH?;
+	if (!value.is_bool()) return CastResult.TYPE_MISMATCH?;
 	return value.b;
 }
 
-<*
- @require self.is_keyable()
-*>
-fn double? Object.get_float(&self, String key)
+/**
+ * @require self.is_keyable()
+ **/
+fn double! Object.get_float(&self, String key)
 {
 	Object* value = self.get(key)!;
 	switch (value.type.kindof)
@@ -431,14 +432,14 @@ fn double? Object.get_float(&self, String key)
 		case FLOAT:
 			return value.f;
 		default:
-			return TYPE_MISMATCH?;
+			return CastResult.TYPE_MISMATCH?;
 	}
 }
 
-<*
- @require self.is_indexable()
-*>
-fn double? Object.get_float_at(&self, usz index)
+/**
+ * @require self.is_indexable()
+ **/
+fn double! Object.get_float_at(&self, usz index)
 {
 	Object* value = self.get_at(index);
 	switch (value.type.kindof)
@@ -450,7 +451,7 @@ fn double? Object.get_float_at(&self, usz index)
 		case FLOAT:
 			return value.f;
 		default:
-			return TYPE_MISMATCH?;
+			return CastResult.TYPE_MISMATCH?;
 	}
 }
 
@@ -462,7 +463,7 @@ fn Object* Object.get_or_create_obj(&self, String key)
 	return container;
 }
 
-alias ObjectInternalMap      @private = HashMap {String, Object*};
-alias ObjectInternalList     @private = List {Object*};
-alias ObjectInternalMapEntry @private = Entry {String, Object*};
+def ObjectInternalMap = HashMap(<String, Object*>) @private;
+def ObjectInternalList = List(<Object*>) @private;
+def ObjectInternalMapEntry = Entry(<String, Object*>) @private;
 

lib/std/collections/priorityqueue.c3

@@ -1,7 +1,7 @@
 //  priorityqueue.c3
 //  A priority queue using a classic binary heap for C3.
 //
-//  Copyright (c) 2022-2025 David Kopec
+//  Copyright (c) 2022 David Kopec
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -20,33 +20,32 @@
 //  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
-module std::collections::priorityqueue{Type};
+module std::collections::priorityqueue(<Type>);
 import std::collections::priorityqueue::private;
 
-typedef PriorityQueue = inline PrivatePriorityQueue{Type, false};
-typedef PriorityQueueMax = inline PrivatePriorityQueue{Type, true};
+distinct PriorityQueue = inline PrivatePriorityQueue(<Type, false>);
+distinct PriorityQueueMax = inline PrivatePriorityQueue(<Type, true>);
 
-module std::collections::priorityqueue::private{Type, MAX};
+module std::collections::priorityqueue::private(<Type, MAX>);
 import std::collections::list, std::io;
 
+def Heap = List(<Type>);
+
 struct PrivatePriorityQueue (Printable)
 {
-	List{Type} heap;
+	Heap heap;
 }
 
-fn PrivatePriorityQueue* PrivatePriorityQueue.init(&self, Allocator allocator, usz initial_capacity = 16, ) @inline
+fn void PrivatePriorityQueue.new_init(&self, usz initial_capacity = 16, Allocator allocator = allocator::heap()) @inline
 {
-	self.heap.init(allocator, initial_capacity);
-	return self;
+	self.heap.new_init(initial_capacity, allocator);
 }
 
-fn PrivatePriorityQueue* PrivatePriorityQueue.tinit(&self, usz initial_capacity = 16) @inline
+fn void PrivatePriorityQueue.temp_init(&self, usz initial_capacity = 16) @inline
 {
-	self.init(tmem, initial_capacity);
-	return self;
+	self.heap.new_init(initial_capacity, allocator::temp()) @inline;
 }
 
-
 fn void PrivatePriorityQueue.push(&self, Type element)
 {
 	self.heap.push(element);
@@ -67,26 +66,14 @@ fn void PrivatePriorityQueue.push(&self, Type element)
 	}
 }
 
-<*
- @require index < self.len() : "Index out of range"
-*>
-fn void PrivatePriorityQueue.remove_at(&self, usz index)
-{
-	if (index == 0)
-	{
-		self.pop()!!;
-		return;
-	}
-	self.heap.remove_at(index);
-}
-<*
- @require self != null
-*>
-fn Type? PrivatePriorityQueue.pop(&self)
+/**
+* @require self != null
+*/
+fn Type! PrivatePriorityQueue.pop(&self)
 {
 	usz i = 0;
 	usz len = self.heap.len();
-	if (!len) return NO_MORE_ELEMENT?;
+	if (!len) return IteratorResult.NO_MORE_ELEMENT?;
 	usz new_count = len - 1;
 	self.heap.swap(0, new_count);
 	while OUTER: ((2 * i + 1) < new_count)
@@ -120,9 +107,10 @@ fn Type? PrivatePriorityQueue.pop(&self)
 	return self.heap.pop();
 }
 
-fn Type? PrivatePriorityQueue.first(&self)
+fn Type! PrivatePriorityQueue.first(&self)
 {
-	return self.heap.first();
+	if (!self.len()) return IteratorResult.NO_MORE_ELEMENT?;
+	return self.heap.get(0);
 }
 
 fn void PrivatePriorityQueue.free(&self)
@@ -132,24 +120,29 @@ fn void PrivatePriorityQueue.free(&self)
 
 fn usz PrivatePriorityQueue.len(&self) @operator(len)
 {
-	return self.heap.len() @inline;
+	return self.heap.len();
 }
 
 fn bool PrivatePriorityQueue.is_empty(&self)
 {
-	return self.heap.is_empty() @inline;
+	return self.heap.is_empty();
 }
 
-<*
- @require index < self.len()
-*>
+/**
+ * @require index < self.len()
+ */
 fn Type PrivatePriorityQueue.get(&self, usz index) @operator([])
 {
 	return self.heap[index];
 }
 
-fn usz? PrivatePriorityQueue.to_format(&self, Formatter* formatter) @dynamic
+fn usz! PrivatePriorityQueue.to_format(&self, Formatter* formatter) @dynamic
 {
 	return self.heap.to_format(formatter);
 }
 
+fn String PrivatePriorityQueue.to_new_string(&self, Allocator allocator = allocator::heap()) @dynamic
+{
+	return self.heap.to_new_string(allocator);
+}
+

lib/std/collections/range.c3

@@ -1,7 +1,7 @@
-<*
- @require Type.is_ordered : "The type must be ordered"
-*>
-module std::collections::range{Type};
+/**
+ * @require Type.is_ordered : "The type must be ordered"
+ **/
+module std::collections::range(<Type>);
 import std::io;
 
 struct Range (Printable)
@@ -21,15 +21,25 @@ fn bool Range.contains(&self, Type value) @inline
 	return value >= self.start && value <= self.end;
 }
 
-<*
- @require index < self.len() : "Can't index into an empty range"
-*>
+/**
+ * @require index < self.len() : "Can't index into an empty range"
+ **/
 fn Type Range.get(&self, usz index) @operator([])
 {
 	return (Type)(self.start + (usz)index);
 }
 
-fn usz? Range.to_format(&self, Formatter* formatter) @dynamic
+fn String Range.to_new_string(&self, Allocator allocator = allocator::heap()) @dynamic
+{
+	return string::new_format("[%s..%s]", self.start, self.end, .allocator = allocator);
+}
+
+fn String Range.to_tstring(&self)
+{
+	return self.to_new_string(allocator::temp());
+}
+
+fn usz! Range.to_format(&self, Formatter* formatter) @dynamic
 {
 	return formatter.printf("[%s..%s]", self.start, self.end)!;
 }
@@ -51,14 +61,24 @@ fn bool ExclusiveRange.contains(&self, Type value) @inline
 	return value >= self.start && value < self.end;
 }
 
-fn usz? ExclusiveRange.to_format(&self, Formatter* formatter) @dynamic
+fn usz! ExclusiveRange.to_format(&self, Formatter* formatter) @dynamic
 {
 	return formatter.printf("[%s..<%s]", self.start, self.end)!;
 }
 
-<*
- @require index < self.len() : "Can't index into an empty range"
-*>
+fn String ExclusiveRange.to_new_string(&self, Allocator allocator = allocator::heap()) @dynamic
+{
+	return string::new_format("[%s..<%s]", self.start, self.end, .allocator = allocator);
+}
+
+fn String ExclusiveRange.to_tstring(&self)
+{
+	return self.to_new_string(allocator::temp());
+}
+
+/**
+ * @require index < self.len() : "Can't index into an empty range"
+ **/
 fn Type ExclusiveRange.get(&self, usz index) @operator([])
 {
 	return (Type)(self.start + index);

lib/std/collections/ringbuffer.c3

@@ -1,14 +1,8 @@
-<*
- @require Type.kindof == ARRAY : "Required an array type"
-*>
-module std::collections::ringbuffer{Type};
-import std::io;
+module std::collections::ringbuffer(<Type, SIZE>);
 
-alias Element = $typeof((Type){}[0]);
-
-struct RingBuffer (Printable)
+struct RingBuffer
 {
-	Type buf;
+	Type[SIZE] buf;
 	usz written;
 	usz head;
 }
@@ -18,9 +12,9 @@ fn void RingBuffer.init(&self) @inline
 	*self = {};
 }
 
-fn void RingBuffer.push(&self, Element c)
+fn void RingBuffer.push(&self, Type c)
 {
-	if (self.written < self.buf.len)
+	if (self.written < SIZE)
 	{
 		self.buf[self.written] = c;
 		self.written++;
@@ -28,14 +22,14 @@ fn void RingBuffer.push(&self, Element c)
 	else
 	{
 		self.buf[self.head] = c;
-		self.head = (self.head + 1) % self.buf.len;
+		self.head = (self.head + 1) % SIZE;
 	}
 }
 
-fn Element RingBuffer.get(&self, usz index) @operator([])
+fn Type RingBuffer.get(&self, usz index) @operator([])
 {
-	index %= self.buf.len;
-	usz avail = self.buf.len - self.head;
+	index %= SIZE;
+	usz avail = SIZE - self.head;
 	if (index < avail)
 	{
 		return self.buf[self.head + index];
@@ -43,31 +37,25 @@ fn Element RingBuffer.get(&self, usz index) @operator([])
 	return self.buf[index - avail];
 }
 
-fn Element? RingBuffer.pop(&self)
+fn Type! RingBuffer.pop(&self)
 {
 	switch
 	{
 		case self.written == 0:
-			return NO_MORE_ELEMENT?;
-		case self.written < self.buf.len:
+			return SearchResult.MISSING?;
+		case self.written < SIZE:
 			self.written--;
 			return self.buf[self.written];
 		default:
-			self.head = (self.head - 1) % self.buf.len;
+			self.head = (self.head - 1) % SIZE;
 			return self.buf[self.head];
 	}
 }
 
-fn usz? RingBuffer.to_format(&self, Formatter* format) @dynamic
+fn usz RingBuffer.read(&self, usz index, Type[] buffer)
 {
-	// Improve this?
-	return format.printf("%s", self.buf);
-}
-
-fn usz RingBuffer.read(&self, usz index, Element[] buffer)
-{
-	index %= self.buf.len;
-	if (self.written < self.buf.len)
+	index %= SIZE;
+	if (self.written < SIZE)
 	{
 		if (index >= self.written) return 0;
 		usz end = self.written - index;
@@ -75,7 +63,7 @@ fn usz RingBuffer.read(&self, usz index, Element[] buffer)
 		buffer[:n] = self.buf[index:n];
 		return n;
 	}
-	usz end = self.buf.len - self.head;
+	usz end = SIZE - self.head;
 	if (index >= end)
 	{
 		index -= end;
@@ -84,13 +72,13 @@ fn usz RingBuffer.read(&self, usz index, Element[] buffer)
 		buffer[:n] = self.buf[index:n];
 		return n;
 	}
-	if (buffer.len <= self.buf.len - index)
+	if (buffer.len <= SIZE - index)
 	{
 		usz n = buffer.len;
 		buffer[:n] = self.buf[self.head + index:n];
 		return n;
 	}
-	usz n1 = self.buf.len - index;
+	usz n1 = SIZE - index;
 	buffer[:n1] = self.buf[self.head + index:n1];
 	buffer = buffer[n1..];
 	index -= n1;
@@ -99,10 +87,10 @@ fn usz RingBuffer.read(&self, usz index, Element[] buffer)
 	return n1 + n2;
 }
 
-fn void RingBuffer.write(&self, Element[] buffer)
+fn void RingBuffer.write(&self, Type[] buffer)
 {
 	usz i;
-	while (self.written < self.buf.len && i < buffer.len)
+	while (self.written < SIZE && i < buffer.len)
 	{
 		self.buf[self.written] = buffer[i++];
 		self.written++;
@@ -110,6 +98,6 @@ fn void RingBuffer.write(&self, Element[] buffer)
 	foreach (c : buffer[i..])
 	{
 		self.buf[self.head] = c;
-		self.head = (self.head + 1) % self.buf.len;
+		self.head = (self.head + 1) % SIZE;
 	}
 }

lib/std/collections/tuple.c3

@@ -1,51 +1,16 @@
-module std::collections::pair{Type1, Type2};
+module std::collections::tuple(<Type1, Type2>);
 
-struct Pair
+struct Tuple
 {
 	Type1 first;
 	Type2 second;
 }
 
-<*
- @param [&out] a
- @param [&out] b
- @require @assignable_to(self.first, $typeof(*a)) : "You cannot assign the first value to a"
- @require @assignable_to(self.second, $typeof(*b)) : "You cannot assign the second value to b"
-*>
-macro void Pair.unpack(&self, a, b)
-{
-	*a = self.first;
-	*b = self.second;
-}
-
-module std::collections::triple{Type1, Type2, Type3};
+module std::collections::triple(<Type1, Type2, Type3>);
 
 struct Triple
 {
 	Type1 first;
 	Type2 second;
 	Type3 third;
-}
-
-<*
- @param [&out] a
- @param [&out] b
- @param [&out] c
- @require @assignable_to(self.first, $typeof(*a)) : "You cannot assign the first value to a"
- @require @assignable_to(self.second, $typeof(*b)) : "You cannot assign the second value to b"
- @require @assignable_to(self.third, $typeof(*c)) : "You cannot assign the second value to c"
-*>
-macro void Triple.unpack(&self, a, b, c)
-{
-	*a = self.first;
-	*b = self.second;
-	*c = self.third;
-}
-
-module std::collections::tuple{Type1, Type2};
-
-struct Tuple @deprecated("Use 'Pair' instead")
-{
-	Type1 first;
-	Type2 second;
-}
+}

lib/std/compression/qoi.c3

@@ -1,473 +0,0 @@
-module std::compression::qoi;
-
-const uint PIXELS_MAX = 400000000;
-
-<*
- Colorspace.
- Purely informative. It will be saved to the file header,
- but does not affect how chunks are en-/decoded.
-*>
-enum QOIColorspace : char (char id)
-{
-	SRGB = 0, 	// sRGB with linear alpha
-	LINEAR = 1 	// all channels linear
-}
-
-<*
- Channels.
- The channels used in an image.
- AUTO can be used when decoding to automatically determine
- the channels from the file's header.
-*>
-enum QOIChannels : char (char id)
-{
-	AUTO = 0,
-	RGB = 3,
-	RGBA = 4
-}
-
-<*
- Descriptor.
- Contains information about an image.
-*>
-struct QOIDesc
-{
-	uint width;
-	uint height;
-	QOIChannels channels;
-	QOIColorspace colorspace;
-}
-<*
- QOI Errors.
- These are all the possible bad outcomes.
-*>
-faultdef INVALID_PARAMETERS, FILE_OPEN_FAILED, FILE_WRITE_FAILED, INVALID_DATA, TOO_MANY_PIXELS;
-
-
-// Let the user decide if they want to use std::io
-module std::compression::qoi @if(!$feature(QOI_NO_STDIO));
-import std::io;
-
-<*
- Encode raw RGB or RGBA pixels into a QOI image and write it to the
- file system.
-
- The desc struct must be filled with the image width, height, the
- used channels (QOIChannels.RGB or RGBA) and the colorspace
- (QOIColorspace.SRGB or LINEAR).
-
- The function returns an optional, which can either be a QOIError
- or the number of bytes written on success.
-
- @param [in] filename : `The file's name to write the image to`
- @param [in] input : `The raw RGB or RGBA pixels to encode`
- @param [&in] desc : `The descriptor of the image`
-*>
-fn usz? write(String filename, char[] input, QOIDesc* desc) => @pool()
-{
-	// encode data
-	char[] output = encode(tmem, input, desc)!;
-
-	file::save(filename, output)!;
-	return output.len;
-}
-
-
-<*
- Read and decode a QOI image from the file system.
-
- If channels is set to QOIChannels.AUTO, the function will
- automatically determine the channels from the file's header.
- However, if channels is RGB or RGBA, the output format will be
- forced into this number of channels.
-
- The desc struct will be filled with the width, height,
- channels and colorspace of the image.
-
- The function returns an optional, which can either be a QOIError
- or a char[] pointing to the decoded pixels on success.
-
- The returned pixel data should be free()d after use, or the decoding
- and use of the data should be wrapped in a @pool() { ... }; block.
-
- @param [in] filename : `The file's name to read the image from`
- @param [&out] desc : `The descriptor to fill with the image's info`
- @param channels : `The channels to be used`
- @return? FILE_OPEN_FAILED, INVALID_DATA, TOO_MANY_PIXELS
-*>
-fn char[]? read(Allocator allocator, String filename, QOIDesc* desc, QOIChannels channels = AUTO) => @pool()
-{
-	// read file
-	char[] data = file::load_temp(filename) ?? FILE_OPEN_FAILED?!;
-	// pass data to decode function
-	return decode(allocator, data, desc, channels);
-}
-
-
-
-// Back to basic non-stdio mode
-module std::compression::qoi;
-import std::bits;
-
-<*
- Encode raw RGB or RGBA pixels into a QOI image in memory.
-
- The function returns an optional, which can either be a QOIError
- or a char[] pointing to the encoded data on success.
-
- The returned qoi data should be free()d after use, or the encoding
- and use of the data should be wrapped in a @pool() { ... }; block.
- See the write() function for an example.
-
- @param [in] input : `The raw RGB or RGBA pixels to encode`
- @param [&in] desc : `The descriptor of the image`
- @return? INVALID_PARAMETERS, TOO_MANY_PIXELS, INVALID_DATA
-*>
-fn char[]? encode(Allocator allocator, char[] input, QOIDesc* desc) @nodiscard
-{
-	// check info in desc
-	if (desc.width == 0 || desc.height == 0) return INVALID_PARAMETERS?;
-	if (desc.channels == AUTO) return INVALID_PARAMETERS?;
-	uint pixels = desc.width * desc.height;
-	if (pixels > PIXELS_MAX) return TOO_MANY_PIXELS?;
-	
-	// check input data size
-	uint image_size = pixels * desc.channels.id;
-	if (image_size != input.len) return INVALID_DATA?;
-
-	// allocate memory for encoded data (output)
-	// header + chunk tag and RGB(A) data for each pixel + end of stream
-	uint max_size = Header.sizeof + pixels + image_size + END_OF_STREAM.len;
-	char[] output = allocator::alloc_array(allocator, char, max_size); // no need to init
-	defer catch allocator::free(allocator, output);
-
-	// write header
-	*(Header*)output.ptr = {
-		.be_magic = bswap('qoif'),
-		.be_width = bswap(desc.width),
-		.be_height = bswap(desc.height),
-		.channels = desc.channels.id,
-		.colorspace = desc.colorspace.id
-	};
-
-	uint pos = Header.sizeof; 	// Current position in output
-	uint loc;					// Current position in image (top-left corner)
-	uint loc_end = image_size - desc.channels.id; // End of image data
-	char run_length = 0; 		// Length of the current run
-	
-	Pixel[64] palette; // Zero-initialized by default
-	Pixel prev = { 0, 0, 0, 255 };
-	Pixel p = { 0, 0, 0, 255 };
-
-	ichar[<3>] diff; // pre-allocate for diff
-	ichar[<3>] luma; // ...and luma
-
-	// write chunks
-	for (loc = 0; loc < image_size; loc += desc.channels.id)
-	{
-		// set previous pixel
-		prev = p;
-
-		// get current pixel
-		p[:3] = input[loc:3]; // cutesy slices :3
-		if (desc.channels == RGBA) p.a = input[loc + 3];
-
-		// check if we can run the previous pixel
-		if (prev == p)
-		{
-			run_length++;
-			if (run_length == 62 || loc == loc_end)
-			{
-				*@extract(OpRun, output, &pos) = { OP_RUN, run_length - 1 };
-				run_length = 0;
-			}
-			continue;
-		}
-		// end last run if there was one
-		if (run_length > 0)
-		{
-			*@extract(OpRun, output, &pos) = { OP_RUN, run_length - 1 };
-			run_length = 0;
-		}
-
-		switch
-		{
-			// check if we can index the palette
-			case (palette[p.hash()] == p):
-				*@extract(OpIndex, output, &pos) = {
-					OP_INDEX,
-					p.hash()
-				};
-
-			// check if we can use diff or luma
-			case (prev != p && prev.a == p.a):
-				// diff the pixels
-				diff = p.rgb - prev.rgb;
-				if (diff.r > -3 && diff.r < 2
-					&& diff.g > -3 && diff.g < 2
-					&& diff.b > -3 && diff.b < 2)
-				{
-					*@extract(OpDiff, output, &pos) = {
-						OP_DIFF,
-						(char)diff.r + 2,
-						(char)diff.g + 2,
-						(char)diff.b + 2
-					};
-					palette[p.hash()] = p;
-					break;
-				}
-				// check luma eligibility
-				luma = { diff.r - diff.g, diff.g, diff.b - diff.g };
-				if (luma.r >= -8 && luma.r <= 7
-					&& luma.g >= -32 && luma.g <= 31
-					&& luma.b >= -8 && luma.b <= 7)
-				{
-					*@extract(OpLuma, output, &pos) = {
-						OP_LUMA,
-						(char)luma.g + 32,
-						(char)luma.r + 8,
-						(char)luma.b + 8
-					};
-					palette[p.hash()] = p;
-					break;
-				}
-				nextcase;
-
-			// worst case scenario: just encode the raw pixel
-			default:
-				if (prev.a != p.a)
-				{
-					*@extract(OpRGBA, output, &pos) = { OP_RGBA, p.r, p.g, p.b, p.a };
-				}
-				else
-				{
-					*@extract(OpRGB, output, &pos) = { OP_RGB, p.r, p.g, p.b };
-				}
-				palette[p.hash()] = p;
-		}
-	}
-
-	// write end of stream
-	output[pos:END_OF_STREAM.len] = END_OF_STREAM[..];
-	pos += END_OF_STREAM.len;
-	
-	return output[:pos];
-}
-
-
-
-<*
- Decode a QOI image from memory.
-
- If channels is set to QOIChannels.AUTO, the function will
- automatically determine the channels from the file's header.
- However, if channels is RGB or RGBA, the output format will be
- forced into this number of channels.
-
- The desc struct will be filled with the width, height,
- channels and colorspace of the image.
-
- The function returns an optional, which can either be a QOIError
- or a char[] pointing to the decoded pixels on success.
-
- The returned pixel data should be free()d after use, or the decoding
- and use of the data should be wrapped in a @pool() { ... }; block.
-
- @param [in] data : `The QOI image data to decode`
- @param [&out] desc : `The descriptor to fill with the image's info`
- @param channels : `The channels to be used`
- @return? INVALID_DATA, TOO_MANY_PIXELS
-*>
-fn char[]? decode(Allocator allocator, char[] data, QOIDesc* desc, QOIChannels channels = AUTO) @nodiscard
-{
-	// check input data
-	if (data.len < Header.sizeof + END_OF_STREAM.len) return INVALID_DATA?;
-
-	// get header
-	Header* header = (Header*)data.ptr;
-
-	// check magic bytes (FourCC)
-	if (bswap(header.be_magic) != 'qoif') return INVALID_DATA?;
-
-	// copy header data to desc
-	desc.width = bswap(header.be_width);
-	desc.height = bswap(header.be_height);
-	desc.channels = @enumcast(QOIChannels, header.channels)!; 			// Rethrow if invalid
-	desc.colorspace = @enumcast(QOIColorspace, header.colorspace)!;	// Rethrow if invalid
-	if (desc.channels == AUTO) return INVALID_DATA?; // Channels must be specified in the header
-
-	// check width and height
-	if (desc.width == 0 || desc.height == 0) return INVALID_DATA?;
-
-	// check pixel count
-	ulong pixels = (ulong)desc.width * (ulong)desc.height;
-	if (pixels > PIXELS_MAX) return TOO_MANY_PIXELS?;
-
-	uint pos = Header.sizeof; 	// Current position in data
-	uint loc;					// Current position in image (top-left corner)
-	char run_length = 0; 		// Length of the current run
-	char tag;					// Current chunk tag
-
-	Pixel[64] palette; // Zero-initialized by default
-	Pixel p = { 0, 0, 0, 255 };
-
-	if (channels == AUTO) channels = desc.channels;
-	
-	// allocate memory for image data
-	usz image_size = (usz)pixels * channels.id;
-	char[] image = allocator::alloc_array(allocator, char, image_size);
-	defer catch allocator::free(allocator, image);
-
-	for (loc = 0; loc < image_size; loc += channels.id)
-	{
-		// get chunk tag
-		tag = data[pos];
-
-		// check for chunk type
-		switch
-		{
-			case run_length > 0:
-				run_length--;
-
-			case tag == OP_RGB:
-				OpRGB* op = @extract(OpRGB, data, &pos);
-				p = { op.red, op.green, op.blue, p.a };
-				palette[p.hash()] = p;
-
-			case tag == OP_RGBA:
-				OpRGBA* op = @extract(OpRGBA, data, &pos);
-				p = { op.red, op.green, op.blue, op.alpha };
-				palette[p.hash()] = p;
-				
-			case tag >> 6 == OP_INDEX:
-				OpIndex* op = @extract(OpIndex, data, &pos);
-				p = palette[op.index];
-
-			case tag >> 6 == OP_DIFF:
-				OpDiff* op = @extract(OpDiff, data, &pos);
-				p.r += op.diff_red - 2;
-				p.g += op.diff_green - 2;
-				p.b += op.diff_blue - 2;
-				palette[p.hash()] = p;
-
-			case tag >> 6 == OP_LUMA:
-				OpLuma* op = @extract(OpLuma, data, &pos);
-				int diff_green = op.diff_green - 32;
-				p.r += (char)(op.diff_red_minus_green - 8 + diff_green);
-				p.g += (char)(diff_green);
-				p.b += (char)(op.diff_blue_minus_green - 8 + diff_green);
-				palette[p.hash()] = p;
-
-			case tag >> 6 == OP_RUN:
-				OpRun* op = @extract(OpRun, data, &pos);
-				run_length = op.run;
-		}
-
-		// draw the pixel
-		if (channels == RGBA) { image[loc:4] = p.rgba[..]; } else { image[loc:3] = p.rgb[..]; }
-	}
-	
-	return image;
-}
-
-
-
-// ***************************************************************************
-// ***                                                                     ***
-// ***    Main functions are at the top to make the file more readable.    ***
-// ***        From here on, helper functions and types are defined.        ***
-// ***                                                                     ***
-// ***************************************************************************
-module std::compression::qoi @private;
-
-// 8-bit opcodes
-const OP_RGB = 0b11111110;
-const OP_RGBA = 0b11111111;
-// 2-bit opcodes
-const OP_INDEX = 0b00;
-const OP_DIFF = 0b01;
-const OP_LUMA = 0b10;
-const OP_RUN = 0b11;
-
-struct Header @packed
-{
-	uint be_magic;	// magic bytes "qoif"
-	uint be_width;	// image width in pixels (BE)
-	uint be_height;	// image height in pixels (BE)
-
-	// informative fields
-	char channels;	// 3 = RGB, 4 = RGB
-	char colorspace;	// 0 = sRGB with linear alpha, 1 = all channels linear
-}
-
-const char[*] END_OF_STREAM = {0, 0, 0, 0, 0, 0, 0, 1};
-
-// inefficient, but it's only run once at a time
-
-<*
- @return? INVALID_DATA
-*>
-macro @enumcast($Type, raw)
-{
-	foreach (value : $Type.values)
-	{
-		if (value.id == raw) return value;
-	}
-	return INVALID_DATA?;
-}
-
-typedef Pixel = inline char[<4>];
-macro char Pixel.hash(Pixel p)
-{
-	return (p.r * 3 + p.g * 5 + p.b * 7 + p.a * 11) % 64;
-}
-
-struct OpRGB // No need to use @packed here, the alignment is 1 anyways.
-{
-	char tag;
-	char red;
-	char green;
-	char blue;
-}
-struct OpRGBA @packed
-{
-	char tag;
-	char red;
-	char green;
-	char blue;
-	char alpha;
-}
-bitstruct OpIndex : char
-{
-	char tag : 6..7;
-	char index : 0..5;
-}
-bitstruct OpDiff : char
-{
-	char tag : 6..7;
-	char diff_red : 4..5;
-	char diff_green : 2..3;
-	char diff_blue : 0..1;
-}
-bitstruct OpLuma : ushort @align(1)
-{
-	char tag : 6..7;
-	char diff_green : 0..5;
-	char diff_red_minus_green : 12..15;
-	char diff_blue_minus_green : 8..11;
-}
-bitstruct OpRun : char
-{
-	char tag : 6..7;
-	char run : 0..5;
-}
-
-// Macro used to locate chunks in data buffers.
-// Can be used both for reading and writing.
-macro @extract($Type, char[] data, uint* pos)
-{
-	// slice data, then double cast
-	$Type* chunk = ($Type*)data[*pos : $Type.sizeof].ptr;
-	*pos += $Type.sizeof;
-	return chunk;
-}

lib/std/core/allocators/arena_allocator.c3

@@ -1,71 +1,38 @@
-// Copyright (c) 2023-2025 Christoffer Lerno. All rights reserved.
+// Copyright (c) 2023 Christoffer Lerno. All rights reserved.
 // Use of this source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::core::mem::allocator;
 import std::math;
 
-// The arena allocator allocates up to its maximum data
-// and then fails to allocate more, returning out of memory.
-// It supports mark and reset to mark.
-
 struct ArenaAllocator (Allocator)
 {
 	char[] data;
 	usz used;
 }
 
-<*
- Initialize a memory arena for use using the provided bytes.
-
- @param [inout] data : "The memory to use for the arena."
-*>
-fn ArenaAllocator* ArenaAllocator.init(&self, char[] data)
+/**
+ * Initialize a memory arena for use using the provided bytes.
+ **/
+fn void ArenaAllocator.init(&self, char[] data)
 {
 	self.data = data;
 	self.used = 0;
-	return self;
 }
 
-<*
- Reset the usage completely.
-*>
 fn void ArenaAllocator.clear(&self)
 {
 	self.used = 0;
 }
 
-<*
- Given some memory, create an arena allocator on the stack for it.
-
- @param [inout] bytes : `The bytes to use, may be empty.`
-
- @return `An arena allocator using the bytes`
-*>
-macro ArenaAllocator* wrap(char[] bytes)
+struct ArenaAllocatorHeader @local
 {
-	return (ArenaAllocator){}.init(bytes);
+	usz size;
+	char[*] data;
 }
 
-<*
- "Mark" the current state of the arena allocator by returning the use count.
-
- @return `The value to pass to 'reset' in order to reset to the current use.`
-*>
-fn usz ArenaAllocator.mark(&self) => self.used;
-
-<*
- Reset to a previous mark.
-
- @param mark : `The previous mark.`
- @require mark <= self.used : "Invalid mark - out of range"
-*>
-fn void ArenaAllocator.reset(&self, usz mark) => self.used = mark;
-
-<*
- Implements the Allocator interface method.
-
- @require ptr != null
-*>
+/*
+ * @require ptr != null
+ **/
 fn void ArenaAllocator.release(&self, void* ptr, bool) @dynamic
 {
 	assert((uptr)ptr >= (uptr)self.data.ptr, "Pointer originates from a different allocator.");
@@ -77,25 +44,24 @@ fn void ArenaAllocator.release(&self, void* ptr, bool) @dynamic
 	}
 }
 
+fn usz ArenaAllocator.mark(&self) @dynamic => self.used;
+fn void ArenaAllocator.reset(&self, usz mark) @dynamic => self.used = mark;
 
-<*
- Implements the Allocator interface method.
-
- @require !alignment || math::is_power_of_2(alignment)
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
- @require size > 0
- @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
-*>
-fn void*? ArenaAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
+/**
+ * @require !alignment || math::is_power_of_2(alignment)
+ * @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
+ * @require size > 0
+ **/
+fn void*! ArenaAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	alignment = alignment_for_allocation(alignment);
 	usz total_len = self.data.len;
-	if (size > total_len) return mem::INVALID_ALLOC_SIZE?;
+	if (size > total_len) return AllocationFailure.CHUNK_TOO_LARGE?;
 	void* start_mem = self.data.ptr;
 	void* unaligned_pointer_to_offset = start_mem + self.used + ArenaAllocatorHeader.sizeof;
 	void* mem = mem::aligned_pointer(unaligned_pointer_to_offset, alignment);
 	usz end = (usz)(mem - self.data.ptr) + size;
-	if (end > total_len) return mem::OUT_OF_MEMORY?;
+	if (end > total_len) return AllocationFailure.OUT_OF_MEMORY?;
 	self.used = end;
 	ArenaAllocatorHeader* header = mem - ArenaAllocatorHeader.sizeof;
 	header.size = size;
@@ -103,21 +69,18 @@ fn void*? ArenaAllocator.acquire(&self, usz size, AllocInitType init_type, usz a
 	return mem;
 }
 
-<*
- Implements the Allocator interface method.
-
- @require !alignment || math::is_power_of_2(alignment)
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
- @require old_pointer != null
- @require size > 0
- @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
-*>
-fn void*? ArenaAllocator.resize(&self, void *old_pointer, usz size, usz alignment) @dynamic
+/**
+ * @require !alignment || math::is_power_of_2(alignment)
+ * @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
+ * @require old_pointer != null
+ * @require size > 0
+ **/
+fn void*! ArenaAllocator.resize(&self, void *old_pointer, usz size, usz alignment) @dynamic
 {
 	alignment = alignment_for_allocation(alignment);
 	assert(old_pointer >= self.data.ptr, "Pointer originates from a different allocator.");
 	usz total_len = self.data.len;
-	if (size > total_len) return mem::INVALID_ALLOC_SIZE?;
+	if (size > total_len) return AllocationFailure.CHUNK_TOO_LARGE?;
 	ArenaAllocatorHeader* header = old_pointer - ArenaAllocatorHeader.sizeof;
 	usz old_size = header.size;
 	// Do last allocation and alignment match?
@@ -130,7 +93,7 @@ fn void*? ArenaAllocator.resize(&self, void *old_pointer, usz size, usz alignmen
 		else
 		{
 			usz new_used = self.used + size - old_size;
-			if (new_used > total_len) return mem::OUT_OF_MEMORY?;
+			if (new_used > total_len) return AllocationFailure.OUT_OF_MEMORY?;
 			self.used = new_used;
 		}
 		header.size = size;
@@ -138,14 +101,6 @@ fn void*? ArenaAllocator.resize(&self, void *old_pointer, usz size, usz alignmen
 	}
 	// Otherwise just allocate new memory.
 	void* mem = self.acquire(size, NO_ZERO, alignment)!;
-	mem::copy(mem, old_pointer, math::min(size, old_size), mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
+	mem::copy(mem, old_pointer, old_size, mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
 	return mem;
-}
-
-// Internal data
-
-struct ArenaAllocatorHeader @local
-{
-	usz size;
-	char[*] data;
-}
+}

lib/std/core/allocators/backed_arena_allocator.c3

@@ -1,219 +0,0 @@
-module std::core::mem::allocator;
-import std::io, std::math;
-
-<*
- The backed arena allocator provides an allocator that will allocate from a pre-allocated chunk of memory
- provided by it's backing allocator. The allocator supports mark / reset operations, so it can be used
- as a stack (push-pop) allocator. If the initial memory is used up, it will fall back to regular allocations,
- that will be safely freed on `reset`.
-
- While this allocator is similar to the dynamic arena, it supports multiple "save points", which the dynamic arena
- doesn't.
-*>
-struct BackedArenaAllocator (Allocator)
-{
-	Allocator backing_allocator;
-	ExtraPage* last_page;
-	usz used;
-	usz capacity;
-	char[*] data;
-}
-
-struct AllocChunk @local
-{
-	usz size;
-	char[*] data;
-}
-
-const usz PAGE_IS_ALIGNED @local = (usz)isz.max + 1u;
-
-struct ExtraPage @local
-{
-	ExtraPage* prev_page;
-	void* start;
-	usz mark;
-	usz size;
-	usz ident;
-	char[*] data;
-}
-
-macro usz ExtraPage.pagesize(&self) => self.size & ~PAGE_IS_ALIGNED;
-macro bool ExtraPage.is_aligned(&self) => self.size & PAGE_IS_ALIGNED == PAGE_IS_ALIGNED;
-
-<*
- @require size >= 16
-*>
-fn BackedArenaAllocator*? new_backed_allocator(usz size, Allocator allocator)
-{
-	BackedArenaAllocator* temp = allocator::alloc_with_padding(allocator, BackedArenaAllocator, size)!;
-	temp.last_page = null;
-	temp.backing_allocator = allocator;
-	temp.used = 0;
-	temp.capacity = size;
-	return temp;
-}
-
-fn void BackedArenaAllocator.destroy(&self)
-{
-	self.reset(0);
-	if (self.last_page) (void)self._free_page(self.last_page);
-	allocator::free(self.backing_allocator, self);
-}
-
-fn usz BackedArenaAllocator.mark(&self) => self.used;
-
-fn void BackedArenaAllocator.release(&self, void* old_pointer, bool) @dynamic
-{
-	usz old_size = *(usz*)(old_pointer - DEFAULT_SIZE_PREFIX);
-	if (old_pointer + old_size == &self.data[self.used])
-	{
-		self.used -= old_size;
-		asan::poison_memory_region(&self.data[self.used], old_size);
-	}
-}
-fn void BackedArenaAllocator.reset(&self, usz mark)
-{
-	ExtraPage *last_page = self.last_page;
-	while (last_page && last_page.mark > mark)
-	{
-		self.used = last_page.mark;
-		ExtraPage *to_free = last_page;
-		last_page = last_page.prev_page;
-		self._free_page(to_free)!!;
-	}
-	self.last_page = last_page;
-	$if env::COMPILER_SAFE_MODE || env::ADDRESS_SANITIZER:
-		if (!last_page)
-		{
-			usz cleaned = self.used - mark;
-			if (cleaned > 0)
-			{
-				$if env::COMPILER_SAFE_MODE && !env::ADDRESS_SANITIZER:
-					self.data[mark : cleaned] = 0xAA;
-				$endif
-				asan::poison_memory_region(&self.data[mark], cleaned);
-			}
-		}
-	$endif
-	self.used = mark;
-}
-
-fn void? BackedArenaAllocator._free_page(&self, ExtraPage* page) @inline @local
-{
-	void* mem = page.start;
-	return self.backing_allocator.release(mem, page.is_aligned());
-}
-
-fn void*? BackedArenaAllocator._realloc_page(&self, ExtraPage* page, usz size, usz alignment) @inline @local
-{
-	// Then the actual start pointer:
-	void* real_pointer = page.start;
-
-	// Walk backwards to find the pointer to this page.
-	ExtraPage **pointer_to_prev = &self.last_page;
-	// Remove the page from the list
-	while (*pointer_to_prev != page)
-	{
-		pointer_to_prev = &((*pointer_to_prev).prev_page);
-	}
-	*pointer_to_prev = page.prev_page;
-	usz page_size = page.pagesize();
-	// Clear on size > original size.
-	void* data = self.acquire(size, NO_ZERO, alignment)!;
-	mem::copy(data, &page.data[0], page_size, mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
-	self.backing_allocator.release(real_pointer, page.is_aligned());
-	return data;
-}
-
-fn void*? BackedArenaAllocator.resize(&self, void* pointer, usz size, usz alignment) @dynamic
-{
-	AllocChunk *chunk = pointer - AllocChunk.sizeof;
-	if (chunk.size == (usz)-1)
-	{
-		assert(self.last_page, "Realloc of unrelated pointer");
-		// First grab the page
-		ExtraPage *page = pointer - ExtraPage.sizeof;
-		return self._realloc_page(page, size, alignment);
-	}
-
-	AllocChunk* data = self.acquire(size, NO_ZERO, alignment)!;
-	mem::copy(data, pointer, math::min(size, chunk.size), mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
-
-	return data;
-}
-
-<*
- @require size > 0
- @require !alignment || math::is_power_of_2(alignment)
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
-*>
-fn void*? BackedArenaAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
-{
-	alignment = alignment_for_allocation(alignment);
-	void* start_mem = &self.data;
-	void* starting_ptr = start_mem + self.used;
-	void* aligned_header_start = mem::aligned_pointer(starting_ptr, AllocChunk.alignof);
-	void* mem = aligned_header_start + AllocChunk.sizeof;
-	if (alignment > AllocChunk.alignof)
-	{
-		mem = mem::aligned_pointer(mem, alignment);
-	}
-	usz new_usage = (usz)(mem - start_mem) + size;
-
-	// Arena allocation, simple!
-	if (new_usage <= self.capacity)
-	{
-		asan::unpoison_memory_region(starting_ptr, new_usage - self.used);
-		AllocChunk* chunk_start = mem - AllocChunk.sizeof;
-		chunk_start.size = size;
-		self.used = new_usage;
-		if (init_type == ZERO) mem::clear(mem, size, mem::DEFAULT_MEM_ALIGNMENT);
-		return mem;
-	}
-
-	// Fallback to backing allocator
-	ExtraPage* page;
-
-	// We have something we need to align.
-	if (alignment > mem::DEFAULT_MEM_ALIGNMENT)
-	{
-		// This is actually simpler, since it will create the offset for us.
-		usz total_alloc_size = mem::aligned_offset(ExtraPage.sizeof + size, alignment);
-		if (init_type == ZERO)
-		{
-			mem = allocator::calloc_aligned(self.backing_allocator, total_alloc_size, alignment)!;
-		}
-		else
-		{
-			mem = allocator::malloc_aligned(self.backing_allocator, total_alloc_size, alignment)!;
-		}
-		void* start = mem;
-		mem += mem::aligned_offset(ExtraPage.sizeof, alignment);
-		page = (ExtraPage*)mem - 1;
-		page.start = start;
-		page.size = size | PAGE_IS_ALIGNED;
-	}
-	else
-	{
-		// Here we might need to pad
-		usz padded_header_size = mem::aligned_offset(ExtraPage.sizeof, mem::DEFAULT_MEM_ALIGNMENT);
-		usz total_alloc_size = padded_header_size + size;
-		void* alloc = self.backing_allocator.acquire(total_alloc_size, init_type, 0)!;
-
-		// Find the page.
-		page = alloc + padded_header_size - ExtraPage.sizeof;
-		assert(mem::ptr_is_aligned(page, BackedArenaAllocator.alignof));
-		assert(mem::ptr_is_aligned(&page.data[0], mem::DEFAULT_MEM_ALIGNMENT));
-		page.start = alloc;
-		page.size = size;
-	}
-
-	// Mark it as a page
-	page.ident = ~(usz)0;
-	// Store when it was created
-	page.mark = ++self.used;
-	// Hook up the page.
-	page.prev_page = self.last_page;
-	self.last_page = page;
-	return &page.data[0];
-}

lib/std/core/allocators/dynamic_arena.c3

@@ -4,17 +4,6 @@
 module std::core::mem::allocator;
 import std::math;
 
-<*
- The dynamic arena allocator is an arena allocator that can grow by adding additional arena "pages".
- It only supports reset, at which point all pages except the first one is released to the backing
- allocator.
-
- If you want multiple save points, use the BackedArenaAllocator instead.
-
- The advantage over the BackedArenaAllocator, is that when allocating beyond the first "page", it will
- retain the characteristics of an arena allocator (allocating a large piece of memory then handing off
- memory from that memory), wheras the BackedArenaAllocator will have heap allocator characteristics.
-*>
 struct DynamicArenaAllocator (Allocator)
 {
 	Allocator backing_allocator;
@@ -23,11 +12,11 @@ struct DynamicArenaAllocator (Allocator)
 	usz page_size;
 }
 
-<*
- @param [&inout] allocator
- @require page_size >= 128
-*>
-fn void DynamicArenaAllocator.init(&self, Allocator allocator, usz page_size)
+/**
+ * @param [&inout] allocator
+ * @require page_size >= 128
+ **/
+fn void DynamicArenaAllocator.init(&self, usz page_size, Allocator allocator)
 {
 	self.page = null;
 	self.unused_page = null;
@@ -35,6 +24,7 @@ fn void DynamicArenaAllocator.init(&self, Allocator allocator, usz page_size)
 	self.backing_allocator = allocator;
 }
 
+import std::io;
 fn void DynamicArenaAllocator.free(&self)
 {
 	DynamicArenaPage* page = self.page;
@@ -71,10 +61,10 @@ struct DynamicArenaChunk @local
 	usz size;
 }
 
-<*
- @require ptr != null
- @require self.page != null  : `tried to free pointer on invalid allocator`
-*>
+/**
+ * @require ptr
+ * @require self.page `tried to free pointer on invalid allocator`
+ */
 fn void DynamicArenaAllocator.release(&self, void* ptr, bool) @dynamic
 {
 	DynamicArenaPage* current_page = self.page;
@@ -85,13 +75,12 @@ fn void DynamicArenaAllocator.release(&self, void* ptr, bool) @dynamic
 	current_page.current_stack_ptr = null;
 }
 
-<*
- @require size > 0 : `Resize doesn't support zeroing`
- @require old_pointer != null : `Resize doesn't handle null pointers`
- @require self.page != null  : `tried to realloc pointer on invalid allocator`
- @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
-*>
-fn void*? DynamicArenaAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
+/**
+ * @require size > 0 `Resize doesn't support zeroing`
+ * @require old_pointer != null `Resize doesn't handle null pointers`
+ * @require self.page `tried to realloc pointer on invalid allocator`
+ */
+fn void*! DynamicArenaAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
 {
 	DynamicArenaPage* current_page = self.page;
 	alignment = alignment_for_allocation(alignment);
@@ -117,12 +106,13 @@ fn void*? DynamicArenaAllocator.resize(&self, void* old_pointer, usz size, usz a
 		return old_pointer;
 	}
 	void* new_mem = self.acquire(size, NO_ZERO, alignment)!;
-	mem::copy(new_mem, old_pointer, math::min(old_size, size), mem::DEFAULT_MEM_ALIGNMENT);
+	mem::copy(new_mem, old_pointer, old_size, mem::DEFAULT_MEM_ALIGNMENT);
 	return new_mem;
 }
 
-fn void DynamicArenaAllocator.reset(&self)
+fn void DynamicArenaAllocator.reset(&self, usz mark = 0) @dynamic
 {
+	assert(mark == 0, "Unexpectedly reset dynamic arena allocator with mark %d", mark);
 	DynamicArenaPage* page = self.page;
 	DynamicArenaPage** unused_page_ptr = &self.unused_page;
 	while (page)
@@ -137,19 +127,18 @@ fn void DynamicArenaAllocator.reset(&self)
 	self.page = page;
 }
 
-<*
- @require math::is_power_of_2(alignment)
- @require size > 0
- @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
-*>
-fn void*? DynamicArenaAllocator._alloc_new(&self, usz size, usz alignment) @local
+/**
+ * @require math::is_power_of_2(alignment)
+ * @require size > 0
+ */
+fn void*! DynamicArenaAllocator._alloc_new(&self, usz size, usz alignment) @local
 {
 	// First, make sure that we can align it, extending the page size if needed.
 	usz page_size = max(self.page_size, mem::aligned_offset(size + DynamicArenaChunk.sizeof + alignment, alignment));
 	assert(page_size > size + DynamicArenaChunk.sizeof);
 	// Grab the page without alignment (we do it ourselves)
 	void* mem = allocator::malloc_try(self.backing_allocator, page_size)!;
-	DynamicArenaPage*? page = allocator::new_try(self.backing_allocator, DynamicArenaPage);
+	DynamicArenaPage*! page = allocator::new_try(self.backing_allocator, DynamicArenaPage);
 	if (catch err = page)
 	{
 		allocator::free(self.backing_allocator, mem);
@@ -168,30 +157,22 @@ fn void*? DynamicArenaAllocator._alloc_new(&self, usz size, usz alignment) @loca
 	return mem_start;
 }
 
-<*
- @require size > 0 : `acquire expects size > 0`
- @require !alignment || math::is_power_of_2(alignment)
- @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
-*>
-fn void*? DynamicArenaAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
+/**
+ * @require size > 0 `acquire expects size > 0`
+ * @require !alignment || math::is_power_of_2(alignment)
+ */
+fn void*! DynamicArenaAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	alignment = alignment_for_allocation(alignment);
 	DynamicArenaPage* page = self.page;
-
-	void* ptr @noinit;
-	do SET_DONE:
-	{
+	void* ptr = {|
 		if (!page && self.unused_page)
 		{
 			self.page = page = self.unused_page;
 			self.unused_page = page.prev_arena;
 			page.prev_arena = null;
 		}
-		if (!page)
-		{
-			ptr = self._alloc_new(size, alignment)!;
-			break SET_DONE;
-		}
+		if (!page) return self._alloc_new(size, alignment);
 		void* start = mem::aligned_pointer(page.memory + page.used + DynamicArenaChunk.sizeof, alignment);
 		usz new_used = start - page.memory + size;
 		if ALLOCATE_NEW: (new_used > page.total)
@@ -208,15 +189,15 @@ fn void*? DynamicArenaAllocator.acquire(&self, usz size, AllocInitType init_type
 					break ALLOCATE_NEW;
 				}
 			}
-			ptr = self._alloc_new(size, alignment)!;
-			break SET_DONE;
+			return self._alloc_new(size, alignment);
 		}
 		page.used = new_used;
 		assert(start + size == page.memory + page.used);
-		ptr = start;
-		DynamicArenaChunk* chunk = (DynamicArenaChunk*)ptr - 1;
+		void* mem = start;
+		DynamicArenaChunk* chunk = (DynamicArenaChunk*)mem - 1;
 		chunk.size = size;
-	};
+		return mem;
+	|}!;
 	if (init_type == ZERO) mem::clear(ptr, size, mem::DEFAULT_MEM_ALIGNMENT);
 	return ptr;
 }

lib/std/core/allocators/heap_allocator.c3

@@ -1,34 +1,27 @@
-// Copyright (c) 2021-2025 Christoffer Lerno. All rights reserved.
+// Copyright (c) 2021-2024 Christoffer Lerno. All rights reserved.
 // Use of this source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
 
 module std::core::mem::allocator;
 import std::math;
 
-<*
- The SimpleHeapAllocator implements a simple heap allocator on top of an allocator function.
-
- It uses the given allocator function to allocate memory from some source, but never frees it.
- This allocator is intended to be used in environments where there isn't any native libc malloc,
- and it has to be emulated from a memory region, or wrapping linear memory as is the case for plain WASM.
-*>
 struct SimpleHeapAllocator (Allocator)
 {
 	MemoryAllocFn alloc_fn;
 	Header* free_list;
 }
 
-<*
- @require allocator != null  : "An underlying memory provider must be given"
- @require !self.free_list : "The allocator may not be already initialized"
-*>
+/**
+ * @require allocator "An underlying memory provider must be given"
+ * @require !self.free_list "The allocator may not be already initialized"
+ **/
 fn void SimpleHeapAllocator.init(&self, MemoryAllocFn allocator)
 {
 	self.alloc_fn = allocator;
 	self.free_list = null;
 }
 
-fn void*? SimpleHeapAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
+fn void*! SimpleHeapAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	if (init_type == ZERO)
 	{
@@ -37,7 +30,7 @@ fn void*? SimpleHeapAllocator.acquire(&self, usz size, AllocInitType init_type,
 	return alignment > 0 ? @aligned_alloc(self._alloc, size, alignment) : self._alloc(size);
 }
 
-fn void*? SimpleHeapAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
+fn void*! SimpleHeapAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
 {
 	return alignment > 0
 		? @aligned_realloc(self._calloc, self._free, old_pointer, size, alignment)
@@ -56,10 +49,10 @@ fn void SimpleHeapAllocator.release(&self, void* old_pointer, bool aligned) @dyn
 	}
 }
 
-<*
- @require old_pointer && bytes > 0
-*>
-fn void*? SimpleHeapAllocator._realloc(&self, void* old_pointer, usz bytes) @local
+/**
+ * @require old_pointer && bytes > 0
+ **/
+fn void*! SimpleHeapAllocator._realloc(&self, void* old_pointer, usz bytes) @local
 {
 	// Find the block header.
 	Header* block = (Header*)old_pointer - 1;
@@ -71,14 +64,14 @@ fn void*? SimpleHeapAllocator._realloc(&self, void* old_pointer, usz bytes) @loc
 	return new;
 }
 
-fn void*? SimpleHeapAllocator._calloc(&self, usz bytes) @local
+fn void*! SimpleHeapAllocator._calloc(&self, usz bytes) @local
 {
 	void* data = self._alloc(bytes)!;
 	mem::clear(data, bytes, mem::DEFAULT_MEM_ALIGNMENT);
 	return data;
 }
 
-fn void*? SimpleHeapAllocator._alloc(&self, usz bytes) @local
+fn void*! SimpleHeapAllocator._alloc(&self, usz bytes) @local
 {
 	usz aligned_bytes = mem::aligned_offset(bytes, mem::DEFAULT_MEM_ALIGNMENT);
 	if (!self.free_list)
@@ -105,7 +98,7 @@ fn void*? SimpleHeapAllocator._alloc(&self, usz bytes) @local
 				return current + 1;
 			case current.size > aligned_bytes:
 				Header* unallocated = (Header*)((char*)current + aligned_bytes + Header.sizeof);
-				unallocated.size = current.size - aligned_bytes - Header.sizeof;
+				unallocated.size = current.size - aligned_bytes;
 				unallocated.next = current.next;
 				if (current == self.free_list)
 				{
@@ -127,7 +120,7 @@ fn void*? SimpleHeapAllocator._alloc(&self, usz bytes) @local
 	return self._alloc(aligned_bytes);
 }
 
-fn void? SimpleHeapAllocator.add_block(&self, usz aligned_bytes) @local
+fn void! SimpleHeapAllocator.add_block(&self, usz aligned_bytes) @local
 {
 	assert(mem::aligned_offset(aligned_bytes, mem::DEFAULT_MEM_ALIGNMENT) == aligned_bytes);
 	char[] result = self.alloc_fn(aligned_bytes + Header.sizeof)!;

lib/std/core/allocators/libc_allocator.c3

@@ -1,59 +1,55 @@
-// Copyright (c) 2021-2025 Christoffer Lerno. All rights reserved.
+// Copyright (c) 2021-2024 Christoffer Lerno. All rights reserved.
 // Use of this source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
-module std::core::mem::allocator @if(env::LIBC);
-import std::io;
+
+module std::core::mem::allocator;
 import libc;
 
-<*
- The LibcAllocator is a wrapper around malloc to conform to the Allocator interface.
-*>
-typedef LibcAllocator (Allocator) = uptr;
 const LibcAllocator LIBC_ALLOCATOR = {};
+distinct LibcAllocator (Allocator) = uptr;
 
 module std::core::mem::allocator @if(env::POSIX);
 import std::os;
 import libc;
 
-
-fn void*? LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
+fn void*! LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
 {
 	if (init_type == ZERO)
 	{
 		void* data @noinit;
 		if (alignment > mem::DEFAULT_MEM_ALIGNMENT)
 		{
-			if (posix::posix_memalign(&data, alignment, bytes)) return mem::OUT_OF_MEMORY?;
+			if (posix::posix_memalign(&data, alignment, bytes)) return AllocationFailure.OUT_OF_MEMORY?;
 			mem::clear(data, bytes, mem::DEFAULT_MEM_ALIGNMENT);
 			return data;
 		}
-		return libc::calloc(1, bytes) ?: mem::OUT_OF_MEMORY?;
+        return libc::calloc(1, bytes) ?: AllocationFailure.OUT_OF_MEMORY?;
 	}
 	else
 	{
 		void* data @noinit;
 		if (alignment > mem::DEFAULT_MEM_ALIGNMENT)
 		{
-			if (posix::posix_memalign(&data, alignment, bytes)) return mem::OUT_OF_MEMORY?;
+			if (posix::posix_memalign(&data, alignment, bytes)) return AllocationFailure.OUT_OF_MEMORY?;
 		}
 		else
 		{
-			if (!(data = libc::malloc(bytes))) return mem::OUT_OF_MEMORY?;
+			if (!(data = libc::malloc(bytes))) return AllocationFailure.OUT_OF_MEMORY?;
 		}
-		$if env::TESTING:
-			for (usz i = 0; i < bytes; i++) ((char*)data)[i] = 0xAA;
-		$endif
-		return data;
+        $if env::TESTING:
+		    for (usz i = 0; i < bytes; i++) ((char*)data)[i] = 0xAA;
+        $endif
+        return data;
 	}
 }
 
-fn void*? LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
+fn void*! LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
 {
-	if (alignment <= mem::DEFAULT_MEM_ALIGNMENT) return libc::realloc(old_ptr, new_bytes) ?: mem::OUT_OF_MEMORY?;
-	void* new_ptr;
-	if (posix::posix_memalign(&new_ptr, alignment, new_bytes)) return mem::OUT_OF_MEMORY?;
+	if (alignment <= mem::DEFAULT_MEM_ALIGNMENT) return libc::realloc(old_ptr, new_bytes) ?: AllocationFailure.OUT_OF_MEMORY?;
+    void* new_ptr;
+	if (posix::posix_memalign(&new_ptr, alignment, new_bytes)) return AllocationFailure.OUT_OF_MEMORY?;
 
-	$switch:
+	$switch
 	$case env::DARWIN:
 		usz old_usable_size = darwin::malloc_size(old_ptr);
 	$case env::LINUX:
@@ -77,73 +73,73 @@ module std::core::mem::allocator @if(env::WIN32);
 import std::os::win32;
 import libc;
 
-fn void*? LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
+fn void*! LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
 {
 	if (init_type == ZERO)
 	{
 		if (alignment > 0)
 		{
-			return win32::_aligned_recalloc(null, 1, bytes, alignment) ?: mem::OUT_OF_MEMORY?;
+			return win32::_aligned_recalloc(null, 1, bytes, alignment) ?: AllocationFailure.OUT_OF_MEMORY?;
 		}
-		return libc::calloc(1, bytes) ?: mem::OUT_OF_MEMORY?;
+		return libc::calloc(1, bytes) ?: AllocationFailure.OUT_OF_MEMORY?;
 	}
 	void* data = alignment > 0 ? win32::_aligned_malloc(bytes, alignment) : libc::malloc(bytes);
-	if (!data) return mem::OUT_OF_MEMORY?;
-	$if env::TESTING:
+	if (!data) return AllocationFailure.OUT_OF_MEMORY?;
+    $if env::TESTING:
 		for (usz i = 0; i < bytes; i++) ((char*)data)[i] = 0xAA;
 	$endif
-	return data;
+    return data;
 }
 
-fn void*? LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
+fn void*! LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
 {
 	if (alignment)
 	{
-		return win32::_aligned_realloc(old_ptr, new_bytes, alignment) ?: mem::OUT_OF_MEMORY?;
+		return win32::_aligned_realloc(old_ptr, new_bytes, alignment) ?: AllocationFailure.OUT_OF_MEMORY?;
 	}
-	return libc::realloc(old_ptr, new_bytes) ?: mem::OUT_OF_MEMORY?;
+	return libc::realloc(old_ptr, new_bytes) ?: AllocationFailure.OUT_OF_MEMORY?;
 }
 
 fn void LibcAllocator.release(&self, void* old_ptr, bool aligned) @dynamic
 {
 	if (aligned)
 	{
-		win32::_aligned_free(old_ptr);
-		return;
+    	win32::_aligned_free(old_ptr);
+    	return;
 	}
 	libc::free(old_ptr);
 }
 
-module std::core::mem::allocator @if(!env::WIN32 && !env::POSIX && env::LIBC);
+module std::core::mem::allocator @if(!env::WIN32 && !env::POSIX);
 import libc;
 
-fn void*? LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
+fn void*! LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
 {
 	if (init_type == ZERO)
 	{
 		void* data = alignment ? @aligned_alloc(fn void*(usz bytes) => libc::calloc(bytes, 1), bytes, alignment)!! : libc::calloc(bytes, 1);
-		return data ?: mem::OUT_OF_MEMORY?;
+        return data ?: AllocationFailure.OUT_OF_MEMORY?;
 	}
 	else
 	{
 		void* data = alignment ? @aligned_alloc(libc::malloc, bytes, alignment)!! : libc::malloc(bytes);
-		if (!data) return mem::OUT_OF_MEMORY?;
-		$if env::TESTING:
-			for (usz i = 0; i < bytes; i++) ((char*)data)[i] = 0xAA;
-		$endif
-		return data;
+        if (!data) return AllocationFailure.OUT_OF_MEMORY?;
+        $if env::TESTING:
+		    for (usz i = 0; i < bytes; i++) ((char*)data)[i] = 0xAA;
+        $endif
+        return data;
 	}
 }
 
 
-fn void*? LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
+fn void*! LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
 {
 	if (alignment)
 	{
 		void* data = @aligned_realloc(fn void*(usz bytes) => libc::malloc(bytes), libc::free, old_ptr, new_bytes, alignment)!!;
-		return data ?: mem::OUT_OF_MEMORY?;
+		return data ?: AllocationFailure.OUT_OF_MEMORY?;
 	}
-	return libc::realloc(old_ptr, new_bytes) ?: mem::OUT_OF_MEMORY?;
+	return libc::realloc(old_ptr, new_bytes) ?: AllocationFailure.OUT_OF_MEMORY?;
 }
 
 

lib/std/core/allocators/on_stack_allocator.c3

@@ -1,14 +1,5 @@
 module std::core::mem::allocator;
-import std::math;
-<*
- The OnStackAllocator is similar to the ArenaAllocator: it allocates from a chunk of memory
- given to it.
 
- The difference is that when it runs out of memory it will go directly to its backing allocator
- rather than failing.
-
- It is utilized by the @stack_mem macro as an alternative to the temp allocator.
-*>
 struct OnStackAllocator (Allocator)
 {
 	Allocator backing_allocator;
@@ -17,6 +8,7 @@ struct OnStackAllocator (Allocator)
 	OnStackAllocatorExtraChunk* chunk;
 }
 
+
 struct OnStackAllocatorExtraChunk @local
 {
 	bool is_aligned;
@@ -24,11 +16,10 @@ struct OnStackAllocatorExtraChunk @local
 	void* data;
 }
 
-<*
- Initialize a memory arena for use using the provided bytes.
-
- @param [&inout] allocator
-*>
+/**
+ * @param [&inout] allocator
+ * Initialize a memory arena for use using the provided bytes.
+ **/
 fn void OnStackAllocator.init(&self, char[] data, Allocator allocator)
 {
 	self.data = data;
@@ -63,14 +54,14 @@ struct OnStackAllocatorHeader
 	char[*] data;
 }
 
-<*
- @require old_pointer != null
-*>
+/**
+ * @require old_pointer
+ **/
 fn void OnStackAllocator.release(&self, void* old_pointer, bool aligned) @dynamic
 {
 	if (allocation_in_stack_mem(self, old_pointer)) return;
 	on_stack_allocator_remove_chunk(self, old_pointer);
-	self.backing_allocator.release(old_pointer, aligned);
+	self.release(old_pointer, aligned);
 }
 
 fn bool allocation_in_stack_mem(OnStackAllocator* a, void* ptr) @local
@@ -107,12 +98,12 @@ fn OnStackAllocatorExtraChunk* on_stack_allocator_find_chunk(OnStackAllocator* a
 	return null;
 }
 
-<*
- @require size > 0
- @require old_pointer != null
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
-*>
-fn void*? OnStackAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
+/**
+ * @require size > 0
+ * @require old_pointer != null
+ * @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
+ **/
+fn void*! OnStackAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
 {
 	if (!allocation_in_stack_mem(self, old_pointer))
 	{
@@ -124,15 +115,15 @@ fn void*? OnStackAllocator.resize(&self, void* old_pointer, usz size, usz alignm
 	OnStackAllocatorHeader* header = old_pointer - OnStackAllocatorHeader.sizeof;
 	usz old_size = header.size;
 	void* mem = self.acquire(size, NO_ZERO, alignment)!;
-	mem::copy(mem, old_pointer, math::min(old_size, size), mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
+	mem::copy(mem, old_pointer, old_size, mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
 	return mem;
 }
 
-<*
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
- @require size > 0
-*>
-fn void*? OnStackAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
+/**
+ * @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
+ * @require size > 0
+ **/
+fn void*! OnStackAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	bool aligned = alignment > 0;
 	alignment = alignment_for_allocation(alignment);

lib/std/core/allocators/temp_allocator.c3

@@ -1,60 +1,29 @@
-module std::core::mem::allocator @if(!(env::POSIX || env::WIN32) || !$feature(VMEM_TEMP));
+module std::core::mem::allocator;
 import std::io, std::math;
 
-// This implements the temp allocator.
-// The temp allocator is a specialized allocator only intended for use where
-// the allocation is strictly stack-like.
-//
-// It is *not* thread-safe: you cannot safely use the
-// temp allocator on a thread and pass it to another thread.
-//
-// Fundamentally the temp allocator is a thread local arena allocator
-// but the stack-like behaviour puts additional constraints to it.
-//
-// It works great for allocating temporary data in a scope then dropping
-// that data, however you should not be storing temporary data in globals
-// or locals that have a lifetime outside of the current temp allocator scope.
-//
-// Furthermore, note that the temp allocator is bounded, with additional
-// allocations on top of that causing heap allocations. Such heap allocations
-// will be cleaned up but is undesirable from a performance standpoint.
-//
-// If you want customizable behaviour similar to the temp allocator, consider
-// the ArenaAllocator, BackedArenaAllocator or the DynamicArenaAllocator.
-//
-// Experimenting with the temp allocator to make it work outside of its
-// standard usage patterns will invariably end in tears and frustrated
-// hair pulling.
-//
-// Use one of the ArenaAllocators instead.
-
-struct TempAllocator (Allocator)
-{
-	Allocator backing_allocator;
-	TempAllocatorPage* last_page;
-	TempAllocator* derived;
-	bool allocated;
-	usz reserve_size;
-	usz realloc_size;
-	usz min_size;
-	usz used;
-	usz capacity;
-	usz original_capacity;
-	char[*] data;
-}
-
 struct TempAllocatorChunk @local
 {
 	usz size;
 	char[*] data;
 }
 
-const usz PAGE_IS_ALIGNED @local = (usz)isz.max + 1u;
+struct TempAllocator (Allocator)
+{
+	Allocator backing_allocator;
+	TempAllocatorPage* last_page;
+	usz used;
+	usz capacity;
+	char[*] data;
+}
+
+const usz PAGE_IS_ALIGNED @private = (usz)isz.max + 1u;
+
 
 struct TempAllocatorPage
 {
 	TempAllocatorPage* prev_page;
 	void* start;
+	usz mark;
 	usz size;
 	usz ident;
 	char[*] data;
@@ -63,110 +32,27 @@ struct TempAllocatorPage
 macro usz TempAllocatorPage.pagesize(&self) => self.size & ~PAGE_IS_ALIGNED;
 macro bool TempAllocatorPage.is_aligned(&self) => self.size & PAGE_IS_ALIGNED == PAGE_IS_ALIGNED;
 
-<*
- @require size >= 64
- @require realloc_size >= 64
- @require allocator.type != TempAllocator.typeid : "You may not create a temp allocator with a TempAllocator as the backing allocator."
- @require min_size > TempAllocator.sizeof + 64 : "Min size must meaningfully hold the data + some bytes"
-*>
-fn TempAllocator*? new_temp_allocator(Allocator allocator, usz size, usz reserve = temp_allocator_reserve_size, usz min_size = temp_allocator_min_size, usz realloc_size = temp_allocator_realloc_size)
+/**
+ * @require size >= 16
+ **/
+fn TempAllocator*! new_temp_allocator(usz size, Allocator allocator)
 {
 	TempAllocator* temp = allocator::alloc_with_padding(allocator, TempAllocator, size)!;
 	temp.last_page = null;
 	temp.backing_allocator = allocator;
 	temp.used = 0;
-	temp.min_size = min_size;
-	temp.realloc_size = realloc_size;
-	temp.reserve_size = reserve;
-	temp.allocated = true;
-	temp.derived = null;
-	temp.original_capacity = temp.capacity = size;
+	temp.capacity = size;
 	return temp;
 }
-<*
- @require !self.derived
-*>
-fn TempAllocator*? TempAllocator.derive_allocator(&self, usz reserve = 0)
+
+fn void TempAllocator.destroy(&self)
 {
-	if (!reserve) reserve = self.reserve_size;
-	usz remaining = self.capacity - self.used;
-	void* mem @noinit;
-	usz size @noinit;
-	if (self.min_size + reserve > remaining)
-	{
-		return self.derived = new_temp_allocator(self.backing_allocator, self.realloc_size, self.reserve_size, self.min_size, self.realloc_size)!;
-	}
-	usz start = mem::aligned_offset(self.used + reserve, mem::DEFAULT_MEM_ALIGNMENT);
-	void* ptr = &self.data[start];
-	TempAllocator* temp = (TempAllocator*)ptr;
-	$if env::ADDRESS_SANITIZER:
-        asan::unpoison_memory_region(ptr, TempAllocator.sizeof);
-	$endif
-	temp.last_page = null;
-    temp.backing_allocator = self.backing_allocator;
-    temp.used = 0;
-    temp.min_size = self.min_size;
-    temp.reserve_size = self.reserve_size;
-    temp.realloc_size = self.realloc_size;
-    temp.allocated = false;
-    temp.derived = null;
-    temp.original_capacity = temp.capacity = self.capacity - start - TempAllocator.sizeof;
-    self.capacity = start;
-	self.derived = temp;
-    return temp;
+	self.reset(0);
+	if (self.last_page) (void)self._free_page(self.last_page);
+	allocator::free(self.backing_allocator, self);
 }
 
-<*
- Reset the entire temp allocator, which will merge all the children into it.
-*>
-fn void TempAllocator.reset(&self)
-{
-	TempAllocator* child = self.derived;
-	if (!child) return;
-	while (child)
-	{
-		TempAllocator* old = child;
-		child = old.derived;
-		old.destroy();
-	}
-	self.capacity = self.original_capacity;
-	$if env::ADDRESS_SANITIZER:
-		asan::poison_memory_region(&self.data[self.used], self.capacity - self.used);
-	$endif
-	self.derived = null;
-}
-
-<*
- @require self.allocated : "Only a top level allocator should be freed."
-*>
-fn void TempAllocator.free(&self)
-{
-	self.reset();
-	self.destroy();
-}
-
-fn void TempAllocator.destroy(&self) @local
-{
-	TempAllocatorPage *last_page = self.last_page;
-	while (last_page)
-	{
-		TempAllocatorPage *to_free = last_page;
-		last_page = last_page.prev_page;
-		self._free_page(to_free)!!;
-	}
-	if (self.allocated)
-	{
-		allocator::free(self.backing_allocator, self);
-		return;
-	}
-	$if env::COMPILER_SAFE_MODE || env::ADDRESS_SANITIZER:
-    	$if env::COMPILER_SAFE_MODE && !env::ADDRESS_SANITIZER:
-    		self.data[0 : self.used] = 0xAA;
-		$else
-            asan::poison_memory_region(&self.data[0], self.used);
-    	$endif
-    $endif
-}
+fn usz TempAllocator.mark(&self) @dynamic => self.used;
 
 fn void TempAllocator.release(&self, void* old_pointer, bool) @dynamic
 {
@@ -177,15 +63,39 @@ fn void TempAllocator.release(&self, void* old_pointer, bool) @dynamic
 		asan::poison_memory_region(&self.data[self.used], old_size);
 	}
 }
+fn void TempAllocator.reset(&self, usz mark) @dynamic
+{
+	TempAllocatorPage *last_page = self.last_page;
+	while (last_page && last_page.mark > mark)
+	{
+		TempAllocatorPage *to_free = last_page;
+		last_page = last_page.prev_page;
+		self._free_page(to_free)!!;
+	}
+	self.last_page = last_page;
+	$if env::COMPILER_SAFE_MODE || env::ADDRESS_SANITIZER:
+		if (!last_page)
+		{
+			usz cleaned = self.used - mark;
+			if (cleaned > 0)
+			{
+				$if env::COMPILER_SAFE_MODE:
+					self.data[mark : cleaned] = 0xAA;
+				$endif
+				asan::poison_memory_region(&self.data[mark], cleaned);
+			}
+		}
+	$endif
+	self.used = mark;
+}
 
-
-fn void? TempAllocator._free_page(&self, TempAllocatorPage* page) @inline @local
+fn void! TempAllocator._free_page(&self, TempAllocatorPage* page) @inline @local
 {
 	void* mem = page.start;
 	return self.backing_allocator.release(mem, page.is_aligned());
 }
 
-fn void*? TempAllocator._realloc_page(&self, TempAllocatorPage* page, usz size, usz alignment) @inline @local
+fn void*! TempAllocator._realloc_page(&self, TempAllocatorPage* page, usz size, usz alignment) @inline @local
 {
 	// Then the actual start pointer:
 	void* real_pointer = page.start;
@@ -201,13 +111,12 @@ fn void*? TempAllocator._realloc_page(&self, TempAllocatorPage* page, usz size,
 	usz page_size = page.pagesize();
 	// Clear on size > original size.
 	void* data = self.acquire(size, NO_ZERO, alignment)!;
-	if (page_size > size) page_size = size;
 	mem::copy(data, &page.data[0], page_size, mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
 	self.backing_allocator.release(real_pointer, page.is_aligned());
 	return data;
 }
 
-fn void*? TempAllocator.resize(&self, void* pointer, usz size, usz alignment) @dynamic
+fn void*! TempAllocator.resize(&self, void* pointer, usz size, usz alignment) @dynamic
 {
 	TempAllocatorChunk *chunk = pointer - TempAllocatorChunk.sizeof;
 	if (chunk.size == (usz)-1)
@@ -217,47 +126,19 @@ fn void*? TempAllocator.resize(&self, void* pointer, usz size, usz alignment) @d
 		TempAllocatorPage *page = pointer - TempAllocatorPage.sizeof;
 		return self._realloc_page(page, size, alignment);
 	}
-	bool is_realloc_of_last = chunk.size + pointer == &self.data[self.used];
-	if (is_realloc_of_last)
-	{
-		isz diff = size - chunk.size;
-		if (diff == 0) return pointer;
-		if (self.capacity - self.used > diff)
-		{
-			chunk.size += diff;
-			self.used += diff;
-			$if env::ADDRESS_SANITIZER:
-				if (diff < 0)
-				{
-					asan::poison_memory_region(pointer + chunk.size, -diff);
-				}
-				else
-				{
-					asan::unpoison_memory_region(pointer, chunk.size);
-				}
-			$endif
-			return pointer;
-		}
-	}
-	void* data = self.acquire(size, NO_ZERO, alignment)!;
-	usz len_to_copy = chunk.size > size ? size : chunk.size;
-	mem::copy(data, pointer, len_to_copy, mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
-	if (is_realloc_of_last)
-	{
-		self.used = (uptr)chunk - (uptr)&self.data;
-		$if env::ADDRESS_SANITIZER:
-			asan::poison_memory_region(chunk, TempAllocatorChunk.sizeof + chunk.size);
-		$endif
-	}
+
+	TempAllocatorChunk* data = self.acquire(size, NO_ZERO, alignment)!;
+	mem::copy(data, pointer, chunk.size, mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
+
 	return data;
 }
 
-<*
- @require size > 0
- @require !alignment || math::is_power_of_2(alignment)
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
-*>
-fn void*? TempAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
+/**
+ * @require size > 0
+ * @require !alignment || math::is_power_of_2(alignment)
+ * @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
+ **/
+fn void*! TempAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	alignment = alignment_for_allocation(alignment);
 	void* start_mem = &self.data;
@@ -297,10 +178,8 @@ fn void*? TempAllocator.acquire(&self, usz size, AllocInitType init_type, usz al
 		{
 			mem = allocator::malloc_aligned(self.backing_allocator, total_alloc_size, alignment)!;
 		}
-		void* start = mem;
-		mem += mem::aligned_offset(TempAllocatorPage.sizeof, alignment);
 		page = (TempAllocatorPage*)mem - 1;
-		page.start = start;
+		page.start = mem;
 		page.size = size | PAGE_IS_ALIGNED;
 	}
 	else
@@ -320,87 +199,29 @@ fn void*? TempAllocator.acquire(&self, usz size, AllocInitType init_type, usz al
 
 	// Mark it as a page
 	page.ident = ~(usz)0;
+	// Store when it was created
+	page.mark = ++self.used;
 	// Hook up the page.
 	page.prev_page = self.last_page;
 	self.last_page = page;
 	return &page.data[0];
 }
 
-module std::core::mem::allocator @if((env::POSIX || env::WIN32) && $feature(VMEM_TEMP));
-import std::math;
-
-tlocal VmemOptions temp_allocator_default_options = {
-	.shrink_on_reset = env::MEMORY_ENV != NORMAL,
-	.protect_unused_pages = env::COMPILER_OPT_LEVEL <= O1 || env::COMPILER_SAFE_MODE,
-	.scratch_released_data = env::COMPILER_SAFE_MODE
-};
-
-
-fn TempAllocator*? new_temp_allocator(Allocator allocator, usz size, usz reserve = temp_allocator_reserve_size, usz min_size = temp_allocator_min_size, usz realloc_size = temp_allocator_realloc_size)
+fn void! TempAllocator.print_pages(&self, File* f)
 {
-	Vmem mem;
-	TempAllocator* t = allocator::new(allocator, TempAllocator);
-	defer catch allocator::free(allocator, t);
-	t.vmem.init(preferred_size: isz.sizeof > 4 ? 4 * mem::GB : 512 * mem::MB,
-	            reserve_page_size: isz.sizeof > 4 ? 256 * mem::KB : 0,
-	            options: temp_allocator_default_options)!;
-	t.allocator = allocator;
-	return t;
+	TempAllocatorPage *last_page = self.last_page;
+	if (!last_page)
+	{
+		io::fprintf(f, "No pages.\n")!;
+		return;
+	}
+	io::fprintf(f, "---Pages----\n")!;
+	uint index = 0;
+	while (last_page)
+	{
+		bool is_not_aligned = !(last_page.size & (1u64 << 63));
+		io::fprintf(f, "%d. Alloc: %d %d at %p%s\n", ++index,
+				last_page.size & ~(1u64 << 63), last_page.mark, &last_page.data[0], is_not_aligned ? "" : " [aligned]")!;
+		last_page = last_page.prev_page;
+	}
 }
-
-struct TempAllocator (Allocator)
-{
-	Vmem vmem;
-	TempAllocator* derived;
-	Allocator allocator;
-}
-
-<*
- @require size > 0
- @require !alignment || math::is_power_of_2(alignment)
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
-*>
-fn void*? TempAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
-{
-	return self.vmem.acquire(size, init_type, alignment) @inline;
-}
-
-fn TempAllocator*? TempAllocator.derive_allocator(&self, usz reserve = 0)
-{
-	if (self.derived) return self.derived;
-	return self.derived = new_temp_allocator(self.allocator, 0)!;
-}
-
-<*
- Reset the entire temp allocator, destroying all children
-*>
-fn void TempAllocator.reset(&self)
-{
-	TempAllocator* child = self.derived;
-	if (!child) return;
-	child.reset();
-	child.vmem.reset(0);
-}
-fn void TempAllocator.free(&self)
-{
-	self.destroy();
-}
-
-fn void TempAllocator.destroy(&self) @local
-{
-	TempAllocator* child = self.derived;
-	if (!child) return;
-	child.destroy();
-	self.vmem.free() @inline;
-	allocator::free(self.allocator, self) @inline;
-}
-
-fn void*? TempAllocator.resize(&self, void* pointer, usz size, usz alignment) @dynamic
-{
-	return self.vmem.resize(pointer, size, alignment) @inline;
-}
-
-fn void TempAllocator.release(&self, void* old_pointer, bool b) @dynamic
-{
-	self.vmem.release(old_pointer, b) @inline;
-}

lib/std/core/allocators/tracking_allocator.c3

@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2025 Christoffer Lerno. All rights reserved.
+// Copyright (c) 2021-2024 Christoffer Lerno. All rights reserved.
 // Use of this source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
 
@@ -13,15 +13,11 @@ struct Allocation
 	void*[MAX_BACKTRACE] backtrace;
 }
 
-alias AllocMap = HashMap { uptr, Allocation };
+def AllocMap = HashMap(<uptr, Allocation>);
 
 // A simple tracking allocator.
 // It tracks allocations using a hash map but
 // is not compatible with allocators that uses mark()
-//
-// It is also embarassingly single-threaded, so
-// do not use it to track allocations that cross threads.
-
 struct TrackingAllocator (Allocator)
 {
 	Allocator inner_allocator;
@@ -30,75 +26,79 @@ struct TrackingAllocator (Allocator)
 	usz allocs_total;
 }
 
-<*
- Initialize a tracking allocator to wrap (and track) another allocator.
-
- @param [&inout] allocator : "The allocator to track"
-*>
+/**
+ * Initialize a tracking allocator to wrap (and track) another allocator.
+ *
+ * @param [&inout] allocator "The allocator to track"
+ **/
 fn void TrackingAllocator.init(&self, Allocator allocator)
 {
 	*self = { .inner_allocator = allocator };
-	self.map.init(allocator);
+	self.map.new_init(.allocator = allocator);
 }
 
-<*
- Free this tracking allocator.
-*>
+/**
+ * Free this tracking allocator.
+ **/
 fn void TrackingAllocator.free(&self)
 {
 	self.map.free();
 	*self = {};
 }
 
-<*
- @return "the total allocated memory not yet freed."
-*>
-fn usz TrackingAllocator.allocated(&self) => @pool()
+/**
+ * @return "the total allocated memory not yet freed."
+ **/
+fn usz TrackingAllocator.allocated(&self)
 {
 	usz allocated = 0;
-	foreach (&allocation : self.map.tvalues()) allocated += allocation.size;
+	@pool()
+	{
+		foreach (&allocation : self.map.value_tlist()) allocated += allocation.size;
+	};
 	return allocated;
 }
 
-<*
- @return "the total memory allocated (freed or not)."
-*>
+/**
+ * @return "the total memory allocated (freed or not)."
+ **/
 fn usz TrackingAllocator.total_allocated(&self) => self.mem_total;
 
-<*
- @return "the total number of allocations (freed or not)."
-*>
+/**
+ * @return "the total number of allocations (freed or not)."
+ **/
 fn usz TrackingAllocator.total_allocation_count(&self) => self.allocs_total;
 
 fn Allocation[] TrackingAllocator.allocations_tlist(&self, Allocator allocator)
 {
-	return self.map.tvalues();
+	return self.map.value_tlist();
 }
 
-<*
- @return "the number of non-freed allocations."
-*>
+/**
+ * @return "the number of non-freed allocations."
+ **/
 fn usz TrackingAllocator.allocation_count(&self) => self.map.count;
 
-fn void*? TrackingAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
+fn void*! TrackingAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	void* data = self.inner_allocator.acquire(size, init_type, alignment)!;
 	self.allocs_total++;
 	void*[MAX_BACKTRACE] bt;
 	backtrace::capture_current(&bt);
 	self.map.set((uptr)data, { data, size, bt });
-	self.mem_total += size;
+    self.mem_total += size;
+	self.allocs_total++;
 	return data;
 }
 
-fn void*? TrackingAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
+fn void*! TrackingAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
 {
 	void* data = self.inner_allocator.resize(old_pointer, size, alignment)!;
 	self.map.remove((uptr)old_pointer);
 	void*[MAX_BACKTRACE] bt;
 	backtrace::capture_current(&bt);
 	self.map.set((uptr)data, { data, size, bt });
-	self.mem_total += size;
+    self.mem_total += size;
 	self.allocs_total++;
 	return data;
 }
@@ -106,9 +106,9 @@ fn void*? TrackingAllocator.resize(&self, void* old_pointer, usz size, usz align
 fn void TrackingAllocator.release(&self, void* old_pointer, bool is_aligned) @dynamic
 {
 	if (catch self.map.remove((uptr)old_pointer))
-	{
-		unreachable("Attempt to release untracked pointer %p, this is likely a bug.", old_pointer);
-	}
+    {
+        unreachable("Attempt to release untracked pointer %p, this is likely a bug.", old_pointer);
+    }
 	self.inner_allocator.release(old_pointer, is_aligned);
 }
 
@@ -117,103 +117,101 @@ fn void TrackingAllocator.clear(&self)
 	self.map.clear();
 }
 
-fn bool TrackingAllocator.has_leaks(&self)
-{
-	return self.map.len() > 0;
-}
-
 fn void TrackingAllocator.print_report(&self) => self.fprint_report(io::stdout())!!;
 
-
-fn void? TrackingAllocator.fprint_report(&self, OutStream out) => @pool()
+fn void! TrackingAllocator.fprint_report(&self, OutStream out)
 {
+
 	usz total = 0;
 	usz entries = 0;
 	bool leaks = false;
-
-	Allocation[] allocs = self.map.tvalues();
-	if (allocs.len)
+	@pool()
 	{
-		if (!allocs[0].backtrace[0])
+		Allocation[] allocs = self.map.value_tlist();
+		if (allocs.len)
 		{
-			io::fprintn(out, "======== Memory Report ========")!;
-			io::fprintn(out, "Size in bytes   Address")!;
-			foreach (i, &allocation : allocs)
+			if (!allocs[0].backtrace[0])
 			{
-				entries++;
-				total += allocation.size;
-				io::fprintfn(out, "%13s   %p", allocation.size, allocation.ptr)!;
-			}
-			io::fprintn(out, "===============================")!;
+				io::fprintn(out, "======== Memory Report ========")!;
+            	io::fprintn(out, "Size in bytes   Address")!;
+            	foreach (i, &allocation : allocs)
+            	{
+            	    entries++;
+            		total += allocation.size;
+            		io::fprintfn(out, "%13s   %p", allocation.size, allocation.ptr)!;
+            	}
+            	io::fprintn(out, "===============================")!;
 
+			}
+			else
+			{
+				io::fprintn(out, "================================== Memory Report ==================================")!;
+				io::fprintn(out, "Size in bytes   Address          Function                       ")!;
+				foreach (i, &allocation : allocs)
+				{
+					entries++;
+					total += allocation.size;
+					BacktraceList backtraces = {};
+					Backtrace trace = backtrace::BACKTRACE_UNKNOWN;
+					if (allocation.backtrace[3])
+					{
+						trace = backtrace::symbolize_backtrace(allocation.backtrace[3:1], allocator::temp()).get(0) ?? backtrace::BACKTRACE_UNKNOWN;
+					}
+					if (trace.function.len)	leaks = true;
+					io::fprintfn(out, "%13s   %p   %s:%d", allocation.size,
+						allocation.ptr, trace.function.len ? trace.function : "???",
+						trace.line ? trace.line : 0)!;
+				}
+				io::fprintn(out, "===================================================================================")!;
+			}
 		}
 		else
 		{
-			io::fprintn(out, "================================== Memory Report ==================================")!;
-			io::fprintn(out, "Size in bytes   Address          Function                       ")!;
-			foreach (i, &allocation : allocs)
-			{
-				entries++;
-				total += allocation.size;
-				BacktraceList backtraces = {};
-				Backtrace trace = backtrace::BACKTRACE_UNKNOWN;
-				if (allocation.backtrace[3])
-				{
-					trace = backtrace::symbolize_backtrace(tmem, allocation.backtrace[3:1]).get(0) ?? backtrace::BACKTRACE_UNKNOWN;
-				}
-				if (trace.function.len)	leaks = true;
-				io::fprintfn(out, "%13s   %p   %s:%d", allocation.size,
-					allocation.ptr, trace.function.len ? trace.function : "???",
-					trace.line ? trace.line : 0)!;
-			}
-			io::fprintn(out, "===================================================================================")!;
+			io::fprintn(out, "* NO ALLOCATIONS FOUND *")!;
 		}
-	}
-	else
-	{
-		io::fprintn(out, "* NO ALLOCATIONS FOUND *")!;
-	}
-	io::fprintfn(out, "- Total currently allocated memory:            %d", total)!;
-	io::fprintfn(out, "- Total current allocations:                   %d", entries)!;
-	io::fprintfn(out, "- Total allocations (freed and retained):      %d", self.allocs_total)!;
-	io::fprintfn(out, "- Total allocated memory (freed and retained): %d", self.mem_total)!;
-	if (leaks)
-	{
-		io::fprintn(out)!;
-		io::fprintn(out, "Full leak report:")!;
-		foreach (i, &allocation : allocs)
-		{
-			if (!allocation.backtrace[3])
-			{
-				io::fprintfn(out, "Allocation %d (%d bytes) - no backtrace available.", i + 1, allocation.size)!;
-				continue;
-			}
-			BacktraceList backtraces = {};
-			usz end = MAX_BACKTRACE;
-			foreach (j, val : allocation.backtrace)
-			{
-				if (!val)
-				{
-					end = j;
-					break;
+		io::fprintfn(out, "- Total currently allocated memory:            %d", total)!;
+        io::fprintfn(out, "- Total current allocations:                   %d", entries)!;
+        io::fprintfn(out, "- Total allocations (freed and retained):      %d", self.allocs_total)!;
+        io::fprintfn(out, "- Total allocated memory (freed and retained): %d", self.mem_total)!;
+        if (leaks)
+        {
+			io::fprintn(out)!;
+			io::fprintn(out, "Full leak report:")!;
+            foreach (i, &allocation : allocs)
+            {
+                if (!allocation.backtrace[3])
+                {
+                    io::fprintfn(out, "Allocation %d (%d bytes) - no backtrace available.", i + 1, allocation.size)!;
+                	continue;
 				}
-			}
-			BacktraceList list = backtrace::symbolize_backtrace(tmem, allocation.backtrace[3..(end - 1)])!;
-			io::fprintfn(out, "Allocation %d (%d bytes): ", i + 1, allocation.size)!;
-			foreach (trace : list)
-			{
-				if (trace.has_file())
-				{
-					io::fprintfn(out, "   %s (in %s:%d)", trace.function, trace.file, trace.line);
-					continue;
+                BacktraceList backtraces = {};
+                usz end = MAX_BACKTRACE;
+                foreach (j, val : allocation.backtrace)
+                {
+                    if (!val)
+                	{
+                	    end = j;
+                	    break;
+					}
 				}
-				if (trace.is_unknown())
-				{
-					io::fprintfn(out, "   ??? (in unknown)");
-					continue;
+        		BacktraceList list = backtrace::symbolize_backtrace(allocation.backtrace[3..(end - 1)], allocator::temp())!;
+                io::fprintfn(out, "Allocation %d (%d bytes): ", i + 1, allocation.size)!;
+        		foreach (trace : list)
+        		{
+        			if (trace.has_file())
+                	{
+                	    io::fprintfn(out, "   %s (in %s:%d)", trace.function, trace.file, trace.line);
+                	    continue;
+                	}
+                	if (trace.is_unknown())
+                	{
+                	    io::fprintfn(out, "   ??? (in unknown)");
+                	    continue;
+                	}
+					io::fprintfn(out, "   %s (source unavailable)", trace.function);
 				}
-				io::fprintfn(out, "   %s (source unavailable)", trace.function);
-			}
-		}
-	}
+        	}
+        }
+	};
+
 }

lib/std/core/allocators/vmem.c3

@@ -1,252 +0,0 @@
-module std::core::mem::allocator @if(env::POSIX || env::WIN32);
-import std::math, std::os::posix, libc, std::bits;
-import std::core::mem;
-import std::core::env;
-
-
-
-// Virtual Memory allocator
-
-faultdef VMEM_RESERVE_FAILED;
-
-struct Vmem (Allocator)
-{
-	VirtualMemory memory;
-	usz allocated;
-	usz pagesize;
-	usz page_pot;
-	usz last_page;
-	usz high_water;
-	VmemOptions options;
-}
-
-bitstruct VmemOptions : int
-{
-	bool shrink_on_reset;         // Release memory on reset
-	bool protect_unused_pages;    // Protect unused pages on reset
-	bool scratch_released_data;   // Overwrite released data with 0xAA
-}
-
-<*
- Implements the Allocator interface method.
-
- @require !reserve_page_size || math::is_power_of_2(reserve_page_size)
- @require reserve_page_size <= preferred_size : "The min reserve_page_size size must be less or equal to the preferred size"
- @require preferred_size >= 1 * mem::KB : "The preferred size must exceed 1 KB"
- @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY, VMEM_RESERVE_FAILED
-*>
-fn void? Vmem.init(&self, usz preferred_size, usz reserve_page_size = 0, VmemOptions options = { true, true, env::COMPILER_SAFE_MODE }, usz min_size = 0)
-{
-	static usz page_size = 0;
-    if (!page_size) page_size = mem::os_pagesize();
-    if (page_size < reserve_page_size) page_size = reserve_page_size;
-    preferred_size = mem::aligned_offset(preferred_size, page_size);
-    if (!min_size) min_size = max(preferred_size / 1024, 1);
-    VirtualMemory? memory = mem::OUT_OF_MEMORY?;
-	while (preferred_size >= min_size)
-	{
-		memory = vm::virtual_alloc(preferred_size, PROTECTED);
-		// It worked?
-		if (try memory) break;
-		switch (@catch(memory))
-		{
-			case mem::OUT_OF_MEMORY:
-			case vm::RANGE_OVERFLOW:
-				// Try a smaller size.
-				preferred_size /= 2;
-				continue;
-			default:
-				break;
-		}
-	}
-	if (catch memory) return VMEM_RESERVE_FAILED?;
-	if (page_size > preferred_size) page_size = preferred_size;
-	$if env::ADDRESS_SANITIZER:
-		asan::poison_memory_region(memory.ptr, memory.size);
-	$endif
-	*self = { .memory = memory,
-	          .high_water = 0,
-			  .pagesize = page_size,
-			  .page_pot = page_size.ctz(),
-			  .options  = options,
-	        };
-}
-
-<*
- Implements the Allocator interface method.
-
- @require !alignment || math::is_power_of_2(alignment)
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
- @require size > 0
- @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
-*>
-fn void*? Vmem.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
-{
-	alignment = alignment_for_allocation(alignment);
-	usz total_len = self.memory.size;
-	if (size > total_len) return mem::INVALID_ALLOC_SIZE?;
-	void* start_mem = self.memory.ptr;
-	void* unaligned_pointer_to_offset = start_mem + self.allocated + VmemHeader.sizeof;
-	void* mem = mem::aligned_pointer(unaligned_pointer_to_offset, alignment);
-	usz after = (usz)(mem - start_mem) + size;
-	if (after > total_len) return mem::OUT_OF_MEMORY?;
-	if (init_type == ZERO && self.high_water <= self.allocated)
-	{
-		init_type = NO_ZERO;
-	}
-	protect(self, after)!;
-	VmemHeader* header = mem - VmemHeader.sizeof;
-	header.size = size;
-	if (init_type == ZERO) mem::clear(mem, size, mem::DEFAULT_MEM_ALIGNMENT);
-	return mem;
-}
-
-fn bool Vmem.owns_pointer(&self, void* ptr) @inline
-{
-	return (uptr)ptr >= (uptr)self.memory.ptr && (uptr)ptr < (uptr)self.memory.ptr + self.memory.size;
-}
-<*
- Implements the Allocator interface method.
-
- @require !alignment || math::is_power_of_2(alignment)
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
- @require old_pointer != null
- @require size > 0
- @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
-*>
-fn void*? Vmem.resize(&self, void *old_pointer, usz size, usz alignment) @dynamic
-{
-	if (size > self.memory.size) return mem::INVALID_ALLOC_SIZE?;
-	alignment = alignment_for_allocation(alignment);
-	assert(self.owns_pointer(old_pointer), "Pointer originates from a different allocator: %p, not in %p - %p", old_pointer, self.memory.ptr, self.memory.ptr + self.allocated);
-	VmemHeader* header = old_pointer - VmemHeader.sizeof;
-    usz old_size = header.size;
-    if (old_size == size) return old_pointer;
-    // Do last allocation and alignment match?
-    if (self.memory.ptr + self.allocated == old_pointer + old_size && mem::ptr_is_aligned(old_pointer, alignment))
-    {
-    	if (old_size > size)
-    	{
-    		unprotect(self, self.allocated + size - old_size);
-    	}
-    	else
-    	{
-    		usz allocated = self.allocated + size - old_size;
-    		if (allocated > self.memory.size) return mem::OUT_OF_MEMORY?;
-    		protect(self, allocated)!;
-    	}
-    	header.size = size;
-    	return old_pointer;
-    }
-    if (old_size > size)
-    {
-        $if env::ADDRESS_SANITIZER:
-    	    asan::poison_memory_region(old_pointer + size, old_size - size);
-    	$endif
-    	header.size = size;
-    	return old_pointer;
-    }
-    // Otherwise just allocate new memory.
-    void* mem = self.acquire(size, NO_ZERO, alignment)!;
-    assert(size > old_size);
-    mem::copy(mem, old_pointer, old_size, mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
-    return mem;
-}
-
-<*
- Implements the Allocator interface method.
-
- @require ptr != null
-*>
-fn void Vmem.release(&self, void* ptr, bool) @dynamic
-{
-	assert(self.owns_pointer(ptr), "Pointer originates from a different allocator %p.", ptr);
-	VmemHeader* header = ptr - VmemHeader.sizeof;
-	// Reclaim memory if it's the last element.
-	if (ptr + header.size == self.memory.ptr + self.allocated)
-	{
-		unprotect(self, self.allocated - header.size - VmemHeader.sizeof);
-	}
-}
-
-fn usz Vmem.mark(&self)
-{
-	return self.allocated;
-}
-
-<*
- @require mark <= self.allocated : "Invalid mark"
-*>
-fn void Vmem.reset(&self, usz mark)
-{
-	if (mark == self.allocated) return;
-	unprotect(self, mark);
-}
-
-fn void Vmem.free(&self)
-{
-	if (!self.memory.ptr) return;
-	$switch:
-		$case env::ADDRESS_SANITIZER:
-			asan::poison_memory_region(self.memory.ptr, self.memory.size);
-		$case env::COMPILER_SAFE_MODE:
-    	    ((char*)self.memory.ptr)[0:self.allocated] = 0xAA;
-	$endswitch
-	(void)self.memory.destroy();
-	*self = {};
-}
-
-// Internal data
-
-struct VmemHeader @local
-{
-	usz size;
-	char[*] data;
-}
-
-macro void? protect(Vmem* mem, usz after) @local
-{
-	usz shift = mem.page_pot;
-	usz page_after = (after + mem.pagesize - 1) >> shift;
-	usz last_page = mem.last_page;
-	bool over_high_water = mem.high_water < after;
-	if (page_after > last_page)
-	{
-		usz page_start = last_page << shift;
-		usz page_len = (page_after - last_page) << shift;
-		mem.memory.commit(page_start, page_len)!;
-		if (mem.options.protect_unused_pages || over_high_water)
-		{
-			mem.memory.protect(page_start, page_len, READWRITE)!;
-		}
-		mem.last_page = page_after;
-	}
-	$if env::ADDRESS_SANITIZER:
-		asan::unpoison_memory_region(mem.memory.ptr + mem.allocated, after - mem.allocated);
-	$endif
-	mem.allocated = after;
-	if (over_high_water) mem.high_water = after;
-}
-
-macro void unprotect(Vmem* mem, usz after) @local
-{
-	usz shift = mem.page_pot;
-	usz last_page = mem.last_page;
-	usz page_after = mem.last_page = (after + mem.pagesize - 1) >> shift;
-	$if env::ADDRESS_SANITIZER:
-		asan::poison_memory_region(mem.memory.ptr + after, mem.allocated - after);
-	$else
-		if (mem.options.scratch_released_data)
-		{
-			mem::set(mem.memory.ptr + after, 0xAA, mem.allocated - after);
-		}
-	$endif
-	if ((mem.options.shrink_on_reset || mem.options.protect_unused_pages) && page_after < last_page)
-	{
-		usz start = page_after << shift;
-		usz len = (last_page - page_after) << shift;
-		if (mem.options.shrink_on_reset) (void)mem.memory.decommit(start, len, false);
-		if (mem.options.protect_unused_pages) (void)mem.memory.protect(start, len, PROTECTED);
-	}
-	mem.allocated = after;
-}

lib/std/core/ansi.c3

@@ -1,133 +0,0 @@
-module std::core::string::ansi;
-
-enum Ansi : const inline String
-{
-	RESET              = "\e[0m",
-	BOLD               = "\e[1m",
-	DIM                = "\e[2m",
-	ITALIC             = "\e[3m",
-	UNDERLINE          = "\e[4m",
-	BLINK              = "\e[5m",
-	BLINK_FAST         = "\e[6m",
-	INVERT             = "\e[7m",
-	HIDDEN             = "\e[8m",
-	STRIKETHROUGH      = "\e[9m",
-	DOUBLE_UNDER       = "\e[21m",
-	NO_DIM             = "\e[22m",
-	NO_ITALIC          = "\e[23m",
-	NO_UNDERLINE       = "\e[24m",
-	NO_BLINK           = "\e[25m",
-	NO_INVERT          = "\e[27m",
-	NO_HIDDEN          = "\e[28m",
-	NO_STRIKETHROUGH   = "\e[29m",
-	BLACK              = "\e[30m",
-	RED                = "\e[31m",
-	GREEN              = "\e[32m",
-	YELLOW             = "\e[33m",
-	BLUE               = "\e[34m",
-	MAGENTA            = "\e[35m",
-	CYAN               = "\e[36m",
-	WHITE              = "\e[37m",
-	DEFAULT            = "\e[39m",
-	BRIGHT_BLACK       = "\e[90m",
-	BRIGHT_RED         = "\e[91m",
-	BRIGHT_GREEN       = "\e[92m",
-	BRIGHT_YELLOW      = "\e[93m",
-	BRIGHT_BLUE        = "\e[94m",
-	BRIGHT_MAGENTA     = "\e[95m",
-	BRIGHT_CYAN        = "\e[96m",
-	BRIGHT_WHITE       = "\e[97m",
-	BG_BLACK           = "\e[40m",
-	BG_RED             = "\e[41m",
-	BG_GREEN           = "\e[42m",
-	BG_YELLOW          = "\e[43m",
-	BG_BLUE            = "\e[44m",
-	BG_MAGENTA         = "\e[45m",
-	BG_CYAN            = "\e[46m",
-	BG_WHITE           = "\e[47m",
-	BG_DEFAULT         = "\e[49m",
-	BG_BRIGHT_BLACK    = "\e[100m",
-	BG_BRIGHT_RED      = "\e[101m",
-	BG_BRIGHT_GREEN    = "\e[102m",
-	BG_BRIGHT_YELLOW   = "\e[103m",
-	BG_BRIGHT_BLUE     = "\e[104m",
-	BG_BRIGHT_MAGENTA  = "\e[105m",
-	BG_BRIGHT_CYAN     = "\e[106m",
-	BG_BRIGHT_WHITE    = "\e[107m",
-}
-
-<*
- 8-bit color code
-
- @return `the formatting char for the given background color`
-*>
-macro String color_8bit(char $index, bool $bg = false) @const
-{
-	int $mode = $bg ? 4 : 3;
-	return @sprintf("\e[%s8;5;%sm", $mode, $index);
-}
-
-<*
- 24-bit color code
-
- @return `the string for the given foreground color`
-*>
-macro String color_rgb(char $r, char $g, char $b, bool $bg = false) @const
-{
-	int $mode = $bg ? 4 : 3;
-	return @sprintf("\e[%s8;2;%s;%s;%sm", $mode, $r, $g, $b);
-}
-
-<*
- 24-bit color code rgb
-
- @require $rgb <= 0xFF_FF_FF : `Expected a 24 bit RGB value`
- @return `the string char for the given foreground color`
-*>
-macro String color(uint $rgb, bool $bg = false) @const
-{
-	int $mode = $bg ? 4 : 3;
-	return @sprintf("\e[%s8;2;%s;%s;%sm", $mode, $rgb >> 16, ($rgb & 0xFF00) >> 8, $rgb & 0xFF);
-}
-
-<*
- 24-bit color code rgb
-
- @require rgb <= 0xFF_FF_FF : `Expected a 24 bit RGB value`
- @return `the string char for the given foreground color`
-*>
-fn String make_color(Allocator mem, uint rgb, bool bg = false)
-{
-	return make_color_rgb(mem, (char)(rgb >> 16), (char)((rgb & 0xFF00) >> 8), (char)rgb, bg);
-}
-
-<*
- 24-bit color code rgb
-
- @require rgb <= 0xFF_FF_FF : `Expected a 24 bit RGB value`
- @return `the string char for the given foreground color`
-*>
-fn String make_tcolor(uint rgb, bool bg = false)
-{
-	return make_color_rgb(tmem, (char)(rgb >> 16), (char)((rgb & 0xFF00) >> 8), (char)rgb, bg);
-}
-
-<*
- 24-bit color code rgb
-
- @return `the string char for the given foreground color`
-*>
-fn String make_color_rgb(Allocator mem, char r, char g, char b, bool bg = false)
-{
-	return string::format(mem, "\e[%s8;2;%s;%s;%sm", bg ? 4 : 3, r, g, b);
-}
-
-<*
- 24-bit color code rgb
-
- @return `the string char for the given foreground color`
-*>
-fn String make_tcolor_rgb(char r, char g, char b, bool bg = false)
-{
-	return string::format(tmem, "\e[%s8;2;%s;%s;%sm", bg ? 4 : 3, r, g, b);
-}

lib/std/core/array.c3

@@ -1,91 +1,61 @@
 module std::core::array;
 import std::core::array::slice;
 
-<*
- Returns true if the array contains at least one element, else false
- 
- @param [in] array
- @param [in] element
- @require @typekind(array) == SLICE || @typekind(array) == ARRAY
- @require @typeis(array[0], $typeof(element)) : "array and element must have the same type"
-*>
-macro bool contains(array, element)
-{
-	foreach (&item : array)
-	{
-		if (*item == element) return true;
-	}
-	return false;	
-}
-
-<*
- Return the first index of element found in the array, searching from the start.
- 
- @param [in] array
- @param [in] element
- @return "the first index of the element"
- @return? NOT_FOUND
-*>
+/**
+ * @param [in] array
+ * @param [in] element
+ * @return "the first index of the element"
+ * @return! SearchResult.MISSING
+ **/
 macro index_of(array, element)
 {
 	foreach (i, &e : array)
 	{
 		if (*e == element) return i;
 	}
-	return NOT_FOUND?;
+	return SearchResult.MISSING?;
 }
 
-<*
- Slice a 2d array and create a Slice2d from it.
-
- @param array_ptr : "the pointer to create a slice from"
- @param x : "The starting position of the slice x, optional"
- @param y : "The starting position of the slice y, optional"
- @param xlen : "The length of the slice in x, defaults to the length of the array"
- @param ylen : "The length of the slice in y, defaults to the length of the array"
- @return "A Slice2d from the array"
- @require @typekind(array_ptr) == POINTER
- @require @typekind(*array_ptr) == VECTOR || @typekind(*array_ptr) == ARRAY
- @require @typekind((*array_ptr)[0]) == VECTOR || @typekind((*array_ptr)[0]) == ARRAY
-*>
-macro slice2d(array_ptr, x = 0, xlen = 0, y = 0, ylen = 0)
+/**
+ * @require @typekind(array) == VECTOR || @typekind(array) == ARRAY
+ * @require @typekind(array[0]) == VECTOR || @typekind(array[0]) == ARRAY
+ **/
+macro slice2d(array, x = 0, xlen = 0, y = 0, ylen = 0)
 {
-	if (xlen < 1) xlen = $typeof((*array_ptr)[0]).len + xlen;
-	if (ylen < 1) ylen = $typeof((*array_ptr)).len + ylen;
-	var $ElementType = $typeof((*array_ptr)[0][0]);
-	return (Slice2d{$ElementType}) { ($ElementType*)array_ptr, $typeof((*array_ptr)[0]).len, y, ylen, x, xlen };
+	if (xlen < 1) xlen = $typeof(array[0]).len + xlen;
+	if (ylen < 1) ylen = $typeof(array).len + ylen;
+	var $ElementType = $typeof(array[0][0]);
+	return Slice2d(<$ElementType>) { ($ElementType*)&array, $typeof(array[0]).len, y, ylen, x, xlen };
 }
 
 
-<*
- Return the first index of element found in the array, searching in reverse from the end.
- 
- @param [in] array
- @param [in] element
- @return "the last index of the element"
- @return? NOT_FOUND
-*>
+/**
+ * @param [in] array
+ * @param [in] element
+ * @return "the last index of the element"
+ * @return! SearchResult.MISSING
+ **/
 macro rindex_of(array, element)
 {
 	foreach_r (i, &e : array)
 	{
 		if (*e == element) return i;
 	}
-	return NOT_FOUND?;
+	return SearchResult.MISSING?;
 }
 
-<*
- Concatenate two arrays or slices, returning a slice containing the concatenation of them.
-
- @param [in] arr1
- @param [in] arr2
- @param [&inout] allocator : "The allocator to use, default is the heap allocator"
- @require @typekind(arr1) == SLICE || @typekind(arr1) == ARRAY
- @require @typekind(arr2) == SLICE || @typekind(arr2) == ARRAY
- @require @typeis(arr1[0], $typeof(arr2[0])) : "Arrays must have the same type"
- @ensure result.len == arr1.len + arr2.len
-*>
-macro concat(Allocator allocator, arr1, arr2) @nodiscard
+/**
+ * Concatenate two arrays or slices, returning a slice containing the concatenation of them.
+ *
+ * @param [in] arr1
+ * @param [in] arr2
+ * @param [&inout] allocator "The allocator to use, default is the heap allocator"
+ * @require @typekind(arr1) == SLICE || @typekind(arr1) == ARRAY
+ * @require @typekind(arr2) == SLICE || @typekind(arr2) == ARRAY
+ * @require @typeis(arr1[0], $typeof(arr2[0])) "Arrays must have the same type"
+ * @ensure result.len == arr1.len + arr2.len
+ **/
+macro concat_new(arr1, arr2, Allocator allocator = allocator::heap())
 {
 	var $Type = $typeof(arr1[0]);
 	$Type[] result = allocator::alloc_array(allocator, $Type, arr1.len + arr2.len);
@@ -99,15 +69,79 @@ macro concat(Allocator allocator, arr1, arr2) @nodiscard
 	}
 	return result;
 }
-<*
- Concatenate two arrays or slices, returning a slice containing the concatenation of them,
- allocated using the temp allocator.
 
- @param [in] arr1
- @param [in] arr2
- @require @typekind(arr1) == SLICE || @typekind(arr1) == ARRAY
- @require @typekind(arr2) == SLICE || @typekind(arr2) == ARRAY
- @require @typeis(arr1[0], $typeof(arr2[0])) : "Arrays must have the same type"
- @ensure return.len == arr1.len + arr2.len
-*>
-macro tconcat(arr1, arr2) @nodiscard => concat(tmem, arr1, arr2);
+/**
+ * Concatenate two arrays or slices, returning a slice containing the concatenation of them,
+ * allocated using the temp allocator.
+ *
+ * @param [in] arr1
+ * @param [in] arr2
+ * @require @typekind(arr1) == SLICE || @typekind(arr1) == ARRAY
+ * @require @typekind(arr2) == SLICE || @typekind(arr2) == ARRAY
+ * @require @typeis(arr1[0], $typeof(arr2[0])) "Arrays must have the same type"
+ * @ensure result.len == arr1.len + arr2.len
+ **/
+macro tconcat(arr1, arr2) => concat(arr1, arr2, allocator::temp());
+
+module std::core::array::slice(<Type>);
+
+struct Slice2d
+{
+	Type* ptr;
+	usz inner_len;
+	usz ystart;
+	usz ylen;
+	usz xstart;
+	usz xlen;
+}
+
+fn usz Slice2d.len(&self) @operator(len)
+{
+	return self.ylen;
+}
+
+fn usz Slice2d.count(&self)
+{
+	return self.ylen * self.xlen;
+}
+
+macro void Slice2d.@each(&self; @body(usz[<2>], Type))
+{
+	foreach (y, line : *self)
+	{
+		foreach (x, val : line)
+		{
+			@body({ x, y }, val);
+		}
+	}
+}
+
+macro void Slice2d.@each_ref(&self; @body(usz[<2>], Type*))
+{
+	foreach (y, line : *self)
+	{
+		foreach (x, &val : line)
+		{
+			@body({ x, y }, val);
+		}
+	}
+}
+
+/**
+ * @require idy >= 0 && idy < self.ylen
+ **/
+macro Type[] Slice2d.get(self, usz idy) @operator([])
+{
+	return (self.ptr + self.inner_len * (idy + self.ystart))[self.xstart:self.xlen];
+}
+
+/**
+ * @require y >= 0 && y < self.ylen
+ * @require x >= 0 && x < self.xlen
+ **/
+fn Slice2d Slice2d.slice(&self, isz x = 0, isz xlen = 0, isz y = 0, isz ylen = 0)
+{
+	if (xlen < 1) xlen = self.xlen + xlen;
+	if (ylen < 1) ylen = self.ylen + ylen;
+	return { self.ptr, self.inner_len, y + self.ystart, ylen, x + self.xstart, xlen };
+}

lib/std/core/ascii.c3

@@ -1,114 +0,0 @@
-<*
- This module contains utils for handling ASCII characters. They only operate on
- characters corresponding to 0-127.
-*>
-module std::core::ascii;
-
-macro bool @is_lower(c)  => ASCII_LOOKUP[c].lower;      // Is a-z
-macro bool @is_upper(c)  => ASCII_LOOKUP[c].upper;      // Is A-Z
-macro bool @is_digit(c)  => ASCII_LOOKUP[c].digit;      // Is 0-9
-macro bool @is_bdigit(c) => ASCII_LOOKUP[c].bin_digit;  // Is 0-1
-macro bool @is_odigit(c) => ASCII_LOOKUP[c].oct_digit;  // Is 0-7
-macro bool @is_xdigit(c) => ASCII_LOOKUP[c].hex_digit;  // Is 0-9 or a-f or A-F
-macro bool @is_alpha(c)  => ASCII_LOOKUP[c].alpha;      // Is a-z or A-Z
-macro bool @is_print(c)  => ASCII_LOOKUP[c].printable;  // Is a printable character (space or higher and < 127
-macro bool @is_graph(c)  => ASCII_LOOKUP[c].graph;      // Does it show any graphics (printable but not space)
-macro bool @is_space(c)  => ASCII_LOOKUP[c].space;      // Is it a space character: space, tab, linefeed etc
-macro bool @is_alnum(c)  => ASCII_LOOKUP[c].alphanum;   // Is it alpha or digit
-macro bool @is_punct(c)  => ASCII_LOOKUP[c].punct;      // Is it "graph" but not digit or letter
-macro bool @is_blank(c)  => ASCII_LOOKUP[c].blank;      // Is it a blank space: space or tab
-macro bool @is_cntrl(c)  => ASCII_LOOKUP[c].control;    // Is it a control character: before space or 127
-macro char @to_lower(c)  => c + TO_LOWER[c];            // Convert A-Z to a-z if found
-macro char @to_upper(c)  => c - TO_UPPER[c];            // Convert a-z to A-Z if found
-
-fn bool is_lower(char c)  => @is_lower(c);  // Is a-z
-fn bool is_upper(char c)  => @is_upper(c);  // Is A-Z
-fn bool is_digit(char c)  => @is_digit(c);  // Is 0-9
-fn bool is_bdigit(char c) => @is_bdigit(c); // Is 0-1
-fn bool is_odigit(char c) => @is_odigit(c); // Is 0-7
-fn bool is_xdigit(char c) => @is_xdigit(c); // Is 0-9 or a-f or A-F
-fn bool is_alpha(char c)  => @is_alpha(c);  // Is a-z or A-Z
-fn bool is_print(char c)  => @is_print(c);  // Is a printable character (space or higher and < 127
-fn bool is_graph(char c)  => @is_graph(c);  // Does it show any graphics (printable but not space)
-fn bool is_space(char c)  => @is_space(c);  // Is it a space character: space, tab, linefeed etc
-fn bool is_alnum(char c)  => @is_alnum(c);  // Is it alpha or digit
-fn bool is_punct(char c)  => @is_punct(c);  // Is it "graph" but not digit or letter
-fn bool is_blank(char c)  => @is_blank(c);  // Is it a blank space: space or tab
-fn bool is_cntrl(char c)  => @is_cntrl(c);  // Is it a control character: before space or 127
-fn char to_lower(char c)  => @to_lower(c);  // Convert A-Z to a-z if found
-fn char to_upper(char c)  => @to_upper(c);  // Convert a-z to A-Z if found
-
-// The following methods are macro methods for the same functions
-macro bool char.is_lower(char c)  => @is_lower(c);
-macro bool char.is_upper(char c)  => @is_upper(c);
-macro bool char.is_digit(char c)  => @is_digit(c);
-macro bool char.is_bdigit(char c) => @is_bdigit(c);
-macro bool char.is_odigit(char c) => @is_odigit(c);
-macro bool char.is_xdigit(char c) => @is_xdigit(c);
-macro bool char.is_alpha(char c)  => @is_alpha(c);
-macro bool char.is_print(char c)  => @is_print(c);
-macro bool char.is_graph(char c)  => @is_graph(c);
-macro bool char.is_space(char c)  => @is_space(c);
-macro bool char.is_alnum(char c)  => @is_alnum(c);
-macro bool char.is_punct(char c)  => @is_punct(c);
-macro bool char.is_blank(char c)  => @is_blank(c);
-macro bool char.is_cntrl(char c)  => @is_cntrl(c);
-macro char char.to_lower(char c)  => @to_lower(c);
-macro char char.to_upper(char c)  => @to_upper(c);
-
-<*
- Convert a-f/A-F/0-9 to the appropriate hex value.
-
- @require c.is_xdigit()
- @ensure return >= 0 && return <= 15
-*>
-macro char char.from_hex(char c) => HEX_VALUE[c];
-
-<*
- Bitstruct containing the different properties of a character
-*>
-bitstruct CharType : ushort @private
-{
-	bool lower;
-	bool upper;
-	bool digit;
-	bool bin_digit;
-	bool hex_digit;
-	bool oct_digit;
-	bool alpha;
-	bool alphanum;
-	bool space;
-	bool printable;
-	bool blank;
-	bool punct;
-	bool control;
-	bool graph;
-}
-
-const CharType[256] ASCII_LOOKUP @private = {
-	[0..31]    = { .control },
-	[9..13]    = { .control, .space },
-	['\t']     = { .control, .space, .blank },
-	[' ']      = { .space, .printable, .blank },
-	[33..126]  = { .printable, .graph, .punct },
-	['0'..'9'] = { .printable, .graph, .alphanum, .hex_digit, .digit },
-	['2'..'7'] = { .printable, .graph, .alphanum, .hex_digit, .digit, .oct_digit },
-	['0'..'1'] = { .printable, .graph, .alphanum, .hex_digit, .digit, .oct_digit, .bin_digit },
-	['A'..'Z'] = { .printable, .graph, .alphanum, .alpha, .upper },
-	['A'..'F'] = { .printable, .graph, .alphanum, .alpha, .upper, .hex_digit },
-	['a'..'z'] = { .printable, .graph, .alphanum, .alpha, .lower },
-	['a'..'f'] = { .printable, .graph, .alphanum, .alpha, .lower, .hex_digit },
-	[127]      = { .control },
-};
-
-const char[256] HEX_VALUE = {
-	['0'] =  0, ['1'] =  1, ['2'] =  2, ['3'] =  3, ['4'] =  4,
-	['5'] =  5, ['6'] =  6, ['7'] =  7, ['8'] =  8, ['9'] =  9,
-	['A'] = 10, ['B'] = 11, ['C'] = 12, ['D'] = 13, ['E'] = 14,
-	['F'] = 15, ['a'] = 10, ['b'] = 11, ['c'] = 12, ['d'] = 13,
-	['e'] = 14, ['f'] = 15
-};
-
-const char[256] TO_UPPER @private = { ['a'..'z'] = 'a' - 'A' };
-const char[256] TO_LOWER @private  = { ['A'..'Z'] = 'a' - 'A' };
-

lib/std/core/bitorder.c3

@@ -1,4 +1,4 @@
-// Copyright (c) 2023-2025 Christoffer Lerno and contributors. All rights reserved.
+// Copyright (c) 2023 Christoffer Lerno and contributors. All rights reserved.
 // Use of this source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::core::bitorder;
@@ -87,98 +87,94 @@ bitstruct UInt128LE : uint128 @littleendian
 	uint128 val : 0..127;
 }
 
-<*
- @require @is_array_or_slice_of_char(bytes) : "argument must be an array, a pointer to an array or a slice of char"
- @require is_bitorder($Type) : "type must be a bitorder integer"
-*>
+/**
+ * @require is_array_or_slice_of_char(bytes) "argument must be an array, a pointer to an array or a slice of char"
+ * @require is_bitorder($Type) "type must be a bitorder integer"
+ **/
 macro read(bytes, $Type)
 {
 	char[] s;
-	$switch @typekind(bytes):
-		$case POINTER:
-			s = (*bytes)[:$Type.sizeof];
-		$default:
-			s = bytes[:$Type.sizeof];
+	$switch (@typekind(bytes))
+	$case POINTER:
+		s = (*bytes)[:$Type.sizeof];
+	$default:
+		s = bytes[:$Type.sizeof];
 	$endswitch
 	return bitcast(*(char[$Type.sizeof]*)s.ptr, $Type).val;
 }
 
-<*
- @require @is_arrayptr_or_slice_of_char(bytes) : "argument must be a pointer to an array or a slice of char"
- @require is_bitorder($Type) : "type must be a bitorder integer"
-*>
+/**
+ * @require is_arrayptr_or_slice_of_char(bytes) "argument must be a pointer to an array or a slice of char"
+ * @require is_bitorder($Type) "type must be a bitorder integer"
+ **/
 macro write(x, bytes, $Type)
 {
 	char[] s;
-	$switch @typekind(bytes):
-		$case POINTER:
-			s = (*bytes)[:$Type.sizeof];
-		$default:
-			s = bytes[:$Type.sizeof];
+	$switch (@typekind(bytes))
+	$case POINTER:
+		s = (*bytes)[:$Type.sizeof];
+	$default:
+		s = bytes[:$Type.sizeof];
 	$endswitch
 	*($typeof(x)*)s.ptr = bitcast(x, $Type).val;
 }
 
 macro is_bitorder($Type)
 {
-	$switch $Type:
-		$case UShortLE:
-		$case ShortLE:
-		$case UIntLE:
-		$case IntLE:
-		$case ULongLE:
-		$case LongLE:
-		$case UInt128LE:
-		$case Int128LE:
-		$case UShortBE:
-		$case ShortBE:
-		$case UIntBE:
-		$case IntBE:
-		$case ULongBE:
-		$case LongBE:
-		$case UInt128BE:
-		$case Int128BE:
-			return true;
-		$default:
-			return false;
+	$switch ($Type)
+	$case UShortLE:
+	$case ShortLE:
+	$case UIntLE:
+	$case IntLE:
+	$case ULongLE:
+	$case LongLE:
+	$case UInt128LE:
+	$case Int128LE:
+	$case UShortBE:
+	$case ShortBE:
+	$case UIntBE:
+	$case IntBE:
+	$case ULongBE:
+	$case LongBE:
+	$case UInt128BE:
+	$case Int128BE:
+		return true;
+	$default:
+		return false;
 	$endswitch
 }
 
-macro bool is_array_or_slice_of_char(bytes) @deprecated("Use @is_array_or_slice_of_char")
+macro bool is_array_or_slice_of_char(bytes)
 {
-	return @is_array_or_slice_of_char(bytes);
-}
-
-macro bool @is_array_or_slice_of_char(#bytes) @const
-{
-    var $Type = $typeof(#bytes);
-	$switch $Type.kindof:
-		$case POINTER:
-			typeid $inner = $Type.inner;
-			return $inner.kindof == ARRAY &&& $inner.inner == char.typeid;
-		$case ARRAY:
-		$case SLICE:
-			return $Type.inner == char.typeid;
-		$default:
-			return false;
+	$switch (@typekind(bytes))
+	$case POINTER:
+		var $Inner = $typefrom($typeof(bytes).inner);
+		$if $Inner.kindof == ARRAY:
+			var $Inner2 = $typefrom($Inner.inner);
+			return $Inner2.typeid == char.typeid;
+		$endif
+	$case ARRAY:
+	$case SLICE:
+		var $Inner = $typefrom($typeof(bytes).inner);
+		return $Inner.typeid == char.typeid;
+	$default:
+		return false;
 	$endswitch
 }
 
-macro bool is_arrayptr_or_slice_of_char(bytes) @deprecated("Use @is_arrayptr_or_slice_of_char")
+macro bool is_arrayptr_or_slice_of_char(bytes)
 {
-	return @is_arrayptr_or_slice_of_char(bytes);
-}
-
-macro bool @is_arrayptr_or_slice_of_char(#bytes) @const
-{
-	var $Type = $typeof(#bytes);
-	$switch $Type.kindof:
-		$case POINTER:
-			typeid $inner = $Type.inner;
-			return $inner.kindof == ARRAY &&& $inner.inner == char.typeid;
-		$case SLICE:
-			return $Type.inner == char.typeid;
-		$default:
-			return false;
+	$switch (@typekind(bytes))
+	$case POINTER:
+		var $Inner = $typefrom($typeof(bytes).inner);
+		$if $Inner.kindof == ARRAY:
+			var $Inner2 = $typefrom($Inner.inner);
+			return $Inner2.typeid == char.typeid;
+		$endif
+	$case SLICE:
+		var $Inner = $typefrom($typeof(bytes).inner);
+		return $Inner.typeid == char.typeid;
+	$default:
+		return false;
 	$endswitch
 }

lib/std/core/builtin.c3

@@ -4,250 +4,157 @@
 module std::core::builtin;
 import libc, std::hash, std::io, std::os::backtrace;
 
+/**
+ * Use `IteratorResult` when reading the end of an iterator, or accessing a result out of bounds.
+ **/
+fault IteratorResult { NO_MORE_ELEMENT }
 
-<*
- EMPTY_MACRO_SLOT is a value used for implementing optional arguments for macros in an efficient
- way. It relies on the fact that distinct types are not implicitly convertable.
+/**
+ * Use `SearchResult` when trying to return a value from some collection but the element is missing.
+ **/
+fault SearchResult { MISSING }
 
- You can use `@is_empty_macro_slot()` and `@is_valid_macro_slot()` to figure out whether
- the argument has been used or not.
+/**
+ * Use `CastResult` when an attempt at conversion fails.
+ **/
+fault CastResult { TYPE_MISMATCH }
 
- An example:
+def VoidFn = fn void();
 
-```c3
-macro foo(a, #b = EMPTY_MACRO_SLOT)
+/**
+ * Stores a variable on the stack, then restores it at the end of the
+ * macro scope.
+ *
+ * @param variable `the variable to store and restore`
+ **/
+macro void @scope(&variable; @body) @builtin
 {
-	$if @is_valid_macro_slot(#b):
-        return invoke_foo2(a, #b);
-    $else
-        return invoke_foo1(a);
-    $endif
-}
-*>
-const EmptySlot EMPTY_MACRO_SLOT @builtin = null;
-
-typedef EmptySlot = void*;
-macro @is_empty_macro_slot(#arg) @const @builtin => @typeis(#arg, EmptySlot);
-macro @is_valid_macro_slot(#arg) @const @builtin => !@typeis(#arg, EmptySlot);
-
-<*
- Returns a random value at compile time.
-
- @ensure return >= 0.0 && return < 1.0
- @return "A compile time random"
-*>
-macro @rnd() @const @builtin => $$rnd();
-
-/*
- Use `IteratorResult` when reading the end of an iterator, or accessing a result out of bounds.
-*/
-faultdef NO_MORE_ELEMENT @builtin;
-
-/*
- Use `SearchResult` when trying to return a value from some collection but the element is missing.
-*/
-faultdef NOT_FOUND @builtin;
-
-/*
- Use `CastResult` when an attempt at conversion fails.
-*/
-faultdef TYPE_MISMATCH @builtin;
-
-
-alias VoidFn = fn void();
-
-<*
- Stores a variable on the stack, then restores it at the end of the
- macro scope.
-
- @param #variable : `the variable to store and restore`
- @require values::@is_lvalue(#variable)
-*>
-macro void @scope(#variable; @body) @builtin
-{
-	var temp = #variable;
-	defer #variable = temp;
+	var temp = *variable;
+	defer *variable = temp;
 	@body();
 }
 
-<*
- Swap two variables
- @require $defined(#a = #b, #b = #a) : `The values must be mutually assignable`
-*>
-macro void @swap(#a, #b) @builtin
+/**
+ * Swap two variables
+ * @require $assignable(*b, $typeof(*a)) && $assignable(*a, $typeof(*b))
+ **/
+macro void @swap(&a, &b) @builtin
 {
-	var temp = #a;
-	#a = #b;
-	#b = temp;
+	var temp = *a;
+	*a = *b;
+	*b = temp;
 }
 
-<*
- Convert an `any` type to a type, returning an failure if there is a type mismatch.
-
- @param v : `the any to convert to the given type.`
- @param $Type : `the type to convert to`
- @return `The any.ptr converted to its type.`
- @ensure @typeis(return, $Type*)
- @return? TYPE_MISMATCH
-*>
+/**
+ * Convert an `any` type to a type, returning an failure if there is a type mismatch.
+ *
+ * @param v `the any to convert to the given type.`
+ * @param $Type `the type to convert to`
+ * @return `The any.ptr converted to its type.`
+ * @ensure @typeis(return, $Type*)
+ * @return! CastResult.TYPE_MISMATCH
+ **/
 macro anycast(any v, $Type) @builtin
 {
-	if (v.type != $Type.typeid) return TYPE_MISMATCH?;
+	if (v.type != $Type.typeid) return CastResult.TYPE_MISMATCH?;
 	return ($Type*)v.ptr;
 }
 
-macro bool @assignable_to(#foo, $Type) @const @builtin => $defined(*&&($Type){} = #foo);
-
-macro @addr(#val) @builtin
+fn bool print_backtrace(String message, int backtraces_to_ignore) @if(env::NATIVE_STACKTRACE)
 {
-	$if $defined(&#val):
-		return &#val;
-	$else
-		return &&#val;
-	$endif
-}
-
-macro typeid @typeid(#value) @const @builtin
-{
-	return $typeof(#value).typeid;
-}
-
-macro TypeKind @typekind(#value) @const @builtin
-{
-	return $typeof(#value).kindof;
-}
-
-macro bool @typeis(#value, $Type) @const @builtin
-{
-	return $typeof(#value).typeid == $Type.typeid;
-}
-
-
-fn bool print_backtrace(String message, int backtraces_to_ignore) @if (env::NATIVE_STACKTRACE) => @stack_mem(0x1100; Allocator smem)
-{
-	void*[256] buffer;
-	void*[] backtraces = backtrace::capture_current(&buffer);
-	backtraces_to_ignore++;
-	@stack_mem(2048; Allocator mem)
+	@pool()
 	{
-		BacktraceList? backtrace = backtrace::symbolize_backtrace(mem, backtraces);
+		void*[256] buffer;
+		void*[] backtraces = backtrace::capture_current(&buffer);
+		backtraces_to_ignore++;
+		BacktraceList! backtrace = backtrace::symbolize_backtrace(backtraces, allocator::temp());
 		if (catch backtrace) return false;
 		if (backtrace.len() <= backtraces_to_ignore) return false;
 		io::eprint("\nERROR: '");
-		io::eprint(message);
-		io::eprintn("'");
+        io::eprint(message);
+        io::eprintn("'");
 		foreach (i, &trace : backtrace)
-		{
-			if (i < backtraces_to_ignore) continue;
-			String inline_suffix = trace.is_inline ? " [inline]" : "";
-			if (trace.is_unknown())
-			{
+        {
+            if (i < backtraces_to_ignore) continue;
+            String inline_suffix = trace.is_inline ? " [inline]" : "";
+            if (trace.is_unknown())
+            {
 				io::eprintfn("  in ???%s", inline_suffix);
 				continue;
 			}
 			if (trace.has_file())
-			{
-				io::eprintfn("  in %s (%s:%d) [%s]%s", trace.function, trace.file, trace.line, trace.object_file, inline_suffix);
-				continue;
-			}
-			io::eprintfn("  in %s (source unavailable) [%s]%s", trace.function, trace.object_file, inline_suffix);
+            {
+                io::eprintfn("  in %s (%s:%d) [%s]%s", trace.function, trace.file, trace.line, trace.object_file, inline_suffix);
+                continue;
+            }
+            io::eprintfn("  in %s (source unavailable) [%s]%s", trace.function, trace.object_file, inline_suffix);
 		}
+		return true;
 	};
-	return true;
-
 }
-
 fn void default_panic(String message, String file, String function, uint line) @if(env::NATIVE_STACKTRACE)
 {
-	$if $defined(io::stderr) && env::PANIC_MSG:
-		if (!print_backtrace(message, 2))
-		{
-			io::eprintfn("\nERROR: '%s', in %s (%s:%d)", message, function, file, line);
-		}
+	$if $defined(io::stderr):
+	if (!print_backtrace(message, 2))
+	{
+		io::eprintfn("\nERROR: '%s', in %s (%s:%d)", message, function, file, line);
+		return;
+	}
 	$endif
 	$$trap();
 
 }
-
-macro void abort(String string = "Unrecoverable error reached", ...) @format(0) @builtin @noreturn
+fn void default_panic(String message, String file, String function, uint line) @if(!env::NATIVE_STACKTRACE)
 {
-	panicf(string, $$FILE, $$FUNC, $$LINE, $vasplat);
-	$$trap();
-}
-
-bool in_panic @local = false;
-
-fn void default_panic(String message, String file, String function, uint line) @if (!env::NATIVE_STACKTRACE)
-{
-	$if $defined(io::stderr) && env::PANIC_MSG:
-		if (in_panic)
-		{
-			io::eprintn("Panic inside of panic.");
-			return;
-		}
-		in_panic = true;
-		$if $defined(io::stderr):
-		io::eprint("\nERROR: '");
-		io::eprint(message);
-		io::eprintfn("', in %s (%s:%d)", function, file, line);
-		$endif
-		in_panic = false;
+	$if $defined(io::stderr):
+	io::eprint("\nERROR: '");
+	io::eprint(message);
+	io::eprintfn("', in %s (%s:%d)", function, file, line);
 	$endif
 	$$trap();
 }
 
-alias PanicFn = fn void(String message, String file, String function, uint line);
+def PanicFn = fn void(String message, String file, String function, uint line);
 
 PanicFn panic = &default_panic;
 
 fn void panicf(String fmt, String file, String function, uint line, args...)
 {
-	$if $defined(io::stderr) && env::PANIC_MSG:
-		if (in_panic)
-		{
-			io::eprint("Panic inside of panic: ");
-			io::eprintn(fmt);
-			return;
-		}
-		in_panic = true;
-		@stack_mem(512; Allocator allocator)
-		{
-			DString s;
-			s.init(allocator);
-			s.appendf(fmt, ...args);
-			in_panic = false;
-			panic(s.str_view(), file, function, line);
-		};
-	$endif
+	@stack_mem(512; Allocator allocator)
+	{
+		DString s;
+		s.new_init(.allocator = allocator);
+		s.appendf(fmt, ...args);
+		panic(s.str_view(), file, function, line);
+	};
 }
 
-<*
- Marks the path as unreachable. This will panic in safe mode, and in fast will simply be assumed
- never happens.
- @param [in] string : "The panic message or format string"
-*>
+/**
+ * Marks the path as unreachable. This will panic in safe mode, and in fast will simply be assumed
+ * never happens.
+ * @param [in] string "The panic message or format string"
+ **/
 macro void unreachable(String string = "Unreachable statement reached.", ...) @builtin @noreturn
 {
 	$if env::COMPILER_SAFE_MODE:
 	panicf(string, $$FILE, $$FUNC, $$LINE, $vasplat);
-	$else
+	$endif;
 	$$unreachable();
-	$endif
 }
 
-<*
- Marks the path as unsupported, this is similar to unreachable.
- @param [in] string : "The error message"
-*>
+/**
+ * Marks the path as unsupported, this is similar to unreachable.
+ * @param [in] string "The error message"
+ **/
 macro void unsupported(String string = "Unsupported function invoked") @builtin @noreturn
 {
 	panicf(string, $$FILE, $$FUNC, $$LINE, $vasplat);
 	$$unreachable();
 }
 
-<*
- Unconditionally break into an attached debugger when reached.
-*>
+/**
+ * Unconditionally break into an attached debugger when reached.
+ **/
 macro void breakpoint() @builtin
 {
 	$$breakpoint();
@@ -268,13 +175,13 @@ macro any.as_inner(&self)
 	return $$any_make(self.ptr, self.type.inner);
 }
 
-<*
- @param expr : "the expression to cast"
- @param $Type : "the type to cast to"
-
- @require $sizeof(expr) == $Type.sizeof  : "Cannot bitcast between types of different size."
- @ensure @typeis(return, $Type)
-*>
+/**
+ * @param expr "the expression to cast"
+ * @param $Type "the type to cast to"
+ *
+ * @require $sizeof(expr) == $Type.sizeof  "Cannot bitcast between types of different size."
+ * @ensure @typeis(return, $Type)
+ **/
 macro bitcast(expr, $Type) @builtin
 {
 	$if $Type.alignof <= $alignof(expr):
@@ -286,99 +193,82 @@ macro bitcast(expr, $Type) @builtin
 	$endif
 }
 
-<*
- @param $Type : `The type of the enum`
- @param [in] enum_name : `The name of the enum to search for`
- @require $Type.kindof == ENUM : `Only enums may be used`
- @ensure @typeis(return, $Type)
- @return? NOT_FOUND
-*>
+/**
+ * @param $Type `The type of the enum`
+ * @param [in] enum_name `The name of the enum to search for`
+ * @require $Type.kindof == ENUM `Only enums may be used`
+ * @ensure @typeis(return, $Type)
+ * @return! SearchResult.MISSING
+ **/
 macro enum_by_name($Type, String enum_name) @builtin
 {
 	typeid x = $Type.typeid;
 	foreach (i, name : x.names)
 	{
-		if (name == enum_name) return $Type.from_ordinal(i);
+		if (name == enum_name) return ($Type)i;
 	}
-	return NOT_FOUND?;
+	return SearchResult.MISSING?;
 }
 
-<*
- @param $Type : `The type of the enum`
- @require $Type.kindof == ENUM : `Only enums may be used`
- @require $defined($Type.#value) : `Expected '#value' to match an enum associated value`
- @require @assignable_to(value, $typeof(($Type){}.#value)) : `Expected the value to match the type of the associated value`
- @ensure @typeis(return, $Type)
- @return? NOT_FOUND
-*>
-macro @enum_from_value($Type, #value, value) @builtin @deprecated("Use Enum.lookup_field and Enum.lookup")
-{
-	foreach (e : $Type.values)
-	{
-		if (e.#value == value) return e;
-	}
-	return NOT_FOUND?;
-}
-
-<*
- Mark an expression as likely to be true
-
- @param #value : "expression to be marked likely"
- @param $probability : "in the range 0 - 1"
- @require $probability >= 0 && $probability <= 1.0
-*>
+/**
+ * Mark an expression as likely to be true
+ *
+ * @param #value "expression to be marked likely"
+ * @param $probability "in the range 0 - 1"
+ * @require $probability >= 0 && $probability <= 1.0
+ **/
 macro bool @likely(bool #value, $probability = 1.0) @builtin
 {
-	$switch:
-	$case env::BUILTIN_EXPECT_IS_DISABLED:
+    $switch
+    $case env::BUILTIN_EXPECT_IS_DISABLED:
 	return #value;
-	$case $probability == 1.0:
+    $case $probability == 1.0:
 	return $$expect(#value, true);
-	$default:
+    $default:
 	return $$expect_with_probability(#value, true, $probability);
-	$endswitch
+    $endswitch
 }
 
-<*
- Mark an expression as unlikely to be true
-
- @param #value : "expression to be marked unlikely"
- @param $probability : "in the range 0 - 1"
- @require $probability >= 0 && $probability <= 1.0
-*>
+/**
+ * Mark an expression as unlikely to be true
+ *
+ * @param #value "expression to be marked unlikely"
+ * @param $probability "in the range 0 - 1"
+ * @require $probability >= 0 && $probability <= 1.0
+ **/
 macro bool @unlikely(bool #value, $probability = 1.0) @builtin
 {
-	$switch:
-	$case env::BUILTIN_EXPECT_IS_DISABLED:
+    $switch
+    $case env::BUILTIN_EXPECT_IS_DISABLED:
 	return #value;
-	$case $probability == 1.0:
+    $case $probability == 1.0:
 	return $$expect(#value, false);
-	$default:
+    $default:
 	return $$expect_with_probability(#value, false, $probability);
-	$endswitch
+    $endswitch
 }
 
-<*
- @require values::@is_int(#value) || values::@is_bool(#value)
- @require @assignable_to(expected, $typeof(#value))
- @require $probability >= 0 && $probability <= 1.0
-*>
+/**
+ * @require values::@is_int(#value) || values::@is_bool(#value)
+ * @require $assignable(expected, $typeof(#value))
+ * @require $probability >= 0 && $probability <= 1.0
+ **/
 macro @expect(#value, expected, $probability = 1.0) @builtin
 {
-	$switch:
-	$case env::BUILTIN_EXPECT_IS_DISABLED:
+    $switch
+    $case env::BUILTIN_EXPECT_IS_DISABLED:
 	return #value == expected;
-	$case $probability == 1.0:
+    $case $probability == 1.0:
 	return $$expect(#value, ($typeof(#value))expected);
-	$default:
+    $default:
 	return $$expect_with_probability(#value, expected, $probability);
-	$endswitch
+    $endswitch
 }
 
-<*
- Locality for prefetch, levels 0 - 3, corresponding
- to "extremely local" to "no locality"
-*>
+/**
+ * Locality for prefetch, levels 0 - 3, corresponding
+ * to "extremely local" to "no locality"
+ **/
 enum PrefetchLocality
 {
 	NO_LOCALITY,
@@ -387,13 +277,13 @@ enum PrefetchLocality
 	VERY_NEAR,
 }
 
-<*
- Prefetch a pointer.
+/**
+ * Prefetch a pointer.
 
- @param [in] ptr : `Pointer to prefetch`
- @param $locality : `Locality ranging from none to extremely local`
- @param $write : `Prefetch for write, otherwise prefetch for read.`
-*>
+ * @param [in] ptr `Pointer to prefetch`
+ * @param $locality `Locality ranging from none to extremely local`
+ * @param $write `Prefetch for write, otherwise prefetch for read.`
+ **/
 macro @prefetch(void* ptr, PrefetchLocality $locality = VERY_NEAR, bool $write = false) @builtin
 {
 	$if !env::BUILTIN_PREFETCH_IS_DISABLED:
@@ -411,97 +301,21 @@ macro swizzle2(v, v2, ...) @builtin
 	return $$swizzle2(v, v2, $vasplat);
 }
 
-<*
- Return the excuse in the Optional if it is Empty, otherwise
- return a null fault.
-
- @require @typekind(#expr) == OPTIONAL : `@catch expects an Optional value`
-*>
-macro fault @catch(#expr) @builtin
+macro anyfault @catch(#expr) @builtin
 {
 	if (catch f = #expr) return f;
-	return {};
+	return anyfault {};
 }
 
-<*
- Check if an Optional expression holds a value or is empty, returning true
- if it has a value.
-
- @require @typekind(#expr) == OPTIONAL : `@ok expects an Optional value`
-*>
 macro bool @ok(#expr) @builtin
 {
 	if (catch #expr) return false;
 	return true;
 }
 
-<*
- Check if an Optional expression evaluates to a fault. If so, return it;
- else, assign the result to an expression.
-
- @require $defined(#v = #v) : "#v must be a variable"
- @require $defined(#expr!) : "Expected an optional expression"
- @require @assignable_to(#expr!!, $typeof(#v))  : `Type of #expr must be an optional of #v's type`
-*>
-macro void? @try(#v, #expr) @builtin
+macro char[] @as_char_view(&value) @builtin
 {
-	var res = #expr;
-	if (catch err = res) return err?;
-	#v = res;
-}
-
-<*
- Check if an Optional expression evaluates to a fault. If so, return true if it is the
- expected fault, the optional if it is unexpected, or false if there was no fault and
- the assign happened.
-
- This can be used in like this:
-
-  while (true)
-  {
-    char[] data;
-    // Read until end of file
-    if (@try_catch(data, load_line(), io::EOF)) break;
-    .. use data ..
-  }
-
- In this example we read until we reach an EOF, which is expected. However, if we encounter some other
- fault, we rethrow is. Without this macro, the code is instead written like:
-
-  while (true)
-  {
-    char[]? data;
-    data = load_line();
-    if (catch err = data)
-    {
-      if (err = io::EOF) break;
-      return err?
-    }
-    .. use data ..
-  }
-
- @require $defined(#v = #v) : "#v must be a variable"
- @require $defined(#expr!) : "Expected an optional expression"
- @require @assignable_to(#expr!!, $typeof(#v))  : `Type of #expr must be an optional of #v's type`
- @return "True if it was the expected fault, false if the variable was assigned, otherwise returns an optional."
-*>
-macro bool? @try_catch(#v, #expr, fault expected_fault) @builtin
-{
-	var res = #expr;
-	if (catch err = res)
-	{
-		return err == expected_fault ? true : err?;
-	}
-	#v = res;
-	return false;
-}
-
-<*
- @require $defined(&#value, (char*)&#value) : "This must be a value that can be viewed as a char array"
- *>
-macro char[] @as_char_view(#value) @builtin
-{
-	return ((char*)&#value)[:$sizeof(#value)];
+	return ((char*)value)[:$sizeof(*value)];
 }
 
 macro isz @str_find(String $string, String $needle) @builtin => $$str_find($string, $needle);
@@ -509,86 +323,31 @@ macro String @str_upper(String $str) @builtin => $$str_upper($str);
 macro String @str_lower(String $str) @builtin => $$str_lower($str);
 macro uint @str_hash(String $str) @builtin => $$str_hash($str);
 
-macro @generic_hash_core(h, value)
-{
-	h ^= (uint)value; // insert lowest 32 bits
-	h *= 0x96f59e5b; // diffuse them up
-	h ^= h >> 16; // diffuse them down
-	return h;
-}
+macro uint int.hash(int i) => i;
+macro uint uint.hash(uint i) => i;
+macro uint short.hash(short s) => s;
+macro uint ushort.hash(ushort s) => s;
+macro uint char.hash(char c) => c;
+macro uint ichar.hash(ichar c) => c;
+macro uint long.hash(long i) => (uint)((i >> 32) ^ i);
+macro uint ulong.hash(ulong i) => (uint)((i >> 32) ^ i);
+macro uint int128.hash(int128 i) => (uint)((i >> 96) ^ (i >> 64) ^ (i >> 32) ^ i);
+macro uint uint128.hash(uint128 i) => (uint)((i >> 96) ^ (i >> 64) ^ (i >> 32) ^ i);
+macro uint bool.hash(bool b) => (uint)b;
+macro uint typeid.hash(typeid t) => ((ulong)(uptr)t).hash();
+macro uint String.hash(String c) => (uint)fnv32a::encode(c);
+macro uint char[].hash(char[] c) => (uint)fnv32a::encode(c);
+macro uint void*.hash(void* ptr) => ((ulong)(uptr)ptr).hash();
 
-macro @generic_hash(value)
-{
-	uint h = @generic_hash_core((uint)0x3efd4391, value);
-	$for var $cnt = 4; $cnt < $sizeof(value); $cnt += 4:
-		value >>= 32; // reduce value
-		h = @generic_hash_core(h, value);
-	$endfor
-	return h;
-}
-
-
-macro uint int128.hash(self)       => @generic_hash(self);
-macro uint uint128.hash(self)      => @generic_hash(self);
-macro uint long.hash(self)         => @generic_hash(self);
-macro uint ulong.hash(self)        => @generic_hash(self);
-macro uint int.hash(self)          => @generic_hash(self);
-macro uint uint.hash(self)         => @generic_hash(self);
-macro uint short.hash(self)        => @generic_hash(self);
-macro uint ushort.hash(self)       => @generic_hash(self);
-macro uint ichar.hash(self)        => @generic_hash(self);
-macro uint char.hash(self)         => @generic_hash(self);
-macro uint bool.hash(self)         => @generic_hash(self);
-
-macro uint int128[*].hash(&self)   => hash_array(self);
-macro uint uint128[*].hash(&self)  => hash_array(self);
-macro uint long[*].hash(&self)     => hash_array(self);
-macro uint ulong[*].hash(&self)    => hash_array(self);
-macro uint int[*].hash(&self)      => hash_array(self);
-macro uint uint[*].hash(&self)     => hash_array(self);
-macro uint short[*].hash(&self)    => hash_array(self);
-macro uint ushort[*].hash(&self)   => hash_array(self);
-macro uint char[*].hash(&self)     => hash_array(self);
-macro uint ichar[*].hash(&self)    => hash_array(self);
-macro uint bool[*].hash(&self)     => hash_array(self);
-
-macro uint int128[<*>].hash(self)  => hash_vec(self);
-macro uint uint128[<*>].hash(self) => hash_vec(self);
-macro uint long[<*>].hash(self)    => hash_vec(self);
-macro uint ulong[<*>].hash(self)   => hash_vec(self);
-macro uint int[<*>].hash(self)     => hash_vec(self);
-macro uint uint[<*>].hash(self)    => hash_vec(self);
-macro uint short[<*>].hash(self)   => hash_vec(self);
-macro uint ushort[<*>].hash(self)  => hash_vec(self);
-macro uint char[<*>].hash(self)    => hash_vec(self);
-macro uint ichar[<*>].hash(self)   => hash_vec(self);
-macro uint bool[<*>].hash(self)    => hash_vec(self);
-
-macro uint typeid.hash(typeid t) => @generic_hash(((ulong)(uptr)t));
-macro uint String.hash(String c) => (uint)fnv32a::hash(c);
-macro uint char[].hash(char[] c) => (uint)fnv32a::hash(c);
-macro uint void*.hash(void* ptr) => @generic_hash(((ulong)(uptr)ptr));
-
-<*
- @require @typekind(array_ptr) == POINTER &&& @typekind(*array_ptr) == ARRAY
-*>
-macro uint hash_array(array_ptr) @local
-{
-	return (uint)fnv32a::hash(((char*)array_ptr)[:$sizeof(*array_ptr)]);
-}
-
-<*
- @require @typekind(vec) == VECTOR
-*>
-macro uint hash_vec(vec) @local
-{
-	return (uint)fnv32a::hash(((char*)&&vec)[:$sizeof(vec.len * $typeof(vec).inner.sizeof)]);
-}
+distinct EmptySlot = void*;
+const EmptySlot EMPTY_MACRO_SLOT @builtin = null;
+macro @is_empty_macro_slot(#arg) @builtin => @typeis(#arg, EmptySlot);
+macro @is_valid_macro_slot(#arg) @builtin => !@typeis(#arg, EmptySlot);
 
 const MAX_FRAMEADDRESS = 128;
-<*
- @require n >= 0
-*>
+/**
+ * @require n >= 0
+ **/
 macro void* get_frameaddress(int n)
 {
 	if (n > MAX_FRAMEADDRESS) return null;
@@ -727,9 +486,9 @@ macro void* get_frameaddress(int n)
 	}
 }
 
-<*
- @require n >= 0
-*>
+/**
+ * @require n >= 0
+ **/
 macro void* get_returnaddress(int n)
 {
 	if (n > MAX_FRAMEADDRESS) return null;
@@ -868,7 +627,7 @@ macro void* get_returnaddress(int n)
 	}
 }
 
-module std::core::builtin @if((env::LINUX || env::ANDROID || env::DARWIN) && env::COMPILER_SAFE_MODE && env::DEBUG_SYMBOLS);
+module std::core::builtin @if((env::LINUX || env::DARWIN) && env::COMPILER_SAFE_MODE && env::DEBUG_SYMBOLS);
 import libc, std::io;
 
 fn void sig_panic(String message)

lib/std/core/builtin_comparison.c3

@@ -3,12 +3,12 @@
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::core::builtin;
 
-<*
- @require types::@comparable_value(a) && types::@comparable_value(b)
-*>
+/**
+ * @require types::@comparable_value(a) && types::@comparable_value(b)
+ **/
 macro less(a, b) @builtin
 {
-	$switch:
+	$switch
 	$case $defined(a.less):
 		return a.less(b);
 	$case $defined(a.compare_to):
@@ -18,12 +18,12 @@ macro less(a, b) @builtin
 	$endswitch
 }
 
-<*
- @require types::@comparable_value(a) && types::@comparable_value(b)
-*>
+/**
+ * @require types::@comparable_value(a) && types::@comparable_value(b)
+ **/
 macro less_eq(a, b) @builtin
 {
-	$switch:
+	$switch
 	$case $defined(a.less):
 		return !b.less(a);
 	$case $defined(a.compare_to):
@@ -33,12 +33,12 @@ macro less_eq(a, b) @builtin
 	$endswitch
 }
 
-<*
- @require types::@comparable_value(a) && types::@comparable_value(b)
-*>
+/**
+ * @require types::@comparable_value(a) && types::@comparable_value(b)
+ **/
 macro greater(a, b) @builtin
 {
-	$switch:
+	$switch
 	$case $defined(a.less):
 		return b.less(a);
 	$case $defined(a.compare_to):
@@ -48,12 +48,12 @@ macro greater(a, b) @builtin
 	$endswitch
 }
 
-<*
- @require types::@comparable_value(a) && types::@comparable_value(b)
-*>
+/**
+ * @require types::@comparable_value(a) && types::@comparable_value(b)
+ **/
 macro int compare_to(a, b) @builtin
 {
-	$switch:
+	$switch
 	$case $defined(a.compare_to):
 		return a.compare_to(b);
 	$case $defined(a.less):
@@ -62,12 +62,12 @@ macro int compare_to(a, b) @builtin
 		return (int)(a > b) - (int)(a < b);
 	$endswitch
 }
-<*
- @require types::@comparable_value(a) && types::@comparable_value(b)
-*>
+/**
+ * @require types::@comparable_value(a) && types::@comparable_value(b)
+ **/
 macro greater_eq(a, b) @builtin
 {
-	$switch:
+	$switch
 	$case $defined(a.less):
 		return !a.less(b);
 	$case $defined(a.compare_to):
@@ -77,12 +77,12 @@ macro greater_eq(a, b) @builtin
 	$endswitch
 }
 
-<*
- @require types::@equatable_value(a) && types::@equatable_value(b) : `values must be equatable`
-*>
+/**
+ * @require types::@equatable_value(a) && types::@equatable_value(b) `values must be equatable`
+ **/
 macro bool equals(a, b) @builtin
 {
-	$switch:
+	$switch
 	$case $defined(a.equals, a.equals(b)):
 		return a.equals(b);
 	$case $defined(a.compare_to, a.compare_to(b)):
@@ -100,7 +100,7 @@ macro min(x, ...) @builtin
 		return less(x, $vaarg[0]) ? x : $vaarg[0];
 	$else
 		var result = x;
-		$for var $i = 0; $i < $vacount; $i++:
+		$for (var $i = 0; $i < $vacount; $i++)
 			if (less($vaarg[$i], result))
 			{
 				 result = $vaarg[$i];
@@ -116,7 +116,7 @@ macro max(x, ...) @builtin
 		return greater(x, $vaarg[0]) ? x : $vaarg[0];
 	$else
 		var result = x;
-		$for var $i = 0; $i < $vacount; $i++:
+		$for (var $i = 0; $i < $vacount; $i++)
 			if (greater($vaarg[$i], result))
 			{
 				 result = $vaarg[$i];

lib/std/core/cinterop.c3

@@ -16,29 +16,23 @@ $assert C_SHORT_SIZE <= C_INT_SIZE;
 $assert C_INT_SIZE <= C_LONG_SIZE;
 $assert C_LONG_SIZE <= C_LONG_LONG_SIZE;
 
-alias CShort = $typefrom(signed_int_from_bitsize($$C_SHORT_SIZE));
-alias CUShort = $typefrom(unsigned_int_from_bitsize($$C_SHORT_SIZE));
-alias CInt = $typefrom(signed_int_from_bitsize($$C_INT_SIZE));
-alias CUInt = $typefrom(unsigned_int_from_bitsize($$C_INT_SIZE));
-alias CLong = $typefrom(signed_int_from_bitsize($$C_LONG_SIZE));
-alias CULong = $typefrom(unsigned_int_from_bitsize($$C_LONG_SIZE));
-alias CLongLong = $typefrom(signed_int_from_bitsize($$C_LONG_LONG_SIZE));
-alias CULongLong = $typefrom(unsigned_int_from_bitsize($$C_LONG_LONG_SIZE));
-alias CSChar = ichar;
-alias CUChar = char;
+def CShort = $typefrom(signed_int_from_bitsize($$C_SHORT_SIZE));
+def CUShort = $typefrom(unsigned_int_from_bitsize($$C_SHORT_SIZE));
+def CInt = $typefrom(signed_int_from_bitsize($$C_INT_SIZE));
+def CUInt = $typefrom(unsigned_int_from_bitsize($$C_INT_SIZE));
+def CLong = $typefrom(signed_int_from_bitsize($$C_LONG_SIZE));
+def CULong = $typefrom(unsigned_int_from_bitsize($$C_LONG_SIZE));
+def CLongLong = $typefrom(signed_int_from_bitsize($$C_LONG_LONG_SIZE));
+def CULongLong = $typefrom(unsigned_int_from_bitsize($$C_LONG_LONG_SIZE));
+def CSChar = ichar;
+def CUChar = char;
 
-alias CChar = $typefrom($$C_CHAR_IS_SIGNED ? ichar.typeid : char.typeid);
-
-enum CBool : char
-{
-	FALSE,
-	TRUE
-}
+def CChar = $typefrom($$C_CHAR_IS_SIGNED ? ichar.typeid : char.typeid);
 
 // Helper macros
 macro typeid signed_int_from_bitsize(usz $bitsize) @private
 {
-	$switch $bitsize:
+	$switch ($bitsize)
 		$case 128: return int128.typeid;
 		$case 64: return long.typeid;
 		$case 32: return int.typeid;
@@ -50,7 +44,7 @@ macro typeid signed_int_from_bitsize(usz $bitsize) @private
 
 macro typeid unsigned_int_from_bitsize(usz $bitsize) @private
 {
-	$switch $bitsize:
+	$switch ($bitsize)
 		$case 128: return uint128.typeid;
 		$case 64: return ulong.typeid;
 		$case 32: return uint.typeid;

lib/std/core/conv.c3

@@ -9,32 +9,31 @@ const uint UTF16_SURROGATE_BITS @private = 10;
 const uint UTF16_SURROGATE_LOW_VALUE @private = 0xDC00;
 const uint UTF16_SURROGATE_HIGH_VALUE @private = 0xD800;
 
-<*
- @param c : `The utf32 codepoint to convert`
- @param [out] output : `the resulting buffer`
- @return? string::CONVERSION_FAILED
-*>
-fn usz? char32_to_utf8(Char32 c, char[] output)
+/**
+ * @param c `The utf32 codepoint to convert`
+ * @param [out] output `the resulting buffer`
+ **/
+fn usz! char32_to_utf8(Char32 c, char[] output)
 {
-	if (!output.len) return string::CONVERSION_FAILED?;
+	if (!output.len) return UnicodeResult.CONVERSION_FAILED?;
 	switch (true)
 	{
 		case c <= 0x7f:
 			output[0] = (char)c;
 			return 1;
 		case c <= 0x7ff:
-			if (output.len < 2) return string::CONVERSION_FAILED?;
+			if (output.len < 2) return UnicodeResult.CONVERSION_FAILED?;
 			output[0] = (char)(0xC0 | c >> 6);
 			output[1] = (char)(0x80 | (c & 0x3F));
 			return 2;
 		case c <= 0xffff:
-			if (output.len < 3) return string::CONVERSION_FAILED?;
+			if (output.len < 3) return UnicodeResult.CONVERSION_FAILED?;
 			output[0] = (char)(0xE0 | c >> 12);
 			output[1] = (char)(0x80 | (c >> 6 & 0x3F));
 			output[2] = (char)(0x80 | (c & 0x3F));
 			return 3;
 		case c <= 0x10ffff:
-			if (output.len < 4) return string::CONVERSION_FAILED?;
+			if (output.len < 4) return UnicodeResult.CONVERSION_FAILED?;
 			output[0] = (char)(0xF0 | c >> 18);
 			output[1] = (char)(0x80 | (c >> 12 & 0x3F));
 			output[2] = (char)(0x80 | (c >> 6 & 0x3F));
@@ -42,16 +41,16 @@ fn usz? char32_to_utf8(Char32 c, char[] output)
 			return 4;
 		default:
 			// 0x10FFFF and above is not defined.
-			return string::CONVERSION_FAILED?;
+			return UnicodeResult.CONVERSION_FAILED?;
 	}
 }
 
-<*
- Convert a code pointer into 1-2 UTF16 characters.
-
- @param c : `The character to convert.`
- @param [inout] output : `the resulting UTF16 buffer to write to.`
-*>
+/**
+ * Convert a code pointer into 1-2 UTF16 characters.
+ *
+ * @param c `The character to convert.`
+ * @param [inout] output `the resulting UTF16 buffer to write to.`
+ **/
 fn void char32_to_utf16_unsafe(Char32 c, Char16** output)
 {
 	if (c < UTF16_SURROGATE_OFFSET)
@@ -67,14 +66,14 @@ fn void char32_to_utf16_unsafe(Char32 c, Char16** output)
 	(*output)++[0] = (Char16)low;
 }
 
-<*
- Convert 1-2 UTF16 data points into UTF8.
-
- @param [in] ptr : `The UTF16 data to convert.`
- @param [inout] available : `amount of UTF16 data available.`
- @param [inout] output : `the resulting utf8 buffer to write to.`
-*>
-fn void? char16_to_utf8_unsafe(Char16 *ptr, usz *available, char** output)
+/**
+ * Convert 1-2 UTF16 data points into UTF8.
+ *
+ * @param [in] ptr `The UTF16 data to convert.`
+ * @param [inout] available `amount of UTF16 data available.`
+ * @param [inout] output `the resulting utf8 buffer to write to.`
+ **/
+fn void! char16_to_utf8_unsafe(Char16 *ptr, usz *available, char** output)
 {
 	Char16 high = *ptr;
 	if (high & UTF16_SURROGATE_GENERIC_MASK != UTF16_SURROGATE_GENERIC_VALUE)
@@ -84,15 +83,15 @@ fn void? char16_to_utf8_unsafe(Char16 *ptr, usz *available, char** output)
 		return;
 	}
 	// Low surrogate first is an error
-	if (high & UTF16_SURROGATE_MASK != UTF16_SURROGATE_HIGH_VALUE) return string::INVALID_UTF16?;
+	if (high & UTF16_SURROGATE_MASK != UTF16_SURROGATE_HIGH_VALUE) return UnicodeResult.INVALID_UTF16?;
 
 	// Unmatched high surrogate is an error
-	if (*available == 1) return string::INVALID_UTF16?;
+	if (*available == 1) return UnicodeResult.INVALID_UTF16?;
 
 	Char16 low = ptr[1];
 
 	// Unmatched high surrogate, invalid
-	if (low & UTF16_SURROGATE_MASK != UTF16_SURROGATE_LOW_VALUE) return string::INVALID_UTF16?;
+	if (low & UTF16_SURROGATE_MASK != UTF16_SURROGATE_LOW_VALUE) return UnicodeResult.INVALID_UTF16?;
 
 	// The high bits of the codepoint are the value bits of the high surrogate
 	// The low bits of the codepoint are the value bits of the low surrogate
@@ -101,10 +100,10 @@ fn void? char16_to_utf8_unsafe(Char16 *ptr, usz *available, char** output)
 	char32_to_utf8_unsafe(uc, output);
 	*available = 2;
 }
-<*
- @param c : `The utf32 codepoint to convert`
- @param [inout] output : `the resulting buffer`
-*>
+/**
+ * @param c `The utf32 codepoint to convert`
+ * @param [inout] output `the resulting buffer`
+ **/
 fn usz char32_to_utf8_unsafe(Char32 c, char** output)
 {
 	switch
@@ -130,15 +129,15 @@ fn usz char32_to_utf8_unsafe(Char32 c, char** output)
 	}
 }
 
-<*
- @param [in] ptr : `pointer to the first character to parse`
- @param [inout] size : `Set to max characters to read, set to characters read`
- @return `the parsed 32 bit codepoint`
-*>
-fn Char32? utf8_to_char32(char* ptr, usz* size)
+/**
+ * @param [in] ptr `pointer to the first character to parse`
+ * @param [inout] size `Set to max characters to read, set to characters read`
+ * @return `the parsed 32 bit codepoint`
+ **/
+fn Char32! utf8_to_char32(char* ptr, usz* size)
 {
 	usz max_size = *size;
-	if (max_size < 1) return string::INVALID_UTF8?;
+	if (max_size < 1) return UnicodeResult.INVALID_UTF8?;
 	char c = (ptr++)[0];
 
 	if ((c & 0x80) == 0)
@@ -148,47 +147,47 @@ fn Char32? utf8_to_char32(char* ptr, usz* size)
 	}
 	if ((c & 0xE0) == 0xC0)
 	{
-		if (max_size < 2) return string::INVALID_UTF8?;
+		if (max_size < 2) return UnicodeResult.INVALID_UTF8?;
 		*size = 2;
 		Char32 uc = (c & 0x1F) << 6;
 		c = *ptr;
 		// Overlong sequence or invalid second.
-		if (!uc || c & 0xC0 != 0x80) return string::INVALID_UTF8?;
+		if (!uc || c & 0xC0 != 0x80) return UnicodeResult.INVALID_UTF8?;
 		return uc + c & 0x3F;
 	}
 	if ((c & 0xF0) == 0xE0)
 	{
-		if (max_size < 3) return string::INVALID_UTF8?;
+		if (max_size < 3) return UnicodeResult.INVALID_UTF8?;
 		*size = 3;
 		Char32 uc = (c & 0x0F) << 12;
 		c = ptr++[0];
-		if (c & 0xC0 != 0x80) return string::INVALID_UTF8?;
+		if (c & 0xC0 != 0x80) return UnicodeResult.INVALID_UTF8?;
 		uc += (c & 0x3F) << 6;
 		c = ptr++[0];
 		// Overlong sequence or invalid last
-		if (!uc || c & 0xC0 != 0x80) return string::INVALID_UTF8?;
+		if (!uc || c & 0xC0 != 0x80) return UnicodeResult.INVALID_UTF8?;
 		return uc + c & 0x3F;
 	}
-	if (max_size < 4) return string::INVALID_UTF8?;
-	if ((c & 0xF8) != 0xF0) return string::INVALID_UTF8?;
+	if (max_size < 4) return UnicodeResult.INVALID_UTF8?;
+	if ((c & 0xF8) != 0xF0) return UnicodeResult.INVALID_UTF8?;
 	*size = 4;
 	Char32 uc = (c & 0x07) << 18;
 	c = ptr++[0];
-	if (c & 0xC0 != 0x80) return string::INVALID_UTF8?;
+	if (c & 0xC0 != 0x80) return UnicodeResult.INVALID_UTF8?;
 	uc += (c & 0x3F) << 12;
 	c = ptr++[0];
-	if (c & 0xC0 != 0x80) return string::INVALID_UTF8?;
+	if (c & 0xC0 != 0x80) return UnicodeResult.INVALID_UTF8?;
 	uc += (c & 0x3F) << 6;
 	c = ptr++[0];
 	// Overlong sequence or invalid last
-	if (!uc || c & 0xC0 != 0x80) return string::INVALID_UTF8?;
+	if (!uc || c & 0xC0 != 0x80) return UnicodeResult.INVALID_UTF8?;
 	return uc + c & 0x3F;
 }
 
-<*
- @param utf8 : `An UTF-8 encoded slice of bytes`
- @return `the number of encoded code points`
-*>
+/**
+ * @param utf8 `An UTF-8 encoded slice of bytes`
+ * @return `the number of encoded code points`
+ **/
 fn usz utf8_codepoints(String utf8)
 {
 	usz len = 0;
@@ -199,11 +198,11 @@ fn usz utf8_codepoints(String utf8)
 	return len;
 }
 
-<*
- Calculate the UTF8 length required to encode an UTF32 array.
- @param [in] utf32 : `the utf32 data to calculate from`
- @return `the length of the resulting UTF8 array`
-*>
+/**
+ * Calculate the UTF8 length required to encode an UTF32 array.
+ * @param [in] utf32 `the utf32 data to calculate from`
+ * @return `the length of the resulting UTF8 array`
+ **/
 fn usz utf8len_for_utf32(Char32[] utf32)
 {
 	usz len = 0;
@@ -224,11 +223,11 @@ fn usz utf8len_for_utf32(Char32[] utf32)
 	return len;
 }
 
-<*
- Calculate the UTF8 length required to encode an UTF16 array.
- @param [in] utf16 : `the utf16 data to calculate from`
- @return `the length of the resulting UTF8 array`
-*>
+/**
+ * Calculate the UTF8 length required to encode an UTF16 array.
+ * @param [in] utf16 `the utf16 data to calculate from`
+ * @return `the length of the resulting UTF8 array`
+ **/
 fn usz utf8len_for_utf16(Char16[] utf16)
 {
 	usz len = 0;
@@ -256,11 +255,11 @@ fn usz utf8len_for_utf16(Char16[] utf16)
 	return len;
 }
 
-<*
- Calculate the UTF16 length required to encode a UTF8 array.
- @param utf8 : `the utf8 data to calculate from`
- @return `the length of the resulting UTF16 array`
-*>
+/**
+ * Calculate the UTF16 length required to encode a UTF8 array.
+ * @param utf8 `the utf8 data to calculate from`
+ * @return `the length of the resulting UTF16 array`
+ **/
 fn usz utf16len_for_utf8(String utf8)
 {
 	usz len = utf8.len;
@@ -280,10 +279,10 @@ fn usz utf16len_for_utf8(String utf8)
 	return len16;
 }
 
-<*
- @param [in] utf32 : `the UTF32 array to check the length for`
- @return `the required length of an UTF16 array to hold the UTF32 data.`
-*>
+/**
+ * @param [in] utf32 `the UTF32 array to check the length for`
+ * @return `the required length of an UTF16 array to hold the UTF32 data.`
+ **/
 fn usz utf16len_for_utf32(Char32[] utf32)
 {
 	usz len = utf32.len;
@@ -294,14 +293,14 @@ fn usz utf16len_for_utf32(Char32[] utf32)
 	return len;
 }
 
-<*
- Convert an UTF32 array to an UTF8 array.
-
- @param [in] utf32
- @param [out] utf8_buffer
- @return `the number of bytes written.`
-*>
-fn usz? utf32to8(Char32[] utf32, char[] utf8_buffer)
+/**
+ * Convert an UTF32 array to an UTF8 array.
+ *
+ * @param [in] utf32
+ * @param [out] utf8_buffer
+ * @return `the number of bytes written.`
+ **/
+fn usz! utf32to8(Char32[] utf32, char[] utf8_buffer)
 {
 	char[] buffer = utf8_buffer;
 	foreach (uc : utf32)
@@ -314,14 +313,14 @@ fn usz? utf32to8(Char32[] utf32, char[] utf8_buffer)
 	return utf8_buffer.len - buffer.len;
 }
 
-<*
- Convert an UTF8 array to an UTF32 array.
-
- @param [in] utf8
- @param [out] utf32_buffer
- @return `the number of Char32s written.`
-*>
-fn usz? utf8to32(String utf8, Char32[] utf32_buffer)
+/**
+ * Convert an UTF8 array to an UTF32 array.
+ *
+ * @param [in] utf8
+ * @param [out] utf32_buffer
+ * @return `the number of Char32s written.`
+ **/
+fn usz! utf8to32(String utf8, Char32[] utf32_buffer)
 {
 	usz len = utf8.len;
 	Char32* ptr = utf32_buffer.ptr;
@@ -329,7 +328,7 @@ fn usz? utf8to32(String utf8, Char32[] utf32_buffer)
 	usz buf_len = utf32_buffer.len;
 	for (usz i = 0; i < len;)
 	{
-		if (len32 == buf_len) return string::CONVERSION_FAILED?;
+		if (len32 == buf_len) return UnicodeResult.CONVERSION_FAILED?;
 		usz width = len - i;
 		Char32 uc = utf8_to_char32(&utf8[i], &width) @inline!;
 		i += width;
@@ -340,15 +339,15 @@ fn usz? utf8to32(String utf8, Char32[] utf32_buffer)
 	return len32;
 }
 
-<*
- Copy an array of UTF16 data into an UTF8 buffer without bounds
- checking. This will assume the buffer is sufficiently large to hold
- the converted data.
-
- @param [in] utf16 : `The UTF16 array containing the data to convert.`
- @param [out] utf8_buffer : `the (sufficiently large) buffer to hold the UTF16 data.`
-*>
-fn void? utf16to8_unsafe(Char16[] utf16, char* utf8_buffer)
+/**
+ * Copy an array of UTF16 data into an UTF8 buffer without bounds
+ * checking. This will assume the buffer is sufficiently large to hold
+ * the converted data.
+ *
+ * @param [in] utf16 `The UTF16 array containing the data to convert.`
+ * @param [out] utf8_buffer `the (sufficiently large) buffer to hold the UTF16 data.`
+ **/
+fn void! utf16to8_unsafe(Char16[] utf16, char* utf8_buffer)
 {
 	usz len16 = utf16.len;
 	for (usz i = 0; i < len16;)
@@ -359,15 +358,15 @@ fn void? utf16to8_unsafe(Char16[] utf16, char* utf8_buffer)
 	}
 }
 
-<*
- Copy an array of UTF8 data into an UTF32 buffer without bounds
- checking. This will assume the buffer is sufficiently large to hold
- the converted data.
-
- @param [in] utf8 : `The UTF8 buffer containing the data to convert.`
- @param [out] utf32_buffer : `the (sufficiently large) buffer to hold the UTF8 data.`
-*>
-fn void? utf8to32_unsafe(String utf8, Char32* utf32_buffer)
+/**
+ * Copy an array of UTF8 data into an UTF32 buffer without bounds
+ * checking. This will assume the buffer is sufficiently large to hold
+ * the converted data.
+ *
+ * @param [in] utf8 `The UTF8 buffer containing the data to convert.`
+ * @param [out] utf32_buffer `the (sufficiently large) buffer to hold the UTF8 data.`
+ **/
+fn void! utf8to32_unsafe(String utf8, Char32* utf32_buffer)
 {
 	usz len = utf8.len;
 	for (usz i = 0; i < len;)
@@ -379,15 +378,15 @@ fn void? utf8to32_unsafe(String utf8, Char32* utf32_buffer)
 	}
 }
 
-<*
- Copy an array of UTF8 data into an UTF16 buffer without bounds
- checking. This will assume the buffer is sufficiently large to hold
- the converted data.
-
- @param [in] utf8 : `The UTF8 buffer containing the data to convert.`
- @param [out] utf16_buffer : `the (sufficiently large) buffer to hold the UTF8 data.`
-*>
-fn void? utf8to16_unsafe(String utf8, Char16* utf16_buffer)
+/**
+ * Copy an array of UTF8 data into an UTF16 buffer without bounds
+ * checking. This will assume the buffer is sufficiently large to hold
+ * the converted data.
+ *
+ * @param [in] utf8 `The UTF8 buffer containing the data to convert.`
+ * @param [out] utf16_buffer `the (sufficiently large) buffer to hold the UTF8 data.`
+ **/
+fn void! utf8to16_unsafe(String utf8, Char16* utf16_buffer)
 {
 	usz len = utf8.len;
 	for (usz i = 0; i < len;)
@@ -399,14 +398,14 @@ fn void? utf8to16_unsafe(String utf8, Char16* utf16_buffer)
 	}
 }
 
-<*
- Copy an array of UTF32 code points into an UTF8 buffer without bounds
- checking. This will assume the buffer is sufficiently large to hold
- the converted data.
-
- @param [in] utf32 : `The UTF32 buffer containing the data to convert.`
- @param [out] utf8_buffer : `the (sufficiently large) buffer to hold the UTF8 data.`
-*>
+/**
+ * Copy an array of UTF32 code points into an UTF8 buffer without bounds
+ * checking. This will assume the buffer is sufficiently large to hold
+ * the converted data.
+ *
+ * @param [in] utf32 `The UTF32 buffer containing the data to convert.`
+ * @param [out] utf8_buffer `the (sufficiently large) buffer to hold the UTF8 data.`
+ **/
 fn void utf32to8_unsafe(Char32[] utf32, char* utf8_buffer)
 {
 	char* start = utf8_buffer;

lib/std/core/dstring.c3

@@ -1,23 +1,14 @@
 module std::core::dstring;
 import std::io;
 
-<*
- The DString offers a dynamic string builder.
-*>
-typedef DString (OutStream) = DStringOpaque*;
-typedef DStringOpaque = void;
+distinct DString (OutStream) = void*;
 
 const usz MIN_CAPACITY @private = 16;
 
-<*
- Initialize the DString with a particular allocator.
-
- @param [&inout] allocator : "The allocator to use"
- @param capacity : "Starting capacity, defaults to MIN_CAPACITY and cannot be smaller"
- @return "Return the DString itself"
- @require !self.data() : "String already initialized"
-*>
-fn DString DString.init(&self, Allocator allocator, usz capacity = MIN_CAPACITY)
+/**
+ * @require !self.data() "String already initialized"
+ **/
+fn DString DString.new_init(&self, usz capacity = MIN_CAPACITY, Allocator allocator = allocator::heap())
 {
 	if (capacity < MIN_CAPACITY) capacity = MIN_CAPACITY;
 	StringData* data = allocator::alloc_with_padding(allocator, StringData, capacity)!!;
@@ -27,30 +18,26 @@ fn DString DString.init(&self, Allocator allocator, usz capacity = MIN_CAPACITY)
 	return *self = (DString)data;
 }
 
-<*
- Initialize the DString with the temp allocator. Note that if the dstring is never
- initialized, this is the allocator it will default to.
-
- @param capacity : "Starting capacity, defaults to MIN_CAPACITY and cannot be smaller"
- @return "Return the DString itself"
- @require !self.data() : "String already initialized"
-*>
-fn DString DString.tinit(&self, usz capacity = MIN_CAPACITY)
+/**
+ * @require !self.data() "String already initialized"
+ **/
+fn DString DString.temp_init(&self, usz capacity = MIN_CAPACITY)
 {
-	return self.init(tmem, capacity) @inline;
+	self.new_init(capacity, allocator::temp()) @inline;
+	return *self;
 }
 
-fn DString new_with_capacity(Allocator allocator, usz capacity)
+fn DString new_with_capacity(usz capacity, Allocator allocator = allocator::heap())
 {
-	return (DString){}.init(allocator, capacity);
+	return DString{}.new_init(capacity, allocator);
 }
 
-fn DString temp_with_capacity(usz capacity) => new_with_capacity(tmem, capacity) @inline;
+fn DString temp_with_capacity(usz capacity) => new_with_capacity(capacity, allocator::temp()) @inline;
 
-fn DString new(Allocator allocator, String c = "")
+fn DString new(String c = "", Allocator allocator = allocator::heap())
 {
 	usz len = c.len;
-	StringData* data = (StringData*)new_with_capacity(allocator, len);
+	StringData* data = (StringData*)new_with_capacity(len, allocator);
 	if (len)
 	{
 		data.len = len;
@@ -59,7 +46,7 @@ fn DString new(Allocator allocator, String c = "")
 	return (DString)data;
 }
 
-fn DString temp(String s = "") => new(tmem, s) @inline;
+fn DString temp_new(String s = "") => new(s, allocator::temp()) @inline;
 
 
 fn void DString.replace_char(self, char ch, char replacement)
@@ -82,8 +69,7 @@ fn void DString.replace(&self, String needle, String replacement)
 		self.replace_char(needle[0], replacement[0]);
 		return;
 	}
-	@pool()
-	{
+	@pool(data.allocator) {
 		String str = self.tcopy_str();
 		self.clear();
 		usz len = str.len;
@@ -91,37 +77,37 @@ fn void DString.replace(&self, String needle, String replacement)
 		foreach (i, c : str)
 		{
 			if (c == needle[match])
-			{
-				match++;
-				if (match == needle_len)
-				{
-					self.append_chars(replacement);
-					match = 0;
-					continue;
-				}
-				continue;
-			}
-			if (match > 0)
-			{
-				self.append_chars(str[i - match:match]);
-				match = 0;
-			}
-			self.append_char(c);
-		}
-		if (match > 0) self.append_chars(str[^match:match]);
+    	    {
+    	        match++;
+    		    if (match == needle_len)
+    		    {
+    			    self.append_chars(replacement);
+    			    match = 0;
+    			    continue;
+    		    }
+    		    continue;
+    		}
+    		if (match > 0)
+    		{
+    		    self.append_chars(str[i - match:match]);
+    		    match = 0;
+    		}
+    		self.append_char(c);
+    	}
+    	if (match > 0) self.append_chars(str[^match:match]);
 	};
 }
 
-fn DString DString.concat(self, Allocator allocator, DString b) @nodiscard
+fn DString DString.new_concat(self, DString b, Allocator allocator = allocator::heap())
 {
 	DString string;
-	string.init(allocator, self.len() + b.len());
+	string.new_init(self.len() + b.len(), allocator);
 	string.append(self);
 	string.append(b);
 	return string;
 }
 
-fn DString DString.tconcat(self, DString b) => self.concat(tmem, b);
+fn DString DString.temp_concat(self, DString b) => self.new_concat(b, allocator::temp());
 
 fn ZString DString.zstr_view(&self)
 {
@@ -146,15 +132,15 @@ fn usz DString.capacity(self)
 	return self.data().capacity;
 }
 
-fn usz DString.len(&self) @dynamic @operator(len)
+fn usz DString.len(&self) @dynamic
 {
 	if (!*self) return 0;
 	return self.data().len;
 }
 
-<*
- @require new_size <= self.len()
-*>
+/**
+ * @require new_size <= self.len()
+ */
 fn void DString.chop(self, usz new_size)
 {
 	if (!self) return;
@@ -168,39 +154,19 @@ fn String DString.str_view(self)
 	return (String)data.chars[:data.len];
 }
 
-<*
- @require index < self.len()
- @require self.data() != null : "Empty string"
-*>
-fn char DString.char_at(self, usz index) @operator([])
-{
-	return self.data().chars[index];
-}
-
-<*
- @require index < self.len()
- @require self.data() != null  : "Empty string"
-*>
-fn char* DString.char_ref(&self, usz index) @operator(&[])
-{
-	return &self.data().chars[index];
-}
-
-fn usz DString.append_utf32(&self, Char32[] chars)
+fn void DString.append_utf32(&self, Char32[] chars)
 {
 	self.reserve(chars.len);
-	usz end = self.len();
 	foreach (Char32 c : chars)
 	{
 		self.append_char32(c);
 	}
-	return self.data().len - end;
 }
 
-<*
- @require index < self.len()
-*>
-fn void DString.set(self, usz index, char c) @operator([]=)
+/**
+ * @require index < self.len()
+ **/
+fn void DString.set(self, usz index, char c)
 {
 	self.data().chars[index] = c;
 }
@@ -216,10 +182,10 @@ fn void DString.append_repeat(&self, char c, usz times)
 	}
 }
 
-<*
- @require c <= 0x10ffff
-*>
-fn usz DString.append_char32(&self, Char32 c)
+/**
+ * @require c <= 0x10ffff
+ */
+fn void DString.append_char32(&self, Char32 c)
 {
 	char[4] buffer @noinit;
 	char* p = &buffer;
@@ -228,21 +194,25 @@ fn usz DString.append_char32(&self, Char32 c)
 	StringData* data = self.data();
 	data.chars[data.len:n] = buffer[:n];
 	data.len += n;
-	return n;
 }
 
-fn DString DString.tcopy(&self) => self.copy(tmem);
+fn DString DString.tcopy(&self) => self.copy(allocator::temp());
 
-fn DString DString.copy(self, Allocator allocator) @nodiscard
+fn DString DString.copy(self, Allocator allocator = null)
 {
-	if (!self) return new(allocator);
+	if (!self)
+	{
+		if (allocator) return new_with_capacity(0, allocator);
+		return (DString)null;
+	}
 	StringData* data = self.data();
-	DString new_string = new_with_capacity(allocator, data.capacity);
+	if (!allocator) allocator = allocator::heap();
+	DString new_string = new_with_capacity(data.capacity, allocator);
 	mem::copy((char*)new_string.data(), (char*)data, StringData.sizeof + data.len);
 	return new_string;
 }
 
-fn ZString DString.copy_zstr(self, Allocator allocator) @nodiscard
+fn ZString DString.copy_zstr(self, Allocator allocator = allocator::heap())
 {
 	usz str_len = self.len();
 	if (!str_len)
@@ -256,12 +226,12 @@ fn ZString DString.copy_zstr(self, Allocator allocator) @nodiscard
 	return (ZString)zstr;
 }
 
-fn String DString.copy_str(self, Allocator allocator) @nodiscard
+fn String DString.copy_str(self, Allocator allocator = allocator::heap())
 {
 	return (String)self.copy_zstr(allocator)[:self.len()];
 }
 
-fn String DString.tcopy_str(self) @nodiscard => self.copy_str(tmem) @inline;
+fn String DString.tcopy_str(self) => self.copy_str(allocator::temp()) @inline;
 
 fn bool DString.equals(self, DString other_string)
 {
@@ -311,7 +281,7 @@ fn void DString.append_chars(&self, String str)
 	if (!other_len) return;
 	if (!*self)
 	{
-		*self = temp(str);
+		*self = new(str);
 		return;
 	}
 	self.reserve(other_len);
@@ -320,9 +290,9 @@ fn void DString.append_chars(&self, String str)
 	data.len += other_len;
 }
 
-fn Char32[] DString.copy_utf32(&self, Allocator allocator)
+fn Char32[] DString.copy_utf32(&self, Allocator allocator = allocator::heap())
 {
-	return self.str_view().to_utf32(allocator) @inline!!;
+	return self.str_view().to_new_utf32(allocator) @inline!!;
 }
 
 fn void DString.append_string(&self, DString str)
@@ -338,13 +308,13 @@ fn void DString.clear(self)
 	self.data().len = 0;
 }
 
-fn usz? DString.write(&self, char[] buffer) @dynamic
+fn usz! DString.write(&self, char[] buffer) @dynamic
 {
 	self.append_chars((String)buffer);
 	return buffer.len;
 }
 
-fn void? DString.write_byte(&self, char c) @dynamic
+fn void! DString.write_byte(&self, char c) @dynamic
 {
 	self.append_char(c);
 }
@@ -353,27 +323,27 @@ fn void DString.append_char(&self, char c)
 {
 	if (!*self)
 	{
-		*self = temp_with_capacity(MIN_CAPACITY);
+		*self = new_with_capacity(MIN_CAPACITY);
 	}
 	self.reserve(1);
 	StringData* data = self.data();
 	data.chars[data.len++] = c;
 }
 
-<*
- @require start < self.len()
- @require end < self.len()
- @require end >= start : "End must be same or equal to the start"
-*>
+/**
+ * @require start < self.len()
+ * @require end < self.len()
+ * @require end >= start "End must be same or equal to the start"
+ **/
 fn void DString.delete_range(&self, usz start, usz end)
 {
 	self.delete(start, end - start + 1);
 }
 
-<*
- @require start < self.len()
- @require start + len <= self.len()
-*>
+/**
+ * @require start < self.len()
+ * @require start + len <= self.len()
+ **/
 fn void DString.delete(&self, usz start, usz len = 1)
 {
 	if (!len) return;
@@ -395,7 +365,7 @@ fn void DString.delete(&self, usz start, usz len = 1)
 macro void DString.append(&self, value)
 {
 	var $Type = $typeof(value);
-	$switch $Type:
+	$switch ($Type)
 		$case char:
 		$case ichar:
 			self.append_char(value);
@@ -406,7 +376,7 @@ macro void DString.append(&self, value)
 		$case Char32:
 			self.append_char32(value);
 		$default:
-			$switch:
+			$switch
 				$case $defined((Char32)value):
 					self.append_char32((Char32)value);
 				$case $defined((String)value):
@@ -417,10 +387,7 @@ macro void DString.append(&self, value)
 	$endswitch
 }
 
-<*
- @require index <= self.len()
-*>
-fn void DString.insert_chars_at(&self, usz index, String s)
+fn void DString.insert_at(&self, usz index, String s)
 {
 	if (s.len == 0) return;
 	self.reserve(s.len);
@@ -452,116 +419,21 @@ fn void DString.insert_chars_at(&self, usz index, String s)
 	}
 }
 
-<*
- @require index <= self.len()
-*>
-fn void DString.insert_string_at(&self, usz index, DString str)
+fn usz! DString.appendf(&self, String format, args...) @maydiscard
 {
-	StringData* other = str.data();
-	if (!other) return;
-	self.insert_at(index, str.str_view());
-}
-
-<*
- @require index <= self.len()
-*>
-fn void DString.insert_char_at(&self, usz index, char c)
-{
-	self.reserve(1);
-	StringData* data = self.data();
-
-	char* start = &data.chars[index];
-	mem::move(start + 1, start, self.len() - index);
-	data.chars[index] = c;
-	data.len++;
-}
-
-<*
- @require index <= self.len()
-*>
-fn usz DString.insert_char32_at(&self, usz index, Char32 c)
-{
-	char[4] buffer @noinit;
-	char* p = &buffer;
-	usz n = conv::char32_to_utf8_unsafe(c, &p);
-
-	self.reserve(n);
-	StringData* data = self.data();
-
-	char* start = &data.chars[index];
-	mem::move(start + n, start, self.len() - index);
-	data.chars[index:n] = buffer[:n];
-	data.len += n;
-
-	return n;
-}
-
-<*
- @require index <= self.len()
-*>
-fn usz DString.insert_utf32_at(&self, usz index, Char32[] chars)
-{
-	usz n = conv::utf8len_for_utf32(chars);
-	
-	self.reserve(n);
-	StringData* data = self.data();
-
-	char* start = &data.chars[index];
-	mem::move(start + n, start, self.len() - index);
-
-	char[4] buffer @noinit;
-
-	foreach(c : chars)
+	if (!self.data()) self.new_init(format.len + 20);
+	@pool(self.data().allocator)
 	{
-		char* p = &buffer;
-		usz m = conv::char32_to_utf8_unsafe(c, &p);
-		data.chars[index:m] = buffer[:m];
-		index += m;
-	}
-
-	data.len += n;
-
-	return n;
+		Formatter formatter;
+		formatter.init(&out_string_append_fn, self);
+		return formatter.vprintf(format, args);
+	};
 }
 
-macro void DString.insert_at(&self, usz index, value)
+fn usz! DString.appendfn(&self, String format, args...) @maydiscard
 {
-	var $Type = $typeof(value);
-	$switch $Type:
-		$case char:
-		$case ichar:
-			self.insert_char_at(index, value);
-		$case DString:
-			self.insert_string_at(index, value);
-		$case String:
-			self.insert_chars_at(index, value);
-		$case Char32:
-			self.insert_char32_at(index, value);
-		$default:
-			$switch:
-				$case $defined((Char32)value):
-					self.insert_char32_at(index, (Char32)value);
-				$case $defined((String)value):
-					self.insert_chars_at(index, (String)value);
-				$default:
-					$error "Unsupported type for insert";
-			$endswitch
-	$endswitch
-}
-
-import libc;
-fn usz? DString.appendf(&self, String format, args...) @maydiscard
-{
-	if (!self.data()) self.tinit(format.len + 20);
-	Formatter formatter;
-	formatter.init(&out_string_append_fn, self);
-	return formatter.vprintf(format, args);
-}
-
-fn usz? DString.appendfn(&self, String format, args...) @maydiscard
-{
-	if (!self.data()) self.tinit(format.len + 20);
-	@pool()
+	if (!self.data()) self.new_init(format.len + 20);
+	@pool(self.data().allocator)
 	{
 		Formatter formatter;
 		formatter.init(&out_string_append_fn, self);
@@ -571,43 +443,30 @@ fn usz? DString.appendfn(&self, String format, args...) @maydiscard
 	};
 }
 
-fn DString join(Allocator allocator, String[] s, String joiner) @nodiscard
+fn DString new_join(String[] s, String joiner, Allocator allocator = allocator::heap())
 {
-	if (!s.len) return new(allocator);
+	if (!s.len) return (DString)null;
 	usz total_size = joiner.len * s.len;
 	foreach (String* &str : s)
 	{
 		total_size += str.len;
 	}
-	DString res = new_with_capacity(allocator, total_size);
+	DString res = new_with_capacity(total_size, allocator);
 	res.append(s[0]);
-	foreach (String str : s[1..])
+	foreach (String* &str : s[1..])
 	{
 		res.append(joiner);
-		res.append(str);
+		res.append(*str);
 	}
 	return res;
 }
 
-fn void? out_string_append_fn(void* data, char c) @private
+fn void! out_string_append_fn(void* data, char c) @private
 {
 	DString* s = data;
 	s.append_char(c);
 }
 
-fn void DString.reverse(self)
-{
-	StringData *data = self.data();
-	if (!data) return;
-	isz mid = data.len / 2;
-	for (isz i = 0; i < mid; i++)
-	{
-		char temp = data.chars[i];
-		isz reverse_index = data.len - 1 - i;
-		data.chars[i] = data.chars[reverse_index];
-		data.chars[reverse_index] = temp;
-	}
-}
 
 fn StringData* DString.data(self) @inline @private
 {
@@ -619,7 +478,7 @@ fn void DString.reserve(&self, usz addition)
 	StringData* data = self.data();
 	if (!data)
 	{
-		*self = dstring::temp_with_capacity(addition);
+		*self = dstring::new_with_capacity(addition);
 		return;
 	}
 	usz len = data.len + addition;
@@ -631,7 +490,7 @@ fn void DString.reserve(&self, usz addition)
 	*self = (DString)allocator::realloc(data.allocator, data, StringData.sizeof + new_capacity);
 }
 
-fn usz? DString.read_from_stream(&self, InStream reader)
+fn usz! DString.read_from_stream(&self, InStream reader)
 {
 	if (&reader.available)
 	{

lib/std/core/env.c3

@@ -57,7 +57,6 @@ enum OsType
 	HURD,
 	WASI,
 	EMSCRIPTEN,
-	ANDROID,
 }
 
 enum ArchType
@@ -116,16 +115,13 @@ enum ArchType
 	XTENSA,       // Xtensa
 }
 
-const String COMPILER_BUILD_HASH = $$BUILD_HASH;
-const String COMPILER_BUILD_DATE = $$BUILD_DATE;
-const OsType OS_TYPE = OsType.from_ordinal($$OS_TYPE);
-const ArchType ARCH_TYPE = ArchType.from_ordinal($$ARCH_TYPE);
-const usz MAX_VECTOR_SIZE = $$MAX_VECTOR_SIZE;
+const OsType OS_TYPE = (OsType)$$OS_TYPE;
+const ArchType ARCH_TYPE = (ArchType)$$ARCH_TYPE;
 const bool ARCH_32_BIT = $$REGISTER_SIZE == 32;
 const bool ARCH_64_BIT = $$REGISTER_SIZE == 64;
 const bool LIBC = $$COMPILER_LIBC_AVAILABLE;
 const bool NO_LIBC = !$$COMPILER_LIBC_AVAILABLE;
-const CompilerOptLevel COMPILER_OPT_LEVEL = CompilerOptLevel.from_ordinal($$COMPILER_OPT_LEVEL);
+const CompilerOptLevel COMPILER_OPT_LEVEL = (CompilerOptLevel)$$COMPILER_OPT_LEVEL;
 const bool BIG_ENDIAN = $$PLATFORM_BIG_ENDIAN;
 const bool I128_NATIVE_SUPPORT = $$PLATFORM_I128_SUPPORTED;
 const bool F16_SUPPORT = $$PLATFORM_F16_SUPPORTED;
@@ -137,13 +133,12 @@ const bool BACKTRACE = $$BACKTRACE;
 const usz LLVM_VERSION = $$LLVM_VERSION;
 const bool BENCHMARKING = $$BENCHMARKING;
 const bool TESTING = $$TESTING;
-const bool PANIC_MSG = $$PANIC_MSG;
-const MemoryEnvironment MEMORY_ENV = MemoryEnvironment.from_ordinal($$MEMORY_ENVIRONMENT);
+const MemoryEnvironment MEMORY_ENV = (MemoryEnvironment)$$MEMORY_ENVIRONMENT;
 const bool TRACK_MEMORY = DEBUG_SYMBOLS && (COMPILER_SAFE_MODE || TESTING);
 const bool X86_64 = ARCH_TYPE == X86_64;
 const bool X86 = ARCH_TYPE == X86;
 const bool AARCH64 = ARCH_TYPE == AARCH64;
-const bool NATIVE_STACKTRACE = LINUX || DARWIN || OPENBSD || WIN32;
+const bool NATIVE_STACKTRACE = LINUX || DARWIN || WIN32;
 const bool LINUX = LIBC && OS_TYPE == LINUX;
 const bool DARWIN = LIBC && os_is_darwin();
 const bool WIN32 = LIBC && OS_TYPE == WIN32;
@@ -151,20 +146,16 @@ const bool POSIX = LIBC && os_is_posix();
 const bool OPENBSD = LIBC && OS_TYPE == OPENBSD;
 const bool FREEBSD = LIBC && OS_TYPE == FREEBSD;
 const bool NETBSD = LIBC && OS_TYPE == NETBSD;
-const bool BSD_FAMILY = env::FREEBSD || env::OPENBSD || env::NETBSD;
 const bool WASI = LIBC && OS_TYPE == WASI;
-const bool ANDROID = LIBC && OS_TYPE == ANDROID;
 const bool WASM_NOLIBC @builtin = !LIBC && ARCH_TYPE == ArchType.WASM32 || ARCH_TYPE == ArchType.WASM64;
 const bool ADDRESS_SANITIZER = $$ADDRESS_SANITIZER;
 const bool MEMORY_SANITIZER = $$MEMORY_SANITIZER;
 const bool THREAD_SANITIZER = $$THREAD_SANITIZER;
 const bool ANY_SANITIZER = ADDRESS_SANITIZER || MEMORY_SANITIZER || THREAD_SANITIZER;
-const int LANGUAGE_DEV_VERSION = $$LANGUAGE_DEV_VERSION;
-const bool HAS_NATIVE_ERRNO = env::LINUX || env::ANDROID || env::OPENBSD || env::DARWIN || env::WIN32;
 
 macro bool os_is_darwin() @const
 {
-	$switch OS_TYPE:
+	$switch (OS_TYPE)
 	$case IOS:
 	$case MACOS:
 	$case TVOS:
@@ -177,7 +168,7 @@ macro bool os_is_darwin() @const
 
 macro bool os_is_posix() @const
 {
-	$switch OS_TYPE:
+	$switch (OS_TYPE)
 	$case IOS:
 	$case MACOS:
 	$case NETBSD:
@@ -188,7 +179,6 @@ macro bool os_is_posix() @const
 	$case SOLARIS:
 	$case TVOS:
 	$case WATCHOS:
-	$case ANDROID:
 		return true;
 	$case WIN32:
 	$case WASI:
@@ -199,7 +189,6 @@ macro bool os_is_posix() @const
 		return false;
 	$endswitch
 }
-const String[] AUTHORS = $$AUTHORS;
-const String[] AUTHOR_EMAILS = $$AUTHOR_EMAILS;
+
 const BUILTIN_EXPECT_IS_DISABLED = $feature(DISABLE_BUILTIN_EXPECT);
 const BUILTIN_PREFETCH_IS_DISABLED = $feature(DISABLE_BUILTIN_PREFETCH);

lib/std/core/mem_allocator.c3

@@ -1,18 +1,4 @@
 module std::core::mem::allocator;
-import std::math;
-
-// C3 has several different allocators available:
-//
-// Name                     Arena  Uses buffer  OOM Fallback?     Mark?   Reset?
-// ArenaAllocator             Yes          Yes             No       Yes      Yes
-// BackedArenaAllocator       Yes           No            Yes       Yes      Yes
-// DynamicArenaAllocator      Yes           No            Yes        No      Yes
-// HeapAllocator               No           No             No        No       No   *Note: Not for normal use
-// LibcAllocator               No           No             No        No       No   *Note: Wraps malloc
-// OnStackAllocator           Yes          Yes            Yes        No       No   *Note: Used by @stack_mem
-// TempAllocator              Yes           No            Yes        No*      No*  *Note: Mark/reset using @pool
-// TrackingAllocator           No           No            N/A        No       No   *Note: Wraps other heap allocator
-// Vmem                       Yes           No             No       Yes      Yes   *Note: Can be set to huge sizes
 
 const DEFAULT_SIZE_PREFIX = usz.sizeof;
 const DEFAULT_SIZE_PREFIX_ALIGNMENT = usz.alignof;
@@ -32,38 +18,34 @@ enum AllocInitType
 
 interface Allocator
 {
-	<*
-	 Acquire memory from the allocator, with the given alignment and initialization type.
-
-	 @require !alignment || math::is_power_of_2(alignment)
-	 @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
-	 @require size > 0 : "The size must be 1 or more"
-	 @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
-	*>
-	fn void*? acquire(usz size, AllocInitType init_type, usz alignment = 0);
-
-	<*
-	 Resize acquired memory from the allocator, with the given new size and alignment.
-
-	 @require !alignment || math::is_power_of_2(alignment)
-	 @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
-	 @require ptr != null
-	 @require new_size > 0
-	 @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
-	*>
-	fn void*? resize(void* ptr, usz new_size, usz alignment = 0);
-
-	<*
-	 Release memory acquired using `acquire` or `resize`.
-
-	 @require ptr != null : "Empty pointers should never be released"
-	*>
+	fn void reset(usz mark) @optional;
+	fn usz mark() @optional;
+	/**
+     * @require !alignment || math::is_power_of_2(alignment)
+     * @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
+     * @require size > 0
+     **/
+	fn void*! acquire(usz size, AllocInitType init_type, usz alignment = 0);
+	/**
+     * @require !alignment || math::is_power_of_2(alignment)
+     * @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
+     * @require ptr != null
+     * @require new_size > 0
+     **/
+	fn void*! resize(void* ptr, usz new_size, usz alignment = 0);
+	/**
+     * @require ptr != null
+     **/
 	fn void release(void* ptr, bool aligned);
 }
 
-alias MemoryAllocFn = fn char[]?(usz);
-
+def MemoryAllocFn = fn char[]!(usz);
 
+fault AllocationFailure
+{
+	OUT_OF_MEMORY,
+	CHUNK_TOO_LARGE,
+}
 
 fn usz alignment_for_allocation(usz alignment) @inline @private
 {
@@ -75,7 +57,7 @@ macro void* malloc(Allocator allocator, usz size) @nodiscard
 	return malloc_try(allocator, size)!!;
 }
 
-macro void*? malloc_try(Allocator allocator, usz size) @nodiscard
+macro void*! malloc_try(Allocator allocator, usz size) @nodiscard
 {
 	if (!size) return null;
 	$if env::TESTING:
@@ -92,7 +74,7 @@ macro void* calloc(Allocator allocator, usz size) @nodiscard
 	return calloc_try(allocator, size)!!;
 }
 
-macro void*? calloc_try(Allocator allocator, usz size) @nodiscard
+macro void*! calloc_try(Allocator allocator, usz size) @nodiscard
 {
 	if (!size) return null;
 	return allocator.acquire(size, ZERO);
@@ -103,7 +85,7 @@ macro void* realloc(Allocator allocator, void* ptr, usz new_size) @nodiscard
 	return realloc_try(allocator, ptr, new_size)!!;
 }
 
-macro void*? realloc_try(Allocator allocator, void* ptr, usz new_size) @nodiscard
+macro void*! realloc_try(Allocator allocator, void* ptr, usz new_size) @nodiscard
 {
 	if (!new_size)
 	{
@@ -123,7 +105,7 @@ macro void free(Allocator allocator, void* ptr)
 	allocator.release(ptr, false);
 }
 
-macro void*? malloc_aligned(Allocator allocator, usz size, usz alignment) @nodiscard
+macro void*! malloc_aligned(Allocator allocator, usz size, usz alignment) @nodiscard
 {
 	if (!size) return null;
 	$if env::TESTING:
@@ -135,13 +117,13 @@ macro void*? malloc_aligned(Allocator allocator, usz size, usz alignment) @nodis
 	$endif
 }
 
-macro void*? calloc_aligned(Allocator allocator, usz size, usz alignment) @nodiscard
+macro void*! calloc_aligned(Allocator allocator, usz size, usz alignment) @nodiscard
 {
 	if (!size) return null;
 	return allocator.acquire(size, ZERO, alignment);
 }
 
-macro void*? realloc_aligned(Allocator allocator, void* ptr, usz new_size, usz alignment) @nodiscard
+macro void*! realloc_aligned(Allocator allocator, void* ptr, usz new_size, usz alignment) @nodiscard
 {
 	if (!new_size)
 	{
@@ -161,14 +143,14 @@ macro void free_aligned(Allocator allocator, void* ptr)
 	$if env::TESTING:
 	((char*)ptr)[0] = 0xBA;
 	$endif
-	allocator.release(ptr, aligned: true);
+	allocator.release(ptr, .aligned = true);
 }
 
-<*
- @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'new_aligned' instead"
- @require $vacount < 2 : "Too many arguments."
- @require $vacount == 0 ||| @assignable_to($vaexpr[0], $Type) : "The second argument must be an initializer for the type"
-*>
+/**
+ * @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'new_aligned' instead"
+ * @require $vacount < 2 : "Too many arguments."
+ * @require $vacount == 0 ||| $assignable($vaexpr[0], $Type) : "The second argument must be an initializer for the type"
+ **/
 macro new(Allocator allocator, $Type, ...) @nodiscard
 {
 	$if $vacount == 0:
@@ -180,11 +162,11 @@ macro new(Allocator allocator, $Type, ...) @nodiscard
 	$endif
 }
 
-<*
- @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'new_aligned' instead"
- @require $vacount < 2 : "Too many arguments."
- @require $vacount == 0 ||| @assignable_to($vaexpr[0], $Type) : "The second argument must be an initializer for the type"
-*>
+/**
+ * @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'new_aligned' instead"
+ * @require $vacount < 2 : "Too many arguments."
+ * @require $vacount == 0 ||| $assignable($vaexpr[0], $Type) : "The second argument must be an initializer for the type"
+ **/
 macro new_try(Allocator allocator, $Type, ...) @nodiscard
 {
 	$if $vacount == 0:
@@ -196,139 +178,119 @@ macro new_try(Allocator allocator, $Type, ...) @nodiscard
 	$endif
 }
 
-<*
- Allocate using an aligned allocation. This is necessary for types with a default memory alignment
- exceeding DEFAULT_MEM_ALIGNMENT. IMPORTANT! It must be freed using free_aligned.
- @require $vacount < 2 : "Too many arguments."
- @require $vacount == 0 ||| @assignable_to($vaexpr[0], $Type) : "The second argument must be an initializer for the type"
-*>
-macro new_aligned(Allocator allocator, $Type, ...) @nodiscard
+/**
+ * Allocate using an aligned allocation. This is necessary for types with a default memory alignment
+ * exceeding DEFAULT_MEM_ALIGNMENT. IMPORTANT! It must be freed using free_aligned.
+ * @require $vacount < 2 : "Too many arguments."
+ * @require $vacount == 0 ||| $assignable($vaexpr[0], $Type) : "The second argument must be an initializer for the type"
+ **/
+macro new_aligned($Type, ...) @nodiscard
 {
 	$if $vacount == 0:
 		return ($Type*)calloc_aligned(allocator, $Type.sizeof, $Type.alignof);
 	$else
-		$Type* val = malloc_aligned(allocator, $Type.sizeof, $Type.alignof)!;
+		$Type* val = malloc_aligned(allocator, $Type.sizeof, $Type.alignof);
 		*val = $vaexpr[0];
 		return val;
 	$endif
 }
 
-<*
- @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT
-*>
+/**
+ * @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT
+ **/
 macro new_with_padding(Allocator allocator, $Type, usz padding) @nodiscard
 {
 	return ($Type*)calloc_try(allocator, $Type.sizeof + padding);
 }
 
-<*
- @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'alloc_aligned' instead"
-*>
+/**
+ * @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'alloc_aligned' instead"
+ **/
 macro alloc(Allocator allocator, $Type) @nodiscard
 {
 	return ($Type*)malloc(allocator, $Type.sizeof);
 }
 
-<*
- @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'alloc_aligned' instead"
-*>
+/**
+ * @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'alloc_aligned' instead"
+ **/
 macro alloc_try(Allocator allocator, $Type) @nodiscard
 {
 	return ($Type*)malloc_try(allocator, $Type.sizeof);
 }
 
-<*
- Allocate using an aligned allocation. This is necessary for types with a default memory alignment
- exceeding DEFAULT_MEM_ALIGNMENT. IMPORTANT! It must be freed using free_aligned.
-*>
+/**
+ * Allocate using an aligned allocation. This is necessary for types with a default memory alignment
+ * exceeding DEFAULT_MEM_ALIGNMENT. IMPORTANT! It must be freed using free_aligned.
+ **/
 macro alloc_aligned(Allocator allocator, $Type) @nodiscard
 {
 	return ($Type*)malloc_aligned(allocator, $Type.sizeof, $Type.alignof);
 }
 
-<*
- @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT
-*>
+/**
+ * @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT
+ **/
 macro alloc_with_padding(Allocator allocator, $Type, usz padding) @nodiscard
 {
 	return ($Type*)malloc_try(allocator, $Type.sizeof + padding);
 }
 
-<*
- @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'new_array_aligned' instead"
-*>
+/**
+ * @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'new_array_aligned' instead"
+ **/
 macro new_array(Allocator allocator, $Type, usz elements) @nodiscard
 {
 	return new_array_try(allocator, $Type, elements)!!;
 }
 
-<*
- @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'new_array_aligned' instead"
-*>
+/**
+ * @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'new_array_aligned' instead"
+ **/
 macro new_array_try(Allocator allocator, $Type, usz elements) @nodiscard
 {
 	return (($Type*)calloc_try(allocator, $Type.sizeof * elements))[:elements];
 }
 
-<*
- Allocate using an aligned allocation. This is necessary for types with a default memory alignment
- exceeding DEFAULT_MEM_ALIGNMENT. IMPORTANT! It must be freed using free_aligned.
-*>
+/**
+ * Allocate using an aligned allocation. This is necessary for types with a default memory alignment
+ * exceeding DEFAULT_MEM_ALIGNMENT. IMPORTANT! It must be freed using free_aligned.
+ **/
 macro new_array_aligned(Allocator allocator, $Type, usz elements) @nodiscard
 {
 	return (($Type*)calloc_aligned(allocator, $Type.sizeof * elements, $Type.alignof))[:elements]!!;
 }
 
-<*
- @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'alloc_array_aligned' instead"
-*>
+/**
+ * @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'alloc_array_aligned' instead"
+ **/
 macro alloc_array(Allocator allocator, $Type, usz elements) @nodiscard
 {
 	return alloc_array_try(allocator, $Type, elements)!!;
 }
 
-<*
- Allocate using an aligned allocation. This is necessary for types with a default memory alignment
- exceeding DEFAULT_MEM_ALIGNMENT. IMPORTANT! It must be freed using free_aligned.
-*>
+/**
+ * Allocate using an aligned allocation. This is necessary for types with a default memory alignment
+ * exceeding DEFAULT_MEM_ALIGNMENT. IMPORTANT! It must be freed using free_aligned.
+ **/
 macro alloc_array_aligned(Allocator allocator, $Type, usz elements) @nodiscard
 {
 	return (($Type*)malloc_aligned(allocator, $Type.sizeof * elements, $Type.alignof))[:elements]!!;
 }
 
-<*
- @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'alloc_array_aligned' instead"
-*>
+/**
+ * @require $Type.alignof <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'alloc_array_aligned' instead"
+ **/
 macro alloc_array_try(Allocator allocator, $Type, usz elements) @nodiscard
 {
 	return (($Type*)malloc_try(allocator, $Type.sizeof * elements))[:elements];
 }
 
-<*
- Clone a value.
-
- @param [&inout] allocator : "The allocator to use to clone"
- @param value : "The value to clone"
- @return "A pointer to the cloned value"
- @require $alignof(value) <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'clone_aligned' instead"
-*>
 macro clone(Allocator allocator, value) @nodiscard
 {
 	return new(allocator, $typeof(value), value);
 }
 
-<*
- Clone overaligned values. Must be released using free_aligned.
-
- @param [&inout] allocator : "The allocator to use to clone"
- @param value : "The value to clone"
- @return "A pointer to the cloned value"
-*>
-macro clone_aligned(Allocator allocator, value) @nodiscard
-{
-	return new_aligned(allocator, $typeof(value), value)!!;
-}
-
 fn any clone_any(Allocator allocator, any value) @nodiscard
 {
 	usz size = value.type.sizeof;
@@ -338,12 +300,12 @@ fn any clone_any(Allocator allocator, any value) @nodiscard
 }
 
 
-<*
- @require bytes > 0
- @require alignment > 0
- @require bytes <= isz.max
-*>
-macro void*? @aligned_alloc(#alloc_fn, usz bytes, usz alignment)
+/**
+ * @require bytes > 0
+ * @require alignment > 0
+ * @require bytes <= isz.max
+ **/
+macro void*! @aligned_alloc(#alloc_fn, usz bytes, usz alignment)
 {
 	if (alignment < void*.alignof) alignment = void*.alignof;
 	usz header = AlignedBlock.sizeof + alignment;
@@ -366,7 +328,7 @@ struct AlignedBlock
 	void* start;
 }
 
-macro void? @aligned_free(#free_fn, void* old_pointer)
+macro void! @aligned_free(#free_fn, void* old_pointer)
 {
 	AlignedBlock* desc = (AlignedBlock*)old_pointer - 1;
 	$if @typekind(#free_fn(desc.start)) == OPTIONAL:
@@ -376,11 +338,11 @@ macro void? @aligned_free(#free_fn, void* old_pointer)
 	$endif
 }
 
-<*
- @require bytes > 0
- @require alignment > 0
-*>
-macro void*? @aligned_realloc(#calloc_fn, #free_fn, void* old_pointer, usz bytes, usz alignment)
+/**
+ * @require bytes > 0
+ * @require alignment > 0
+ **/
+macro void*! @aligned_realloc(#calloc_fn, #free_fn, void* old_pointer, usz bytes, usz alignment)
 {
 	AlignedBlock* desc = (AlignedBlock*)old_pointer - 1;
 	void* data_start = desc.start;
@@ -396,107 +358,41 @@ macro void*? @aligned_realloc(#calloc_fn, #free_fn, void* old_pointer, usz bytes
 
 
 // All allocators
-alias mem @builtin = thread_allocator ;
-tlocal Allocator thread_allocator @private = base_allocator();
-Allocator temp_base_allocator @private = base_allocator();
+tlocal Allocator thread_allocator @private = &allocator::LIBC_ALLOCATOR;
+tlocal TempAllocator* thread_temp_allocator @private = null;
+tlocal TempAllocator*[2] temp_allocator_pair @private;
+Allocator temp_base_allocator @private = &allocator::LIBC_ALLOCATOR;
 
-typedef PoolState = TempAllocator*;
-
-const LazyTempAllocator LAZY_TEMP @private = {};
-tlocal Allocator current_temp = &LAZY_TEMP;
-tlocal TempAllocator* top_temp;
-tlocal bool auto_create_temp = false;
-
-usz temp_allocator_min_size = temp_allocator_default_min_size();
-usz temp_allocator_reserve_size = temp_allocator_default_reserve_size();
-usz temp_allocator_realloc_size = temp_allocator_default_min_size() * 4;
-
-fn PoolState push_pool(usz reserve = 0)
+macro TempAllocator* create_default_sized_temp_allocator(Allocator allocator) @local
 {
-	Allocator old = top_temp ? current_temp : create_temp_allocator_on_demand();
-	current_temp = ((TempAllocator*)old).derive_allocator(reserve)!!;
-	return (PoolState)old.ptr;
-}
-
-fn void pop_pool(PoolState old)
-{
-	TempAllocator* temp = (TempAllocator*)old;
-	current_temp = temp;
-	temp.reset();
-}
-
-macro Allocator base_allocator() @private
-{
-	$if env::LIBC:
-		return &allocator::LIBC_ALLOCATOR;
-	$else
-		return &allocator::NULL_ALLOCATOR;
-	$endif
-}
-
-macro usz temp_allocator_size() @local
-{
-	$switch env::MEMORY_ENV:
-		$case NORMAL: return 256 * 1024;
-		$case SMALL: return 1024 * 32;
-		$case TINY: return 1024 * 4;
-		$case NONE: return 0;
+	$switch (env::MEMORY_ENV)
+	$case NORMAL:
+		return new_temp_allocator(1024 * 256, allocator)!!;
+	$case SMALL:
+		return new_temp_allocator(1024 * 16, allocator)!!;
+	$case TINY:
+		return new_temp_allocator(1024 * 2, allocator)!!;
+	$case NONE:
+		unreachable("Temp allocator must explicitly created when memory-env is set to 'none'.");
 	$endswitch
 }
 
-macro usz temp_allocator_default_min_size() @local
-{
-	$switch env::MEMORY_ENV:
-		$case NORMAL: return 16 * 1024;
-		$case SMALL: return 1024 * 2;
-		$case TINY: return 256;
-		$case NONE: return 256;
-	$endswitch
-}
+macro Allocator heap() => thread_allocator;
 
-macro usz temp_allocator_default_reserve_size() @local
+macro TempAllocator* temp()
 {
-	$switch env::MEMORY_ENV:
-		$case NORMAL: return 1024;
-		$case SMALL: return 128;
-		$case TINY: return 64;
-		$case NONE: return 64;
-	$endswitch
-}
-
-macro Allocator heap() @deprecated("Use 'mem' instead.") => thread_allocator;
-
-<*
- @require !top_temp : "This should never be called when temp already exists"
-*>
-fn Allocator create_temp_allocator_on_demand() @private
-{
-	if (!auto_create_temp)
+	if (!thread_temp_allocator)
 	{
-	    auto_create_temp = true;
-	    abort("Use '@pool_init()' to enable the temp allocator on a new thread. A temp allocator is only implicitly created on the main thread.");
+		init_default_temp_allocators();
 	}
-	return create_temp_allocator(temp_base_allocator, temp_allocator_size(), temp_allocator_reserve_size, temp_allocator_min_size, temp_allocator_realloc_size);
+	return thread_temp_allocator;
 }
 
-<*
- @require !top_temp : "This should never be called when temp already exists"
-*>
-fn Allocator create_temp_allocator(Allocator allocator, usz size, usz reserve, usz min_size, usz realloc_size) @private
+fn void init_default_temp_allocators() @private
 {
-	return current_temp = top_temp = allocator::new_temp_allocator(allocator, size, reserve, min_size, realloc_size)!!;
-}
-
-macro Allocator temp() @deprecated("Use 'tmem' instead")
-{
-	return current_temp;
-}
-
-alias tmem @builtin = current_temp;
-
-fn void allow_implicit_temp_allocator_on_load_thread() @init(1) @local @if(env::LIBC || env::WASM_NOLIBC)
-{
-	auto_create_temp = true;
+	temp_allocator_pair[0] = create_default_sized_temp_allocator(temp_base_allocator);
+	temp_allocator_pair[1] = create_default_sized_temp_allocator(temp_base_allocator);
+	thread_temp_allocator = temp_allocator_pair[0];
 }
 
 fn void destroy_temp_allocators_after_exit() @finalizer(65535) @local @if(env::LIBC)
@@ -504,50 +400,25 @@ fn void destroy_temp_allocators_after_exit() @finalizer(65535) @local @if(env::L
 	destroy_temp_allocators();
 }
 
-<*
- Call this to destroy any memory used by the temp allocators. This will invalidate all temp memory.
-*>
+/**
+ * Call this to destroy any memory used by the temp allocators. This will invalidate all temp memory.
+ **/
 fn void destroy_temp_allocators()
 {
-	if (!top_temp) return;
-	top_temp.free();
-	top_temp = null;
-	current_temp = &LAZY_TEMP;
+	if (!thread_temp_allocator) return;
+	temp_allocator_pair[0].destroy();
+	temp_allocator_pair[1].destroy();
+	temp_allocator_pair[..] = null;
+	thread_temp_allocator = null;
 }
 
-import libc;
-typedef LazyTempAllocator (Allocator) @private = uptr;
-
-fn void*? LazyTempAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
+fn TempAllocator* temp_allocator_next() @private
 {
-	if (!top_temp) create_temp_allocator_on_demand();
-	return top_temp.acquire(bytes, init_type, alignment);
+	if (!thread_temp_allocator)
+	{
+		init_default_temp_allocators();
+		return thread_temp_allocator;
+	}
+	usz index = thread_temp_allocator == temp_allocator_pair[0] ? 1 : 0;
+	return thread_temp_allocator = temp_allocator_pair[index];
 }
-
-fn void*? LazyTempAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
-{
-	if (!top_temp) create_temp_allocator_on_demand();
-	return top_temp.resize(old_ptr, new_bytes, alignment);
-}
-
-fn void LazyTempAllocator.release(&self, void* old_ptr, bool aligned) @dynamic
-{
-}
-
-const NullAllocator NULL_ALLOCATOR = {};
-typedef NullAllocator (Allocator) = uptr;
-
-fn void*? NullAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
-{
-	return mem::OUT_OF_MEMORY?;
-}
-
-fn void*? NullAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
-{
-	return mem::OUT_OF_MEMORY?;
-}
-
-fn void NullAllocator.release(&self, void* old_ptr, bool aligned) @dynamic
-{
-}
-

lib/std/core/os/mem_vm.c3

@@ -1,323 +0,0 @@
-<*
- The VM module holds code for working with virtual memory on supported platforms (currently Win32 and Posix)
-*>
-module std::core::mem::vm;
-import std::os::win32, std::os::posix, libc;
-
-<*
- VirtualMemory is an abstraction for working with an allocated virtual memory area. It will invoke vm:: functions
- but will perform more checks and track its size (required to unmap the memory on Posix)
-*>
-struct VirtualMemory
-{
-	void* ptr;
-	usz size;
-	VirtualMemoryAccess default_access;
-}
-
-faultdef RANGE_OVERFLOW, UNKNOWN_ERROR, ACCESS_DENIED, UNMAPPED_ACCESS, UNALIGNED_ADDRESS, RELEASE_FAILED, UPDATE_FAILED, INVALID_ARGS;
-
-enum VirtualMemoryAccess
-{
-	PROTECTED,
-	READ,
-	WRITE,
-	READWRITE,
-	EXEC,
-	EXECREAD,
-	EXECWRITE,
-	ANY
-}
-
-fn usz aligned_alloc_size(usz size)
-{
-	$if env::WIN32:
-		return size > 0 ? mem::aligned_offset(size, win32::allocation_granularity()) : win32::allocation_granularity();
-	$else
-		return size > 0 ? mem::aligned_offset(size, mem::os_pagesize()) : mem::os_pagesize();
-	$endif
-}
-
-<*
- Allocate virtual memory, size is rounded up to platform granularity (Win32) / page size (Posix).
-
- @param size : "The size of the memory to allocate, will be rounded up"
- @param access : "The initial access permissions."
- @return? mem::OUT_OF_MEMORY, RANGE_OVERFLOW, UNKNOWN_ERROR, ACCESS_DENIED, INVALID_ARGS
- @return "Pointer to the allocated memory, page aligned"
-*>
-fn void*? alloc(usz size, VirtualMemoryAccess access)
-{
-	$switch:
-		$case env::POSIX:
-			void* ptr = posix::mmap(null, aligned_alloc_size(size), access.to_posix(), posix::MAP_PRIVATE | posix::MAP_ANONYMOUS, -1, 0);
-			if (ptr != posix::MAP_FAILED) return ptr;
-			switch (libc::errno())
-			{
-				case errno::ENOMEM:    return mem::OUT_OF_MEMORY?;
-				case errno::EOVERFLOW: return RANGE_OVERFLOW?;
-				case errno::EPERM:     return ACCESS_DENIED?;
-				case errno::EINVAL:    return INVALID_ARGS?;
-				default:               return UNKNOWN_ERROR?;
-			}
-		$case env::WIN32:
-			void* ptr = win32::virtualAlloc(null, aligned_alloc_size(size), MEM_RESERVE, access.to_win32());
-			if (ptr) return ptr;
-			switch (win32::getLastError())
-			{
-				case win32::ERROR_NOT_ENOUGH_MEMORY:
-				case win32::ERROR_COMMITMENT_LIMIT:  return mem::OUT_OF_MEMORY?;
-				default:                             return UNKNOWN_ERROR?;
-			}
-		$default:
-			unsupported("Virtual alloc only available on Win32 and Posix");
-	$endswitch
-}
-
-<*
- Release memory allocated with "alloc".
-
- @param [&inout] ptr : "Pointer to page to release, should be allocated using vm::alloc"
- @param size : "The size of the allocated pointer"
- @require mem::ptr_is_page_aligned(ptr) : "The pointer should be page aligned"
-*>
-fn void? release(void* ptr, usz size)
-{
-	$switch:
-		$case env::POSIX:
-			if (posix::munmap(ptr, aligned_alloc_size(size)))
-			{
-				switch (libc::errno())
-				{
-					case errno::EINVAL: return INVALID_ARGS?;    // Not a valid mapping or size
-					case errno::ENOMEM: return UNMAPPED_ACCESS?; // Address not mapped
-					default:            return RELEASE_FAILED?;
-				}
-			}
-		$case env::WIN32:
-			if (win32::virtualFree(ptr, 0, MEM_RELEASE)) return;
-			switch (win32::getLastError())
-			{
-				case win32::ERROR_INVALID_ADDRESS:   return INVALID_ARGS?;
-				case win32::ERROR_NOT_ENOUGH_MEMORY: return mem::OUT_OF_MEMORY?;
-				default:                             return RELEASE_FAILED?;
-			}
-		$default:
-			unsupported("Virtual free only available on Win32 and Posix");
-	$endswitch
-}
-
-<*
- Change the access protection of a region in memory. The region must be page aligned.
-
- @param [&inout] ptr : "Pointer to page to update, must be page aligned"
- @param len : "To what len to update, must be page aligned"
- @param access : "The new access"
- @require mem::ptr_is_page_aligned(ptr) : "The pointer should be page aligned"
- @require mem::ptr_is_page_aligned(ptr + len) : "The length must be page aligned"
- @return? ACCESS_DENIED, UNALIGNED_ADDRESS, RANGE_OVERFLOW, UPDATE_FAILED, UNMAPPED_ACCESS, INVALID_ARGS
-*>
-fn void? protect(void* ptr, usz len, VirtualMemoryAccess access)
-{
-	$switch:
-		$case env::POSIX:
-			if (!posix::mprotect(ptr, len, access.to_posix())) return;
-			switch (libc::errno())
-			{
-				case errno::EACCES:    return ACCESS_DENIED?;
-				case errno::EINVAL:    return UNALIGNED_ADDRESS?;
-				case errno::EOVERFLOW: return RANGE_OVERFLOW?;
-				case errno::ENOMEM:    return UNMAPPED_ACCESS?;
-				default:               return UPDATE_FAILED?;
-			}
-		$case env::WIN32:
-			Win32_Protect old;
-			if (win32::virtualProtect(ptr, len, access.to_win32(), &old)) return;
-			switch (win32::getLastError())
-			{
-				case win32::ERROR_INVALID_ADDRESS:   return UNALIGNED_ADDRESS?;
-				case win32::ERROR_ACCESS_DENIED:     return ACCESS_DENIED?;
-				case win32::ERROR_INVALID_PARAMETER: return INVALID_ARGS?;
-				default:                             return UPDATE_FAILED?;
-			}
-		$default:
-			unsupported("'virtual_protect' is only available on Win32 and Posix.");
-	$endswitch
-}
-
-<*
- Makes a region of memory available that was previously retrieved using 'alloc'. This is necessary on Win32,
- but optional on Posix.
-
- @param [&inout] ptr : "Pointer to page to update, must be page aligned"
- @param len : "To what len to commit, must be page aligned"
- @require mem::ptr_is_page_aligned(ptr) : "The pointer should be page aligned"
- @require mem::ptr_is_page_aligned(ptr + len) : "The length must be page aligned"
- @return? UNKNOWN_ERROR, mem::OUT_OF_MEMORY, ACCESS_DENIED, UNALIGNED_ADDRESS, RANGE_OVERFLOW, UPDATE_FAILED, UNMAPPED_ACCESS, INVALID_ARGS
-*>
-fn void? commit(void* ptr, usz len, VirtualMemoryAccess access = READWRITE)
-{
-	$switch:
-		$case env::POSIX:
-			return protect(ptr, len, READWRITE) @inline;
-		$case env::WIN32:
-			void* result = win32::virtualAlloc(ptr, len, MEM_COMMIT, access.to_win32());
-			if (result) return;
-			switch (win32::getLastError())
-			{
-				case win32::ERROR_INVALID_ADDRESS:   return UNALIGNED_ADDRESS?;
-				case win32::ERROR_ACCESS_DENIED:     return ACCESS_DENIED?;
-				case win32::ERROR_COMMITMENT_LIMIT:
-				case win32::ERROR_NOT_ENOUGH_MEMORY: return mem::OUT_OF_MEMORY?;
-				case win32::ERROR_INVALID_PARAMETER: return INVALID_ARGS?;
-				default:                             return UNKNOWN_ERROR?;
-			}
-		$default:
-			unsupported("'virtual_commit' is only available on Win32 and Posix.");
-	$endswitch
-}
-
-<*
- Notifies that the memory in the region can be released back to the OS. On Win32 this decommits the region,
- whereas on Posix it tells the system that it may be reused using madvise. The "block" parameter is only
- respected on Posix, and protects the region from read/write/exec. On Win32 this always happens.
-
- @param [&inout] ptr : "Pointer to page to update, must be page aligned"
- @param len : "To what len to commit, must be page aligned"
- @param block : "Set the released memory to protected"
- @require mem::ptr_is_page_aligned(ptr) : "The pointer should be page aligned"
- @require mem::ptr_is_page_aligned(ptr + len) : "The length must be page aligned"
- @return? ACCESS_DENIED, UNALIGNED_ADDRESS, RANGE_OVERFLOW, UPDATE_FAILED, UNMAPPED_ACCESS, INVALID_ARGS
-*>
-fn void? decommit(void* ptr, usz len, bool block = true)
-{
-	$switch:
-		$case env::POSIX:
-			if (posix::madvise(ptr, len, posix::MADV_DONTNEED))
-			{
-				switch (libc::errno())
-				{
-					case errno::EINVAL: return UNALIGNED_ADDRESS?;
-					case errno::ENOMEM: return UNMAPPED_ACCESS?;
-					default:            return UPDATE_FAILED?;
-				}
-			}
-			if (block) (void)protect(ptr, len, PROTECTED) @inline;
-		$case env::WIN32:
-			if (!win32::virtualFree(ptr, len, MEM_DECOMMIT))
-			{
-				switch (win32::getLastError())
-				{
-					case win32::ERROR_INVALID_ADDRESS:   return UNALIGNED_ADDRESS?;
-					case win32::ERROR_INVALID_PARAMETER: return INVALID_ARGS?;
-					case win32::ERROR_ACCESS_DENIED:     return ACCESS_DENIED?;
-					default:                             return UPDATE_FAILED?;
-				}
-			}
-		$default:
-			unsupported("'virtual_decommit' is only available on Win32 and Posix.");
-	$endswitch
-}
-
-<*
- Create a VirtualMemory using
-
- @param size : "The size of the memory to allocate."
- @require size > 0 : "The size must be non-zero"
- @return? mem::OUT_OF_MEMORY, RANGE_OVERFLOW, UNKNOWN_ERROR, ACCESS_DENIED, INVALID_ARGS
-*>
-fn VirtualMemory? virtual_alloc(usz size, VirtualMemoryAccess access = PROTECTED)
-{
-	size = aligned_alloc_size(size);
-	void* ptr = alloc(size, access)!;
-	return { ptr, size, access };
-}
-
-<*
- Commits memory, using vm::commit
-
- @param offset : "Starting from what offset to commit"
- @param len : "To what len to commit"
- @require mem::ptr_is_page_aligned(self.ptr + offset) : "The offset should be page aligned"
- @require mem::ptr_is_page_aligned(self.ptr + offset + len) : "The length must be page aligned"
- @require offset < self.size : "Offset out of range"
- @require offset + len <= self.size : "Length out of range"
- @return? UPDATE_FAILED, ACCESS_DENIED, UNALIGNED_ADDRESS, RANGE_OVERFLOW, UNKNOWN_ERROR
-*>
-macro void? VirtualMemory.commit(self, usz offset, usz len)
-{
-	return commit(self.ptr + offset, len, self.default_access);
-}
-
-<*
- Changes protection of a part of memory using vm::protect
-
- @param offset : "Starting from what offset to update"
- @param len : "To what len to update"
- @require mem::ptr_is_page_aligned(self.ptr + offset) : "The offset should be page aligned"
- @require mem::ptr_is_page_aligned(self.ptr + offset + len) : "The length must be page aligned"
- @require offset < self.size : "Offset out of range"
- @require offset + len < self.size : "Length out of range"
- @return? UPDATE_FAILED, ACCESS_DENIED, UNALIGNED_ADDRESS, RANGE_OVERFLOW, UNKNOWN_ERROR
-*>
-macro void? VirtualMemory.protect(self, usz offset, usz len, VirtualMemoryAccess access)
-{
-	return protect(self.ptr + offset, len, access);
-}
-<*
- Decommits a part of memory using vm::decommit
-
- @param offset : "Starting from what offset to decommit"
- @param len : "To what len to decommit"
- @param block : "Should the memory be blocked from access after decommit"
- @require mem::ptr_is_page_aligned(self.ptr + offset) : "The offset should be page aligned"
- @require mem::ptr_is_page_aligned(self.ptr + offset + len) : "The length must be page aligned"
- @require offset < self.size : "Offset out of range"
- @require offset + len < self.size : "Length out of range"
- @return? UPDATE_FAILED
-*>
-fn void? VirtualMemory.decommit(self, usz offset, usz len, bool block = true)
-{
-	return decommit(self.ptr + offset, len, block);
-}
-
-<*
- Releases the memory region
-
- @require self.ptr != null : "Virtual memory must be initialized to call destroy"
-*>
-fn void? VirtualMemory.destroy(&self)
-{
-	return release(self.ptr, self.size);
-}
-
-fn CInt VirtualMemoryAccess.to_posix(self) @if(env::POSIX) @private
-{
-	switch (self)
-	{
-		case PROTECTED: return posix::PROT_NONE;
-		case READ: return posix::PROT_READ;
-		case WRITE: return posix::PROT_WRITE;
-		case EXEC: return posix::PROT_EXEC;
-		case READWRITE: return posix::PROT_READ | posix::PROT_WRITE;
-		case EXECREAD: return posix::PROT_READ | posix::PROT_EXEC;
-		case EXECWRITE: return posix::PROT_WRITE | posix::PROT_EXEC;
-		case ANY: return posix::PROT_WRITE | posix::PROT_READ | posix::PROT_EXEC;
-	}
-}
-
-fn Win32_Protect VirtualMemoryAccess.to_win32(self) @if(env::WIN32) @private
-{
-	switch (self)
-	{
-		case PROTECTED: return PAGE_NOACCESS;
-		case READ: return PAGE_READONLY;
-		case WRITE: return PAGE_READWRITE;
-		case EXEC: return PAGE_EXECUTE;
-		case READWRITE: return PAGE_READWRITE;
-		case EXECWRITE: return PAGE_EXECUTE_READWRITE;
-		case EXECREAD: return PAGE_EXECUTE_READ;
-		case ANY: return PAGE_EXECUTE_READWRITE;
-	}
-}
-

lib/std/core/os/wasm_memory.c3

@@ -11,7 +11,7 @@ struct WasmMemory
 	uptr use;
 }
 
-fn char[]? WasmMemory.allocate_block(&self, usz bytes)
+fn char[]! WasmMemory.allocate_block(&self, usz bytes)
 {
 	if (!self.allocation)
 	{
@@ -25,7 +25,7 @@ fn char[]? WasmMemory.allocate_block(&self, usz bytes)
 	}
 
 	usz blocks_required = (bytes_required + WASM_BLOCK_SIZE + 1) / WASM_BLOCK_SIZE;
-	if ($$wasm_memory_grow(0, blocks_required) == -1) return mem::OUT_OF_MEMORY?;
+	if ($$wasm_memory_grow(0, blocks_required) == -1) return AllocationFailure.OUT_OF_MEMORY?;
 	self.allocation = $$wasm_memory_size(0) * WASM_BLOCK_SIZE;
 	defer self.use += bytes;
 	return ((char*)self.use)[:bytes];

lib/std/core/private/cpu_detect.c3

@@ -25,22 +25,14 @@ enum X86Feature
 {
 	ADX,
 	AES,
-	AMX_AVX512,
-	AMX_FP8,
-	AMX_MOVRS,
-	AMX_TF32,
-	AMX_TRANSPOSE,
 	AMX_BF16,
 	AMX_COMPLEX,
 	AMX_FP16,
 	AMX_INT8,
 	AMX_TILE,
-	APXF,
 	AVX,
 	AVX10_1_256,
 	AVX10_1_512,
-	AVX10_2_256,
-	AVX10_2_512,
 	AVX2,
 	AVX5124FMAPS,
 	AVX5124VNNIW,
@@ -91,7 +83,6 @@ enum X86Feature
 	MOVBE,
 	MOVDIR64B,
 	MOVDIRI,
-	MOVRS,
 	MWAITX,
 	PCLMUL,
 	PCONFIG,
@@ -143,21 +134,21 @@ uint128 x86_features;
 
 fn void add_feature_if_bit(X86Feature feature, uint register, int bit)
 {
-	if (register & 1U << bit) x86_features |= 1ULL << feature.ordinal;
+	if (register & 1U << bit) x86_features |= 1u128 << feature.ordinal;
 }
 
 fn void x86_initialize_cpu_features()
 {
 	uint max_level = x86_cpuid(0).eax;
 	CpuId feat = x86_cpuid(1);
-	CpuId leaf7 = max_level >= 8 ? x86_cpuid(7) : {};
-	CpuId leaf7s1 = leaf7.eax >= 1 ? x86_cpuid(7, 1) : {};
-	CpuId ext1 = x86_cpuid(0x80000000).eax >= 0x80000001 ? x86_cpuid(0x80000001) : {};
-	CpuId ext8 = x86_cpuid(0x80000000).eax >= 0x80000008 ? x86_cpuid(0x80000008) : {};
-	CpuId leaf_d = max_level >= 0xd ? x86_cpuid(0xd, 0x1) : {};
-	CpuId leaf_14 = max_level >= 0x14 ? x86_cpuid(0x14) : {};
-	CpuId leaf_19 = max_level >= 0x19 ? x86_cpuid(0x19) : {};
-	CpuId leaf_24 = max_level >= 0x24 ? x86_cpuid(0x24) : {};
+	CpuId leaf7 = max_level >= 8 ? x86_cpuid(7) : CpuId {};
+	CpuId leaf7s1 = leaf7.eax >= 1 ? x86_cpuid(7, 1) : CpuId {};
+	CpuId ext1 = x86_cpuid(0x80000000).eax >= 0x80000001 ? x86_cpuid(0x80000001) : CpuId {};
+	CpuId ext8 = x86_cpuid(0x80000000).eax >= 0x80000008 ? x86_cpuid(0x80000008) : CpuId {};
+	CpuId leaf_d = max_level >= 0xd ? x86_cpuid(0xd, 0x1) : CpuId {};
+	CpuId leaf_14 = max_level >= 0x14 ? x86_cpuid(0x14) : CpuId {};
+	CpuId leaf_19 = max_level >= 0x19 ? x86_cpuid(0x19) : CpuId {};
+	CpuId leaf_24 = max_level >= 0x24 ? x86_cpuid(0x24) : CpuId {};
 	add_feature_if_bit(ADX, leaf7.ebx, 19);
 	add_feature_if_bit(AES, feat.ecx, 25);
 	add_feature_if_bit(AMX_BF16, leaf7.edx, 22);
@@ -165,7 +156,6 @@ fn void x86_initialize_cpu_features()
 	add_feature_if_bit(AMX_FP16, leaf7s1.eax, 21);
 	add_feature_if_bit(AMX_INT8, leaf7.edx, 25);
 	add_feature_if_bit(AMX_TILE, leaf7.edx, 24);
-	add_feature_if_bit(APXF, leaf7s1.edx, 21);
 	add_feature_if_bit(AVX, feat.ecx, 28);
 	add_feature_if_bit(AVX10_1_256, leaf7s1.edx, 19);
 	add_feature_if_bit(AVX10_1_512, leaf_24.ebx, 18);
@@ -265,4 +255,4 @@ fn void x86_initialize_cpu_features()
 	add_feature_if_bit(XSAVEOPT, leaf_d.eax, 0);
 	add_feature_if_bit(XSAVES, leaf_d.eax, 3);
 
-}
+}

lib/std/core/private/macho_runtime.c3

@@ -56,7 +56,10 @@ struct MachHeader64
 
 const LC_SEGMENT_64 = 0x19;
 
-
+fault MachoSearch
+{
+	NOT_FOUND
+}
 fn bool name_cmp(char* a, char[16]* b)
 {
 	for (usz i = 0; i < 16; i++)
@@ -67,7 +70,7 @@ fn bool name_cmp(char* a, char[16]* b)
 	return false;
 }
 
-fn SegmentCommand64*? find_segment(MachHeader* header, char* segname)
+fn SegmentCommand64*! find_segment(MachHeader* header, char* segname)
 {
 	LoadCommand* command = (void*)header + MachHeader64.sizeof;
 	for (uint i = 0; i < header.ncmds; i++)
@@ -79,9 +82,9 @@ fn SegmentCommand64*? find_segment(MachHeader* header, char* segname)
 		}
 		command = (void*)command + command.cmdsize;
 	}
-	return NOT_FOUND?;
+	return MachoSearch.NOT_FOUND?;
 }
-fn Section64*? find_section(SegmentCommand64* command, char* sectname)
+fn Section64*! find_section(SegmentCommand64* command, char* sectname)
 {
 	Section64* section = (void*)command + SegmentCommand64.sizeof;
 	for (uint i = 0; i < command.nsects; i++)
@@ -89,22 +92,22 @@ fn Section64*? find_section(SegmentCommand64* command, char* sectname)
 		if (name_cmp(sectname, &section.sectname)) return section;
 		section++;
 	}
-	return NOT_FOUND?;
+	return MachoSearch.NOT_FOUND?;
 }
 
 macro find_segment_section_body(MachHeader* header, char* segname, char* sectname, $Type)
 {
 
-	Section64*? section = find_section(find_segment(header, segname), sectname);
+	Section64*! section = find_section(find_segment(header, segname), sectname);
 	if (catch section)
 	{
-		return ($Type[]){};
+		return $Type[] {};
 	}
 	$Type* ptr = (void*)header + section.offset;
 	return ptr[:section.size / $Type.sizeof];
 }
 
-alias DyldCallback = fn void (MachHeader* mh, isz vmaddr_slide);
+def DyldCallback = fn void (MachHeader* mh, isz vmaddr_slide);
 
 extern fn void _dyld_register_func_for_add_image(DyldCallback);
 
@@ -123,7 +126,7 @@ extern fn void* realloc(void* ptr, usz size);
 extern fn void* malloc(usz size);
 extern fn void free(void* ptr);
 
-alias CallbackFn = fn void();
+def CallbackFn = fn void();
 struct Callback
 {
 	uint priority;

lib/std/core/private/main_stub.c3

@@ -47,13 +47,6 @@ macro int @main_to_int_main_args(#m, int argc, char** argv)
 	return #m(list);
 }
 
-macro int @_main_runner(#m, int argc, char** argv)
-{
-	String[] list = args_to_strings(argc, argv);
-	defer free(list.ptr);
-	return #m(list) ? 0 : 1;
-}
-
 macro int @main_to_void_main_args(#m, int argc, char** argv)
 {
 	String[] list = args_to_strings(argc, argv);
@@ -80,7 +73,7 @@ macro String[] wargs_strings(int argc, Char16** argv) @private
 	{
 		Char16* arg = argv[i];
 		Char16[] argstring = arg[:_strlen(arg)];
-		list[i] = string::from_utf16(mem, argstring) ?? "?".copy(mem);
+		list[i] = string::new_from_utf16(argstring) ?? "?".copy();
 	}
 	return list[:argc];
 }
@@ -164,13 +157,6 @@ macro int @wmain_to_int_main_args(#m, int argc, Char16** argv)
 	return #m(args);
 }
 
-macro int @_wmain_runner(#m, int argc, Char16** argv)
-{
-	String[] args = wargs_strings(argc, argv);
-	defer release_wargs(args);
-	return #m(args) ? 0 : 1;
-}
-
 macro int @wmain_to_void_main_args(#m, int argc, Char16** argv)
 {
 	String[] args = wargs_strings(argc, argv);

lib/std/core/refcount.c3

@@ -1,132 +0,0 @@
-<*
- Ref provides a general *external* ref counted wrapper for a pointer. For convenience, a ref count of 0
- means the reference is still valid.
-
- When the rc drops to -1, it will first run the dealloc function on the underlying pointer (if it exists),
- then free the pointer and the atomic variable assuming that they are allocated using the Allocator in the Ref.
-
- @require !$defined(Type.dealloc) ||| $defined(Type.dealloc(&&(Type){})) : "'dealloc' must only take a pointer to the underlying type"
- @require !$defined(Type.dealloc) ||| @typeis((Type){}.dealloc(), void) : "'dealloc' must return 'void'"
-*>
-module std::core::mem::ref { Type };
-import std::thread, std::atomic;
-
-const OVERALIGNED @private = Type.alignof > mem::DEFAULT_MEM_ALIGNMENT;
-
-alias DeallocFn = fn void(void*);
-
-fn Ref wrap(Type* ptr, Allocator allocator = mem)
-{
-	return { .refcount = allocator::new(allocator, Atomic{int}), .ptr = ptr, .allocator = allocator };
-}
-<*
- @require $vacount < 2 : "Too many arguments."
- @require $vacount == 0 ||| @assignable_to($vaexpr[0], Type) : "The first argument must be an initializer for the type"
-*>
-macro Ref new(..., Allocator allocator = mem)
-{
-
-	$switch:
-		$case OVERALIGNED && !$vacount:
-			Type* ptr = allocator::calloc_aligned(allocator, Type.sizeof, Type.alignof)!!;
-		$case OVERALIGNED:
-			Type* ptr = allocator::malloc_aligned(allocator, Type.sizeof, Type.alignof)!!;
-			*ptr = $vaexpr[0];
-		$case !$vacount:
-			Type* ptr = allocator::calloc(allocator, Type.sizeof);
-		$default:
-			Type* ptr = allocator::malloc(allocator, Type.sizeof);
-			*ptr = $vaexpr[0];
-	$endswitch
-	return { .refcount = allocator::new(allocator, Atomic{int}),
-	         .ptr = ptr,
-	         .allocator = allocator };
-}
-
-struct Ref
-{
-	Atomic{int}* refcount;
-	Type* ptr;
-	Allocator allocator;
-}
-
-fn Ref* Ref.retain(&self)
-{
-	assert(self.refcount != null, "Reference already released");
-	assert(self.refcount.load(RELAXED) >= 0, "Retaining zombie");
-	self.refcount.add(1, RELAXED);
-	return self;
-}
-
-fn void Ref.release(&self)
-{
-	assert(self.refcount != null, "Reference already released");
-    assert(self.refcount.load(RELAXED) >= 0, "Overrelease of refcount");
-	if (self.refcount.sub(1, RELAXED) == 0)
-	{
-		thread::fence(ACQUIRE);
-		$if $defined(Type.dealloc):
-			self.ptr.dealloc();
-		$endif
-		$if OVERALIGNED:
-			allocator::free_aligned(self.allocator, self.ptr);
-		$else
-			allocator::free(self.allocator, self.ptr);
-		$endif
-		allocator::free(self.allocator, self.refcount);
-		*self = {};
-	}
-}
-
-module std::core::mem::rc;
-import std::thread, std::atomic;
-
-<*
- A RefCounted struct should be an inline base of a struct.
- If a `dealloc` is defined, then it will be called rather than `free`
-
- For convenience, a ref count of 0 is still valid, and the struct is
- only freed when when ref count drops to -1.
-
- The macros rc::retain and rc::release must be used on the full pointer,
- not on the RefCounted substruct.
-
- So `Foo* f = ...; RefCounted* rc = f; rc::release(rc);` will not do the right thing.
-*>
-struct RefCounted
-{
-	Atomic{int} refcount;
-}
-
-<*
- @require @assignable_to(refcounted, RefCounted*) : "Expected a ref counted value"
-*>
-macro retain(refcounted)
-{
-	if (refcounted)
-	{
-		assert(refcounted.refcount.load(RELAXED) >= 0, "Retaining zombie");
-    	refcounted.refcount.add(1, RELAXED);
-	}
-	return refcounted;
-}
-
-<*
- @require @assignable_to(refcounted, RefCounted*) : "Expected a ref counted value"
- @require !$defined(refcounted.dealloc()) ||| @typeis(refcounted.dealloc(), void)
-   : "Expected refcounted type to have a valid dealloc"
-*>
-macro void release(refcounted)
-{
-	if (!refcounted) return;
-	assert(refcounted.refcount.load(RELAXED) >= 0, "Overrelease of refcount");
-	if (refcounted.refcount.sub(1, RELAXED) == 0)
-	{
-		thread::fence(ACQUIRE);
-		$if $defined(refcounted.dealloc):
-			refcounted.dealloc();
-		$else
-			free(refcounted);
-		$endif
-	}
-}

lib/std/core/runtime.c3

@@ -4,12 +4,6 @@
 module std::core::runtime;
 import libc, std::time, std::io, std::sort;
 
-struct ReflectedParam (Printable) @if(!$defined(ReflectedParam))
-{
-	String name;
-	typeid type;
-}
-
 struct AnyRaw
 {
 	void* ptr;
@@ -22,22 +16,229 @@ struct SliceRaw
 	usz len;
 }
 
-macro @enum_lookup($Type, #value, value)
+def BenchmarkFn = fn void!();
+
+struct BenchmarkUnit
 {
-	$foreach $val : $Type.values:
-		if ($val.#value == value) return $val;
-	$endforeach
-	return NOT_FOUND?;
+	String name;
+	BenchmarkFn func;
 }
 
-macro @enum_lookup_new($Type, $name, value)
+fn BenchmarkUnit[] benchmark_collection_create(Allocator allocator = allocator::heap())
 {
-	$foreach $val : $Type.values:
-		if ($val.$eval($name) == value) return $val;
-	$endforeach
-	return NOT_FOUND?;
+	BenchmarkFn[] fns = $$BENCHMARK_FNS;
+	String[] names = $$BENCHMARK_NAMES;
+	BenchmarkUnit[] benchmarks = allocator::alloc_array(allocator, BenchmarkUnit, names.len);
+	foreach (i, benchmark : fns)
+	{
+		benchmarks[i] = { names[i], fns[i] };
+	}
+	return benchmarks;
 }
 
+const DEFAULT_BENCHMARK_WARMUP_ITERATIONS = 3;
+const DEFAULT_BENCHMARK_MAX_ITERATIONS = 10000;
+
+uint benchmark_warmup_iterations @private = DEFAULT_BENCHMARK_WARMUP_ITERATIONS;
+uint benchmark_max_iterations @private = DEFAULT_BENCHMARK_MAX_ITERATIONS;
+
+fn void set_benchmark_warmup_iterations(uint value) @builtin
+{
+    benchmark_warmup_iterations = value;
+}
+
+fn void set_benchmark_max_iterations(uint value) @builtin
+{
+    assert(value > 0);
+    benchmark_max_iterations = value;
+}
+
+fn bool run_benchmarks(BenchmarkUnit[] benchmarks)
+{
+	int benchmarks_passed = 0;
+	int benchmark_count = benchmarks.len;
+	usz max_name;
+
+	foreach (&unit : benchmarks)
+	{
+		if (max_name < unit.name.len) max_name = unit.name.len;
+	}
+
+	usz len = max_name + 9;
+
+	DString name = dstring::temp_with_capacity(64);
+	name.append_repeat('-', len / 2);
+	name.append(" BENCHMARKS ");
+	name.append_repeat('-', len - len / 2);
+
+	io::printn(name);
+
+	name.clear();
+
+	long sys_clock_started;
+	long sys_clock_finished;
+	long sys_clocks;
+	Clock clock;
+	anyfault err;
+
+	foreach(unit : benchmarks)
+	{
+		defer name.clear();
+		name.appendf("Benchmarking %s ", unit.name);
+		name.append_repeat('.', max_name - unit.name.len + 2);
+		io::printf("%s ", name.str_view());
+
+		for (uint i = 0; i < benchmark_warmup_iterations; i++)
+		{
+			err = @catch(unit.func()) @inline;
+			@volatile_load(err);
+		}
+
+		clock = std::time::clock::now();
+		sys_clock_started = $$sysclock();
+
+		for (uint i = 0; i < benchmark_max_iterations; i++)
+		{
+			err = @catch(unit.func()) @inline;
+			@volatile_load(err);
+		}
+
+		sys_clock_finished = $$sysclock();
+		NanoDuration nano_seconds = clock.mark();
+		sys_clocks = sys_clock_finished - sys_clock_started;
+
+		if (err)
+		{
+			io::printfn("[failed] Failed due to: %s", err);
+			continue;
+		}
+
+		io::printfn("[ok] %.2f ns, %.2f CPU's clocks", (float)nano_seconds / benchmark_max_iterations, (float)sys_clocks / benchmark_max_iterations);
+		benchmarks_passed++;
+	}
+
+	io::printfn("\n%d benchmark%s run.\n", benchmark_count, benchmark_count > 1 ? "s" : "");
+	io::printfn("Benchmarks Result: %s. %d passed, %d failed.",
+		benchmarks_passed < benchmark_count ? "FAILED" : "ok",
+		benchmarks_passed,
+		benchmark_count - benchmarks_passed);
+
+	return benchmark_count == benchmarks_passed;
+}
+
+fn bool default_benchmark_runner()
+{
+	@pool()
+	{
+		return run_benchmarks(benchmark_collection_create(allocator::temp()));
+	};
+}
+
+def TestFn = fn void!();
+
+struct TestUnit
+{
+	String name;
+	TestFn func;
+}
+
+fn TestUnit[] test_collection_create(Allocator allocator = allocator::heap())
+{
+	TestFn[] fns = $$TEST_FNS;
+	String[] names = $$TEST_NAMES;
+	TestUnit[] tests = allocator::alloc_array(allocator, TestUnit, names.len);
+	foreach (i, test : fns)
+	{
+		tests[i] = { names[i], fns[i] };
+	}
+	return tests;
+}
+
+struct TestContext
+{
+	JmpBuf buf;
+}
+
+// Sort the tests by their name in ascending order.
+fn int cmp_test_unit(TestUnit a, TestUnit b)
+{
+	usz an = a.name.len;
+	usz bn = b.name.len;
+	if (an > bn) @swap(a, b);
+	foreach (i, ac : a.name)
+	{
+		char bc = b.name[i];
+		if (ac != bc) return an > bn ? bc - ac : ac - bc;
+	}
+	return (int)(an - bn);
+}
+
+TestContext* test_context @private;
+
+fn void test_panic(String message, String file, String function, uint line)
+{
+	io::printn("[error]");
+	io::print("\n Error: ");
+	io::print(message);
+	io::printn();
+	io::printfn("  - in %s %s:%s.\n", function, file, line);
+	libc::longjmp(&test_context.buf, 1);
+}
+
+fn bool run_tests(TestUnit[] tests)
+{
+	usz max_name;
+	foreach (&unit : tests)
+	{
+		if (max_name < unit.name.len) max_name = unit.name.len;
+	}
+	quicksort(tests, &cmp_test_unit);
+
+	TestContext context;
+	test_context = &context;
+
+	PanicFn old_panic = builtin::panic;
+	defer builtin::panic = old_panic;
+	builtin::panic = &test_panic;
+	int tests_passed = 0;
+	int test_count = tests.len;
+	DString name = dstring::temp_with_capacity(64);
+	usz len = max_name + 9;
+	name.append_repeat('-', len / 2);
+	name.append(" TESTS ");
+	name.append_repeat('-', len - len / 2);
+	io::printn(name);
+	name.clear();
+	foreach(unit : tests)
+	{
+		defer name.clear();
+		name.appendf("Testing %s ", unit.name);
+		name.append_repeat('.', max_name - unit.name.len + 2);
+		io::printf("%s ", name.str_view());
+		if (libc::setjmp(&context.buf) == 0)
+		{
+			if (catch err = unit.func())
+			{
+				io::printfn("[failed] Failed due to: %s", err);
+				continue;
+			}
+			io::printn("[ok]");
+			tests_passed++;
+		}
+	}
+	io::printfn("\n%d test%s run.\n", test_count, test_count > 1 ? "s" : "");
+	io::printfn("Test Result: %s. %d passed, %d failed.",
+		tests_passed < test_count ? "FAILED" : "ok", tests_passed, test_count - tests_passed);
+	return test_count == tests_passed;
+}
+
+fn bool default_test_runner()
+{
+	@pool()
+	{
+		return run_tests(test_collection_create(allocator::temp()));
+	};
+}
 
 module std::core::runtime @if(WASM_NOLIBC);
 

lib/std/core/runtime_benchmark.c3

@@ -1,100 +0,0 @@
-module std::core::runtime;
-import libc, std::time, std::io, std::sort;
-
-alias BenchmarkFn = fn void();
-
-struct BenchmarkUnit
-{
-	String name;
-	BenchmarkFn func;
-}
-
-fn BenchmarkUnit[] benchmark_collection_create(Allocator allocator)
-{
-	BenchmarkFn[] fns = $$BENCHMARK_FNS;
-	String[] names = $$BENCHMARK_NAMES;
-	BenchmarkUnit[] benchmarks = allocator::alloc_array(allocator, BenchmarkUnit, names.len);
-	foreach (i, benchmark : fns)
-	{
-		benchmarks[i] = { names[i], fns[i] };
-	}
-	return benchmarks;
-}
-
-const DEFAULT_BENCHMARK_WARMUP_ITERATIONS = 3;
-const DEFAULT_BENCHMARK_MAX_ITERATIONS = 10000;
-
-uint benchmark_warmup_iterations @private = DEFAULT_BENCHMARK_WARMUP_ITERATIONS;
-uint benchmark_max_iterations @private = DEFAULT_BENCHMARK_MAX_ITERATIONS;
-
-fn void set_benchmark_warmup_iterations(uint value) @builtin
-{
-    benchmark_warmup_iterations = value;
-}
-
-fn void set_benchmark_max_iterations(uint value) @builtin
-{
-    assert(value > 0);
-    benchmark_max_iterations = value;
-}
-
-fn bool run_benchmarks(BenchmarkUnit[] benchmarks)
-{
-	usz max_name;
-
-	foreach (&unit : benchmarks)
-	{
-		if (max_name < unit.name.len) max_name = unit.name.len;
-	}
-
-	usz len = max_name + 9;
-
-	DString name = dstring::temp_with_capacity(64);
-	name.append_repeat('-', len / 2);
-	name.append(" BENCHMARKS ");
-	name.append_repeat('-', len - len / 2);
-
-	io::printn(name);
-
-	name.clear();
-
-	long sys_clock_started;
-	long sys_clock_finished;
-	long sys_clocks;
-	Clock clock;
-
-	foreach(unit : benchmarks)
-	{
-		defer name.clear();
-		name.appendf("Benchmarking %s ", unit.name);
-		name.append_repeat('.', max_name - unit.name.len + 2);
-		io::printf("%s ", name.str_view());
-
-		for (uint i = 0; i < benchmark_warmup_iterations; i++)
-		{
-			unit.func() @inline;
-		}
-
-		clock = std::time::clock::now();
-		sys_clock_started = $$sysclock();
-
-		for (uint i = 0; i < benchmark_max_iterations; i++)
-		{
-			unit.func() @inline;
-		}
-
-		sys_clock_finished = $$sysclock();
-		NanoDuration nano_seconds = clock.mark();
-		sys_clocks = sys_clock_finished - sys_clock_started;
-
-		io::printfn("[COMPLETE] %.2f ns, %.2f CPU's clocks", (float)nano_seconds / benchmark_max_iterations, (float)sys_clocks / benchmark_max_iterations);
-	}
-
-	io::printfn("\n%d benchmark%s run.\n", benchmarks.len, benchmarks.len > 1 ? "s" : "");
-	return true;
-}
-
-fn bool default_benchmark_runner(String[] args) => @pool()
-{
-	return run_benchmarks(benchmark_collection_create(tmem));
-}

lib/std/core/runtime_test.c3

@@ -1,334 +0,0 @@
-// Copyright (c) 2025 Christoffer Lerno. All rights reserved.
-// Use of this source code is governed by the MIT license
-// a copy of which can be found in the LICENSE_STDLIB file.
-module std::core::runtime;
-import std::core::test @public;
-import std::core::mem::allocator @public;
-import libc, std::time, std::io, std::sort;
-import std::os::env;
-
-alias TestFn = fn void();
-
-TestContext* test_context @private;
-
-struct TestContext
-{
-	JmpBuf buf;
-	// Allows filtering test cased or modules by substring, e.g. 'foo::', 'foo::test_add'
-	String test_filter;
-	// Triggers debugger breakpoint when assert or test:: checks failed
-	bool breakpoint_on_assert;
-
-	// internal state
-	bool assert_print_backtrace;
-	bool has_ansi_codes;
-	bool is_in_panic;
-	bool is_quiet_mode;
-	bool is_no_capture;
-	String current_test_name;
-	TestFn setup_fn;
-	TestFn teardown_fn;
-
-	char* error_buffer;
-	usz error_buffer_capacity;
-	File fake_stdout;
-	struct stored
-	{
-		File stdout;
-		File stderr;
-		Allocator allocator;
-	}
-}
-
-struct TestUnit
-{
-	String name;
-	TestFn func;
-}
-
-fn TestUnit[] test_collection_create(Allocator allocator)
-{
-	TestFn[] fns = $$TEST_FNS;
-	String[] names = $$TEST_NAMES;
-	TestUnit[] tests = allocator::alloc_array(allocator, TestUnit, names.len);
-	foreach (i, test : fns)
-	{
-		tests[i] = { names[i], fns[i] };
-	}
-	return tests;
-}
-
-// Sort the tests by their name in ascending order.
-fn int cmp_test_unit(TestUnit a, TestUnit b)
-{
-	usz an = a.name.len;
-	usz bn = b.name.len;
-	if (an > bn) @swap(a, b);
-	foreach (i, ac : a.name)
-	{
-		char bc = b.name[i];
-		if (ac != bc) return an > bn ? bc - ac : ac - bc;
-	}
-	return (int)(an - bn);
-}
-
-fn bool terminal_has_ansi_codes() @local => @pool()
-{
-
-	if (try v = env::tget_var("TERM"))
-	{
-		if (v.contains("xterm") || v.contains("vt100") || v.contains("screen")) return true;
-	}
-	$if env::WIN32 || env::NO_LIBC:
-		return false;
-	$else
-		return io::stdout().isatty();
-	$endif
-}
-
-fn void test_panic(String message, String file, String function, uint line) @local
-{
-	if (test_context.is_in_panic) return;
-	test_context.is_in_panic = true;
-
-	unmute_output(true);
-	(void)io::stdout().flush();
-	if (test_context.assert_print_backtrace)
-	{
-		$if env::NATIVE_STACKTRACE:
-    		builtin::print_backtrace(message, 0);
-		$endif
-	}
-	io::printf("\nTest failed ^^^ ( %s:%s ) %s\n",  file, line, message);
-	test_context.assert_print_backtrace = true;
-
-	if (test_context.breakpoint_on_assert)
-	{
-		breakpoint();
-	}
-
-	if (test_context.teardown_fn)
-	{
-		test_context.teardown_fn();
-	}
-
-	test_context.is_in_panic = false;
-	allocator::thread_allocator = test_context.stored.allocator;
-	libc::longjmp(&test_context.buf, 1);
-}
-
-fn void mute_output() @local
-{
-	if (test_context.is_no_capture || !test_context.fake_stdout.file) return;
-	File* stdout = io::stdout();
-    File* stderr = io::stderr();
-	*stderr = test_context.fake_stdout;
-	*stdout = test_context.fake_stdout;
-	(void)test_context.fake_stdout.seek(0, Seek.SET)!!;
-}
-
-fn void unmute_output(bool has_error) @local
-{
-	if (test_context.is_no_capture || !test_context.fake_stdout.file) return;
-
-	File* stdout = io::stdout();
-	File* stderr = io::stderr();
-
-	*stderr = test_context.stored.stderr;
-	*stdout = test_context.stored.stdout;
-
-	usz log_size = test_context.fake_stdout.seek(0, Seek.CURSOR)!!;
-	if (has_error)
-	{
-		io::printf("\nTesting %s ", test_context.current_test_name);
-		io::printn(test_context.has_ansi_codes ? "[\e[0;31mFAIL\e[0m]" : "[FAIL]");
-	}
-
-	if (has_error && log_size > 0)
-	{
-		test_context.fake_stdout.write_byte('\n')!!;
-		test_context.fake_stdout.write_byte('\0')!!;
-		(void)test_context.fake_stdout.seek(0, Seek.SET)!!;
-
-		io::printfn("\n========== TEST LOG ============");
-		io::printfn("%s\n", test_context.current_test_name);
-		while (try c = test_context.fake_stdout.read_byte())
-		{
-			if (@unlikely(c == '\0'))
-			{
-				// ignore junk from previous tests
-				break;
-			}
-			libc::putchar(c);
-		}
-		io::printf("========== TEST END ============");
-	}
-	(void)stdout.flush();
-}
-
-fn bool run_tests(String[] args, TestUnit[] tests) @private
-{
-	usz max_name;
-	bool sort_tests = true;
-	bool check_leaks = true;
-	foreach (&unit : tests)
-	{
-		if (max_name < unit.name.len) max_name = unit.name.len;
-	}
-	TestContext context =
-	{
-		.assert_print_backtrace = true,
-		.breakpoint_on_assert = false,
-		.test_filter = "",
-		.has_ansi_codes = terminal_has_ansi_codes(),
-		.stored.allocator = mem,
-		.stored.stderr = *io::stderr(),
-		.stored.stdout = *io::stdout(),
-	};
-	for (int i = 1; i < args.len; i++)
-	{
-		switch (args[i])
-		{
-			case "--test-breakpoint":
-				context.breakpoint_on_assert = true;
-			case "--test-nosort":
-				sort_tests = false;
-			case "--test-noleak":
-				check_leaks = false;
-			case "--test-nocapture":
-				context.is_no_capture = true;
-			case "--noansi":
-				context.has_ansi_codes = false;
-			case "--useansi":
-				context.has_ansi_codes = true;
-			case "--test-quiet":
-				context.is_quiet_mode = true;
-			case "--test-filter":
-				if (i == args.len - 1)
-				{
-					io::printn("Invalid arguments to test runner.");
-					return false;
-				}
-				context.test_filter = args[i + 1];
-				i++;
-			default:
-				io::printfn("Unknown argument: %s", args[i]);
-		}
-	}
-	test_context = &context;
-
-	if (sort_tests)
-	{
-		quicksort(tests, &cmp_test_unit);
-	}
-
-	// Buffer for hijacking the output
-	$if (!env::NO_LIBC):
-		context.fake_stdout.file = libc::tmpfile();
-	$endif
-	if (context.fake_stdout.file == null)
-	{
-		io::print("Failed to hijack stdout, tests will print everything");
-	}
-
-	PanicFn old_panic = builtin::panic;
-	defer builtin::panic = old_panic;
-	builtin::panic = &test_panic;
-	int tests_passed = 0;
-	int tests_skipped = 0;
-	int test_count = tests.len;
-	DString name = dstring::temp_with_capacity(64);
-	usz len = max_name + 9;
-	name.append_repeat('-', len / 2);
-	name.append(" TESTS ");
-	name.append_repeat('-', len - len / 2);
-	if (!context.is_quiet_mode) io::printn(name);
-	name.clear();
-	PoolState temp_state = mem::temp_push();
-	defer mem::temp_pop(temp_state);
-	foreach(unit : tests)
-	{
-		mem::temp_pop(temp_state);
-		if (context.test_filter && !unit.name.contains(context.test_filter))
-		{
-			tests_skipped++;
-			continue;
-		}
-		context.setup_fn = null;
-		context.teardown_fn = null;
-		context.current_test_name = unit.name;
-
-		defer name.clear();
-		name.appendf("Testing %s ", unit.name);
-		name.append_repeat('.', max_name - unit.name.len + 2);
-		if (context.is_quiet_mode)
-		{
-			io::print(".");
-		}
-		else
-		{
-			io::printf("%s ", name.str_view());
-		}
-		(void)io::stdout().flush();
-		TrackingAllocator mem;
-
-		mem.init(context.stored.allocator);
-		if (libc::setjmp(&context.buf) == 0)
-		{
-			mute_output();
-			mem.clear();
-			if (check_leaks) allocator::thread_allocator = &mem;
-			unit.func();
-			// track cleanup that may take place in teardown_fn
-			if (context.teardown_fn)
-			{
-				context.teardown_fn();
-			}
-			if (check_leaks) allocator::thread_allocator = context.stored.allocator;
-
-			unmute_output(false); // all good, discard output
-			if (mem.has_leaks())
-			{
-				if (context.is_quiet_mode) io::printf("\n%s ", context.current_test_name);
-				io::print(context.has_ansi_codes ? "[\e[0;31mFAIL\e[0m]" : "[FAIL]");
-				io::printn(" LEAKS DETECTED!");
-				mem.print_report();
-			}
-			else
-			{
-				if (!context.is_quiet_mode)
-				{
-					io::printfn(context.has_ansi_codes ? "[\e[0;32mPASS\e[0m]" : "[PASS]");
-				}
-				tests_passed++;
-			}
-		}
-		mem.free();
-	}
-	io::printfn("\n%d test%s run.\n", test_count-tests_skipped, test_count > 1 ? "s" : "");
-
-	int n_failed = test_count - tests_passed - tests_skipped;
-	io::printf("Test Result: %s%s%s: ",
-				context.has_ansi_codes ? (n_failed ? "\e[0;31m" : "\e[0;32m") : "",
-				n_failed ? "FAILED" : "PASSED",
-				context.has_ansi_codes ? "\e[0m" : "",
-				);
-
-	io::printfn("%d passed, %d failed, %d skipped.",
-				tests_passed,
-				n_failed,
-				tests_skipped);
-
-	// cleanup fake_stdout file
-	if (context.fake_stdout.file) libc::fclose(context.fake_stdout.file);
-	context.fake_stdout.file = null;
-
-	return n_failed == 0;
-}
-
-fn bool default_test_runner(String[] args) => @pool()
-{
-	assert(test_context == null, "test suite is already running");
-	return run_tests(args, test_collection_create(tmem));
-}
-

lib/std/core/sanitizer/asan.c3

@@ -12,23 +12,23 @@
 
 module std::core::sanitizer::asan;
 
-alias ErrorCallback = fn void (ZString);
+def ErrorCallback = fn void (ZString);
 
-<*
- Marks a memory region ([addr, addr+size)) as unaddressable.
-
- This memory must be previously allocated by your program. Instrumented
- code is forbidden from accessing addresses in this region until it is
- unpoisoned. This function is not guaranteed to poison the entire region -
- it could poison only a subregion of [addr, addr+size) due to ASan
- alignment restrictions.
-
- NOTE This function is not thread-safe because no two threads can poison or
- unpoison memory in the same memory region simultaneously.
-
- @param addr : "Start of memory region."
- @param size : "Size of memory region."
-*>
+/**
+ * Marks a memory region ([addr, addr+size)) as unaddressable.
+ *
+ * This memory must be previously allocated by your program. Instrumented
+ * code is forbidden from accessing addresses in this region until it is
+ * unpoisoned. This function is not guaranteed to poison the entire region -
+ * it could poison only a subregion of [addr, addr+size) due to ASan
+ * alignment restrictions.
+ *
+ * NOTE This function is not thread-safe because no two threads can poison or
+ * unpoison memory in the same memory region simultaneously.
+ *
+ * @param addr "Start of memory region."
+ * @param size "Size of memory region."
+ **/
 macro poison_memory_region(void* addr, usz size)
 {
 	$if env::ADDRESS_SANITIZER: 
@@ -36,20 +36,20 @@ macro poison_memory_region(void* addr, usz size)
 	$endif 
 }
 
-<*
- Marks a memory region ([addr, addr+size)) as addressable.
-
- This memory must be previously allocated by your program. Accessing
- addresses in this region is allowed until this region is poisoned again.
- This function could unpoison a super-region of [addr, addr+size) due
- to ASan alignment restrictions.
-
- NOTE This function is not thread-safe because no two threads can
- poison or unpoison memory in the same memory region simultaneously.
-
- @param addr : "Start of memory region."
- @param size : "Size of memory region."
-*>
+/**
+ * Marks a memory region ([addr, addr+size)) as addressable.
+ *
+ * This memory must be previously allocated by your program. Accessing
+ * addresses in this region is allowed until this region is poisoned again.
+ * This function could unpoison a super-region of [addr, addr+size) due
+ * to ASan alignment restrictions.
+ *
+ * NOTE This function is not thread-safe because no two threads can
+ * poison or unpoison memory in the same memory region simultaneously.
+ *
+ * @param addr "Start of memory region."
+ * @param size "Size of memory region."
+ **/
 macro unpoison_memory_region(void* addr, usz size)
 {
 	$if env::ADDRESS_SANITIZER: 
@@ -57,11 +57,11 @@ macro unpoison_memory_region(void* addr, usz size)
 	$endif 
 }
 
-<*
- Checks if an address is poisoned.
- @return "True if 'addr' is poisoned (that is, 1-byte read/write access to this address would result in an error report from ASan). Otherwise returns false."
- @param addr : "Address to check."
-*>
+/**
+ * Checks if an address is poisoned.
+ * @return "True if 'addr' is poisoned (that is, 1-byte read/write access to this address would result in an error report from ASan). Otherwise returns false."
+ * @param addr "Address to check."
+ **/
 macro bool address_is_poisoned(void* addr)
 {
 	$if env::ADDRESS_SANITIZER:
@@ -71,28 +71,28 @@ macro bool address_is_poisoned(void* addr)
 	$endif
 }
 
-<*
- Checks if a region is poisoned.
-
- If at least one byte in [beg, beg+size) is poisoned, returns the
- address of the first such byte. Otherwise returns 0.
-
- @param beg : "Start of memory region."
- @param size : "Start of memory region."
- @return "Address of first poisoned byte."
-*>
+/**
+ * Checks if a region is poisoned.
+ *
+ * If at least one byte in [beg, beg+size) is poisoned, returns the
+ * address of the first such byte. Otherwise returns 0.
+ *
+ * @param beg "Start of memory region."
+ * @param size "Start of memory region."
+ * @return "Address of first poisoned byte."
+ **/
 macro void* region_is_poisoned(void* beg, usz size)
 {
 	$if env::ADDRESS_SANITIZER:
-		return __asan_region_is_poisoned(beg, size);
+		return __asan_region_is_poisoned(addr);
 	$else
 		return null;
 	$endif
 }
 
-<*
- Sets the callback function to be called during ASan error reporting.
-*>
+/**
+ * Sets the callback function to be called during ASan error reporting.
+ **/
 fn void set_error_report_callback(ErrorCallback callback)
 {
 	$if env::ADDRESS_SANITIZER:

lib/std/core/sanitizer/tsan.c3

@@ -1,6 +1,6 @@
 module std::core::sanitizer::tsan;
 
-typedef MutexFlags = inline CUInt;
+distinct MutexFlags = inline CUInt;
 
 const MutexFlags MUTEX_LINKER_INIT      = 1 << 0;
 const MutexFlags MUTEX_WRITE_REENTRANT  = 1 << 1;

lib/std/core/slice2d.c3

@@ -1,169 +0,0 @@
-module std::core::array::slice {Type};
-
-<*
- A slice2d allows slicing an array like int[10][10] into an arbitrary "int[][]"-like counterpart
- Typically you'd use array::slice2d(...) to create one.
-*>
-struct Slice2d
-{
-	Type* ptr;
-	usz inner_len;
-	usz ystart;
-	usz ylen;
-	usz xstart;
-	usz xlen;
-}
-
-<*
- @return `The length of the "outer" slice`
-*>
-fn usz Slice2d.len(&self) @operator(len)
-{
-	return self.ylen;
-}
-
-<*
- @return `The total number of elements.`
-*>
-fn usz Slice2d.count(&self)
-{
-	return self.ylen * self.xlen;
-}
-
-<*
- Step through each element of the slice.
-*>
-macro void Slice2d.@each(&self; @body(usz[<2>], Type))
-{
-	foreach (y, line : *self)
-	{
-		foreach (x, val : line)
-		{
-			@body({ x, y }, val);
-		}
-	}
-}
-
-<*
- Step through each element of the slice *by reference*
-*>
-macro void Slice2d.@each_ref(&self; @body(usz[<2>], Type*))
-{
-	foreach (y, line : *self)
-	{
-		foreach (x, &val : line)
-		{
-			@body({ x, y }, val);
-		}
-	}
-}
-
-<*
- Return a row as a slice.
-
- @param idy : "The row to return"
- @return "The slice for the particular row"
- @require idy >= 0 && idy < self.ylen
-*>
-macro Type[] Slice2d.get_row(self, usz idy) @operator([])
-{
-	return (self.ptr + self.inner_len * (idy + self.ystart))[self.xstart:self.xlen];
-}
-
-<*
- Get the value at a particular x/y position in the slice.
-
- @param coord : "The xy coordinate"
- @return "The value at that coordinate"
- @require coord.y >= 0 && coord.y < self.ylen : "y value out of range"
- @require coord.x >= 0 && coord.x < self.xlen : "x value out of range"
-*>
-macro Type Slice2d.get_coord(self, usz[<2>] coord)
-{
-	return *self.get_coord_ref(coord);
-}
-
-<*
- Get a pointer to the value at a particular x/y position in the slice.
-
- @param coord : "The xy coordinate"
- @return "A pointer to the value at that coordinate"
- @require coord.y >= 0 && coord.y < self.ylen : "y value out of range"
- @require coord.x >= 0 && coord.x < self.xlen : "x value out of range"
-*>
-macro Type* Slice2d.get_coord_ref(self, usz[<2>] coord)
-{
-	return self.get_xy_ref(coord.x, coord.y);
-}
-
-<*
- Get the value at a particular x/y position in the slice.
-
- @param x : "The x coordinate"
- @param y : "The x coordinate"
- @return "The value at that coordinate"
- @require y >= 0 && y < self.ylen : "y value out of range"
- @require x >= 0 && x < self.xlen : "x value out of range"
-*>
-macro Type Slice2d.get_xy(self, x, y)
-{
-	return *self.get_xy_ref(x, y);
-}
-
-<*
- Get the value at a particular x/y position in the slice by reference.
-
- @param x : "The x coordinate"
- @param y : "The y coordinate"
- @return "A pointer to the value at that coordinate"
- @require y >= 0 && y < self.ylen : "y value out of range"
- @require x >= 0 && x < self.xlen : "x value out of range"
-*>
-macro Type* Slice2d.get_xy_ref(self, x, y)
-{
-	return self.ptr + self.inner_len * (y + self.ystart) + self.xstart + x;
-}
-
-<*
- Set the ´value at a particular x/y position in the slice.
-
- @param coord : "The xy coordinate"
- @param value : "The new value"
- @require coord.y >= 0 && coord.y < self.ylen : "y value out of range"
- @require coord.x >= 0 && coord.x < self.xlen : "x value out of range"
-*>
-macro void Slice2d.set_coord(self, usz[<2>] coord, Type value)
-{
-	*self.get_coord_ref(coord) = value;
-}
-
-<*
- Set the value at a particular x/y position in the slice.
-
- @param x : "The x coordinate"
- @param y : "The y coordinate"
- @param value : "The new value"
- @require y >= 0 && y < self.ylen : "y value out of range"
- @require x >= 0 && x < self.xlen : "x value out of range"
-*>
-macro void Slice2d.set_xy(self, x, y, Type value)
-{
-	*self.get_xy_ref(x, y) = value;
-}
-
-<*
- Reslice a slice2d returning a new slice.
-
- @param x : "The starting x"
- @param xlen : "The length along x"
- @param y : "The starting y"
- @param ylen : "The length along y"
- @require y >= 0 && y < self.ylen
- @require x >= 0 && x < self.xlen
-*>
-fn Slice2d Slice2d.slice(&self, isz x = 0, isz xlen = 0, isz y = 0, isz ylen = 0)
-{
-	if (xlen < 1) xlen = self.xlen + xlen;
-	if (ylen < 1) ylen = self.ylen + ylen;
-	return { self.ptr, self.inner_len, y + self.ystart, ylen, x + self.xstart, xlen };
-}

lib/std/core/string_escape.c3

@@ -1,233 +0,0 @@
-// Copyright (c) 2024 Christoffer Lerno. All rights reserved.
-// Use of this source code is governed by the MIT license
-// a copy of which can be found in the LICENSE_STDLIB file.
-
-<*
- This module provides functionality for escaping and unescaping strings
- with standard C-style escape sequences, similar to what's used in JSON
- and other string literals.
-*>
-module std::core::string;
-import std::io;
-
-faultdef INVALID_ESCAPE_SEQUENCE, UNTERMINATED_STRING, INVALID_HEX_ESCAPE, INVALID_UNICODE_ESCAPE;
-
-<*
- Escape a string by adding quotes and converting special characters to escape sequences.
-
- @param allocator : "The allocator to use for the result"
- @param s : "The string to escape"
- @param strip_quotes : "Do not include beginning and end quotes, defaults to false"
- @return "The escaped string with surrounding quotes, can safely be cast to ZString"
-*>
-fn String String.escape(String s, Allocator allocator, bool strip_quotes = true)
-{
-    // Conservative allocation: most strings need minimal escaping
-    usz initial_capacity = s.len + s.len / 5 + 2; // ~1.2x + quotes
-    DString result = dstring::new_with_capacity(allocator, initial_capacity);
-
-    if (!strip_quotes) result.append_char('"');
-
-    foreach (char c : s)
-    {
-        switch (c)
-        {
-            case '"':  result.append(`\"`);
-            case '\\': result.append(`\\`);
-            case '\b': result.append(`\b`);
-            case '\f': result.append(`\f`);
-            case '\n': result.append(`\n`);
-            case '\r': result.append(`\r`);
-            case '\t': result.append(`\t`);
-            case '\v': result.append(`\v`);
-            case '\0': result.append(`\0`);
-            default:
-                if (c >= 32 && c <= 126)
-                {
-                    // Printable ASCII
-                    result.append_char(c);
-                }
-                else
-                {
-                    // Non-printable, use hex escape
-                    result.appendf("\\x%02x", (uint)c);
-                }
-        }
-    }
-
-    if (!strip_quotes) result.append_char('"');
-    return result.copy_str(allocator);
-}
-
-<*
- Escape a string using the temp allocator.
-
- @param s : "The string to escape"
- @param strip_quotes : "Do not include beginning and end quotes, defaults to false"
- @return "The escaped string with surrounding quotes"
-*>
-fn String String.tescape(String s, bool strip_quotes = false) => s.escape(tmem, strip_quotes);
-
-<*
- Calculate the length needed for an escaped string (including quotes).
-
- @param s : "The string to check"
- @return "The length needed for the escaped version"
-*>
-fn usz escape_len(String s)
-{
-    usz len = 2; // For quotes
-    foreach (char c : s)
-    {
-        switch (c)
-        {
-            case '"':
-            case '\\':
-            case '\b':
-            case '\f':
-            case '\n':
-            case '\r':
-            case '\t':
-            case '\v':
-            case '\0':
-                len += 2; // \X
-            default:
-                if (c >= 32 && c <= 126)
-                {
-                    len += 1;
-                }
-                else
-                {
-                    len += 4; // \xHH
-                }
-        }
-    }
-    return len;
-}
-
-<*
- Unescape a quoted string by parsing escape sequences.
-
- @param allocator : "The allocator to use for the result"
- @param s : "The quoted string to unescape"
- @param allow_unquoted : "Set to true to unescape strings not surrounded by quotes, defaults to false"
- @return "The unescaped string without quotes, safe to convert to ZString"
- @return? UNTERMINATED_STRING, INVALID_ESCAPE_SEQUENCE, INVALID_HEX_ESCAPE, INVALID_UNICODE_ESCAPE
-*>
-fn String? String.unescape(String s, Allocator allocator, bool allow_unquoted = false)
-{
-	if (s.len >= 2 && s[0] == '"' && s[^1] == '"')
-	{
-		// Remove quotes.
-		s = s[1:^2];
-	}
-	else if (!allow_unquoted) return UNTERMINATED_STRING?;
-
-    // Handle empty string case
-    if (!s.len)
-    {
-        return "".copy(allocator);
-    }
-
-    DString result = dstring::new_with_capacity(allocator, s.len);
-
-	usz len = s.len;
-	for (usz i = 0; i < len; i++)
-	{
-		char c = s[i];
-        if (c != '\\')
-        {
-            result.append_char(c);
-            continue;
-        }
-
-        // Handle escape sequence
-        if (i + 1 >= len) return INVALID_ESCAPE_SEQUENCE?;
-
-        char escape_char = s[++i];
-        switch (escape_char)
-        {
-            case '"':  result.append_char('"');
-            case '\\': result.append_char('\\');
-            case '/':  result.append_char('/');
-            case 'b':  result.append_char('\b');
-            case 'f':  result.append_char('\f');
-            case 'n':  result.append_char('\n');
-            case 'r':  result.append_char('\r');
-            case 't':  result.append_char('\t');
-            case 'v':  result.append_char('\v');
-            case '0':  result.append_char('\0');
-            case 'x':
-                // Hex escape \xHH
-                if (i + 2 >= len) return INVALID_HEX_ESCAPE?;
-                char h1 = s[++i];
-                char h2 = s[++i];
-                if (!h1.is_xdigit() || !h2.is_xdigit()) return INVALID_HEX_ESCAPE?;
-                uint val = h1 > '9' ? (h1 | 32) - 'a' + 10 : h1 - '0';
-                val = val << 4;
-                val += h2 > '9' ? (h2 | 32) - 'a' + 10 : h2 - '0';
-                result.append_char((char)val);
-            case 'u':
-                // Unicode escape \uHHHH
-                if (i + 4 >= len) return INVALID_UNICODE_ESCAPE?;
-                uint val;
-                for (int j = 0; j < 4; j++)
-                {
-                    char hex_char = s[++i];
-                    if (!hex_char.is_xdigit()) return INVALID_UNICODE_ESCAPE?;
-                    val = val << 4 + (hex_char > '9' ? (hex_char | 32) - 'a' + 10 : hex_char - '0');
-                }
-                result.append_char32(val);
-            case 'U':
-                // Unicode escape \UHHHHHHHH
-                if (i + 8 >= len) return INVALID_UNICODE_ESCAPE?;
-                uint val;
-                for (int j = 0; j < 8; j++)
-                {
-                    char hex_char = s[++i];
-                    if (!hex_char.is_xdigit()) return INVALID_UNICODE_ESCAPE?;
-                    val = val << 4 + (hex_char > '9' ? (hex_char | 32) - 'a' + 10 : hex_char - '0');
-                }
-                result.append_char32(val);
-            default:
-                return INVALID_ESCAPE_SEQUENCE?;
-        }
-    }
-
-    return result.copy_str(allocator);
-}
-
-<*
- Unescape a quoted string using the temp allocator.
-
- @param s : "The quoted string to unescape"
- @param allow_unquoted : "Set to true to unescape strings not surrounded by quotes, defaults to false"
- @return "The unescaped string without quotes"
- @return? UNTERMINATED_STRING, INVALID_ESCAPE_SEQUENCE, INVALID_HEX_ESCAPE, INVALID_UNICODE_ESCAPE
-*>
-fn String? String.tunescape(String s, bool allow_unquoted = false) => s.unescape(tmem, allow_unquoted);
-
-<*
- Check if a character needs to be escaped in a string literal.
-
- @param c : "The character to check"
- @return "True if the character needs escaping"
-*>
-fn bool needs_escape(char c)
-{
-    switch (c)
-    {
-        case '"':
-        case '\\':
-        case '\b':
-        case '\f':
-        case '\n':
-        case '\r':
-        case '\t':
-        case '\v':
-        case '\0':
-            return true;
-        default:
-            return c < 32 || c > 126;
-    }
-}

lib/std/core/string_iterator.c3

@@ -11,22 +11,22 @@ fn void StringIterator.reset(&self)
 	self.current = 0;
 }
 
-fn Char32? StringIterator.next(&self)
+fn Char32! StringIterator.next(&self)
 {
     usz len = self.utf8.len;
     usz current = self.current;
-    if (current >= len) return NO_MORE_ELEMENT?;
+    if (current >= len) return IteratorResult.NO_MORE_ELEMENT?;
     usz read = (len - current < 4 ? len - current : 4);
     Char32 res = conv::utf8_to_char32(&self.utf8[current], &read)!;
     self.current += read;
     return res;
 }
 
-fn Char32? StringIterator.peek(&self)
+fn Char32! StringIterator.peek(&self)
 {
     usz len = self.utf8.len;
     usz current = self.current;
-    if (current >= len) return NO_MORE_ELEMENT?;
+    if (current >= len) return IteratorResult.NO_MORE_ELEMENT?;
     usz read = (len - current < 4 ? len - current : 4);
     Char32 res = conv::utf8_to_char32(&self.utf8[current], &read)!;
     return res;
@@ -37,13 +37,13 @@ fn bool StringIterator.has_next(&self)
     return self.current < self.utf8.len;
 }
 
-fn Char32? StringIterator.get(&self)
+fn Char32! StringIterator.get(&self)
 {
     usz len = self.utf8.len;
     usz current = self.current;
     usz read = (len - current < 4 ? len - current : 4);
     usz index = current > read ? current - read : 0;
-    if (index >= len) return NO_MORE_ELEMENT?;
+    if (index >= len) return IteratorResult.NO_MORE_ELEMENT?;
     Char32 res = conv::utf8_to_char32(&self.utf8[index], &read)!;
     return res;
 }

lib/std/core/string_to_real.c3

@@ -31,10 +31,10 @@ const MASK = KMAX - 1;
 const B1B_DIG = 2;
 const uint[2] B1B_MAX = { 9007199, 254740991 };
 
-<*
- @require chars.len > 0
-*>
-macro double? decfloat(char[] chars, int $bits, int $emin, int sign)
+/**
+ * @require chars.len > 0
+ **/
+macro double! decfloat(char[] chars, int $bits, int $emin, int sign)
 {
 	uint[KMAX] x;
 	const uint[2] TH = B1B_MAX;
@@ -64,7 +64,7 @@ macro double? decfloat(char[] chars, int $bits, int $emin, int sign)
 		got_rad = true;
 		if (index == last_char)
 		{
-			if (!got_digit) return MALFORMED_FLOAT?;
+			if (!got_digit) return NumberConversion.MALFORMED_FLOAT?;
 			return sign * 0.0;
 		}
 		if (index != last_char && (c = chars[++index]) == '0')
@@ -83,7 +83,7 @@ macro double? decfloat(char[] chars, int $bits, int $emin, int sign)
 		switch
 		{
 			case c == '.':
-				if (got_rad) return MALFORMED_FLOAT?;
+				if (got_rad) return NumberConversion.MALFORMED_FLOAT?;
 				got_rad = true;
 				lrp = dc;
 			case k < KMAX - 3:
@@ -113,24 +113,24 @@ macro double? decfloat(char[] chars, int $bits, int $emin, int sign)
 		c = chars[++index];
 	}
 	if (!got_rad) lrp = dc;
-	if (!got_digit) return MALFORMED_FLOAT?;
+	if (!got_digit) return NumberConversion.MALFORMED_FLOAT?;
 	if ((c | 32) == 'e')
 	{
-		if (last_char == index) return MALFORMED_FLOAT?;
-		long e10 = String.to_long((String)chars[index + 1..]) ?? MALFORMED_FLOAT?!;
+		if (last_char == index) return NumberConversion.MALFORMED_FLOAT?;
+		long e10 = String.to_long((String)chars[index + 1..]) ?? NumberConversion.MALFORMED_FLOAT?!;
 		lrp += e10;
 	}
 	else if (index != last_char)
 	{
-		return MALFORMED_FLOAT?;
+		return NumberConversion.MALFORMED_FLOAT?;
 	}
 	// Handle zero specially to avoid nasty special cases later
 	if (!x[0]) return sign * 0.0;
 
 	// Optimize small integers (w/no exponent) and over/under-flow
 	if (lrp == dc && dc < 10 && ($bits > 30 || (ulong)x[0] >> $bits == 0)) return sign * (double)x[0];
-	if (lrp > - $emin / 2) return FLOAT_OUT_OF_RANGE?;
-	if (lrp < $emin - 2 * math::DOUBLE_MANT_DIG) return FLOAT_OUT_OF_RANGE?;
+	if (lrp > - $emin / 2) return NumberConversion.FLOAT_OUT_OF_RANGE?;
+	if (lrp < $emin - 2 * math::DOUBLE_MANT_DIG) return NumberConversion.FLOAT_OUT_OF_RANGE?;
 
 	// Align incomplete final B1B digit
 	if (j)
@@ -266,7 +266,7 @@ macro double? decfloat(char[] chars, int $bits, int $emin, int sign)
 	y *= sign;
 
 	bool denormal;
-	// Limit precision for denormal results
+	/* Limit precision for denormal results */
 	uint bits = $bits;
 	if (bits > math::DOUBLE_MANT_DIG + e2 - $emin)
 	{
@@ -320,12 +320,12 @@ macro double? decfloat(char[] chars, int $bits, int $emin, int sign)
 			y *= 0.5;
 			e2++;
 		}
-		if (e2 + math::DOUBLE_MANT_DIG > emax || (denormal && frac)) return MALFORMED_FLOAT?;
+		if (e2 + math::DOUBLE_MANT_DIG > emax || (denormal && frac)) return NumberConversion.MALFORMED_FLOAT?;
 	}
 	return math::scalbn(y, e2);
 }
 
-macro double? hexfloat(char[] chars, int $bits, int $emin, int sign)
+macro double! hexfloat(char[] chars, int $bits, int $emin, int sign)
 {
 	double scale = 1;
 	uint x;
@@ -351,7 +351,7 @@ macro double? hexfloat(char[] chars, int $bits, int $emin, int sign)
 		got_rad = true;
 		if (index == last_char)
 		{
-			if (!got_digit) return MALFORMED_FLOAT?;
+			if (!got_digit) return NumberConversion.MALFORMED_FLOAT?;
 			return sign * 0.0;
 		}
 		if (index != last_char && (c = chars[++index]) == '0')
@@ -369,14 +369,17 @@ macro double? hexfloat(char[] chars, int $bits, int $emin, int sign)
 	{
 		if (c == '.')
 		{
-			if (got_rad) return MALFORMED_FLOAT?;
+			if (got_rad) return NumberConversion.MALFORMED_FLOAT?;
 			got_rad = true;
 			rp = dc;
 		}
 		else
 		{
 			got_digit = true;
-			int d = c > '9' ? ((c | 32) + 10 - 'a') : (c - '0');
+			int d = {|
+				if (c > '9') return (c | 32) + 10 - 'a';
+				return c - '0';
+			|};
 			switch
 			{
 				case dc < 8:
@@ -393,20 +396,20 @@ macro double? hexfloat(char[] chars, int $bits, int $emin, int sign)
 		if (index == last_char) break;
 		c = chars[++index];
 	}
-	if (!got_digit) return MALFORMED_FLOAT?;
+	if (!got_digit) return NumberConversion.MALFORMED_FLOAT?;
 	if (!got_rad) rp = dc;
 	for (; dc < 8; dc++) x *= 16;
 
 	long e2;
 	if ((c | 32) == 'p')
 	{
-		long e2val = String.to_long((String)chars[index + 1..]) ?? (MALFORMED_FLOAT?)!;
+		long e2val = String.to_long((String)chars[index + 1..]) ?? (NumberConversion.MALFORMED_FLOAT?)!;
 		e2 = e2val;
 	}
 	e2 += 4 * rp - 32;
 	if (!x) return sign * 0.0;
-	if (e2 > -$emin) return FLOAT_OUT_OF_RANGE?;
-	if (e2 < $emin - 2 * math::DOUBLE_MANT_DIG) return FLOAT_OUT_OF_RANGE?;
+	if (e2 > -$emin) return NumberConversion.FLOAT_OUT_OF_RANGE?;
+	if (e2 < $emin - 2 * math::DOUBLE_MANT_DIG) return NumberConversion.FLOAT_OUT_OF_RANGE?;
 
 	while (x < 0x80000000)
 	{
@@ -441,7 +444,7 @@ macro double? hexfloat(char[] chars, int $bits, int $emin, int sign)
 	}
 	y = bias + sign * (double)x + sign * y;
 	y -= bias;
-	if (!y) return FLOAT_OUT_OF_RANGE?;
+	if (!y) return NumberConversion.FLOAT_OUT_OF_RANGE?;
 
 	return math::scalbn(y, (int)e2);
 }
@@ -449,7 +452,7 @@ macro double? hexfloat(char[] chars, int $bits, int $emin, int sign)
 macro String.to_real(chars, $Type) @private
 {
 	int sign = 1;
-	$switch $Type:
+	$switch ($Type)
 	$case float:
 		const int BITS = math::FLOAT_MANT_DIG;
 		const int EMIN = math::FLOAT_MIN_EXP - BITS;
@@ -462,23 +465,16 @@ macro String.to_real(chars, $Type) @private
 		$error "Unexpected type";
 	$endswitch
 
-	chars = chars.trim();
-	if (!chars.len) return MALFORMED_FLOAT?;
-
-	if (chars.len != 1)
+	while (chars.len && chars[0] == ' ') chars = chars[1..];
+	if (!chars.len) return NumberConversion.MALFORMED_FLOAT?;
+	switch (chars[0])
 	{
-		switch (chars[0])
-		{
-			case '-':
-				sign = -1;
-				nextcase;
-			case '+':
-				chars = chars[1..];
-		}
+		case '-':
+			sign = -1;
+			nextcase;
+		case '+':
+			chars = chars[1..];
 	}
-	chars = chars.trim();
-	if (!chars.len) return MALFORMED_FLOAT?;
-
 	if (chars == "infinity" || chars == "INFINITY") return sign * $Type.inf;
 	if (chars == "NAN" || chars == "nan") return $Type.nan;
 

lib/std/core/test.c3

@@ -1,220 +0,0 @@
-<*
-Unit test module
-
-This module provides a toolset of macros for running unit test checks 
-
-Example:
-```c3
-module sample::m;
-import std::io;
-
-faultdef DIVISION_BY_ZERO;
-
-fn double? divide(int a, int b)
-{
-	if (b == 0) return MathError.DIVISION_BY_ZERO?;
-	return (double)(a) / (double)(b);
-}
-
-fn void? test_div() @test
-{
-	test::eq(2, divide(6, 3)!);
-	test::ne(1, 2);
-	test::ge(3, 3);
-	test::gt(2, divide(3, 3)!);
-	test::lt(2, 3);
-	test::le(2, 3);
-	test::eq_approx(m::divide(1, 3)!, 0.333, places: 3);
-	test::@check(2 == 2, "divide: %d", divide(6, 3)!);
-	test::@error(m::divide(3, 0), MathError.DIVISION_BY_ZERO);
-}
-
-```
-*>
-// Copyright (c) 2025 Alex Veden <i@alexveden.com>. All rights reserved.
-// Use of this source code is governed by the MIT license
-// a copy of which can be found in the LICENSE_STDLIB file.
-module std::core::test;
-import std::core::runtime @public;
-import std::math, std::io, libc;
-
-<*
- Initializes test case context.
-
- @param setup_fn : `initializer function for test case`
- @param teardown_fn : `cleanup function for test context (may be null)`
-
- @require runtime::test_context != null : "Only allowed in @test functions"
- @require setup_fn != null : "setup_fn must always be set"
-*>
-macro @setup(TestFn setup_fn, TestFn teardown_fn = null)
-{
-	runtime::test_context.setup_fn = setup_fn;
-	runtime::test_context.teardown_fn = teardown_fn;
-	runtime::test_context.setup_fn();
-}
-
-<*
- Checks condition and fails assertion if not true
-
- @param #condition : `any boolean condition, will be expanded by text`
- @param format : `printf compatible format`
- @param args : `vargs for format`
- @require runtime::test_context != null : "Only allowed in @test functions"
-*>
-macro @check(#condition, String format = "", args...)
-{
-	if (!#condition)
-	{
-		@stack_mem(512; Allocator allocator)
-		{
-			DString s;
-			s.init(allocator);
-			s.appendf("check `%s` failed. ", $stringify(#condition));
-			s.appendf(format, ...args);
-			print_panicf(s.str_view());
-		};
-	}
-}
-
-<*
- Check if function returns specific error
-
- @param #funcresult : `result of function execution`
- @param error_expected : `expected error of function execution`
- @require runtime::test_context != null : "Only allowed in @test functions"
-*>
-macro @error(#funcresult, fault error_expected)
-{
-	if (catch err = #funcresult)
-	{
-		if (err != error_expected)
-		{
-			print_panicf("`%s` expected to return error [%s], got [%s]",
-				$stringify(#funcresult), error_expected, err);
-		}
-		return;
-	}
-	print_panicf("`%s` error [%s] was not returned.", $stringify(#funcresult), error_expected);
-}
-
-<*
- Check if left == right
-
- @param left : `left argument of any comparable type`
- @param right : `right argument of any comparable type`
- @require runtime::test_context != null : "Only allowed in @test functions"
-*>
-macro eq(left, right)
-{
-	if (!equals(left, right))
-	{
-		print_panicf("`%s` != `%s`", left, right);
-	}
-}
-
-<*
- Check left floating point value is approximately equals to right value
-
- @param places : `number of decimal places to compare (default: 7)`
- @param delta : `minimal allowed difference (overrides places parameter)`
- @param equal_nan : `allows comparing nan values, if left and right both nans result is ok`
-
- @require places > 0, places <= 20 : "too many decimal places"
- @require delta >= 0, delta <= 1 : "delta must be a small number"
- @require runtime::test_context != null : "Only allowed in @test functions"
-*>
-macro void eq_approx(double left, double right, uint places = 7, double delta = 0, bool equal_nan = true)
-{
-	double diff = left - right;
-	double eps = delta;
-	if (eps == 0) eps = 1.0 / math::pow(10.0, places);
-
-	if (!math::is_approx(left, right, eps))
-	{
-		if (equal_nan && math::is_nan(left) && math::is_nan(right)) return;
-		print_panicf("Not almost equal: `%s` !~~ `%s` delta=%e diff: %e", left, right, eps, diff);
-	}
-}
-
-<*
- Check if left != right
-
- @param left : `left argument of any comparable type`
- @param right : `right argument of any comparable type`
- @require runtime::test_context != null : "Only allowed in @test functions"
-*>
-macro void ne(left, right)
-{
-	if (equals(left, right))
-	{
-		print_panicf("`%s` == `%s`", left, right);
-	}
-}
-
-<*
- Check if left > right
-
- @param left : `left argument of any comparable type`
- @param right : `right argument of any comparable type`
- @require runtime::test_context != null : "Only allowed in @test functions"
-*>
-macro gt(left, right)
-{
-	if (!builtin::greater(left, right))
-	{
-		print_panicf("`%s` <= `%s`", left, right);
-	}
-}
-
-<*
- Check if left >= right
-
- @param left : `left argument of any comparable type`
- @param right : `right argument of any comparable type`
- @require runtime::test_context != null : "Only allowed in @test functions"
-*>
-macro ge(left, right)
-{
-	if (!builtin::greater_eq(left, right))
-	{
-		print_panicf("`%s` < `%s`", left, right);
-	}
-}
-
-<*
- Check if left < right
-
- @param left : `left argument of any comparable type`
- @param right : `right argument of any comparable type`
- @require runtime::test_context != null : "Only allowed in @test functions"
-*>
-macro lt(left, right)
-{
-	if (!builtin::less(left, right))
-	{
-		print_panicf("`%s` >= `%s`", left, right);
-	}
-}
-
-<*
- Check if left <= right
-
- @param left : `left argument of any comparable type`
- @param right : `right argument of any comparable type`
- @require runtime::test_context != null : "Only allowed in @test functions"
-*>
-macro le(left, right)
-{
-	if (!builtin::less_eq(left, right))
-	{
-		print_panicf("`%s` > `%s`", left, right);
-	}
-}
-
-macro void print_panicf(format, ...) @local
-{
-	runtime::test_context.assert_print_backtrace = false;
-	builtin::panicf(format, $$FILE, $$FUNC, $$LINE, $vasplat);
-}
-

lib/std/core/types.c3

@@ -3,25 +3,23 @@ module std::core::types;
 import libc;
 
 
-faultdef VALUE_OUT_OF_RANGE, VALUE_OUT_OF_UNSIGNED_RANGE;
-
-<*
- @require $Type.kindof.is_int() : "Type was not an integer"
- @require v.type.kindof == ENUM : "Value was not an enum"
-*>
-macro any_to_enum_ordinal(any v, $Type)
+fault ConversionResult
 {
-	return any_to_int(v.as_inner(), $Type);
+	VALUE_OUT_OF_RANGE,
+	VALUE_OUT_OF_UNSIGNED_RANGE,
 }
-
-<*
- @require $Type.kindof.is_int() : "Type was not an integer"
- @require v.type.kindof.is_int() : "Value was not an integer"
-*>
+/**
+ * @require $Type.kindof.is_int() || $Type.kindof == TypeKind.ENUM "Argument was not an integer"
+ **/
 macro any_to_int(any v, $Type)
 {
 	typeid any_type = v.type;
 	TypeKind kind = any_type.kindof;
+	if (kind == TypeKind.ENUM)
+	{
+		any_type = any_type.inner;
+		kind = any_type.kindof;
+	}
 	bool is_mixed_signed = $Type.kindof != any_type.kindof;
 	$Type max = $Type.max;
 	$Type min = $Type.min;
@@ -29,47 +27,47 @@ macro any_to_int(any v, $Type)
 	{
 		case ichar:
 			ichar c = *(char*)v.ptr;
-			if (is_mixed_signed && c < 0) return VALUE_OUT_OF_UNSIGNED_RANGE?;
+			if (is_mixed_signed && c < 0) return ConversionResult.VALUE_OUT_OF_UNSIGNED_RANGE?;
 			return ($Type)c;
 		case short:
 			short s = *(short*)v.ptr;
-			if (is_mixed_signed && s < 0) return VALUE_OUT_OF_UNSIGNED_RANGE?;
-			if (s > max || s < min) return VALUE_OUT_OF_RANGE?;
+			if (is_mixed_signed && s < 0) return ConversionResult.VALUE_OUT_OF_UNSIGNED_RANGE?;
+			if (s > max || s < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
 			return ($Type)s;
 		case int:
 			int i = *(int*)v.ptr;
-			if (is_mixed_signed && i < 0) return VALUE_OUT_OF_UNSIGNED_RANGE?;
-			if (i > max || i < min) return VALUE_OUT_OF_RANGE?;
+			if (is_mixed_signed && i < 0) return ConversionResult.VALUE_OUT_OF_UNSIGNED_RANGE?;
+			if (i > max || i < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
 			return ($Type)i;
 		case long:
 			long l = *(long*)v.ptr;
-			if (is_mixed_signed && l < 0) return VALUE_OUT_OF_UNSIGNED_RANGE?;
-			if (l > max || l < min) return VALUE_OUT_OF_RANGE?;
+			if (is_mixed_signed && l < 0) return ConversionResult.VALUE_OUT_OF_UNSIGNED_RANGE?;
+			if (l > max || l < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
 			return ($Type)l;
 		case int128:
 			int128 i = *(int128*)v.ptr;
-			if (is_mixed_signed && i < 0) return VALUE_OUT_OF_UNSIGNED_RANGE?;
-			if (i > max || i < min) return VALUE_OUT_OF_RANGE?;
+			if (is_mixed_signed && i < 0) return ConversionResult.VALUE_OUT_OF_UNSIGNED_RANGE?;
+			if (i > max || i < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
 			return ($Type)i;
 		case char:
 			char c = *(char*)v.ptr;
-			if (c > max) return VALUE_OUT_OF_RANGE?;
+			if (c > max) return ConversionResult.VALUE_OUT_OF_RANGE?;
 			return ($Type)c;
 		case ushort:
 			ushort s = *(ushort*)v.ptr;
-			if (s > max || s < min) return VALUE_OUT_OF_RANGE?;
+			if (s > max || s < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
 			return ($Type)s;
 		case uint:
 			uint i = *(uint*)v.ptr;
-			if (i > max || i < min) return VALUE_OUT_OF_RANGE?;
+			if (i > max || i < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
 			return ($Type)i;
 		case ulong:
 			ulong l = *(ulong*)v.ptr;
-			if (l > max || l < min) return VALUE_OUT_OF_RANGE?;
+			if (l > max || l < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
 			return ($Type)l;
 		case uint128:
 			uint128 i = *(uint128*)v.ptr;
-			if (i > max || i < min) return VALUE_OUT_OF_RANGE?;
+			if (i > max || i < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
 			return ($Type)i;
 		default:
 			unreachable();
@@ -89,25 +87,20 @@ fn bool typeid.is_subtype_of(self, typeid other)
 macro bool is_subtype_of($Type, $OtherType)
 {
 	var $typeid = $Type.typeid;
-	$switch $Type:
+	$switch ($Type)
 		$case $OtherType: return true;
 		$default: return false;
 	$endswitch
 }
 macro bool is_numerical($Type)
 {
-	$switch $Type.kindof:
-		$case DISTINCT:
-		$case CONST_ENUM:
-			return is_numerical($Type.inner);
-		$case SIGNED_INT:
-		$case UNSIGNED_INT:
-		$case FLOAT:
-		$case VECTOR:
-			return true;
-		$default:
-			return false;
-	$endswitch
+	var $kind = $Type.kindof;
+	$if $kind == TypeKind.DISTINCT:
+		return is_numerical($typefrom($Type.inner));
+	$else
+		return $kind == TypeKind.SIGNED_INT || $kind == TypeKind.UNSIGNED_INT || $kind == TypeKind.FLOAT
+			|| $kind == TypeKind.VECTOR;
+	$endif
 }
 
 fn bool TypeKind.is_int(kind) @inline
@@ -117,7 +110,7 @@ fn bool TypeKind.is_int(kind) @inline
 
 macro bool is_slice_convertable($Type)
 {
-	$switch $Type.kindof:
+	$switch ($Type.kindof)
 		$case SLICE:
 			return true;
 		$case POINTER:
@@ -130,83 +123,19 @@ macro bool is_slice_convertable($Type)
 macro bool is_bool($Type) @const => $Type.kindof == TypeKind.BOOL;
 macro bool is_int($Type) @const  => $Type.kindof == TypeKind.SIGNED_INT || $Type.kindof == TypeKind.UNSIGNED_INT;
 
-<*
- @require is_numerical($Type) : "Expected a numerical type"
-*>
-macro bool is_signed($Type) @const
-{
-	$switch inner_kind($Type):
-		$case SIGNED_INT:
-		$case FLOAT:
-			return true;
-		$case VECTOR:
-			return is_signed($Type.inner);
-		$default:
-			return false;
-	$endswitch
-}
-
-<*
- @require is_numerical($Type) : "Expected a numerical type"
-*>
-macro bool is_unsigned($Type) @const
-{
-	$switch inner_kind($Type):
-		$case UNSIGNED_INT:
-			return true;
-		$case VECTOR:
-			return is_unsigned($Type.inner);
-		$default:
-			return false;
-	$endswitch
-}
-
-macro typeid flat_type($Type) @const
-{
-	$if $Type.kindof == DISTINCT || $Type.kindof == CONST_ENUM:
-		return flat_type($Type.inner);
-	$else
-		return $Type.typeid;
-	$endif
-}
-
-macro TypeKind flat_kind($Type) @const
-{
-	$if $Type.kindof == DISTINCT || $Type.kindof == CONST_ENUM:
-		return flat_type($Type.inner);
-	$else
-		return $Type.kindof;
-	$endif
-}
-
 macro bool is_indexable($Type) @const
 {
-	return $defined(($Type){}[0]);
+	return $defined($Type{}[0]);
 }
 
 macro bool is_ref_indexable($Type) @const
 {
-	return $defined(&($Type){}[0]);
-}
-
-macro bool is_flat_intlike($Type) @const
-{
-	$switch $Type.kindof:
-		$case SIGNED_INT:
-		$case UNSIGNED_INT:
-			return true;
-		$case VECTOR:
-		$case DISTINCT:
-		$case CONST_ENUM:
-			return is_flat_intlike($Type.inner);
-		$default:
-			return false;
-	$endswitch
+	return $defined(&$Type{}[0]);
 }
 
 macro bool is_intlike($Type) @const
 {
-	$switch $Type.kindof:
+	$switch ($Type.kindof)
 		$case SIGNED_INT:
 		$case UNSIGNED_INT:
 			return true;
@@ -219,12 +148,12 @@ macro bool is_intlike($Type) @const
 
 macro bool is_underlying_int($Type) @const
 {
-	$switch $Type.kindof:
+	$switch ($Type.kindof)
 		$case SIGNED_INT:
 		$case UNSIGNED_INT:
 			return true;
 		$case DISTINCT:
-			return is_underlying_int($Type.inner);
+			return is_underlying_int($typefrom($Type.inner));
 		$default:
 			return false;
 	$endswitch
@@ -234,7 +163,7 @@ macro bool is_float($Type) @const  => $Type.kindof == TypeKind.FLOAT;
 
 macro bool is_floatlike($Type) @const
 {
-	$switch $Type.kindof:
+	$switch ($Type.kindof)
 		$case FLOAT:
 			return true;
 		$case VECTOR:
@@ -249,18 +178,13 @@ macro bool is_vector($Type) @const
 	return $Type.kindof == TypeKind.VECTOR;
 }
 
-macro typeid inner_type($Type) @const
-{
-	$if $Type.kindof == DISTINCT || $Type.kindof == CONST_ENUM:
-		return inner_type($Type.inner);
-	$else
-		return $Type.typeid;
-	$endif
-}
-
 macro TypeKind inner_kind($Type) @const
 {
-	return inner_type($Type).kindof;
+	$if $Type.kindof == TypeKind.DISTINCT:
+		return inner_kind($typefrom($Type.inner));
+	$else
+		return $Type.kindof;
+	$endif
 }
 
 macro bool is_same($TypeA, $TypeB) @const
@@ -274,7 +198,7 @@ macro bool @has_same(#a, #b, ...) @const
 	$if $type_a != @typeid(#b):
 		return false;
 	$endif
-	$for var $i = 0; $i < $vacount; $i++:
+	$for (var $i = 0; $i < $vacount; $i++)
 		$if @typeid($vaexpr[$i]) != $type_a:
 			return false;
 		$endif
@@ -284,15 +208,13 @@ macro bool @has_same(#a, #b, ...) @const
 
 macro bool may_load_atomic($Type) @const
 {
-	$switch $Type.kindof:
-	$case BOOL:
+	$switch ($Type.kindof)
 	$case SIGNED_INT:
 	$case UNSIGNED_INT:
 	$case POINTER:
 	$case FLOAT:
 		return true;
 	$case DISTINCT:
-	$case ENUM:
 		return may_load_atomic($Type.inner);
 	$default:
 		return false;
@@ -301,17 +223,15 @@ macro bool may_load_atomic($Type) @const
 
 macro lower_to_atomic_compatible_type($Type) @const
 {
-	$switch $Type.kindof:
-		$case BOOL:
-		$case SIGNED_INT:
-		$case UNSIGNED_INT:
-	        return $Type.typeid;
+	$switch ($Type.kindof)
+    $case SIGNED_INT:
+	  $case UNSIGNED_INT:
+      return $Type.typeid;
 		$case DISTINCT:
-		$case CONST_ENUM:
 			return lower_to_atomic_compatible_type($Type.inner);
 		$case FLOAT:
-			$switch $Type:
-				$case float16:
+			$switch ($Type)
+				$case float16: 
 					return ushort.typeid;
 				$case float: 
 					return uint.typeid;
@@ -348,14 +268,19 @@ macro bool is_equatable_type($Type) @const
 	$endif
 }
 
-<*
- Checks if a type implements the copy protocol.
-*>
+/**
+ * Checks if a type implements the copy protocol.
+ **/
 macro bool implements_copy($Type) @const
 {
 	return $defined($Type.copy) && $defined($Type.free);
 }
 
+macro bool is_equatable_value(value) @deprecated
+{
+	return is_equatable_type($typeof(value));
+}
+
 macro bool @equatable_value(#value) @const
 {
 	return is_equatable_type($typeof(#value));
@@ -370,6 +295,15 @@ macro bool @comparable_value(#value) @const
 	$endif
 }
 
+macro bool is_comparable_value(value) @deprecated
+{
+	$if $defined(value.less) || $defined(value.compare_to):
+		return true;
+	$else
+		return $typeof(value).is_ordered;
+	$endif
+}
+
 enum TypeKind : char
 {
 	VOID,
@@ -378,10 +312,10 @@ enum TypeKind : char
 	UNSIGNED_INT,
 	FLOAT,
 	TYPEID,
-	FAULT,
+	ANYFAULT,
 	ANY,
 	ENUM,
-	CONST_ENUM,
+	FAULT,
 	STRUCT,
 	UNION,
 	BITSTRUCT,

lib/std/core/values.c3

@@ -1,27 +1,21 @@
 module std::core::values;
-import std::core::types;
 
-
-<*
- Return true if two values have the same type before any conversions.
-*>
+macro typeid @typeid(#value) @const @builtin => $typeof(#value).typeid;
+macro TypeKind @typekind(#value) @const @builtin => $typeof(#value).kindof;
+macro bool @typeis(#value, $Type) @const @builtin => $typeof(#value).typeid == $Type.typeid;
+/**
+ * Return true if two values have the same type before any conversions.
+ **/
 macro bool @is_same_type(#value1, #value2) @const => $typeof(#value1).typeid == $typeof(#value2).typeid;
 macro bool @is_bool(#value) @const => types::is_bool($typeof(#value));
 macro bool @is_int(#value) @const => types::is_int($typeof(#value));
-macro bool @is_flat_intlike(#value) @const => types::is_flat_intlike($typeof(#value));
 macro bool @is_floatlike(#value) @const => types::is_floatlike($typeof(#value));
 macro bool @is_float(#value) @const => types::is_float($typeof(#value));
 macro bool @is_promotable_to_floatlike(#value) @const => types::is_promotable_to_floatlike($typeof(#value));
 macro bool @is_promotable_to_float(#value) @const => types::is_promotable_to_float($typeof(#value));
 macro bool @is_vector(#value) @const => types::is_vector($typeof(#value));
 macro bool @is_same_vector_type(#value1, #value2) @const => types::is_same_vector_type($typeof(#value1), $typeof(#value2));
-macro bool @assign_to(#value1, #value2) @const => @assignable_to(#value1, $typeof(#value2));
-macro bool @is_lvalue(#value) => $defined(#value = #value);
-macro bool @is_const(#foo) @const @builtin
-{
-	var $v;
-	return $defined($v = #foo);
-}
+macro bool @assign_to(#value1, #value2) @const => $assignable(#value1, $typeof(#value2));
 
 macro promote_int(x)
 {
@@ -32,29 +26,10 @@ macro promote_int(x)
 	$endif
 }
 
-<*
- Select between two values at compile time,
- the values do not have to be of the same type.
-
- This acts like `$bool ? #value_1 : #value_2` but at compile time.
-
- @param $bool : `true for picking the first value, false for the other`
- @param #value_1
- @param #value_2
- @returns `The selected value.`
-*>
-macro @select(bool $bool, #value_1, #value_2) @builtin
-{
-	$if $bool:
-		return #value_1;
-	$else
-		return #value_2;
-	$endif
-}
 macro promote_int_same(x, y)
 {
 	$if @is_int(x):
-		$switch:
+		$switch
 		$case @is_vector(y) &&& $typeof(y).inner == float.typeid:
 			return (float)x;
 		$case $typeof(y).typeid == float.typeid:

lib/std/crypto/crypto.c3

@@ -1,12 +1,2 @@
 module std::crypto;
 
-fn bool safe_compare(void* data1, void* data2, usz len)
-{
-	char match = 0;
-	for (usz i = 0; i < len; i++)
-	{
-		match = match | (mem::@volatile_load(((char*)data1)[i]) ^ mem::@volatile_load(((char*)data2)[i]));
-	}
-	return match == 0;
-}
-

lib/std/crypto/dh.c3

@@ -1,12 +0,0 @@
-module std::crypto::dh;
-import std::math::bigint;
-
-fn BigInt generate_secret(BigInt p, BigInt x, BigInt y)
-{
-	return y.mod_pow(x, p);
-}
-
-fn BigInt public_key(BigInt p, BigInt g, BigInt x)
-{
-	return g.mod_pow(x, p);
-}

lib/std/crypto/ed25519.c3

@@ -1,736 +0,0 @@
-/*
- Ed25519 Digital Signature Algorithm
-*/
-
-module std::crypto::ed25519;
-import std::hash::sha512;
-
-alias Ed25519PrivateKey = char[32];
-alias Ed25519PublicKey = char[Ed25519PrivateKey.len];
-alias Ed25519Signature = char[2 * Ed25519PublicKey.len];
-
-<*
- Generate a public key from a private key.
-
- @param [in] private_key : "32 bytes of cryptographically secure random data"
- @require private_key.len == Ed25519PrivateKey.len
-*>
-fn Ed25519PublicKey public_keygen(char[] private_key)
-{
-	return pack(&&unproject(&&(BASE * expand_private_key(private_key)[:FBaseInt.len])));
-}
-
-<*
- Sign a message.
-
- @param [in] message
- @param [in] private_key
- @param [in] public_key
- @require private_key.len == Ed25519PrivateKey.len
- @require public_key.len == Ed25519PublicKey.len
-*>
-fn Ed25519Signature sign(char[] message, char[] private_key, char[] public_key)
-{
-	Ed25519Signature r @noinit;
-
-	char[*] exp = expand_private_key(private_key);
-
-	Sha512 sha @noinit;
-	sha.init();
-
-	sha.update(exp[FBaseInt.len..]);
-	sha.update(message);
-
-	FBaseInt k = from_bytes(&&sha.final());
-
-	r[:F25519Int.len] = pack(&&unproject(&&(BASE * k[..])))[..];
-
-	sha.init();
-
-	sha.update(r[:F25519Int.len]);
-	sha.update(public_key);
-	sha.update(message);
-
-	FBaseInt z = from_bytes(&&sha.final());
-	FBaseInt e = from_bytes(exp[:FBaseInt.len]);
-
-	r[F25519Int.len..] = (z * e + k)[..];
-
-	return r;
-}
-
-<*
- Verify the signature of a message.
-
- @param [in] message
- @param [in] signature
- @param [in] public_key
- @require signature.len == Ed25519Signature.len
- @require public_key.len == Ed25519PublicKey.len
-*>
-fn bool verify(char[] message, char[] signature, char[] public_key)
-{
-	char ok = 1;
-
-	F25519Int lhs = pack(&&unproject(&&(BASE * signature[F25519Int.len..])));
-
-	Unpacking unp_p = unpack_on_curve((F25519Int*)public_key);
-	Projection p = project(&unp_p.point);
-	ok &= unp_p.on_curve;
-
-	Sha512 sha @noinit;
-	sha.init();
-
-	sha.update(signature[:F25519Int.len]);
-	sha.update(public_key);
-	sha.update(message);
-
-	FBaseInt z = from_bytes(&&sha.final());
-
-	p = p * z[..];
-
-	Unpacking unp_q = unpack_on_curve((F25519Int*)signature[:F25519Int.len]);
-	Projection q = project(&unp_q.point);
-	ok &= unp_q.on_curve;
-
-	p = p + q;
-
-	F25519Int rhs = pack(&&unproject(&p));
-
-	return (bool)(ok & eq(&lhs, &rhs));
-}
-
-// Base point for Ed25519. Generate a subgroup of order 2^252+0x14def9dea2f79cd65812631a5cf5d3ed
-const Projection BASE @private =
-{
-	x"1ad5258f602d56c9 b2a7259560c72c69 5cdcd6fd31e2a4c0 fe536ecdd3366921",
-	x"5866666666666666 6666666666666666 6666666666666666 6666666666666666",
-	x"a3ddb7a5b38ade6d f5525177809ff020 7de3ab648e4eea66 65768bd70f5f8767",
-	ONE
-};
-
-<*
- Compute the pruned SHA-512 hash of a private key.
-
- @param [in] private_key
- @require private_key.len == Ed25519PrivateKey.len
-*>
-fn char[sha512::HASH_SIZE] expand_private_key(char[] private_key) @local
-{
-	char[*] r = sha512::hash(private_key);
-
-	r[0] &= 0b11111000;
-	r[FBaseInt.len - 1] &= 0b01111111;
-	r[FBaseInt.len - 1] |= 0b01000000;
-
-	return r;
-}
-
-
-
-/*
- Operations on the twisted Edwards curve -x^2+y^2=1-121665/121666*x^2*y^2 over the prime field F_(2^255-19) (edwards25519)
- The set of F_(2^255-19)-rational curve points is a group of order 2^3*(2^252+0x14def9dea2f79cd65812631a5cf5d3ed)
-*/
-
-module std::crypto::ed25519 @private;
-
-// Affine coordinates.
-struct Point
-{
-	F25519Int x;
-	F25519Int y;
-}
-
-// Projective coordinates.
-struct Projection
-{
-	F25519Int x;
-	F25519Int y;
-	F25519Int t;
-	F25519Int z;
-}
-
-// Neutral.
-const Projection NEUTRAL =
-{
-	ZERO,
-	ONE,
-	ZERO,
-	ONE
-};
-
-<*
- Convert affine to projective coordinates.
-
- @param [&in] p
-*>
-fn Projection project(Point* p) => { p.x, p.y, p.x * p.y, ONE };
-
-<*
- Convert projective to affine coordinates.
-
- @param [&in] p
-*>
-fn Point unproject(Projection* p)
-{
-	Point r @noinit;
-
-	F25519Int inv = p.z.inv();
-	r.x = p.x * inv;
-	r.y = p.y * inv;
-
-	r.x.normalize();
-	r.y.normalize();
-
-	return r;
-}
-
-// d parameter for edwards25519 : -121665/121666
-const F25519Int D = x"a3785913ca4deb75 abd841414d0a7000 98e879777940c78c 73fe6f2bee6c0352";
-
-// 2*d
-const F25519Int DD = x"59f1b226949bd6eb 56b183829a14e000 30d1f3eef2808e19 e7fcdf56dcd90624";
-
-<*
- Compress a point.
-
- @param [&in] p
-*>
-fn F25519Int pack(Point* p)
-{
-	Point r = *p;
-
-	r.x.normalize();
-	r.y.normalize();
-
-	r.y[^1] |= (r.x[0] & 1) << 7;
-
-	return r.y;
-}
-
-struct Unpacking
-{
-	Point point;
-	char on_curve; // Non-zero if true.
-}
-
-<*
- Uncompress a point. Check if it is on the curve.
-
- @param [&in] encoding
-*>
-fn Unpacking unpack_on_curve(F25519Int* encoding)
-{
-	Point p @noinit;
-
-	char parity = (*encoding)[^1] >> 7;
-
-	p.y = *encoding;
-	p.y[^1] &= 0b01111111;
-
-	F25519Int y2 = p.y * p.y;
-	F25519Int x2 = (D * y2 + ONE).inv() * (y2 - ONE);
-
-	F25519Int x = x2.sqrt();
-
-	p.x = f25519_select(&x, &&-x, (x[0] ^ parity) & 1);
-
-	F25519Int _x2 = p.x * p.x;
-
-	x2.normalize();
-	_x2.normalize();
-
-	return {p, eq(&x2, &_x2)};
-}
-
-macro Projection Projection.@add(&s, Projection #p) @operator(+) => s.add(@addr(#p));
-<*
- Addition.
-
- @param [&in] s
-*>
-fn Projection Projection.add(&s, Projection* p) @operator(+)
-{
-	Projection r @noinit;
-
-	F25519Int a = (s.y - s.x) * (p.y - p.x);
-	F25519Int b = (s.y + s.x) * (p.y + p.x);
-	F25519Int c = s.t * DD * p.t;
-	F25519Int d = (s.z * p.z).mul_s(2);
-	F25519Int e = b - a;
-	F25519Int f = d - c;
-	F25519Int g = d + c;
-	F25519Int h = b + a;
-
-	r.x = e * f;
-	r.y = g * h;
-	r.t = e * h;
-	r.z = f * g;
-
-	return r;
-}
-
-<*
- Double a point.
-
- @param [&in] s
-*>
-fn Projection Projection.twice(&s)
-{
-	Projection r @noinit;
-
-	F25519Int a = s.x * s.x;
-	F25519Int b = s.y * s.y;
-	F25519Int c = (s.z * s.z).mul_s(2);
-	F25519Int d = s.x + s.y;
-	F25519Int e = d * d - a - b;
-	F25519Int g = b - a;
-	F25519Int f = g - c;
-	F25519Int h = -b - a;
-
-	r.x = e * f;
-	r.y = g * h;
-	r.t = e * h;
-	r.z = f * g;
-
-	return r;
-}
-
-<*
- Variable base scalar multiplication.
-
- @param [&in] s
- @param [in] n
-*>
-fn Projection Projection.mul(&s, char[] n) @operator(*)
-{
-	Projection r = NEUTRAL;
-
-	for (isz i = n.len << 3 - 1; i >= 0; i--)
-	{
-		r = r.twice();
-
-		Projection t = r + s;
-
-		char bit = n[i >> 3] >> (i & 7) & 1;
-		r.x = f25519_select(&r.x, &t.x, bit);
-		r.y = f25519_select(&r.y, &t.y, bit);
-		r.z = f25519_select(&r.z, &t.z, bit);
-		r.t = f25519_select(&r.t, &t.t, bit);
-	}
-
-	return r;
-}
-
-
-
-/*
- Modular arithmetic over the prime field F_(2^255-19)
-*/
-
-module std::crypto::ed25519 @private;
-
-typedef F25519Int = inline char[32];
-
-const F25519Int ZERO = {};
-const F25519Int ONE = {[0] = 1};
-
-<*
- Reduce an element with carry to at most 2^255+18 (32 bytes)
-
- @param [&inout] s
-*>
-fn void F25519Int.reduce_carry(&s, uint carry)
-{
-	// Reduce using 2^255 = 19 mod p
-	(*s)[^1] &= 0b01111111;
-
-	carry *= 19;
-
-	foreach (i, &v : s)
-	{
-		carry += *v;
-		*v = (char)carry;
-		carry >>= 8;
-	}
-}
-
-<*
- Reduce an element to at most 2^255-19
-
- @param [&inout] s
-*>
-fn void F25519Int.normalize(&s)
-{
-	s.reduce_carry((*s)[^1] >> 7);
-
-	// Substract p
-	F25519Int sub @noinit;
-	ushort c = 19;
-	foreach (i, v : (*s)[:^1])
-	{
-		c += v;
-		sub[i] = (char)c;
-		c >>= 8;
-	}
-	c += (*s)[^1] - 0b10000000;
-	sub[^1] = (char)c;
-
-	*s = f25519_select(&sub, s, (char)(c >> 15));
-}
-
-<*
- Constant-time equality comparison. Return is non-zero if true.
-
- @param [&in] a
- @param [&in] b
-*>
-fn char eq(F25519Int* a, F25519Int* b)
-{
-	char e;
-	foreach (i, v : a) e |= v ^ (*b)[i];
-
-	e |= (e >> 4);
-	e |= (e >> 2);
-	e |= (e >> 1);
-
-	return e ^ 1;
-}
-
-<*
- Constant-time conditonal selection. Result is undefined if condition is neither 0 nor 1.
-
- @param [&in] zero : "selected if condition is 0"
- @param [&in] one : "selected if condition is 1"
-*>
-fn F25519Int f25519_select(F25519Int* zero, F25519Int* one, char condition)
-{
-	F25519Int r @noinit;
-
-	foreach (i, z : zero) r[i] = z ^ (-condition & ((*one)[i] ^ z));
-
-	return r;
-}
-
-macro F25519Int F25519Int.@add(&s, F25519Int #n) @operator(+) => s.add(@addr(#n));
-
-<*
- Addition.
-
- @param [&in] s
- @param [&in] n
-*>
-fn F25519Int F25519Int.add(&s, F25519Int* n) @operator(+)
-{
-	F25519Int r @noinit;
-
-	ushort c;
-	foreach (i, v : s)
-	{
-		c >>= 8;
-		c += v + (*n)[i];
-		r[i] = (char)c;
-	}
-
-	r.reduce_carry(c >> 7);
-
-	return r;
-}
-
-macro F25519Int F25519Int.@sub(&s, F25519Int #n) @operator(-) => s.sub(@addr(#n));
-
-<*
- Substraction.
-
- @param [&in] s
- @param [&in] n
-*>
-fn F25519Int F25519Int.sub(&s, F25519Int* n) @operator(-)
-{
-	// Compute s+2*p-n instead of s-n to avoid underflow.
-	F25519Int r @noinit;
-
-	uint c = (char)~(2 * 19 - 1);
-	foreach (i, v : (*s)[:^1])
-	{
-		c += 0b11111111_00000000 + v - (*n)[i];
-		r[i] = (char)c;
-		c >>= 8;
-	}
-	c += (*s)[^1] - (*n)[^1];
-	r[^1] = (char)c;
-
-	r.reduce_carry(c >> 7);
-
-	return r;
-}
-
-<*
- Negation.
-
- @param [&in] s
-*>
-fn F25519Int F25519Int.neg(&s) @operator(-)
-{
-	// Compute 2*p-s instead of -s to avoid underflow.
-	F25519Int r @noinit;
-
-	uint c = (char)~(2 * 19 - 1);
-	foreach (i, v : (*s)[:^1])
-	{
-		c += 0b11111111_00000000 - v;
-		r[i] = (char)c;
-		c >>= 8;
-	}
-	c -= (*s)[^1];
-	r[^1] = (char)c;
-
-	r.reduce_carry(c >> 7);
-
-	return r;
-}
-
-macro F25519Int F25519Int.@mul(&s, F25519Int #n) @operator(*) => s.mul(@addr(#n));
-
-<*
- Multiplication.
-
- @param [&in] s
- @param [&in] n
-*>
-fn F25519Int F25519Int.mul(&s, F25519Int* n) @operator(*)
-{
-	F25519Int r @noinit;
-
-	uint c;
-	for (usz i = 0; i < F25519Int.len; i++)
-	{
-		c >>= 8;
-		for (usz j; j <= i; j++) c += (*s)[j] * (*n)[i - j];
-		// Reduce using 2^256 = 2*19 mod p
-		for (usz j = i + 1; j < F25519Int.len; j++) c += (*s)[j] * (*n)[^j - i] * 2 * 19;
-		r[i] = (char)c;
-	}
-
-	r.reduce_carry(c >> 7);
-
-	return r;
-}
-
-<*
- Multiplication by a small element.
-
- @param [&in] s
-*>
-fn F25519Int F25519Int.mul_s(&s, uint n)
-{
-	F25519Int r @noinit;
-
-	uint c;
-	foreach (i, v : s)
-	{
-		c >>= 8;
-		c += v * n;
-		r[i] = (char)c;
-	}
-
-	r.reduce_carry(c >> 7);
-
-	return r;
-}
-
-<*
- Inverse an element.
-
- @param [&in] s
-*>
-fn F25519Int F25519Int.inv(&s)
-{
-	//Compute s^(p-2)
-	F25519Int r = *s;
-
-	for (usz i; i < 255 - 1 - 5; i++) r = r * r * s;
-
-	r *= r;
-	r = r * r * s;
-	r *= r;
-	r = r * r * s;
-	r = r * r * s;
-
-	return r;
-}
-
-<*
- Raise an element to the power of 2^252-3
-
- @param [&in] s
-*>
-fn F25519Int F25519Int.pow_2523(&s) @local
-{
-	F25519Int r = *s;
-
-	for (usz i; i < 252 - 1 - 2; i++) r = r * r * s;
-
-	r *= r;
-	r = r * r * s;
-
-	return r;
-}
-
-<*
- Compute the square root of an element.
-
- @param [&in] s
-*>
-fn F25519Int F25519Int.sqrt(&s)
-{
-	F25519Int twice = s.mul_s(2);
-	F25519Int pow = twice.pow_2523();
-
-	return (twice * pow * pow - ONE) * s * pow;
-}
-
-
-
-/*
- Modular arithmetic over the prime field F_(2^252+0x14def9dea2f79cd65812631a5cf5d3ed)
-*/
-
-module std::crypto::ed25519 @private;
-import std::math;
-
-typedef FBaseInt = inline char[32];
-
-// Order of the field : 2^252+0x14def9dea2f79cd65812631a5cf5d3ed
-const FBaseInt ORDER = x"edd3f55c1a631258 d69cf7a2def9de14 0000000000000000 0000000000000010";
-
-<*
- Interpret bytes as a normalized element.
-
- @param [in] bytes
-*>
-fn FBaseInt from_bytes(char[] bytes)
-{
-	FBaseInt r;
-
-	usz bitc = min(252 - 1, bytes.len << 3);
-	usz bytec = bitc >> 3;
-	usz mod = bitc & 7;
-	usz rem = bytes.len << 3 - bitc;
-
-	r[:bytec] = bytes[^bytec..];
-
-	if (mod)
-	{
-		r <<= mod;
-		r[0] |= bytes[^bytec + 1] >> (8 - mod);
-	}
-
-	for (isz i = rem - 1; i >= 0; i--)
-	{
-		r <<= 1;
-		r[0] |= bytes[i >> 3] >> (i & 7) & 1;
-		r = r.sub_l(&ORDER);
-	}
-
-	return r;
-}
-
-<*
- Constant-time conditonal selection. Result is undefined if condition is neither 0 nor 1.
-
- @param [&in] zero : "selected if condition is 0"
- @param [&in] one : "selected if condition is 1"
-*>
-fn FBaseInt fbase_select(FBaseInt* zero, FBaseInt* one, char condition)
-{
-	FBaseInt r @noinit;
-
-	foreach (i, z : zero) r[i] = z ^ (-condition & ((*one)[i] ^ z));
-
-	return r;
-}
-
-macro FBaseInt FBaseInt.@add(&s, FBaseInt #n) @operator(+) => s.add(@addr(#n));
-
-<*
- Addition.
-
- @param [&in] s
- @param [&in] n
-*>
-fn FBaseInt FBaseInt.add(&s, FBaseInt* n) @operator(+)
-{
-	FBaseInt r @noinit;
-
-	ushort c;
-	foreach (i, v : s)
-	{
-		c += v + (*n)[i];
-		r[i] = (char)c;
-		c >>= 8;
-	}
-
-	return r.sub_l(&ORDER);
-}
-
-<*
- Substraction if RHS is less than LHS else identity.
-
- @param [&in] s
- @param [&in] n
-*>
-fn FBaseInt FBaseInt.sub_l(&s, FBaseInt* n)
-{
-	FBaseInt sub @noinit;
-	ushort c;
-	foreach (i, v : s)
-	{
-		c = v - (*n)[i] - c;
-		sub[i] = (char)c;
-		c = (c >> 8) & 1;
-	}
-
-	return fbase_select(&sub, s, (char)c);
-}
-
-<*
- Left shift.
-
- @param [&in] s
-*>
-fn FBaseInt FBaseInt.shl(&s, usz n) @operator(<<)
-{
-	FBaseInt r @noinit;
-
-	ushort c;
-	foreach (i, v : s)
-	{
-		c |= v << n;
-		r[i] = (char)c;
-		c >>= 8;
-	}
-
-	return r;
-}
-
-macro FBaseInt FBaseInt.@mul(&s, FBaseInt #n) @operator(*) => s.mul(@addr(#n));
-<*
- Multiplication.
-
- @param [&in] s
- @param [&in] n
-*>
-fn FBaseInt FBaseInt.mul(&s, FBaseInt* n) @operator(*)
-{
-	FBaseInt r;
-
-	for (isz i = 252; i >= 0; i--)
-	{
-		r = (r << 1).sub_l(&ORDER);
-		r = fbase_select(&r, &&(r + s), (*n)[i >> 3] >> (i & 7) & 1);
-	}
-
-	return r;
-}

lib/std/crypto/rc4.c3

@@ -9,12 +9,12 @@ struct Rc4
 	char[256] state;
 }
 
-<*
- Initialize the RC4 state.
-
- @param [in] key : "The key to use"
- @require key.len > 0 : "The key must be at least 1 byte long"
-*>
+/**
+ * Initialize the RC4 state.
+ *
+ * @param [in] key "The key to use"
+ * @require key.len > 0 "The key must be at least 1 byte long"
+ **/
 fn void Rc4.init(&self, char[] key)
 {
 	// Init the state matrix
@@ -28,11 +28,11 @@ fn void Rc4.init(&self, char[] key)
 	self.j = 0;
 }
 
-<*
- Run a single pass of en/decryption using a particular key.
- @param [in] key
- @param [inout] data
-*>
+/**
+ * Run a single pass of en/decryption using a particular key.
+ * @param [in] key
+ * @param [inout] data
+ **/
 fn void crypt(char[] key, char[] data)
 {
 	Rc4 rc4;
@@ -40,13 +40,13 @@ fn void crypt(char[] key, char[] data)
 	rc4.crypt(data, data);
 }
 
-<*
- Encrypt or decrypt a sequence of bytes.
-
- @param [in] in : "The input"
- @param [out] out : "The output"
- @require in.len <= out.len : "Output would overflow"
-*>
+/**
+ * Encrypt or decrypt a sequence of bytes.
+ *
+ * @param [in] in "The input"
+ * @param [out] out "The output"
+ * @require in.len <= out.len "Output would overflow"
+ **/
 fn void Rc4.crypt(&self, char[] in, char[] out)
 {
 	uint i = self.i;
@@ -64,11 +64,11 @@ fn void Rc4.crypt(&self, char[] in, char[] out)
 	self.j = j;
 }
 
-<*
- Clear the rc4 state.
-
- @param [&out] self : "The RC4 State"
-*>
+/**
+ * Clear the rc4 state.
+ *
+ * @param [&out] self "The RC4 State"
+ **/
 fn void Rc4.destroy(&self)
 {
 	*self = {};

lib/std/encoding/base32.c3

@@ -1,273 +0,0 @@
-module std::encoding::base32;
-
-// This module implements base32 encoding according to RFC 4648
-// (https://www.rfc-editor.org/rfc/rfc4648)
-
-struct Base32Alphabet
-{
-	char[32] encoding;
-	char[256] reverse;
-}
-
-const char NO_PAD = 0;
-const char DEFAULT_PAD = '=';
-
-<*
- Encode the content of src into a newly allocated string
- @param [in] src : "The input to be encoded."
- @param padding : "The padding character or 0 if none"
- @param alphabet : "The alphabet to use"
- @require padding < 0xFF : "Invalid padding character"
- @return "The encoded string."
-*>
-fn String? encode(Allocator allocator, char[] src, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD)
-{
-	char[] dst = allocator::alloc_array(allocator, char, encode_len(src.len, padding));
-	return encode_buffer(src, dst, padding, alphabet);
-}
-
-<*
- Decode the content of src into a newly allocated char array.
- @param [in] src : "The input to be encoded."
- @param padding : "The padding character or 0 if none"
- @param alphabet : "The alphabet to use"
- @require padding < 0xFF : "Invalid padding character"
- @return "The decoded data."
-*>
-fn char[]? decode(Allocator allocator, char[] src, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD)
-{
-	char[] dst = allocator::alloc_array(allocator, char, decode_len(src.len, padding));
-	return decode_buffer(src, dst, padding, alphabet);
-}
-
-fn String? tencode(char[] code, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD) @inline => encode(tmem, code, padding, alphabet);
-fn char[]? tdecode(char[] code, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD) @inline => decode(tmem, code, padding, alphabet);
-
-<*
- Calculate the length in bytes of the decoded data.
- @param n : "Length in bytes of input."
- @param padding : "The padding character or 0 if none"
- @require padding < 0xFF : "Invalid padding character"
- @return "Length in bytes of the decoded data."
-*>
-fn usz decode_len(usz n, char padding)
-{
-	if (padding) return (n / 8) * 5;
-	// no padding
-	usz trailing = n % 8;
-	return n / 8 * 5 + (trailing * 5 ) / 8;
-}
-
-<*
- Calculate the length in bytes of the encoded data.
- @param n : "Length in bytes on input."
- @param padding : "The padding character or 0 if none"
- @require padding < 0xFF : "Invalid padding character"
- @return "Length in bytes of the encoded data."
-*>
-fn usz encode_len(usz n, char padding)
-{
-	// A character is encoded into 8 x 5-bit blocks.
-	if (padding) return (n + 4) / 5 * 8;
-
-	// no padding
-	usz trailing = n % 5;
-	return n / 5 * 8 + (trailing * 8 + 4) / 5;
-}
-
-<*
- Decode the content of src into dst, which must be properly sized.
- @param src : "The input to be decoded."
- @param dst : "The decoded input."
- @param padding : "The padding character or 0 if none"
- @param alphabet : "The alphabet to use"
- @require padding < 0xFF : "Invalid padding character"
- @require dst.len >= decode_len(src.len, padding) : "Destination buffer too small"
- @return "The resulting dst buffer"
- @return? encoding::INVALID_PADDING, encoding::INVALID_CHARACTER
-*>
-fn char[]? decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD)
-{
-	if (src.len == 0) return dst[:0];
-	char* dst_ptr = dst;
-	usz dn = decode_len(src.len, padding);
-	usz n;
-	char[8] buf;
-	while (src.len > 0 && dst.len > 0)
-	{
-		usz i @noinit;
-		// load 8 bytes into buffer
-		for (i = 0; i < 8; i++)
-		{
-			if (src.len == 0)
-			{
-				if (padding > 0) return encoding::INVALID_PADDING?;
-				break;
-			}
-			if (src[0] == padding) break;
-			buf[i] = alphabet.reverse[src[0]];
-			if (buf[i] == INVALID) return encoding::INVALID_CHARACTER?;
-			src = src[1..];
-		}
-
-		// extract 5-bytes from the buffer which contains 8 x 5 bit chunks
-		switch (i)
-		{
-			case 8:
-				// |66677777|  dst[4]
-				// |   77777|  buf[7]
-				// |666     |  buf[6] << 5
-				dst[4] = buf[7] | buf[6] << 5;
-				n++;
-				nextcase 7;
-			case 7:
-				// |45555566|  dst[3]
-				// |      66|  buf[6] >> 3
-				// | 55555  |  buf[5] << 2
-				// |4       |  buf[4] << 7
-				dst[3] = buf[6] >> 3 | buf[5] << 2 | buf[4] << 7;
-				n++;
-				nextcase 5;
-			case 5:
-				// |33334444|  dst[2]
-				// |    4444|  buf[4] >> 1
-				// |3333    |  buf[3] << 4
-				dst[2] = buf[4] >> 1 | buf[3] << 4;
-				n++;
-				nextcase 4;
-			case 4:
-				// |11222223|  dst[1]
-				// |       3|  buf[3] >> 4
-				// |  22222 |  buf[2] << 1
-				// |11      |  buf[1] << 6
-				dst[1] = buf[3] >> 4 | buf[2] << 1 | buf[1] << 6;
-				n++;
-				nextcase 2;
-			case 2:
-				// |00000111|  dst[0]
-				// |     111|  buf[1] >> 2
-				// |00000   |  buf[0] << 3
-				dst[0] = buf[1] >> 2 | buf[0] << 3;
-				n++;
-			default:
-				return encoding::INVALID_CHARACTER?;
-		}
-		if (dst.len < 5) break;
-		dst = dst[5..];
-	}
-	return dst_ptr[:n];
-}
-
-<*
- Encode the content of src into dst, which must be properly sized.
- @param [in] src : "The input to be encoded."
- @param [inout] dst : "The encoded input."
- @param padding : "The padding character or 0 if none"
- @param alphabet : "The alphabet to use"
- @require padding < 0xFF : "Invalid padding character"
- @require dst.len >= encode_len(src.len, padding) : "Destination buffer too small"
- @return "The encoded size."
-*>
-fn String encode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD)
-{
-	if (src.len == 0) return (String)dst[:0];
-
-	char* dst_ptr = dst;
-	usz n = (src.len / 5) * 5;
-	usz dn = encode_len(src.len, padding);
-
-	uint msb, lsb;
-	for (usz i = 0; i < n; i += 5)
-	{
-		// to fit 40 bits we need two 32-bit uints
-		msb = (uint)src[i] << 24 | (uint)src[i+1] << 16
-				| (uint)src[i+2] << 8 | (uint)src[i+3];
-		lsb = msb << 8 | (uint)src[i+4];
-
-		// now slice them into 5-bit chunks and translate to the
-		// alphabet.
-		dst[0] = alphabet.encoding[(msb >> 27) & MASK];
-		dst[1] = alphabet.encoding[(msb >> 22) & MASK];
-		dst[2] = alphabet.encoding[(msb >> 17) & MASK];
-		dst[3] = alphabet.encoding[(msb >> 12) & MASK];
-		dst[4] = alphabet.encoding[(msb >> 7) & MASK];
-		dst[5] = alphabet.encoding[(msb >> 2) & MASK];
-		dst[6] = alphabet.encoding[(lsb >> 5) & MASK];
-		dst[7] = alphabet.encoding[lsb & MASK];
-
-		dst = dst[8..];
-	}
-
-	usz trailing = src.len - n;
-	if (trailing == 0) return (String)dst_ptr[:dn];
-
-	msb = 0;
-	switch (trailing)
-	{
-		case 4:
-			msb |= (uint)src[n+3];
-			lsb = msb << 8;
-			dst[6] = alphabet.encoding[(lsb >> 5) & MASK];
-			dst[5] = alphabet.encoding[(msb >> 2) & MASK];
-			nextcase 3;
-		case 3:
-			msb |= (uint)src[n+2] << 8;
-			dst[4] = alphabet.encoding[(msb >> 7) & MASK];
-			nextcase 2;
-		case 2:
-			msb |= (uint)src[n+1] << 16;
-			dst[3] = alphabet.encoding[(msb >> 12) & MASK];
-			dst[2] = alphabet.encoding[(msb >> 17) & MASK];
-			nextcase 1;
-		case 1:
-			msb |= (uint)src[n] << 24;
-			dst[1] = alphabet.encoding[(msb >> 22) & MASK];
-			dst[0] = alphabet.encoding[(msb >> 27) & MASK];
-	}
-
-	// add the padding
-	if (padding > 0)
-	{
-		for (usz i = (trailing * 8 / 5) + 1; i < 8; i++)
-		{
-			dst[i] = padding;
-		}
-	}
-	return (String)dst_ptr[:dn];
-}
-
-const uint MASK @private = 0b11111;
-const char INVALID @private = 0xff;
-
-const int STD_PADDING = '=';
-const int NO_PADDING = -1;
-
-typedef Alphabet = char[32];
-// Standard base32 Alphabet
-const Alphabet STD_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
-// Extended Hex Alphabet
-const Alphabet HEX_ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
-
-const Base32Alphabet STANDARD = {
-	.encoding = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567",
-	.reverse = x`ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-                 ffffffffffffffffffffffffffffffffffff1a1b1c1d1e1fffffffffffffffff
-                 ff000102030405060708090a0b0c0d0e0f10111213141516171819ffffffffff
-                 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-                 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-                 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-                 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-                 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff`
-};
-
-const Base32Alphabet HEX = {
-	.encoding = "0123456789ABCDEFGHIJKLMNOPQRSTUV",
-	.reverse = x`ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-                 ffffffffffffffffffffffffffffffff00010203040506070809ffffffffffff
-                 ff0a0b0c0d0e0f101112131415161718191a1b1c1d1e1fffffffffffffffffff
-                 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-                 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-                 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-                 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-                 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff`
-};

lib/std/encoding/base64.c3

@@ -5,121 +5,73 @@ import std::core::bitorder;
 // Specifically this section:
 // https://www.rfc-editor.org/rfc/rfc4648#section-4
 
-const char NO_PAD = 0;
-const char DEFAULT_PAD = '=';
-
-struct Base64Alphabet
-{
-	char[64] encoding;
-	char[256] reverse;
-}
-
-const Base64Alphabet STANDARD = {
-	.encoding = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",
-	.reverse =
-	x`ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-	  ffffffffffffffffffffff3effffff3f3435363738393a3b3c3dffffffffffff
-	  ff000102030405060708090a0b0c0d0e0f10111213141516171819ffffffffff
-	  ff1a1b1c1d1e1f202122232425262728292a2b2c2d2e2f30313233ffffffffff
-	  ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-	  ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-	  ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-	  ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff`
-};
-
-const Base64Alphabet URL = {
-	.encoding = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_",
-	.reverse =
-	x`ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-	  ffffffffffffffffffffffffff3effff3435363738393a3b3c3dffffffffffff
-	  ff000102030405060708090a0b0c0d0e0f10111213141516171819ffffffff3f
-	  ff1a1b1c1d1e1f202122232425262728292a2b2c2d2e2f30313233ffffffffff
-	  ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-	  ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-	  ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-	  ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff`
-};
-
 const STD_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 const URL_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
 
-fn String encode(Allocator allocator, char[] src, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD)
+const MASK @private = 0b111111;
+
+struct Base64Encoder
 {
-	char[] dst = allocator::alloc_array(allocator, char, encode_len(src.len, padding));
-	return encode_buffer(src, dst, padding, alphabet);
+	int padding;
+	String alphabet;
 }
 
-fn char[]? decode(Allocator allocator, char[] src, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD)
+fault Base64Error
 {
-	char[] dst = allocator::alloc_array(allocator, char, decode_len(src.len, padding))!;
-	return decode_buffer(src, dst, padding, alphabet);
+	DUPLICATE_IN_ALPHABET,
+	PADDING_IN_ALPHABET,
+	DESTINATION_TOO_SMALL,
+	INVALID_PADDING,
+	INVALID_CHARACTER,
 }
 
-fn String tencode(char[] code, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD) @inline => encode(tmem, code, padding, alphabet);
-fn char[]? tdecode(char[] code, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD) @inline => decode(tmem, code, padding, alphabet);
-
-
-<*
- Calculate the size of the encoded data.
- @param n : "Size of the input to be encoded."
- @param padding : "The padding character or 0 if none"
- @require padding < 0xFF : "Invalid padding character"
- @return "The size of the input once encoded."
-*>
-fn usz encode_len(usz n, char padding)
+/**
+ * @param alphabet "The alphabet used for encoding."
+ * @param padding "Set to a negative value to disable padding."
+ * @require alphabet.len == 64
+ * @require padding < 256
+ * @return! Base64Error.DUPLICATE_IN_ALPHABET, Base64Error.PADDING_IN_ALPHABET
+ **/
+fn void! Base64Encoder.init(&self, String alphabet, int padding = '=')
 {
-	if (padding) return (n + 2) / 3 * 4;
+	check_alphabet(alphabet, padding)!;
+	*self = { .padding = padding, .alphabet = alphabet };
+}
+
+/**
+ * Calculate the size of the encoded data.
+ * @param n "Size of the input to be encoded."
+ * @return "The size of the input once encoded."
+ **/
+fn usz Base64Encoder.encode_len(&self, usz n)
+{
+	if (self.padding >= 0) return (n + 2) / 3 * 4;
 	usz trailing = n % 3;
 	return n / 3 * 4 + (trailing * 4 + 2) / 3;
 }
 
-<*
- Calculate the size of the decoded data.
- @param n : "Size of the input to be decoded."
- @param padding : "The padding character or 0 if none"
- @require padding < 0xFF : "Invalid padding character"
- @return "The size of the input once decoded."
- @return? encoding::INVALID_PADDING
-*>
-fn usz? decode_len(usz n, char padding)
+/**
+ * Encode the content of src into dst, which must be properly sized.
+ * @param src "The input to be encoded."
+ * @param dst "The encoded input."
+ * @return "The encoded size."
+ * @return! Base64Error.DESTINATION_TOO_SMALL
+ **/
+fn usz! Base64Encoder.encode(&self, char[] src, char[] dst)
 {
-	usz dn = n / 4 * 3;
-	usz trailing = n % 4;
-	if (padding)
-	{
-		if (trailing != 0) return encoding::INVALID_PADDING?;
-		// source size is multiple of 4
-		return dn;
-	}
-	if (trailing == 1) return encoding::INVALID_PADDING?;
-	return dn + trailing * 3 / 4;
-}
-
-<*
- Encode the content of src into dst, which must be properly sized.
- @param src : "The input to be encoded."
- @param dst : "The encoded input."
- @param padding : "The padding character or 0 if none"
- @param alphabet : "The alphabet to use"
- @require padding < 0xFF : "Invalid padding character"
- @return "The encoded size."
-*>
-fn String encode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD)
-{
-	if (src.len == 0) return (String)dst[:0];
-	usz dn = encode_len(src.len, padding);
-	char* dst_ptr = dst;
-	assert(dst.len >= dn);
+	if (src.len == 0) return 0;
+	usz dn = self.encode_len(src.len);
+	if (dst.len < dn) return Base64Error.DESTINATION_TOO_SMALL?;
 	usz trailing = src.len % 3;
 	char[] src3 = src[:^trailing];
 
 	while (src3.len > 0)
 	{
 		uint group = (uint)src3[0] << 16 | (uint)src3[1] << 8 | (uint)src3[2];
-		dst[0] = alphabet.encoding[group >> 18 & MASK];
-		dst[1] = alphabet.encoding[group >> 12 & MASK];
-		dst[2] = alphabet.encoding[group >> 6 & MASK];
-		dst[3] = alphabet.encoding[group & MASK];
+		dst[0] = self.alphabet[group >> 18 & MASK];
+		dst[1] = self.alphabet[group >> 12 & MASK];
+		dst[2] = self.alphabet[group >> 6 & MASK];
+		dst[3] = self.alphabet[group & MASK];
 		dst = dst[4..];
 		src3 = src3[3..];
 	}
@@ -130,73 +82,133 @@ fn String encode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Base
 	{
 		case 1:
 			uint group = (uint)src[^1] << 16;
-			dst[0] = alphabet.encoding[group >> 18 & MASK];
-			dst[1] = alphabet.encoding[group >> 12 & MASK];
-			if (padding > 0)
+			dst[0] = self.alphabet[group >> 18 & MASK];
+			dst[1] = self.alphabet[group >> 12 & MASK];
+			if (self.padding >= 0)
 			{
-				dst[2] = padding;
-				dst[3] = padding;
+				char pad = (char)self.padding;
+				dst[2] = pad;
+				dst[3] = pad;
 			}
 		case 2:
 			uint group = (uint)src[^2] << 16 | (uint)src[^1] << 8;
-			dst[0] = alphabet.encoding[group >> 18 & MASK];
-			dst[1] = alphabet.encoding[group >> 12 & MASK];
-			dst[2] = alphabet.encoding[group >> 6 & MASK];
-			if (padding > 0)
+			dst[0] = self.alphabet[group >> 18 & MASK];
+			dst[1] = self.alphabet[group >> 12 & MASK];
+			dst[2] = self.alphabet[group >> 6 & MASK];
+			if (self.padding >= 0)
 			{
-				dst[3] = padding;
+				char pad = (char)self.padding;
+				dst[3] = pad;
 			}
-		case 0:
-			break;
-		default:
-			unreachable();
 	}
-	return (String)dst_ptr[:dn];
+	return dn;
 }
 
-<*
- Decode the content of src into dst, which must be properly sized.
- @param src : "The input to be decoded."
- @param dst : "The decoded input."
- @param padding : "The padding character or 0 if none"
- @param alphabet : "The alphabet to use"
- @require (decode_len(src.len, padding) ?? 0) <= dst.len : "Destination buffer too small"
- @require padding < 0xFF : "Invalid padding character"
- @return "The decoded data."
- @return? encoding::INVALID_CHARACTER, encoding::INVALID_PADDING
-*>
-fn char[]? decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD)
+struct Base64Decoder
 {
-	if (src.len == 0) return dst[:0];
-	usz dn = decode_len(src.len, padding)!;
-	assert(dst.len >= dn);
+	int padding;
+	String alphabet;
+	char[256] reverse;
+	char invalid;
+}
+
+/**
+ * @param alphabet "The alphabet used for encoding."
+ * @param padding "Set to a negative value to disable padding."
+ * @require alphabet.len == 64
+ * @require padding < 256
+ * @return! Base64Error.DUPLICATE_IN_ALPHABET, Base64Error.PADDING_IN_ALPHABET
+ **/
+fn void! Base64Decoder.init(&self, String alphabet, int padding = '=')
+{
+	check_alphabet(alphabet, padding)!;
+	*self = { .padding = padding, .alphabet = alphabet };
+
+	bool[256] checked;
+	foreach (i, c : alphabet)
+	{
+		checked[c] = true;
+		self.reverse[c] = (char)i;
+	}
+	if (padding < 0)
+	{
+		self.invalid = 255;
+		return;
+	}
+	// Find a character for invalid neither in the alphabet nor equal to the padding.
+	char pad = (char)padding;
+	foreach (i, ok : checked)
+	{
+		if (!ok && (char)i != pad)
+		{
+			self.invalid = (char)i;
+			break;
+		}
+	}
+}
+
+/**
+ * Calculate the size of the decoded data.
+ * @param n "Size of the input to be decoded."
+ * @return "The size of the input once decoded."
+ * @return! Base64Error.INVALID_PADDING
+ **/
+fn usz! Base64Decoder.decode_len(&self, usz n)
+{
+	usz dn = n / 4 * 3;
+	usz trailing = n % 4;
+	if (self.padding >= 0)
+	{
+		if (trailing != 0) return Base64Error.INVALID_PADDING?;
+		// source size is multiple of 4
+	}
+	else
+	{
+		if (trailing == 1) return Base64Error.INVALID_PADDING?;
+		dn += trailing * 3 / 4;
+	}
+	return dn;
+}
+
+/**
+ * Decode the content of src into dst, which must be properly sized.
+ * @param src "The input to be decoded."
+ * @param dst "The decoded input."
+ * @return "The decoded size."
+ * @return! Base64Error.DESTINATION_TOO_SMALL, Base64Error.INVALID_PADDING, Base64Error.INVALID_CHARACTER
+ **/
+fn usz! Base64Decoder.decode(&self, char[] src, char[] dst)
+{
+	if (src.len == 0) return 0;
+	usz dn = self.decode_len(src.len)!;
+	if (dst.len < dn) return Base64Error.DESTINATION_TOO_SMALL?;
 
 	usz trailing = src.len % 4;
-	char* dst_ptr = dst;
 	char[] src4 = src;
 	switch
 	{
-		case !padding:
+		case self.padding < 0:
 			src4 = src[:^trailing];
 		default:
 			// If there is padding, keep the last 4 bytes for later.
 			// NB. src.len >= 4 as decode_len passed
 			trailing = 4;
-			if (src[^1] == padding) src4 = src[:^4];
+			char pad = (char)self.padding;
+			if (src[^1] == pad) src4 = src[:^4];
 	}
 	while (src4.len > 0)
 	{
-		char c0 = alphabet.reverse[src4[0]];
-		char c1 = alphabet.reverse[src4[1]];
-		char c2 = alphabet.reverse[src4[2]];
-		char c3 = alphabet.reverse[src4[3]];
-		switch (0xFF)
+		char c0 = self.reverse[src4[0]];
+		char c1 = self.reverse[src4[1]];
+		char c2 = self.reverse[src4[2]];
+		char c3 = self.reverse[src4[3]];
+		switch (self.invalid)
 		{
 			case c0:
 			case c1:
 			case c2:
 			case c3:
-				return encoding::INVALID_CHARACTER?;
+				return Base64Error.INVALID_CHARACTER?;
 		}
 		uint group = (uint)c0 << 18 | (uint)c1 << 12 | (uint)c2 << 6 | (uint)c3;
 		dst[0] = (char)(group >> 16);
@@ -206,13 +218,13 @@ fn char[]? decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Bas
 		src4 = src4[4..];
 	}
 
-	if (trailing == 0) return dst_ptr[:dn];
+	if (trailing == 0) return dn;
 
 	src = src[^trailing..];
-	char c0 = alphabet.reverse[src[0]];
-	char c1 = alphabet.reverse[src[1]];
-	if (c0 == 0xFF || c1 == 0xFF) return encoding::INVALID_PADDING?;
-	if (!padding)
+	char c0 = self.reverse[src[0]];
+	char c1 = self.reverse[src[1]];
+	if (c0 == self.invalid || c1 == self.invalid) return Base64Error.INVALID_PADDING?;
+	if (self.padding < 0)
 	{
 		switch (src.len)
 		{
@@ -220,8 +232,8 @@ fn char[]? decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Bas
 				uint group = (uint)c0 << 18 | (uint)c1 << 12;
 				dst[0] = (char)(group >> 16);
 			case 3:
-				char c2 = alphabet.reverse[src[2]];
-				if (c2 == 0xFF) return encoding::INVALID_CHARACTER?;
+				char c2 = self.reverse[src[2]];
+				if (c2 == self.invalid) return Base64Error.INVALID_CHARACTER?;
 				uint group = (uint)c0 << 18 | (uint)c1 << 12 | (uint)c2 << 6;
 				dst[0] = (char)(group >> 16);
 				dst[1] = (char)(group >> 8);
@@ -232,24 +244,45 @@ fn char[]? decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Bas
 		// Valid paddings are:
 		// 2: xx==
 		// 1: xxx=
-		switch (padding)
+		char pad = (char)self.padding;
+		switch (pad)
 		{
 			case src[2]:
-				if (src[3] != padding) return encoding::INVALID_PADDING?;
+				if (src[3] != pad) return Base64Error.INVALID_PADDING?;
 				uint group = (uint)c0 << 18 | (uint)c1 << 12;
 				dst[0] = (char)(group >> 16);
 				dn -= 2;
 			case src[3]:
-				char c2 = alphabet.reverse[src[2]];
-				if (c2 == 0xFF) return encoding::INVALID_CHARACTER?;
+				char c2 = self.reverse[src[2]];
+				if (c2 == self.invalid) return Base64Error.INVALID_CHARACTER?;
 				uint group = (uint)c0 << 18 | (uint)c1 << 12 | (uint)c2 << 6;
 				dst[0] = (char)(group >> 16);
 				dst[1] = (char)(group >> 8);
 				dn -= 1;
 		}
 	}
-	return dst_ptr[:dn];
+	return dn;
 }
 
-const MASK @private = 0b111111;
-
+// Make sure that all bytes in the alphabet are unique and
+// the padding is not present in the alphabet.
+fn void! check_alphabet(String alphabet, int padding) @local
+{
+	bool[256] checked;
+	if (padding < 0)
+	{
+		foreach (c : alphabet)
+		{
+			if (checked[c]) return Base64Error.DUPLICATE_IN_ALPHABET?;
+			checked[c] = true;
+		}
+		return;
+	}
+	char pad = (char)padding;
+	foreach (c : alphabet)
+	{
+		if (c == pad) return Base64Error.PADDING_IN_ALPHABET?;
+		if (checked[c]) return Base64Error.DUPLICATE_IN_ALPHABET?;
+		checked[c] = true;
+	}
+}

lib/std/encoding/csv.c3

@@ -1,95 +1,64 @@
 module std::encoding::csv;
 import std::io;
 
-
 struct CsvReader
 {
 	InStream stream;
 	String separator;
 }
 
-struct CsvRow (Printable)
-{
-	String[] list;
-	String row;
-	Allocator allocator;
-}
-
-fn usz? CsvRow.to_format(&self, Formatter* f) @dynamic
-{
-	return f.printf("%s", self.list);
-}
-
-fn usz CsvRow.len(&self) @operator(len)
-{
-	return self.list.len;
-}
-
-<*
- @require col < self.list.len
-*>
-fn String CsvRow.get_col(&self, usz col) @operator([])
-{
-	return self.list[col];
-}
-
 fn void CsvReader.init(&self, InStream stream, String separator = ",")
 {
 	self.stream = stream;
 	self.separator = separator;
 }
-<*
- @param [&inout] allocator
-*>
-fn CsvRow? CsvReader.read_row(self, Allocator allocator)
+
+fn String[]! CsvReader.read_new_row(self, Allocator allocator = allocator::heap())
 {
-	String row = io::readline(allocator, self.stream)!;
-	defer catch allocator::free(allocator, row);
-	String[] list = row.split(allocator, self.separator);
-	return { list, row, allocator };
+	return self.read_new_row_with_allocator(allocator::temp()) @inline;
 }
 
-fn CsvRow? CsvReader.tread_row(self)
+fn String[]! CsvReader.read_new_row_with_allocator(self, Allocator allocator = allocator::heap())
 {
-	return self.read_row(tmem) @inline;
-}
-
-<*
- @require self.allocator != null  : `Row already freed`
-*>
-fn void CsvRow.free(&self)
-{
-	allocator::free(self.allocator, self.list);
-	allocator::free(self.allocator, self.row);
-	self.allocator = null;
-}
-
-fn void? CsvReader.skip_row(self) @maydiscard => @pool()
-{
-	(void)io::treadline(self.stream);
-}
-
-macro void? @each_row(InStream stream, String separator = ",", int max_rows = int.max; @body(String[] row)) @maydiscard
-{
-	while (max_rows--)
+	@pool(allocator)
 	{
-		@stack_mem(512; mem)
+		return io::treadline(self.stream).split(self.separator, .allocator = allocator);
+	};
+}
+
+fn String[]! CsvReader.read_temp_row(self)
+{
+	return self.read_new_row_with_allocator(allocator::temp()) @inline;
+}
+
+fn void! CsvReader.skip_row(self) @maydiscard
+{
+	@pool()
+	{
+		(void)io::treadline(self.stream);
+	};
+}
+
+macro CsvReader.@each_row(self, int rows = int.max; @body(String[] row))
+{
+	InputStream* stream = self.stream;
+	String sep = self.separator;
+	while (rows--)
+	{
+		@stack_mem(512; Allocator mem)
 		{
-			String? s = io::readline(mem, stream);
-			if (catch err = s)
+			String[] parts;
+			@pool()
 			{
-				if (err == io::EOF) return;
-				return err?;
-			}
-			@body(s.split(mem, separator));
+				String! s = stream.treadline();
+				if (catch err = s)
+				{
+					if (err == IoError.EOF) return;
+					return err?;
+				}
+				parts = s.split(sep, .allocator = mem);
+			};
+			@body(parts);
 		};
 	}
-}
-
-macro void? CsvReader.@each_row(self, int rows = int.max; @body(String[] row)) @maydiscard
-{
-	return @each_row(self.stream, self.separator, rows; row)
-	{
-		@body(row);
-	};
 }

lib/std/encoding/encoding.c3

@@ -1,3 +0,0 @@
-module std::encoding;
-
-faultdef INVALID_CHARACTER, INVALID_PADDING;

lib/std/encoding/hex.c3

@@ -1,108 +0,0 @@
-module std::encoding::hex;
-import std::encoding @norecurse;
-
-// The implementation is based on https://www.rfc-editor.org/rfc/rfc4648
-
-fn String encode_buffer(char[] code, char[] buffer)
-{
-	return (String)buffer[:encode_bytes(code, buffer)];
-}
-
-fn char[]? decode_buffer(char[] code, char[] buffer)
-{
-	return buffer[:decode_bytes(code, buffer)!];
-}
-
-fn String encode(Allocator allocator, char[] code)
-{
-	char[] data = allocator::alloc_array(allocator, char, encode_len(code.len));
-	return (String)data[:encode_bytes(code, data)];
-}
-
-fn char[]? decode(Allocator allocator, char[] code)
-{
-	char[] data = allocator::alloc_array(allocator, char, decode_len(code.len));
-	return data[:decode_bytes(code, data)!];
-}
-
-fn String tencode(char[] code) @inline => encode(tmem, code);
-fn char[]? tdecode(char[] code) @inline => decode(tmem, code);
-
-
-<*
- Calculate the size of the encoded data.
- @param n : "Size of the input to be encoded."
- @return "The size of the input once encoded."
-*>
-fn usz encode_len(usz n) => n * 2;
-
-<*
- Encode the content of src into dst, which must be properly sized.
- @param src : "The input to be encoded."
- @param dst : "The encoded input."
- @return "The encoded size."
- @require dst.len >= encode_len(src.len) : "Destination array is not large enough"
-*>
-fn usz encode_bytes(char[] src, char[] dst)
-{
-	usz j = 0;
-	foreach (v : src)
-	{
-		dst[j] = HEXALPHABET[v >> 4];
-		dst[j + 1] = HEXALPHABET[v & 0x0f];
-		j = j + 2;
-	}
-	return src.len * 2;
-}
-
-<*
- Calculate the size of the decoded data.
- @param n : "Size of the input to be decoded."
- @return "The size of the input once decoded."
-*>
-macro usz decode_len(usz n) => n / 2;
-
-<*
- Decodes src into bytes. Returns the actual number of bytes written to dst.
-
- Expects that src only contains hexadecimal characters and that src has even
- length.
-
- @param src : "The input to be decoded."
- @param dst : "The decoded input."
- @require src.len % 2 == 0 : "src is not of even length"
- @require dst.len >= decode_len(src.len) : "Destination array is not large enough"
- @return? encoding::INVALID_CHARACTER
-*>
-fn usz? decode_bytes(char[] src, char[] dst)
-{
-	usz i;
-	for (usz j = 1; j < src.len; j += 2)
-	{
-		char a = HEXREVERSE[src[j - 1]];
-		char b = HEXREVERSE[src[j]];
-		if (a > 0x0f || b > 0x0f) return encoding::INVALID_CHARACTER?;
-		dst[i] = (a << 4) | b;
-		i++;
-	}
-	return i;
-}
-
-const char[*] HEXALPHABET @private = "0123456789abcdef";
-const char[*] HEXREVERSE @private =
-x`ffffffffffffffffffffffffffffffff
-  ffffffffffffffffffffffffffffffff
-  ffffffffffffffffffffffffffffffff
-  00010203040506070809ffffffffffff
-  ff0a0b0c0d0e0fffffffffffffffffff
-  ffffffffffffffffffffffffffffffff
-  ff0a0b0c0d0e0fffffffffffffffffff
-  ffffffffffffffffffffffffffffffff
-  ffffffffffffffffffffffffffffffff
-  ffffffffffffffffffffffffffffffff
-  ffffffffffffffffffffffffffffffff
-  ffffffffffffffffffffffffffffffff
-  ffffffffffffffffffffffffffffffff
-  ffffffffffffffffffffffffffffffff
-  ffffffffffffffffffffffffffffffff
-  ffffffffffffffffffffffffffffffff`;

lib/std/encoding/json.c3

@@ -3,45 +3,41 @@
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::encoding::json;
 import std::io;
+import std::ascii;
 import std::collections::object;
 
-faultdef UNEXPECTED_CHARACTER, INVALID_ESCAPE_SEQUENCE, INVALID_NUMBER, MAX_DEPTH_REACHED;
-
-int max_depth = 128;
-
-fn Object*? parse_string(Allocator allocator, String s)
+fault JsonParsingError
 {
-	return parse(allocator, (ByteReader){}.init(s));
+	EOF,
+	UNEXPECTED_CHARACTER,
+	INVALID_ESCAPE_SEQUENCE,
+	DUPLICATE_MEMBERS,
+	INVALID_NUMBER,
 }
 
-fn Object*? tparse_string(String s)
+fn Object*! parse_string(String s, Allocator allocator = allocator::heap())
 {
-	return parse(tmem, (ByteReader){}.init(s));
+	return parse(ByteReader{}.init(s), allocator);
 }
 
-fn Object*? parse(Allocator allocator, InStream s)
+fn Object*! temp_parse_string(String s)
 {
-	@stack_mem(512; Allocator smem)
+	return parse(ByteReader{}.init(s), allocator::temp());
+}
+
+fn Object*! parse(InStream s, Allocator allocator = allocator::heap())
+{
+	JsonContext context = { .last_string = dstring::new_with_capacity(64, allocator), .stream = s, .allocator = allocator };
+	defer context.last_string.free();
+	@pool(allocator)
 	{
-		JsonContext context = { .last_string = dstring::new_with_capacity(smem, 64), .stream = s, .allocator = allocator };
-		@pool()
-		{
-			Object* o = parse_any(&context)!;
-			defer catch o.free();
-			while (char c = read_next(&context)!, c != 0)
-			{
-				if (c.is_space()) continue;
-				return UNEXPECTED_CHARACTER?;
-			}
-			if (!@catch(context.stream.read_byte())) return UNEXPECTED_CHARACTER?;
-			return o;
-		};
+		return parse_any(&context);
 	};
 }
 
-fn Object*? tparse(InStream s)
+fn Object*! temp_parse(InStream s)
 {
-	return parse(tmem, s);
+	return parse(s, allocator::temp());
 }
 
 // -- Implementation follows --
@@ -72,18 +68,15 @@ struct JsonContext @local
 	DString last_string;
 	double last_number;
 	char current;
-	int depth;
-	bitstruct : char
-	{
+	bitstruct : char {
 		bool skip_comments;
 		bool reached_end;
 		bool pushed_back;
 	}
-
 }
 
 
-fn Object*? parse_from_token(JsonContext* context, JsonTokenType token) @local
+fn Object*! parse_from_token(JsonContext* context, JsonTokenType token) @local
 {
 	switch (token)
 	{
@@ -93,41 +86,35 @@ fn Object*? parse_from_token(JsonContext* context, JsonTokenType token) @local
 		case COMMA:
 		case RBRACE:
 		case RBRACKET:
-		case COLON: return UNEXPECTED_CHARACTER?;
+		case COLON: return JsonParsingError.UNEXPECTED_CHARACTER?;
 		case STRING: return object::new_string(context.last_string.str_view(), context.allocator);
 		case NUMBER: return object::new_float(context.last_number, context.allocator);
 		case TRUE: return object::new_bool(true);
 		case FALSE: return object::new_bool(false);
 		case NULL: return object::new_null();
-		case EOF: return io::EOF?;
+		case EOF: return JsonParsingError.EOF?;
 	}
 }
-fn Object*? parse_any(JsonContext* context) @local
+fn Object*! parse_any(JsonContext* context) @local
 {
 	return parse_from_token(context, advance(context));
 }
 
-fn JsonTokenType? lex_number(JsonContext *context, char c) @local
+fn JsonTokenType! lex_number(JsonContext *context, char c) @local
 {
-	@stack_mem(256; Allocator mem)
+	@pool()
 	{
-		DString t = dstring::new_with_capacity(mem, 32);
+		DString t = dstring::temp_with_capacity(32);
 		bool negate = c == '-';
 		if (negate)
 		{
 			t.append(c);
 			c = read_next(context)!;
 		}
-		bool leading_zero = c == '0';
 		while (c.is_digit())
 		{
 			t.append(c);
 			c = read_next(context)!;
-			if (leading_zero)
-			{
-				if (c.is_digit()) return INVALID_NUMBER?;
-				leading_zero = false;
-			}
 		}
 		if (c == '.')
 		{
@@ -148,7 +135,7 @@ fn JsonTokenType? lex_number(JsonContext *context, char c) @local
 					t.append(c);
 					c = read_next(context)!;
 			}
-			if (!c.is_digit()) return INVALID_NUMBER?;
+			if (!c.is_digit()) return JsonParsingError.INVALID_NUMBER?;
 			while (c.is_digit())
 			{
 				t.append(c);
@@ -156,52 +143,47 @@ fn JsonTokenType? lex_number(JsonContext *context, char c) @local
 			}
 		}
 		pushback(context, c);
-		double? d = t.str_view().to_double() ?? INVALID_NUMBER?;
+		double! d = t.str_view().to_double() ?? JsonParsingError.INVALID_NUMBER?;
 		context.last_number = d!;
 		return NUMBER;
 	};
 }
 
-fn Object*? parse_map(JsonContext* context) @local
+fn Object*! parse_map(JsonContext* context) @local
 {
 	Object* map = object::new_obj(context.allocator);
-	defer catch map.free();
 	JsonTokenType token = advance(context)!;
-	defer context.depth--;
-	if (++context.depth >= max_depth) return json::MAX_DEPTH_REACHED?;
+	defer catch map.free();
 
-	@stack_mem(256; Allocator mem)
+	DString temp_key = dstring::new_with_capacity(32, context.allocator);
+	defer temp_key.free();
+	while (token != JsonTokenType.RBRACE)
 	{
-		DString temp_key = dstring::new_with_capacity(mem, 32);
-		while (token != JsonTokenType.RBRACE)
+		if (token != JsonTokenType.STRING) return JsonParsingError.UNEXPECTED_CHARACTER?;
+		DString string = context.last_string;
+		if (map.has_key(string.str_view())) return JsonParsingError.DUPLICATE_MEMBERS?;
+		// Copy the key to our temp holder. We do this to work around the issue
+		// if the temp allocator should be used as the default allocator.
+		temp_key.clear();
+		temp_key.append(string);
+		parse_expected(context, COLON)!;
+		Object* element = parse_any(context)!;
+		map.set(temp_key.str_view(), element);
+		token = advance(context)!;
+		if (token == JsonTokenType.COMMA)
 		{
-			if (token != JsonTokenType.STRING) return UNEXPECTED_CHARACTER?;
-			DString string = context.last_string;
-			// Copy the key to our temp holder, since our
-			// last_string may be used in parse_any
-			temp_key.clear();
-			temp_key.append(string);
-			parse_expected(context, COLON)!;
-			Object* element = parse_any(context)!;
-			map.set(temp_key.str_view(), element);
 			token = advance(context)!;
-			if (token == JsonTokenType.COMMA)
-			{
-				token = advance(context)!;
-				continue;
-			}
-			if (token != JsonTokenType.RBRACE) return UNEXPECTED_CHARACTER?;
+			continue;
 		}
-		return map;
-	};
+		if (token != JsonTokenType.RBRACE) return JsonParsingError.UNEXPECTED_CHARACTER?;
+	}
+	return map;
 }
 
-fn Object*? parse_array(JsonContext* context) @local
+fn Object*! parse_array(JsonContext* context) @local
 {
 	Object* list = object::new_obj(context.allocator);
 	defer catch list.free();
-	defer context.depth--;
-	if (++context.depth >= max_depth) return json::MAX_DEPTH_REACHED?;
 	JsonTokenType token = advance(context)!;
 	while (token != JsonTokenType.RBRACKET)
 	{
@@ -213,7 +195,7 @@ fn Object*? parse_array(JsonContext* context) @local
 			token = advance(context)!;
 			continue;
 		}
-		if (token != JsonTokenType.RBRACKET) return UNEXPECTED_CHARACTER?;
+		if (token != JsonTokenType.RBRACKET) return JsonParsingError.UNEXPECTED_CHARACTER?;
 	}
 	return list;
 }
@@ -228,7 +210,7 @@ fn void pushback(JsonContext* context, char c) @local
 	}
 }
 
-fn char? read_next(JsonContext* context) @local
+fn char! read_next(JsonContext* context) @local
 {
 	if (context.reached_end) return '\0';
 	if (context.pushed_back)
@@ -236,15 +218,14 @@ fn char? read_next(JsonContext* context) @local
 		context.pushed_back = false;
 		return context.current;
 	}
-	char? c = context.stream.read_byte();
+	char! c = context.stream.read_byte();
 	if (catch err = c)
 	{
-		if (err == io::EOF)
-		{
+		case IoError.EOF:
 			context.reached_end = true;
 			return '\0';
-		}
-		return err?;
+		default:
+			return err?;
 	}
 	if (c == 0)
 	{
@@ -253,7 +234,7 @@ fn char? read_next(JsonContext* context) @local
 	return c;
 }
 
-fn JsonTokenType? advance(JsonContext* context) @local
+fn JsonTokenType! advance(JsonContext* context) @local
 {
 	char c;
 	// Skip whitespace
@@ -270,7 +251,7 @@ fn JsonTokenType? advance(JsonContext* context) @local
 			case '\v':
 				continue;
 			case '/':
-				if (!context.skip_comments) break WS;
+				if (!context.skip_comments) break;
 				c = read_next(context)!;
 				if (c != '*')
 				{
@@ -301,7 +282,7 @@ fn JsonTokenType? advance(JsonContext* context) @local
 	switch (c)
 	{
 		case '\0':
-			return io::EOF?;
+			return IoError.EOF?;
 		case '{':
 			return LBRACE;
 		case '}':
@@ -329,25 +310,25 @@ fn JsonTokenType? advance(JsonContext* context) @local
 			match(context, "ull")!;
 			return NULL;
 		default:
-			return UNEXPECTED_CHARACTER?;
+			return JsonParsingError.UNEXPECTED_CHARACTER?;
 	}
 }
 
-fn void? match(JsonContext* context, String str) @local
+fn void! match(JsonContext* context, String str) @local
 {
 	foreach (c : str)
 	{
 		char l = read_next(context)!;
-		if (l != c) return UNEXPECTED_CHARACTER?;
+		if (l != c) return JsonParsingError.UNEXPECTED_CHARACTER?;
 	}
 }
 
-fn void? parse_expected(JsonContext* context, JsonTokenType token) @local
+fn void! parse_expected(JsonContext* context, JsonTokenType token) @local
 {
-	if (advance(context)! != token) return UNEXPECTED_CHARACTER?;
+	if (advance(context)! != token) return JsonParsingError.UNEXPECTED_CHARACTER?;
 }
 
-fn JsonTokenType? lex_string(JsonContext* context)
+fn JsonTokenType! lex_string(JsonContext* context)
 {
 	context.last_string.clear();
 	while LOOP: (true)
@@ -356,9 +337,9 @@ fn JsonTokenType? lex_string(JsonContext* context)
 		switch (c)
 		{
 			case '\0':
-				return io::EOF?;
+				return JsonParsingError.EOF?;
 			case 1..31:
-				return UNEXPECTED_CHARACTER?;
+				return JsonParsingError.UNEXPECTED_CHARACTER?;
 			case '"':
 				break LOOP;
 			case '\\':
@@ -371,9 +352,9 @@ fn JsonTokenType? lex_string(JsonContext* context)
 		switch (c)
 		{
 			case '\0':
-				return io::EOF?;
+				return JsonParsingError.EOF?;
 			case 1..31:
-				return UNEXPECTED_CHARACTER?;
+				return JsonParsingError.UNEXPECTED_CHARACTER?;
 			case '"':
 			case '\\':
 			case '/':
@@ -393,15 +374,14 @@ fn JsonTokenType? lex_string(JsonContext* context)
 				for (int i = 0; i < 4; i++)
 				{
 					c = read_next(context)!;
-					if (!c.is_xdigit()) return INVALID_ESCAPE_SEQUENCE?;
+					if (!c.is_xdigit()) return JsonParsingError.INVALID_ESCAPE_SEQUENCE?;
 					val = val << 4 + (c > '9' ? (c | 32) - 'a' + 10 : c - '0');
 				}
 				context.last_string.append_char32(val);
 				continue;
 			default:
-				 return INVALID_ESCAPE_SEQUENCE?;
+				 return JsonParsingError.INVALID_ESCAPE_SEQUENCE?;
 		}
-		context.last_string.append(c);
 	}
 	return STRING;
 }

lib/std/experimental/FrameScheduler.c3

@@ -1,94 +0,0 @@
-module std::experimental::scheduler{Event};
-import std::collections, std::thread, std::time;
-
-struct DelayedSchedulerEvent @local
-{
-	inline Event event;
-	Clock execution_time;
-}
-
-fn int DelayedSchedulerEvent.compare_to(self, DelayedSchedulerEvent other) @local
-{
-	switch
-	{
-		case self.execution_time < other.execution_time: return -1;
-		case self.execution_time > other.execution_time: return 1;
-		default: return 0;
-	}
-}
-
-struct FrameScheduler
-{
-	PriorityQueue{DelayedSchedulerEvent} delayed_events;
-	List{Event} events;
-	List{Event} pending_events;
-	bool pending;
-	Mutex mtx;
-}
-
-fn void FrameScheduler.init(&self)
-{
-	self.events.init(mem);
-	self.pending_events.init(mem);
-	self.delayed_events.init(mem);
-	(void)self.mtx.init();
-	bool pending;
-}
-
-macro void FrameScheduler.@destroy(&self; @destruct(Event e))
-{
-	foreach (e : self.events) @destruct(e);
-	foreach (e : self.pending_events) @destruct(e);
-	foreach (e : self.delayed_events.heap) @destruct(e.event);
-	self.events.free();
-	self.pending_events.free();
-	self.delayed_events.free();
-	(void)self.mtx.destroy();
-}
-
-fn void FrameScheduler.queue_delayed_event(&self, Event event, Duration delay)
-{
-	self.mtx.@in_lock()
-	{
-		self.delayed_events.push({ event, clock::now().add_duration(delay)});
-		@atomic_store(self.pending, true);
-	};
-}
-
-fn bool FrameScheduler.has_delayed(&self)
-{
-	self.mtx.@in_lock()
-    {
-        return @ok(self.delayed_events.first());
-    };
-}
-
-fn void FrameScheduler.queue_event(&self, Event event)
-{
-	self.mtx.@in_lock()
-	{
-		self.pending_events.push(event);
-		@atomic_store(self.pending, true);
-	};
-}
-fn Event? FrameScheduler.pop_event(&self)
-{
-	while (true)
-	{
-		if (try event = self.events.pop()) return event;
-    	if (!@atomic_load(self.pending)) return NO_MORE_ELEMENT?;
-        self.mtx.@in_lock()
-        {
-            self.events.add_all(&self.pending_events);
-            self.pending_events.clear();
-            Clock c = clock::now();
-            while (try top = self.delayed_events.first())
-            {
-                if (top.execution_time > c) break;
-                self.events.push(self.delayed_events.pop()!!);
-            }
-            @atomic_store(self.pending, self.delayed_events.len() > 0);
-            if (!self.events.len()) return NO_MORE_ELEMENT?;
-        };
-	}
-}

lib/std/hash/a5hash.c3

@@ -1,96 +0,0 @@
-// Copyright (c) 2025 Zack Puhl <github@xmit.xyz>. All rights reserved.
-// Use of this source code is governed by the MIT license
-// a copy of which can be found in the LICENSE_STDLIB file.
-//
-// An implementation of Aleksey Vaneev's a5hash, version 5.16, in C3:
-//   https://github.com/avaneev/komihash
-//
-// The license for komihash from the above repository at the time of writing is as follows:
-//
-// >> MIT License
-// >>
-// >> Copyright (c) 2025 Aleksey Vaneev
-// >>
-// >> Permission is hereby granted, free of charge, to any person obtaining a copy
-// >> of this software and associated documentation files (the "Software"), to deal
-// >> in the Software without restriction, including without limitation the rights
-// >> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// >> copies of the Software, and to permit persons to whom the Software is
-// >> furnished to do so, subject to the following conditions:
-// >>
-// >> The above copyright notice and this permission notice shall be included in all
-// >> copies or substantial portions of the Software.
-// >>
-// >> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// >> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// >> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// >> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// >> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// >> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// >> SOFTWARE.
-//
-//
-module std::hash::a5hash;
-
-
-macro @a5mul(#u, #v, #lo, #hi) @local
-{
-	uint128 imd = (uint128)#u * (uint128)#v;
-	#lo = (ulong)imd;
-	#hi = (ulong)(imd >> 64);
-}
-
-
-fn ulong hash(char[] data, ulong seed = 0)
-{
-	ulong seed1 = 0x243F_6A88_85A3_08D3 ^ data.len;
-	ulong seed2 = 0x4528_21E6_38D0_1377 ^ data.len;
-	ulong val10 = 0xAAAA_AAAA_AAAA_AAAA;
-	ulong val01 = 0x5555_5555_5555_5555;
-	ulong a, b;
-
-	@a5mul(seed2 ^ (seed & val10), seed1 ^ (seed & val01), seed1, seed2);
-
-	val10 ^= seed2;
-
-	if (@likely(data.len > 3))
-	{
-		if (data.len > 16)
-		{
-			val01 ^= seed1;
-
-			for (; data.len > 16; data = data[16..])
-			{
-				@a5mul(
-					@unaligned_load(((ulong*)data.ptr)[0], 1) ^ seed1,
-					@unaligned_load(((ulong*)data.ptr)[1], 1) ^ seed2,
-					seed1, seed2
-				);
-
-				seed1 += val01;
-				seed2 += val10;
-			}
-
-			a = @unaligned_load(*(ulong*)(data.ptr + (uptr)data.len - 16), 1);
-			b = @unaligned_load(*(ulong*)(data.ptr + (uptr)data.len - 8), 1);
-		}
-		else
-		{
-			a = ((ulong)@unaligned_load(*(uint*)&data[0], 1) << 32)
-				| @unaligned_load(*(uint*)&data[^4], 1);
-
-			b = ((ulong)@unaligned_load(*(uint*)&data[(data.len >> 3) * 4], 1) << 32)
-				| @unaligned_load(*(uint*)(data.ptr + data.len - 4 - (data.len >> 3) * 4), 1);
-		}
-	}
-	else
-	{
-		a = data.len ? (data[0] | (data.len > 1 ? ((ulong)data[1] << 8) : 0) | (data.len > 2 ? ((ulong)data[2] << 16) : 0)) : 0;
-		b = 0;
-	}
-
-	@a5mul(a ^ seed1, b ^ seed2, seed1, seed2);
-	@a5mul(val01 ^ seed1, seed2, a, b);
-
-	return a ^ b;
-}

lib/std/hash/adler32.c3

@@ -40,7 +40,7 @@ fn uint Adler32.final(&self)
 	return (self.b << 16) | self.a;
 }
 
-fn uint hash(char[] data)
+fn uint encode(char[] data)
 {
 	uint a = 1;
 	uint b = 0;

lib/std/hash/crc32.c3

@@ -33,7 +33,7 @@ fn uint Crc32.final(&self)
 	return ~self.result;
 }
 
-fn uint hash(char[] data)
+fn uint encode(char[] data)
 {
 	uint result = ~(uint)(0);
 	foreach (char x : data)

lib/std/hash/crc64.c3

@@ -33,7 +33,7 @@ fn ulong Crc64.final(&self)
 	return self.result;
 }
 
-fn ulong hash(char[] data)
+fn ulong encode(char[] data)
 {
 	ulong result = (ulong)(0);
 	foreach (char x : data)

lib/std/hash/fnv32a.c3

@@ -3,12 +3,12 @@
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::hash::fnv32a;
 
-typedef Fnv32a = uint;
+distinct Fnv32a = uint;
 
 const FNV32A_START @private = 0x811c9dc5;
 const FNV32A_MUL @private = 0x01000193;
 
-macro void update(h, char x) @private => *h = (*h ^ ($typeof(*h))x) * FNV32A_MUL;
+macro void @update(uint* &h, char x) @private => *h = (*h * FNV32A_MUL) ^ x;
 
 fn void Fnv32a.init(&self)
 {
@@ -17,25 +17,25 @@ fn void Fnv32a.init(&self)
 
 fn void Fnv32a.update(&self, char[] data)
 {
-	Fnv32a h = *self;
+	uint h = (uint)*self;
 	foreach (char x : data)
 	{
-		update(&h, x);
+		@update(h, x);
 	}
-	*self = h;
+	*self = (Fnv32a)h;
 }
 
 macro void Fnv32a.update_char(&self, char c)
 {
-	update(self, c);
+	@update(*self, x);
 }
 
-fn uint hash(char[] data)
+fn uint encode(char[] data)
 {
 	uint h = FNV32A_START;
 	foreach (char x : data)
 	{
-		update(&h, x);
+		@update(h, x);
 	}
 	return h;
-}
+}

lib/std/hash/fnv64a.c3

@@ -3,12 +3,12 @@
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::hash::fnv64a;
 
-typedef Fnv64a = ulong;
+distinct Fnv64a = ulong;
 
 const FNV64A_START @private = 0xcbf29ce484222325;
 const FNV64A_MUL @private = 0x00000100000001b3;
 
-macro void update(h, char x) @private => *h = (*h ^ ($typeof(*h))x) * FNV64A_MUL;
+macro void @update(ulong* &h, char x) @private => *h = (*h * FNV64A_MUL) ^ x;
 
 fn void Fnv64a.init(&self)
 {
@@ -17,25 +17,25 @@ fn void Fnv64a.init(&self)
 
 fn void Fnv64a.update(&self, char[] data)
 {
-	Fnv64a h = *self;
+	ulong h = (ulong)*self;
 	foreach (char x : data)
 	{
-		update(&h, x);
+		@update(h, x);
 	}
-	*self = h;
+	*self = (Fnv64a)h;
 }
 
 macro void Fnv64a.update_char(&self, char c)
 {
-	update(self, c);
+	@update(*self, x);
 }
 
-fn ulong hash(char[] data)
+fn ulong encode(char[] data)
 {
 	ulong h = FNV64A_START;
 	foreach (char x : data)
 	{
-		update(&h, x);
+		@update(h, x);
 	}
 	return h;
-}
+}

lib/std/hash/hmac.c3

@@ -1,107 +0,0 @@
-module std::hash::hmac{HashAlg, HASH_BYTES, BLOCK_BYTES};
-import std::crypto;
-
-struct Hmac
-{
-	HashAlg a, b;
-}
-
-fn char[HASH_BYTES] hash(char[] key, char[] message)
-{
-	Hmac hmac @noinit;
-	hmac.init(key);
-	hmac.update(message);
-	return hmac.final();
-}
-
-<*
- @require output.len > 0 : "Output must be greater than zero"
- @require output.len < int.max / HASH_BYTES : "Output is too large"
-*>
-fn void pbkdf2(char[] pw, char[] salt, uint iterations, char[] output)
-{
-	usz l = output.len / HASH_BYTES;
-	usz r = output.len % HASH_BYTES;
-
-	Hmac hmac;
-	hmac.init(pw);
-
-	char[] dst_curr = output;
-	for (usz i = 1; i <= l; i++)
-	{
-		@derive(&hmac, salt, iterations, i, dst_curr[:HASH_BYTES]);
-		dst_curr = dst_curr[HASH_BYTES..];
-	}
-
-	if (r > 0)
-	{
-		char[HASH_BYTES] tmp;
-		@derive(&hmac, salt, iterations, l + 1, &tmp);
-		dst_curr[..] = tmp[:dst_curr.len];
-		mem::zero_volatile(&tmp);
-	}
-}
-
-fn void Hmac.init(&self, char[] key)
-{
-	char[BLOCK_BYTES] buffer;
-	if (key.len > BLOCK_BYTES)
-	{
-		self.a.init();
-		self.a.update(key);
-		buffer[:HASH_BYTES] = self.a.final()[..];
-	}
-	else
-	{
-		buffer[:key.len] = key[..];
-	}
-
-	foreach (&b : buffer) *b ^= IPAD;
-
-	self.a.init();
-	self.a.update(&buffer);
-
-	foreach (&b : buffer) *b ^= IPAD ^ OPAD;
-
-	self.b.init();
-	self.b.update(&buffer);
-
-	mem::zero_volatile(&buffer);
-}
-
-fn void Hmac.update(&self, char[] data)
-{
-	self.a.update(data);
-}
-
-fn char[HASH_BYTES] Hmac.final(&self)
-{
-	self.b.update(&&self.a.final());
-	return self.b.final();
-}
-
-const IPAD @private = 0x36;
-const OPAD @private = 0x5C;
-
-macro @derive(Hmac *hmac_start, char[] salt, uint iterations, usz index, char[] out)
-{
-	assert(out.len == HASH_BYTES);
-	char[HASH_BYTES] tmp @noinit;
-	defer mem::zero_volatile(&tmp);
-	Hmac hmac  = *hmac_start;
-	hmac.update(salt);
-	UIntBE be = { (uint)index };
-	hmac.update(&&bitcast(be, char[4]));
-	tmp = hmac.final();
-	out[..] = tmp[..];
-	for (int it = 1; it < iterations; it++)
-	{
-		hmac = *hmac_start;
-		hmac.update(&tmp);
-		tmp = hmac.final();
-		foreach (i, v : tmp)
-		{
-			out[i] ^= v;
-		}
-	}
-}

lib/std/hash/komi.c3

@@ -1,156 +0,0 @@
-// Copyright (c) 2025 Zack Puhl <github@xmit.xyz>. All rights reserved.
-// Use of this source code is governed by the MIT license
-// a copy of which can be found in the LICENSE_STDLIB file.
-//
-// An implementation of Aleksey Vaneev's komihash, version 5.27, in C3:
-//   https://github.com/avaneev/komihash
-//
-// The license for komihash from the above repository at the time of writing is as follows:
-//
-// >> MIT License
-// >>
-// >> Copyright (c) 2021-2025 Aleksey Vaneev
-// >>
-// >> Permission is hereby granted, free of charge, to any person obtaining a copy
-// >> of this software and associated documentation files (the "Software"), to deal
-// >> in the Software without restriction, including without limitation the rights
-// >> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// >> copies of the Software, and to permit persons to whom the Software is
-// >> furnished to do so, subject to the following conditions:
-// >>
-// >> The above copyright notice and this permission notice shall be included in all
-// >> copies or substantial portions of the Software.
-// >>
-// >> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// >> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// >> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// >> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// >> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// >> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// >> SOFTWARE.
-//
-//
-module std::hash::komi;
-
-
-macro @komimul(#u, #v, #lo, #hi) @local
-{
-	uint128 imd = (uint128)#u * (uint128)#v;
-	#lo = (ulong)imd;
-	#hi += (ulong)(imd >> 64);
-}
-
-
-fn ulong hash(char[] data, ulong seed = 0)
-{
-	ulong seed1 = 0x243F_6A88_85A3_08D3 ^ (seed & 0x5555_5555_5555_5555);
-	ulong seed5 = 0x4528_21E6_38D0_1377 ^ (seed & 0xAAAA_AAAA_AAAA_AAAA);
-	ulong r1h, r2h;
-
-	// HASHROUND
-	@komimul(seed1, seed5, seed1, seed5);
-	seed1 ^= seed5;
-
-	if (@likely(data.len < 16))
-	{
-		r1h = seed1;
-		r2h = seed5;
-
-		if (@likely(data.len >= 8))
-		{
-			r1h ^= @unaligned_load(*(ulong*)data.ptr, 1);
-
-			r2h ^= (data.len < 12)
-				? ((data[data.len - 3] | ((ulong)data[data.len - 2] << 8) | ((ulong)data[data.len - 1] << 16) | ((ulong)1 << 24)) >> ((data.len * 8) ^ 88))
-				: (((@unaligned_load(*(uint*)&data[^4], 1) | ((ulong)1 << 32)) >> (128 - data.len * 8)) << 32 | @unaligned_load(*(uint*)&data[8], 1));
-		}
-		else if (data.len != 0)
-		{
-			r1h ^= (data.len < 4)
-				? (((ulong)1 << (data.len * 8)) ^ data[0] ^ (data.len > 1 ? (ulong)data[1] << 8 : 0) ^ (data.len > 2 ? (ulong)data[2] << 16 : 0))
-				: (((@unaligned_load(*(uint*)&data[^4], 1) | ((ulong)1 << 32)) >> (64 - data.len * 8)) << 32 | @unaligned_load(*(uint*)&data[0], 1));
-		}
-	}
-	else if (data.len < 32)
-	{
-		// HASH16
-		@komimul(
-			@unaligned_load(*(ulong*)&data[0], 1) ^ seed1,
-			@unaligned_load(*(ulong*)&data[8], 1) ^ seed5,
-			seed1, seed5
-		);
-		seed1 ^= seed5;
-
-		if (data.len < 24)
-		{
-			r1h = (((@unaligned_load(*(ulong*)&data[^8], 1) >> 8) | ((ulong)1 << 56)) >> (((int)(data.len * 8) ^ 184))) ^ seed1;
-			r2h = seed5;
-		}
-		else
-		{
-			r1h = @unaligned_load(*(ulong*)&data[16], 1) ^ seed1;
-			r2h = (((@unaligned_load(*(ulong*)&data[^8], 1) >> 8) | ((ulong)1 << 56)) >> (((int)(data.len * 8) ^ 248))) ^ seed5;
-		}
-	}
-	else
-	{
-		if (data.len >= 64)
-		{
-			ulong[8] seeds = {
-				seed1, 0x1319_8A2E_0370_7344 ^ seed1, 0xA409_3822_299F_31D0 ^ seed1, 0x082E_FA98_EC4E_6C89 ^ seed1,
-				seed5, 0xBE54_66CF_34E9_0C6C ^ seed5, 0xC0AC_29B7_C97C_50DD ^ seed5, 0x3F84_D5B5_B547_0917 ^ seed5,
-			};
-
-			// HASHLOOP64
-			for (; data.len >= 64; data = data[64:^64])
-			{
-				$for var $x = 0; $x < 4; ++$x :
-					@komimul(
-						@unaligned_load(*(ulong*)&data[0 + ($x * 8)], 1) ^ seeds[$x],
-						@unaligned_load(*(ulong*)&data[32 + ($x * 8)], 1) ^ seeds[4 + $x],
-						seeds[$x], seeds[4 + $x]
-					);
-				$endfor
-
-				seeds[3] ^= seeds[6];
-				seeds[0] ^= seeds[7];
-				seeds[2] ^= seeds[5];
-				seeds[1] ^= seeds[4];
-			}
-
-			seed1 = seeds[0] ^ seeds[1] ^ seeds[2] ^ seeds[3];
-			seed5 = seeds[4] ^ seeds[5] ^ seeds[6] ^ seeds[7];
-		}
-
-		for (; data.len >= 16; data = data[16:^16])
-		{
-			@komimul(
-				@unaligned_load(*(ulong*)&data[0], 1) ^ seed1,
-				@unaligned_load(*(ulong*)&data[8], 1) ^ seed5,
-				seed1, seed5
-			);
-			seed1 ^= seed5;
-		}
-
-		if (data.len < 8)
-		{
-			// NOTE: This is translated from the original code. It grabs the last ulong off the buffer even though the
-			//        data slice is less than 8 bytes. This is possible because this branch only occurs in a loop where
-			//        the original data slice length is >= 32.
-			r1h = (((@unaligned_load(*(ulong*)(data.ptr + data.len - 8), 1) >> 8) | ((ulong)1 << 56)) >> ((data.len * 8) ^ 0x38)) ^ seed1;
-			r2h = seed5;
-		}
-		else
-		{
-			r1h = @unaligned_load(*(ulong*)data.ptr, 1) ^ seed1;
-			r2h = (((@unaligned_load(*(ulong*)&data[^8], 1) >> 8) | ((ulong)1 << 56)) >> ((data.len * 8) ^ 0x78)) ^ seed5;
-		}
-	}
-
-	// HASHFIN
-	@komimul(r1h, r2h, seed1, seed5);
-	seed1 ^= seed5;
-	@komimul(seed1, seed5, seed1, seed5);
-	seed1 ^= seed5;
-	return seed1;
-}

lib/std/hash/md5.c3

@@ -1,225 +0,0 @@
-module std::hash::md5;
-import std::hash::hmac;
-import std::bits;
-
-const BLOCK_BYTES = 64;
-const HASH_BYTES = 16;
-
-struct Md5
-{
-	uint lo, hi;
-	uint a, b, c, d;
-	char[64] buffer;
-	uint[16] block;
-}
-
-alias HmacMd5 = Hmac{Md5, HASH_BYTES, BLOCK_BYTES};
-alias hmac = hmac::hash{Md5, HASH_BYTES, BLOCK_BYTES};
-alias pbkdf2 = hmac::pbkdf2{Md5, HASH_BYTES, BLOCK_BYTES};
-
-fn char[HASH_BYTES] hash(char[] data)
-{
-	Md5 md5;
-	md5.init();
-	md5.update(data);
-	return md5.final();
-}
-
-fn void Md5.init(&self)
-{
-	self.a = 0x67452301;
-	self.b = 0xefcdab89;
-	self.c = 0x98badcfe;
-	self.d = 0x10325476;
-
-	self.lo = 0;
-	self.hi = 0;
-}
-
-
-fn void Md5.update(&ctx, char[] data)
-{
-	uint saved_lo = ctx.lo;
-	if ((ctx.lo = (saved_lo + data.len) & 0x1fffffff) < saved_lo) ctx.hi++;
-	ctx.hi += data.len >> 29;
-
-	usz used = (usz)saved_lo & 0x3f;
-
-	if (used)
-	{
-		usz available = 64 - used;
-
-		if (data.len < available)
-		{
-			ctx.buffer[used:data.len] = data[..];
-			return;
-		}
-		ctx.buffer[used:available] = data[:available];
-		data = data[available..];
-		body(ctx, &ctx.buffer, 64);
-	}
-
-	if (data.len >= 64)
-	{
-		data = body(ctx, data, data.len & ~(usz)0x3f)[:data.len & 0x3f];
-	}
-	ctx.buffer[:data.len] = data[..];
-}
-
-fn char[HASH_BYTES] Md5.final(&ctx)
-{
-	usz used = (usz)ctx.lo & 0x3f;
-	ctx.buffer[used++] = 0x80;
-
-	usz available = 64 - used;
-
-	if (available < 8)
-	{
-		ctx.buffer[used:available] = 0;
-		body(ctx, &ctx.buffer, 64);
-		used = 0;
-		available = 64;
-	}
-	ctx.buffer[used:available - 8] = 0;
-
-	ctx.lo <<= 3;
-	ctx.buffer[56:4] = bitcast(ctx.lo, char[4])[..];
-	ctx.buffer[60:4] = bitcast(ctx.hi, char[4])[..];
-
-	body(ctx, &ctx.buffer, 64);
-
-	char[16] res @noinit;
-	res[0:4] = bitcast(ctx.a, char[4])[..];
-	res[4:4] = bitcast(ctx.b, char[4])[..];
-	res[8:4] = bitcast(ctx.c, char[4])[..];
-	res[12:4] = bitcast(ctx.d, char[4])[..];
-	*ctx = {};
-	return res;
-}
-
-module std::hash::md5 @private;
-
-// Implementation
-macro @f(x, y, z) => z ^ (x & (y ^ z));
-macro @g(x, y, z) => y ^ (z & (x ^ y));
-macro @h(x, y, z) => (x ^ y) ^ z;
-macro @h2(x, y, z) => x ^ (y ^ z);
-macro @i(x, y, z) => y ^ (x | ~z);
-
-macro @step(#f, a, b, c, d, ptr, n, t, s)
-{
-	*a += #f(b, c, d) + @unaligned_load(*(uint *)&ptr[n * 4], 2) + t;
-	*a = (*a << s) | ((*a & 0xffffffff) >> (32 - s));
-	*a += b;
-}
-
-
-fn char* body(Md5* ctx, void* data, usz size)
-{
-	char* ptr;
-	uint a, b, c, d;
-	uint saved_a, saved_b, saved_c, saved_d;
-	ptr = data;
-	a = ctx.a;
-	b = ctx.b;
-	c = ctx.c;
-	d = ctx.d;
-
-	do
-	{
-		saved_a = a;
-		saved_b = b;
-		saved_c = c;
-		saved_d = d;
-
-/* Round 1 */
-		@step(@f, &a, b, c, d, ptr, 0, 0xd76aa478, 7)  ;
-		@step(@f, &d, a, b, c, ptr, 1, 0xe8c7b756, 12) ;
-		@step(@f, &c, d, a, b, ptr, 2, 0x242070db, 17) ;
-		@step(@f, &b, c, d, a, ptr, 3, 0xc1bdceee, 22) ;
-		@step(@f, &a, b, c, d, ptr, 4, 0xf57c0faf, 7)  ;
-		@step(@f, &d, a, b, c, ptr, 5, 0x4787c62a, 12) ;
-		@step(@f, &c, d, a, b, ptr, 6, 0xa8304613, 17) ;
-		@step(@f, &b, c, d, a, ptr, 7, 0xfd469501, 22) ;
-		@step(@f, &a, b, c, d, ptr, 8, 0x698098d8, 7)  ;
-		@step(@f, &d, a, b, c, ptr, 9, 0x8b44f7af, 12) ;
-		@step(@f, &c, d, a, b, ptr, 10, 0xffff5bb1, 17);
-		@step(@f, &b, c, d, a, ptr, 11, 0x895cd7be, 22);
-		@step(@f, &a, b, c, d, ptr, 12, 0x6b901122, 7) ;
-		@step(@f, &d, a, b, c, ptr, 13, 0xfd987193, 12);
-		@step(@f, &c, d, a, b, ptr, 14, 0xa679438e, 17);
-		@step(@f, &b, c, d, a, ptr, 15, 0x49b40821, 22);
-
-/* Round 2 */
-		@step(@g, &a, b, c, d, ptr, 1, 0xf61e2562, 5)  ;
-		@step(@g, &d, a, b, c, ptr, 6, 0xc040b340, 9)  ;
-		@step(@g, &c, d, a, b, ptr, 11, 0x265e5a51, 14);
-		@step(@g, &b, c, d, a, ptr, 0, 0xe9b6c7aa, 20) ;
-		@step(@g, &a, b, c, d, ptr, 5, 0xd62f105d, 5)  ;
-		@step(@g, &d, a, b, c, ptr, 10, 0x02441453, 9) ;
-		@step(@g, &c, d, a, b, ptr, 15, 0xd8a1e681, 14);
-		@step(@g, &b, c, d, a, ptr, 4, 0xe7d3fbc8, 20) ;
-		@step(@g, &a, b, c, d, ptr, 9, 0x21e1cde6, 5)  ;
-		@step(@g, &d, a, b, c, ptr, 14, 0xc33707d6, 9) ;
-		@step(@g, &c, d, a, b, ptr, 3, 0xf4d50d87, 14) ;
-		@step(@g, &b, c, d, a, ptr, 8, 0x455a14ed, 20) ;
-		@step(@g, &a, b, c, d, ptr, 13, 0xa9e3e905, 5) ;
-		@step(@g, &d, a, b, c, ptr, 2, 0xfcefa3f8, 9)  ;
-		@step(@g, &c, d, a, b, ptr, 7, 0x676f02d9, 14) ;
-		@step(@g, &b, c, d, a, ptr, 12, 0x8d2a4c8a, 20);
-
-/* Round 3 */
-		@step(@h,  &a, b, c, d, ptr, 5, 0xfffa3942, 4);
-		@step(@h2, &d, a, b, c, ptr, 8, 0x8771f681, 11);
-		@step(@h,  &c, d, a, b, ptr, 11, 0x6d9d6122, 16);
-		@step(@h2, &b, c, d, a, ptr, 14, 0xfde5380c, 23);
-		@step(@h,  &a, b, c, d, ptr, 1, 0xa4beea44, 4);
-		@step(@h2, &d, a, b, c, ptr, 4, 0x4bdecfa9, 11);
-		@step(@h,  &c, d, a, b, ptr, 7, 0xf6bb4b60, 16);
-		@step(@h2, &b, c, d, a, ptr, 10, 0xbebfbc70, 23);
-		@step(@h,  &a, b, c, d, ptr, 13, 0x289b7ec6, 4)   ;
-		@step(@h2, &d, a, b, c, ptr, 0, 0xeaa127fa, 11)  ;
-		@step(@h,  &c, d, a, b, ptr, 3, 0xd4ef3085, 16)   ;
-		@step(@h2, &b, c, d, a, ptr, 6, 0x04881d05, 23)  ;
-		@step(@h,  &a, b, c, d, ptr, 9, 0xd9d4d039, 4)   ;
-		@step(@h2, &d, a, b, c, ptr, 12, 0xe6db99e5, 11) ;
-		@step(@h,  &c, d, a, b, ptr, 15, 0x1fa27cf8, 16)  ;
-		@step(@h2, &b, c, d, a, ptr, 2, 0xc4ac5665, 23)  ;
-
-/* Round 4 */
-		@step(@i, &a, b, c, d, ptr, 0, 0xf4292244, 6)   ;
-		@step(@i, &d, a, b, c, ptr, 7, 0x432aff97, 10)  ;
-		@step(@i, &c, d, a, b, ptr, 14, 0xab9423a7, 15) ;
-		@step(@i, &b, c, d, a, ptr, 5, 0xfc93a039, 21)  ;
-		@step(@i, &a, b, c, d, ptr, 12, 0x655b59c3, 6)  ;
-		@step(@i, &d, a, b, c, ptr, 3, 0x8f0ccc92, 10)  ;
-		@step(@i, &c, d, a, b, ptr, 10, 0xffeff47d, 15) ;
-		@step(@i, &b, c, d, a, ptr, 1, 0x85845dd1, 21)  ;
-		@step(@i, &a, b, c, d, ptr, 8, 0x6fa87e4f, 6)   ;
-		@step(@i, &d, a, b, c, ptr, 15, 0xfe2ce6e0, 10) ;
-		@step(@i, &c, d, a, b, ptr, 6, 0xa3014314, 15)  ;
-		@step(@i, &b, c, d, a, ptr, 13, 0x4e0811a1, 21) ;
-		@step(@i, &a, b, c, d, ptr, 4, 0xf7537e82, 6)   ;
-		@step(@i, &d, a, b, c, ptr, 11, 0xbd3af235, 10) ;
-		@step(@i, &c, d, a, b, ptr, 2, 0x2ad7d2bb, 15)  ;
-		@step(@i, &b, c, d, a, ptr, 9, 0xeb86d391, 21)  ;
-
-		a += saved_a;
-		b += saved_b;
-		c += saved_c;
-		d += saved_d;
-
-		ptr += 64;
-
-	} while (size -= 64);
-
-	ctx.a = a;
-	ctx.b = b;
-	ctx.c = c;
-	ctx.d = d;
-
-	return ptr;
-}
-
-
-

lib/std/hash/metro128.c3

@@ -1,149 +0,0 @@
-// Copyright (c) 2025 Zack Puhl <github@xmit.xyz>. All rights reserved.
-// Use of this source code is governed by the MIT license
-// a copy of which can be found in the LICENSE_STDLIB file.
-//
-// MetroHash64 and MetroHash128 are different enough to warrant their own
-//   modules, and there would be no reason to create a generic module just
-//   for the two. If you inspect the differences, the only shared portion
-//   of the entire process is the `update` method.
-//
-module std::hash::metro128;
-
-
-const ulong[4] K @local = {
-	0xc83a91e1,
-	0x8648dbdb,
-	0x7bdec03b,
-	0x2f5870a5,
-};
-
-
-struct MetroHash128
-{
-	union
-	{
-		ulong[4] state;
-		uint128 result;
-	}
-	union
-	{
-		ulong[4] stomach_64;
-		char[32] stomach;
-	}
-	ulong bytes;
-}
-
-
-fn uint128 hash(char[] data, ulong seed = 0)
-{
-	MetroHash128 m;
-	m.init(seed);
-	m.update(data);
-	return m.final();
-}
-
-
-fn void MetroHash128.init(&self, ulong seed = 0)
-{
-	self.state = {
-		(seed - K[0]) * K[3],
-		(seed + K[1]) * K[2],
-		(seed + K[0]) * K[2],
-		(seed - K[1]) * K[3],
-	};
-}
-
-
-fn void MetroHash128.update(&self, char[] data)
-{
-	if (self.bytes % 32)   // partial buffer
-	{
-		ulong to_fill = min(data.len, (32 - (self.bytes % 32)));
-
-		self.stomach[(self.bytes % 32):to_fill] = data[:to_fill];
-
-		data = data[to_fill..];
-		self.bytes += to_fill;
-
-		if (self.bytes % 32) return;   // still awaiting more input, or final
-
-		self.state[0] += self.stomach_64[0] * K[0]; self.state[0] = self.state[0].rotr(29) + self.state[2];
-		self.state[1] += self.stomach_64[1] * K[1]; self.state[1] = self.state[1].rotr(29) + self.state[3];
-		self.state[2] += self.stomach_64[2] * K[2]; self.state[2] = self.state[2].rotr(29) + self.state[0];
-		self.state[3] += self.stomach_64[3] * K[3]; self.state[3] = self.state[3].rotr(29) + self.state[1];
-	}
-
-	self.bytes += data.len;
-
-	for (; data.len >= 32; data = data[32:^32])
-	{
-		self.state[0] += @unaligned_load(((ulong*)data.ptr)[0], 1) * K[0]; self.state[0] = self.state[0].rotr(29) + self.state[2];
-		self.state[1] += @unaligned_load(((ulong*)data.ptr)[1], 1) * K[1]; self.state[1] = self.state[1].rotr(29) + self.state[3];
-		self.state[2] += @unaligned_load(((ulong*)data.ptr)[2], 1) * K[2]; self.state[2] = self.state[2].rotr(29) + self.state[0];
-		self.state[3] += @unaligned_load(((ulong*)data.ptr)[3], 1) * K[3]; self.state[3] = self.state[3].rotr(29) + self.state[1];
-	}
-
-	// Gobble up the leftover bytes. Nom nom.
-	if (data.len > 0) self.stomach[:data.len] = data[..];
-}
-
-
-fn uint128 MetroHash128.final(&self)
-{
-	if (self.bytes >= 32)
-	{
-		self.state[2] ^= (((self.state[0] + self.state[3]) * K[0]) + self.state[1]).rotr(21) * K[1];
-		self.state[3] ^= (((self.state[1] + self.state[2]) * K[1]) + self.state[0]).rotr(21) * K[0];
-		self.state[0] ^= (((self.state[0] + self.state[2]) * K[0]) + self.state[3]).rotr(21) * K[1];
-		self.state[1] ^= (((self.state[1] + self.state[3]) * K[1]) + self.state[2]).rotr(21) * K[0];
-	}
-
-	char[] final_data = self.stomach[:(self.bytes % 32)];
-
-	if (final_data.len >= 16)
-	{
-		self.state[0] += ((ulong*)final_data.ptr)[0] * K[2]; self.state[0] = self.state[0].rotr(33) * K[3];
-		self.state[1] += ((ulong*)final_data.ptr)[1] * K[2]; self.state[1] = self.state[1].rotr(33) * K[3];
-		self.state[0] ^= ((self.state[0] * K[2]) + self.state[1]).rotr(45) * K[1];
-		self.state[1] ^= ((self.state[1] * K[3]) + self.state[0]).rotr(45) * K[0];
-
-		final_data = final_data[16:^16];
-	}
-
-	if (final_data.len >= 8)
-	{
-		self.state[0] += @unaligned_load(((ulong*)final_data.ptr)[0], 1) * K[2]; self.state[0] = self.state[0].rotr(33) * K[3];
-		self.state[0] ^= ((self.state[0] * K[2]) + self.state[1]).rotr(27) * K[1];
-
-		final_data = final_data[8:^8];
-	}
-
-	if (final_data.len >= 4)
-	{
-		self.state[1] += @unaligned_load(((uint*)final_data.ptr)[0], 1) * K[2]; self.state[1] = self.state[1].rotr(33) * K[3];
-		self.state[1] ^= ((self.state[1] * K[3]) + self.state[0]).rotr(46) * K[0];
-
-		final_data = final_data[4:^4];
-	}
-
-	if (final_data.len >= 2)
-	{
-		self.state[0] += @unaligned_load(((ushort*)final_data.ptr)[0], 1) * K[2]; self.state[0] = self.state[0].rotr(33) * K[3];
-		self.state[0] ^= ((self.state[0] * K[2]) + self.state[1]).rotr(22) * K[1];
-
-		final_data = final_data[2:^2];
-	}
-
-	if (final_data.len >= 1)
-	{
-		self.state[1] += ((char*)final_data.ptr)[0] * K[2]; self.state[1] = self.state[1].rotr(33) * K[3];
-		self.state[1] ^= ((self.state[1] * K[3]) + self.state[0]).rotr(58) * K[0];
-	}
-
-	self.state[0] += ((self.state[0] * K[0]) + self.state[1]).rotr(13);
-	self.state[1] += ((self.state[1] * K[1]) + self.state[0]).rotr(37);
-	self.state[0] += ((self.state[0] * K[2]) + self.state[1]).rotr(13);
-	self.state[1] += ((self.state[1] * K[3]) + self.state[0]).rotr(37);
-
-	return self.result;
-}