Add path separator.

Installer changes windows.
Prepare for 1.37.0 release.
2025-10-27 21:57:41 +00:00 · 2024-12-05 20:14:33 -06:00 · 2024-12-05 20:11:39 -06:00 · 2024-12-05 17:51:06 -06:00 · 2024-12-03 21:05:37 -06:00 · 2024-12-02 05:46:00 -08:00
79 changed files with 762 additions and 395 deletions
--- a/.builds/linux.yml
+++ b/.builds/linux.yml
@@ -19,3 +19,8 @@ tasks:
    ninja
    ninja test
    sudo ninja install
+- meson_min: |
+    cd janet
+    meson setup build_meson_min --buildtype=release -Dsingle_threaded=true -Dnanbox=false -Ddynamic_modules=false -Ddocstrings=false -Dnet=false -Dsourcemaps=false -Dpeg=false -Dassembler=false -Dint_types=false -Dreduced_os=true -Dffi=false
+    cd build_meson_min
+    ninja
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ ubuntu-latest, macos-13 ]
    steps:
      - name: Checkout the repository
        uses: actions/checkout@master
@@ -39,6 +39,35 @@ jobs:
            build/c/janet.c
            build/c/shell.c

+  release-arm:
+    permissions:
+      contents: write  # for softprops/action-gh-release to create GitHub release
+    name: Build release binaries
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ macos-latest ]
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@master
+      - name: Set the version
+        run: echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+      - name: Set the platform
+        run: echo "platform=$(tr '[A-Z]' '[a-z]' <<< $RUNNER_OS)" >> $GITHUB_ENV
+      - name: Compile the project
+        run: make clean && make
+      - name: Build the artifact
+        run: JANET_DIST_DIR=janet-${{ env.version }}-${{ env.platform }} make build/janet-${{ env.version }}-${{ env.platform }}-aarch64.tar.gz
+      - name: Draft the release
+        uses: softprops/action-gh-release@v1
+        with:
+          draft: true
+          files: |
+            build/*.gz
+            build/janet.h
+            build/c/janet.c
+            build/c/shell.c
+
  release-windows:
    permissions:
      contents: write  # for softprops/action-gh-release to create GitHub release
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ ubuntu-latest, macos-latest, macos-13 ]
    steps:
      - name: Checkout the repository
        uses: actions/checkout@master
@@ -23,7 +23,10 @@ jobs:

  test-windows:
    name: Build and test on Windows
-    runs-on: windows-latest
+    strategy:
+      matrix:
+        os: [ windows-latest, windows-2019 ]
+    runs-on: ${{ matrix.os }}
    steps:
      - name: Checkout the repository
        uses: actions/checkout@master
@@ -35,28 +38,61 @@ jobs:
      - name: Test the project
        shell: cmd
        run: build_win test
+      - name: Test installer build
+        shell: cmd
+        run: build_win dist
+
+  test-windows-min:
+    name: Build and test on Windows Minimal build
+    strategy:
+      matrix:
+        os: [ windows-2019 ]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@master
+      - name: Setup MSVC
+        uses: ilammy/msvc-dev-cmd@v1
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+      - name: Install Python Dependencies
+        run: pip install meson ninja
+      - name: Build
+        shell: cmd
+        run: |
+          meson setup build_meson_min --buildtype=release -Dsingle_threaded=true -Dnanbox=false -Ddynamic_modules=false -Ddocstrings=false -Dnet=false -Dsourcemaps=false -Dpeg=false -Dassembler=false -Dint_types=false -Dreduced_os=true -Dffi=false
+          cd build_meson_min
+          ninja

  test-mingw:
-    name: Build on Windows with Mingw (no test yet)
+    name: Build on Windows with Mingw
    runs-on: windows-latest
    defaults:
      run:
        shell: msys2 {0}
+    strategy:
+      matrix:
+        msystem: [ UCRT64, CLANG64 ]
    steps:
      - name: Checkout the repository
        uses: actions/checkout@master
      - name: Setup Mingw
        uses: msys2/setup-msys2@v2
        with:
-          msystem: UCRT64
+          msystem: ${{ matrix.msystem }}
          update: true
          install: >-
            base-devel
            git
            gcc
-      - name: Build the project
+      - name: Build
        shell: cmd
-        run: make -j4 CC=gcc JANET_NO_AMALG=1
+        run: make -j4 CC=gcc
+      - name: Test
+        shell: cmd
+        run: make -j4 CC=gcc test

  test-mingw-linux:
    name: Build and test with Mingw on Linux + Wine
@@ -86,6 +122,17 @@ jobs:
          sudo apt-get update
          sudo apt-get install gcc-arm-linux-gnueabi qemu-user
      - name: Compile the project
-        run: make RUN="qemu-arm -L /usr/arm-linux-gnueabi/" CC=arm-linux-gnueabi-gcc LD=arm-linux-gnueabi-gcc 
+        run: make RUN="qemu-arm -L /usr/arm-linux-gnueabi/" CC=arm-linux-gnueabi-gcc LD=arm-linux-gnueabi-gcc
      - name: Test the project
        run: make RUN="qemu-arm -L /usr/arm-linux-gnueabi/" SUBRUN="qemu-arm -L /usr/arm-linux-gnueabi/" test VERBOSE=1
+
+  test-s390x-linux:
+    name: Build and test s390x in qemu
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the repository
+      uses: actions/checkout@master
+    - name: Do Qemu build and test
+      run: |
+        docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+        docker run --rm -v .:/janet --platform linux/s390x ubuntu bash -c "apt-get -y update && apt-get -y install git build-essential && cd /janet && make -j3 && make test"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,18 +1,35 @@
 # Changelog
 All notable changes to this project will be documented in this file.

-## Unreleased - ???
+## 1.37.0 - 2024-12-05
+- Fix meson cross compilation
+- Update timeout documentation for networking APIs: timeouts raise errors and do not return nil.
+- Add `janet_addtimeout_nil(double sec);` to the C API.
+- Change string hashing.
+- Fix string equality bug.
+- Add `assertf`
+- Change how JANET_PROFILE is loaded to allow more easily customizing the environment.
+- Add `*repl-prompt*` dynamic binding to allow customizing the built in repl.
+- Add multiple path support in the `JANET_PATH` environment variables. This lets
+  user more easily import modules from many directories.
+- Add `nth` and `only-tags` PEG specials to select from sub-captures while
+  dropping the rest.
+
+## 1.36.0 - 2024-09-07
+- Improve error messages in `bundle/add*` functions.
+- Add CI testing and verify tests pass on the s390x architecture.
 - Save `:source-form` in environment entries when `*debug*` is set.
- Add experimental `filewatch/` module for listening to file system changes.
+- Add experimental `filewatch/` module for listening to file system changes on Linux and Windows.
 - Add `bundle/who-is` to query which bundle a file on disk was installed by.
 - Add `geomean` function
 - Add `:R` and `:W` flags to `os/pipe` to create blocking pipes on Posix and Windows systems.
  These streams cannot be directly read to and written from, but can be passed to subprocesses.
 - Add `array/join`
 - Add `tuple/join`
- Fix marshalling weak tables and weak arrays.
- Expose C functions for constructing weak tables in janet.h
 - Add `bundle/add-bin` to make installing scripts easier. This also establishes a packaging convention for it.
+- Fix marshalling weak tables and weak arrays.
+- Fix bug in `ev/` module that could accidentally close sockets on accident.
+- Expose C functions for constructing weak tables in janet.h
 - Let range take non-integer values.

 ## 1.35.2 - 2024-06-16
--- a/13
+++ b/13
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Calvin Rose
+# Copyright (c) 2024 Calvin Rose
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -43,6 +43,7 @@ JANET_DIST_DIR?=janet-dist
 JANET_BOOT_FLAGS:=. JANET_PATH '$(JANET_PATH)'
 JANET_TARGET_OBJECTS=build/janet.o build/shell.o
 JPM_TAG?=master
+SPORK_TAG?=master
 HAS_SHARED?=1
 DEBUGGER=gdb
 SONAME_SETTER=-Wl,-soname,
@@ -205,9 +206,9 @@ build/%.bin.o: src/%.c $(JANET_HEADERS) $(JANET_LOCAL_HEADERS) Makefile
 ########################

 ifeq ($(UNAME), Darwin)
-SONAME=libjanet.1.35.dylib
+SONAME=libjanet.1.37.dylib
 else
-SONAME=libjanet.so.1.35
+SONAME=libjanet.so.1.37
 endif

 build/c/shell.c: src/mainclient/shell.c
@@ -359,6 +360,12 @@ install-jpm-git: $(JANET_TARGET)
 		JANET_LIBPATH='$(LIBDIR)' \
 		$(RUN) ../../$(JANET_TARGET) ./bootstrap.janet

+install-spork-git: $(JANET_TARGET)
+	mkdir -p build
+	rm -rf build/spork
+	git clone --depth=1 --branch='$(SPORK_TAG)' https://github.com/janet-lang/spork.git build/spork
+	$(JANET_TARGET) -e '(bundle/install "build/spork")'
+
 uninstall:
 	-rm '$(DESTDIR)$(BINDIR)/janet'
 	-rm -rf '$(DESTDIR)$(INCLUDEDIR)/janet'
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Join the chat](https://badges.gitter.im/janet-language/community.svg)](https://gitter.im/janet-language/community)
+[![Join the chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://janet.zulipchat.com)
 &nbsp;
 [![builds.sr.ht status](https://builds.sr.ht/~bakpakin/janet/commits/master/freebsd.yml.svg)](https://builds.sr.ht/~bakpakin/janet/commits/master/freebsd.yml?)
 [![builds.sr.ht status](https://builds.sr.ht/~bakpakin/janet/commits/master/openbsd.yml.svg)](https://builds.sr.ht/~bakpakin/janet/commits/master/openbsd.yml?)
@@ -18,9 +18,6 @@ to run script files. This client program is separate from the core runtime, so
 Janet can be embedded in other programs. Try Janet in your browser at
 <https://janet-lang.org>.

-If you'd like to financially support the ongoing development of Janet, consider
-[sponsoring its primary author](https://github.com/sponsors/bakpakin) through GitHub.
-
 <br>

 ## Examples
@@ -253,8 +250,10 @@ Emacs, and Atom each have syntax packages for the Janet language, though.

 ## Installation

-See the [Introduction](https://janet-lang.org/docs/index.html) for more details. If you just want
-to try out the language, you don't need to install anything. You can also move the `janet` executable wherever you want on your system and run it.
+If you just want to try out the language, you don't need to install anything.
+In this case you can also move the `janet` executable wherever you want on
+your system and run it.  However, for a fuller setup, please see the
+[Introduction](https://janet-lang.org/docs/index.html) for more details.

 ## Usage

--- a/build_win.bat
+++ b/build_win.bat
@@ -121,7 +121,6 @@ copy README.md dist\README.md

 copy janet.lib dist\janet.lib
 copy janet.exp dist\janet.exp
-copy janet.def dist\janet.def

 janet.exe tools\patch-header.janet src\include\janet.h src\conf\janetconf.h build\janet.h
 copy build\janet.h dist\janet.h
@@ -139,7 +138,8 @@ if defined APPVEYOR_REPO_TAG_NAME (
    set RELEASE_VERSION=%JANET_VERSION%
 )
 if defined CI (
-    set WIXBIN="c:\Program Files (x86)\WiX Toolset v3.11\bin\"
+    set WIXBIN="%WIX%bin\"
+    echo WIXBIN = %WIXBIN%
 ) else (
    set WIXBIN=
 )
--- a/examples/chatserver.janet
+++ b/examples/chatserver.janet
@@ -30,7 +30,6 @@
  (printf "STARTING SERVER...")
  (flush)
  (def my-server (net/listen "127.0.0.1" "8000"))
-  '(handler (net/accept my-server))
  (forever
   (def connection (net/accept my-server))
   (ev/call handler connection)))
--- a/examples/sample-bad-bundle/badmod.janet
+++ b/examples/sample-bad-bundle/badmod.janet
@@ -0,0 +1 @@
+(def abc 123)
--- a/examples/sample-bad-bundle/bundle.janet
+++ b/examples/sample-bad-bundle/bundle.janet
@@ -0,0 +1,7 @@
+(defn install
+  [manifest &]
+  (bundle/add-file manifest "badmod.janet"))
+
+(defn check
+  [&]
+  (error "Check failed!"))
--- a/janet.1
+++ b/janet.1
@@ -255,7 +255,8 @@ and then arguments to the script.
 .RS
 The location to look for Janet libraries. This is the only environment variable Janet needs to
 find native and source code modules. If no JANET_PATH is set, Janet will look in
-the default location set at compile time.
+the default location set at compile time. This should be a list of as well as a colon
+separate list of such directories.
 .RE

 .B JANET_PROFILE
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Calvin Rose and contributors
+# Copyright (c) 2024 Calvin Rose and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -20,14 +20,23 @@

 project('janet', 'c',
  default_options : ['c_std=c99', 'build.c_std=c99', 'b_lundef=false', 'default_library=both'],
-  version : '1.35.2')
+  version : '1.37.0')

 # Global settings
 janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet')
 header_path = join_paths(get_option('prefix'), get_option('includedir'), 'janet')

-# Link math library on all systems
+# Compilers
 cc = meson.get_compiler('c')
+native_cc = meson.get_compiler('c', native : true)
+
+# Native deps
+native_m_dep = native_cc.find_library('m', required : false)
+native_dl_dep = native_cc.find_library('dl', required : false)
+native_android_spawn_dep = native_cc.find_library('android-spawn', required : false)
+native_thread_dep = dependency('threads', native : true)
+
+# Deps
 m_dep = cc.find_library('m', required : false)
 dl_dep = cc.find_library('dl', required : false)
 android_spawn_dep = cc.find_library('android-spawn', required : false)
@@ -164,11 +173,18 @@ mainclient_src = [
  'src/mainclient/shell.c'
 ]

+janet_dependencies = [m_dep, dl_dep, android_spawn_dep]
+janet_native_dependencies = [native_m_dep, native_dl_dep, native_android_spawn_dep]
+if not get_option('single_threaded')
+  janet_dependencies += thread_dep
+  janet_native_dependencies += native_thread_dep
+endif
+
 # Build boot binary
 janet_boot = executable('janet-boot', core_src, boot_src,
  include_directories : incdir,
  c_args : '-DJANET_BOOTSTRAP',
-  dependencies : [m_dep, dl_dep, thread_dep, android_spawn_dep],
+  dependencies : janet_native_dependencies,
  native : true)

 # Build janet.c
@@ -181,11 +197,6 @@ janetc = custom_target('janetc',
    'JANET_PATH', janet_path
  ])

-janet_dependencies = [m_dep, dl_dep, android_spawn_dep]
-if not get_option('single_threaded')
-  janet_dependencies += thread_dep
-endif
-
 # Allow building with no shared library
 if cc.has_argument('-fvisibility=hidden')
  lib_cflags = ['-fvisibility=hidden']
@@ -231,7 +242,7 @@ if meson.is_cross_build()
  endif
  janet_nativeclient = executable('janet-native', janetc, mainclient_src,
    include_directories : incdir,
-    dependencies : janet_dependencies,
+    dependencies : janet_native_dependencies,
    c_args : extra_native_cflags,
    native : true)
 else
--- a/src/boot/array_test.c
+++ b/src/boot/array_test.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/boot/boot.c
+++ b/src/boot/boot.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/boot/boot.janet
+++ b/src/boot/boot.janet
@@ -204,6 +204,16 @@
  [fmt & args]
  (error (string/format fmt ;args)))

+(defmacro assertf
+  "Convenience macro that combines `assert` and `string/format`."
+  [x fmt & args]
+  (def v (gensym))
+  ~(do
+     (def ,v ,x)
+     (if ,v
+       ,v
+       (,errorf ,fmt ,;args))))
+
 (defmacro default
  ``Define a default value for an optional argument.
  Expands to `(def sym (if (= nil sym) val sym))`.``
@@ -1853,6 +1863,9 @@
 (defdyn *pretty-format*
  "Format specifier for the `pp` function")

+(defdyn *repl-prompt*
+  "Allow setting a custom prompt at the default REPL. Not all REPLs will respect this binding.")
+
 (defn pp
  ``Pretty-print to stdout or `(dyn *out*)`. The format string used is `(dyn *pretty-format* "%q")`.``
  [x]
@@ -2652,7 +2665,6 @@

      (do
        (var pindex 0)
-        (var pstatus nil)
        (def len (length buf))
        (when (= len 0)
          (:eof p)
@@ -2827,6 +2839,24 @@
  (array/insert mp curall-index [(string ":cur:/:all:" ext) loader check-relative])
  mp)

+# Don't expose this externally yet - could break if custom module/paths is setup.
+(defn- module/add-syspath
+  ```
+  Add a custom syspath to `module/paths` by duplicating all entries that being with `:sys:` and
+  adding duplicates with a specific path prefix instead.
+  ```
+  [path]
+  (def copies @[])
+  (var last-index 0)
+  (def mp (dyn *module-paths* module/paths))
+  (eachp [index entry] mp
+    (def pattern (first entry))
+    (when (and (string? pattern) (string/has-prefix? ":sys:/" pattern))
+      (set last-index index)
+      (array/push copies [(string/replace ":sys:" path pattern) ;(drop 1 entry)])))
+   (array/insert mp (+ 1 last-index) ;copies)
+   mp)
+
 (module/add-paths ":native:" :native)
 (module/add-paths "/init.janet" :source)
 (module/add-paths ".janet" :source)
@@ -3913,7 +3943,7 @@
    (defn make-sig []
      (ffi/signature :default real-ret-type ;computed-type-args))
    (defn make-ptr []
-      (assert (ffi/lookup (if lazy (llib) lib) raw-symbol) (string "failed to find ffi symbol " raw-symbol)))
+      (assertf (ffi/lookup (if lazy (llib) lib) raw-symbol) "failed to find ffi symbol %v" raw-symbol))
    (if lazy
      ~(defn ,alias ,;meta [,;formal-args]
         (,ffi/call (,(delay (make-ptr))) (,(delay (make-sig))) ,;formal-args))
@@ -4056,15 +4086,18 @@

  (defn- copyfile
    [from to]
-    (def mode (os/stat from :permissions))
-    (def b (buffer/new 0x10000))
-    (with [ffrom (file/open from :rb)]
-      (with [fto (file/open to :wb)]
-        (forever
-          (file/read ffrom 0x10000 b)
-          (when (empty? b) (buffer/trim b) (os/chmod to mode) (break))
-          (file/write fto b)
-          (buffer/clear b)))))
+    (if-with [ffrom (file/open from :rb)]
+      (if-with [fto (file/open to :wb)]
+        (do
+          (def perm (os/stat from :permissions))
+          (def b (buffer/new 0x10000))
+          (forever
+            (file/read ffrom 0x10000 b)
+            (when (empty? b) (buffer/trim b) (os/chmod to perm) (break))
+            (file/write fto b)
+            (buffer/clear b)))
+         (errorf "destination file %s cannot be opened for writing" to))
+      (errorf "source file %s cannot be opened for reading" from)))

  (defn- copyrf
    [from to]
@@ -4087,7 +4120,7 @@
    "Get the manifest for a give installed bundle"
    [bundle-name]
    (def name (get-manifest-filename bundle-name))
-    (assert (fexists name) (string "no bundle " bundle-name " found"))
+    (assertf (fexists name) "no bundle %v found" bundle-name)
    (parse (slurp name)))

  (defn- get-bundle-module
@@ -4230,11 +4263,9 @@
      (def missing (seq [d :in deps :when (not (bundle/installed? d))] (string d)))
      (when (next missing) (errorf "missing dependencies %s" (string/join missing ", "))))
    (def bundle-name (get config :name default-bundle-name))
-    (assert bundle-name (errorf "unable to infer bundle name for %v, use :name argument" path))
-    (assert (not (string/check-set "\\/" bundle-name))
-            (string "bundle name "
-                    bundle-name
-                    " cannot contain path separators"))
+    (assertf bundle-name "unable to infer bundle name for %v, use :name argument" path)
+    (assertf (not (string/check-set "\\/" bundle-name))
+             "bundle name %v cannot contain path separators" bundle-name)
    (assert (next bundle-name) "cannot use empty bundle-name")
    (assert (not (fexists (get-manifest-filename bundle-name)))
            "bundle is already installed")
@@ -4271,10 +4302,10 @@
        (do-hook module bundle-name :clean man))
      (do-hook module bundle-name :build man)
      (do-hook module bundle-name :install man)
-      (when check
-        (do-hook module bundle-name :check man))
      (if (empty? (get man :files)) (print "no files installed, is this a valid bundle?"))
-      (sync-manifest man))
+      (sync-manifest man)
+      (when check
+        (do-hook module bundle-name :check man)))
    (print "installed " bundle-name)
    bundle-name)

@@ -4286,7 +4317,7 @@
    (var i 0)
    (def man (bundle/manifest bundle-name))
    (def files (get man :files @[]))
-    (assert (os/mkdir dest-dir) (string "could not create directory " dest-dir " (or it already exists)"))
+    (assertf (os/mkdir dest-dir) "could not create directory %v (or it already exists)" dest-dir)
    (def s (sep))
    (os/mkdir (string dest-dir s "bundle"))
    (def install-hook (string dest-dir s "bundle" s "init.janet"))
@@ -4382,12 +4413,15 @@
    [manifest src &opt dest chmod-mode]
    (default dest src)
    (def s (sep))
-    (case (os/stat src :mode)
+    (def mode (os/stat src :mode))
+    (if-not mode (errorf "file %s does not exist" src))
+    (case mode
      :directory
      (let [absdest (bundle/add-directory manifest dest chmod-mode)]
        (each d (os/dir src) (bundle/add manifest (string src s d) (string dest s d) chmod-mode))
        absdest)
-      :file (bundle/add-file manifest src dest chmod-mode)))
+      :file (bundle/add-file manifest src dest chmod-mode)
+      (errorf "bad path %s - file is a %s" src mode)))

  (defn bundle/add-bin
    `Shorthand for adding scripts during an install. Scripts will be installed to
@@ -4482,7 +4516,12 @@
  (var error-level nil)
  (var expect-image false)

-  (if-let [jp (getenv-alias "JANET_PATH")] (setdyn *syspath* jp))
+  (when-let [jp (getenv-alias "JANET_PATH")]
+    (def path-sep (if (index-of (os/which) [:windows :mingw]) ";" ":"))
+    (def paths (reverse! (string/split path-sep jp)))
+    (for i 1 (length paths)
+      (module/add-syspath (get paths i)))
+    (setdyn *syspath* (first paths)))
  (if-let [jprofile (getenv-alias "JANET_PROFILE")] (setdyn *profilepath* jprofile))
  (set colorize (and
                  (not (getenv-alias "NO_COLOR"))
@@ -4614,17 +4653,15 @@
        (if-not quiet
          (print "Janet " janet/version "-" janet/build " " (os/which) "/" (os/arch) "/" (os/compiler) " - '(doc)' for help"))
        (flush)
+        (def env (make-env))
        (defn getprompt [p]
+          (when-let [custom-prompt (get env *repl-prompt*)] (break (custom-prompt p)))
          (def [line] (parser/where p))
          (string "repl:" line ":" (parser/state p :delimiters) "> "))
        (defn getstdin [prompt buf _]
          (file/write stdout prompt)
          (file/flush stdout)
          (file/read stdin :line buf))
-        (def env (make-env))
-        (when-let [profile.janet (dyn *profilepath*)]
-          (def new-env (dofile profile.janet :exit true))
-          (merge-module env new-env "" false))
        (when debug-flag
          (put env *debug* true)
          (put env *redef* true))
@@ -4636,6 +4673,9 @@
        (setdyn *doc-color* (if colorize true))
        (setdyn *lint-error* error-level)
        (setdyn *lint-warn* error-level)
+        (when-let [profile.janet (dyn *profilepath*)]
+          (dofile profile.janet :exit true :env env)
+          (put env *current-file* nil))
        (repl getchunk nil env)))))

 ###
--- a/src/boot/buffer_test.c
+++ b/src/boot/buffer_test.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/boot/number_test.c
+++ b/src/boot/number_test.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/boot/system_test.c
+++ b/src/boot/system_test.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/boot/table_test.c
+++ b/src/boot/table_test.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/conf/janetconf.h
+++ b/src/conf/janetconf.h
@@ -4,10 +4,10 @@
 #define JANETCONF_H

 #define JANET_VERSION_MAJOR 1
-#define JANET_VERSION_MINOR 36
+#define JANET_VERSION_MINOR 37
 #define JANET_VERSION_PATCH 0
-#define JANET_VERSION_EXTRA "-dev"
-#define JANET_VERSION "1.36.0-dev"
+#define JANET_VERSION_EXTRA ""
+#define JANET_VERSION "1.37.0"

 /* #define JANET_BUILD "local" */

--- a/src/core/abstract.c
+++ b/src/core/abstract.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/array.c
+++ b/src/core/array.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/asm.c
+++ b/src/core/asm.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/buffer.c
+++ b/src/core/buffer.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -371,17 +371,15 @@ JANET_CORE_FN(cfun_buffer_push_uint16,
    janet_fixarity(argc, 3);
    JanetBuffer *buffer = janet_getbuffer(argv, 0);
    int reverse = should_reverse_bytes(argv, 1);
-    union {
-        uint16_t data;
-        uint8_t bytes[2];
-    } u;
-    u.data = janet_getuinteger16(argv, 2);
+    uint16_t data = janet_getuinteger16(argv, 2);
+    uint8_t bytes[sizeof(data)];
+    memcpy(bytes, &data, sizeof(bytes));
    if (reverse) {
-        uint8_t temp = u.bytes[1];
-        u.bytes[1] = u.bytes[0];
-        u.bytes[0] = temp;
+        uint8_t temp = bytes[1];
+        bytes[1] = bytes[0];
+        bytes[0] = temp;
    }
-    janet_buffer_push_u16(buffer, *(uint16_t *) u.bytes);
+    janet_buffer_push_bytes(buffer, bytes, sizeof(bytes));
    return argv[0];
 }

@@ -392,14 +390,12 @@ JANET_CORE_FN(cfun_buffer_push_uint32,
    janet_fixarity(argc, 3);
    JanetBuffer *buffer = janet_getbuffer(argv, 0);
    int reverse = should_reverse_bytes(argv, 1);
-    union {
-        uint32_t data;
-        uint8_t bytes[4];
-    } u;
-    u.data = janet_getuinteger(argv, 2);
+    uint32_t data = janet_getuinteger(argv, 2);
+    uint8_t bytes[sizeof(data)];
+    memcpy(bytes, &data, sizeof(bytes));
    if (reverse)
-        reverse_u32(u.bytes);
-    janet_buffer_push_u32(buffer, *(uint32_t *) u.bytes);
+        reverse_u32(bytes);
+    janet_buffer_push_bytes(buffer, bytes, sizeof(bytes));
    return argv[0];
 }

@@ -410,14 +406,12 @@ JANET_CORE_FN(cfun_buffer_push_uint64,
    janet_fixarity(argc, 3);
    JanetBuffer *buffer = janet_getbuffer(argv, 0);
    int reverse = should_reverse_bytes(argv, 1);
-    union {
-        uint64_t data;
-        uint8_t bytes[8];
-    } u;
-    u.data = janet_getuinteger64(argv, 2);
+    uint64_t data = janet_getuinteger64(argv, 2);
+    uint8_t bytes[sizeof(data)];
+    memcpy(bytes, &data, sizeof(bytes));
    if (reverse)
-        reverse_u64(u.bytes);
-    janet_buffer_push_u64(buffer, *(uint64_t *) u.bytes);
+        reverse_u64(bytes);
+    janet_buffer_push_bytes(buffer, bytes, sizeof(bytes));
    return argv[0];
 }

@@ -428,14 +422,12 @@ JANET_CORE_FN(cfun_buffer_push_float32,
    janet_fixarity(argc, 3);
    JanetBuffer *buffer = janet_getbuffer(argv, 0);
    int reverse = should_reverse_bytes(argv, 1);
-    union {
-        float data;
-        uint8_t bytes[4];
-    } u;
-    u.data = (float) janet_getnumber(argv, 2);
+    float data = (float) janet_getnumber(argv, 2);
+    uint8_t bytes[sizeof(data)];
+    memcpy(bytes, &data, sizeof(bytes));
    if (reverse)
-        reverse_u32(u.bytes);
-    janet_buffer_push_u32(buffer, *(uint32_t *) u.bytes);
+        reverse_u32(bytes);
+    janet_buffer_push_bytes(buffer, bytes, sizeof(bytes));
    return argv[0];
 }

@@ -446,14 +438,12 @@ JANET_CORE_FN(cfun_buffer_push_float64,
    janet_fixarity(argc, 3);
    JanetBuffer *buffer = janet_getbuffer(argv, 0);
    int reverse = should_reverse_bytes(argv, 1);
-    union {
-        double data;
-        uint8_t bytes[8];
-    } u;
-    u.data = janet_getnumber(argv, 2);
+    double data = janet_getnumber(argv, 2);
+    uint8_t bytes[sizeof(data)];
+    memcpy(bytes, &data, sizeof(bytes));
    if (reverse)
-        reverse_u64(u.bytes);
-    janet_buffer_push_u64(buffer, *(uint64_t *) u.bytes);
+        reverse_u64(bytes);
+    janet_buffer_push_bytes(buffer, bytes, sizeof(bytes));
    return argv[0];
 }

--- a/src/core/bytecode.c
+++ b/src/core/bytecode.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/capi.c
+++ b/src/core/capi.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -31,11 +31,13 @@
 #ifndef JANET_SINGLE_THREADED
 #ifndef JANET_WINDOWS
 #include <pthread.h>
-#else
-#include <windows.h>
 #endif
 #endif

+#ifdef JANET_WINDOWS
+#include <windows.h>
+#endif
+
 #ifdef JANET_USE_STDATOMIC
 #include <stdatomic.h>
 /* We don't need stdatomic on most compilers since we use compiler builtins for atomic operations.
@@ -546,8 +548,8 @@ void *janet_optabstract(const Janet *argv, int32_t argc, int32_t n, const JanetA
 /* Atomic refcounts */

 JanetAtomicInt janet_atomic_inc(JanetAtomicInt volatile *x) {
-#ifdef JANET_WINDOWS
-    return InterlockedIncrement(x);
+#ifdef _MSC_VER
+    return _InterlockedIncrement(x);
 #elif defined(JANET_USE_STDATOMIC)
    return atomic_fetch_add_explicit(x, 1, memory_order_relaxed) + 1;
 #else
@@ -556,8 +558,8 @@ JanetAtomicInt janet_atomic_inc(JanetAtomicInt volatile *x) {
 }

 JanetAtomicInt janet_atomic_dec(JanetAtomicInt volatile *x) {
-#ifdef JANET_WINDOWS
-    return InterlockedDecrement(x);
+#ifdef _MSC_VER
+    return _InterlockedDecrement(x);
 #elif defined(JANET_USE_STDATOMIC)
    return atomic_fetch_add_explicit(x, -1, memory_order_acq_rel) - 1;
 #else
@@ -566,8 +568,8 @@ JanetAtomicInt janet_atomic_dec(JanetAtomicInt volatile *x) {
 }

 JanetAtomicInt janet_atomic_load(JanetAtomicInt volatile *x) {
-#ifdef JANET_WINDOWS
-    return InterlockedOr(x, 0);
+#ifdef _MSC_VER
+    return _InterlockedOr(x, 0);
 #elif defined(JANET_USE_STDATOMIC)
    return atomic_load_explicit(x, memory_order_acquire);
 #else
--- a/src/core/cfuns.c
+++ b/src/core/cfuns.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/compile.c
+++ b/src/core/compile.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/compile.h
+++ b/src/core/compile.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/corelib.c
+++ b/src/core/corelib.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -700,7 +700,15 @@ JANET_CORE_FN(janet_core_is_lengthable,

 JANET_CORE_FN(janet_core_signal,
              "(signal what x)",
-              "Raise a signal with payload x. ") {
+              "Raise a signal with payload x. `what` can be an integer\n"
+              "from 0 through 7 indicating user(0-7), or one of:\n\n"
+              "* :ok\n"
+              "* :error\n"
+              "* :debug\n"
+              "* :yield\n"
+              "* :user(0-7)\n"
+              "* :interrupt\n"
+              "* :await") {
    janet_arity(argc, 1, 2);
    Janet payload = argc == 2 ? argv[1] : janet_wrap_nil();
    if (janet_checkint(argv[0])) {
--- a/src/core/debug.c
+++ b/src/core/debug.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/emit.c
+++ b/src/core/emit.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/emit.h
+++ b/src/core/emit.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/ev.c
+++ b/src/core/ev.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -625,6 +625,18 @@ void janet_addtimeout(double sec) {
    add_timeout(to);
 }

+/* Set timeout for the current root fiber but resume with nil instead of raising an error */
+void janet_addtimeout_nil(double sec) {
+    JanetFiber *fiber = janet_vm.root_fiber;
+    JanetTimeout to;
+    to.when = ts_delta(ts_now(), sec);
+    to.fiber = fiber;
+    to.curr_fiber = NULL;
+    to.sched_id = fiber->sched_id;
+    to.is_error = 0;
+    add_timeout(to);
+}
+
 void janet_ev_inc_refcount(void) {
    janet_atomic_inc(&janet_vm.listener_count);
 }
--- a/src/core/features.h
+++ b/src/core/features.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/ffi.c
+++ b/src/core/ffi.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -400,7 +400,7 @@ static JanetFFIStruct *build_struct_type(int32_t argc, const Janet *argv) {

    JanetFFIStruct *st = janet_abstract(&janet_struct_type,
                                        sizeof(JanetFFIStruct) + argc * sizeof(JanetFFIStructMember));
-    st->field_count = member_count;
+    st->field_count = 0;
    st->size = 0;
    st->align = 1;
    if (argc == 0) {
@@ -418,6 +418,7 @@ static JanetFFIStruct *build_struct_type(int32_t argc, const Janet *argv) {
        st->fields[i].type = decode_ffi_type(argv[j]);
        size_t el_size = type_size(st->fields[i].type);
        size_t el_align = type_align(st->fields[i].type);
+        if (el_align <= 0) janet_panicf("bad field type %V", argv[j]);
        if (all_packed || pack_one) {
            if (st->size % el_align != 0) is_aligned = 0;
            st->fields[i].offset = st->size;
@@ -433,6 +434,7 @@ static JanetFFIStruct *build_struct_type(int32_t argc, const Janet *argv) {
    st->size += (st->align - 1);
    st->size /= st->align;
    st->size *= st->align;
+    st->field_count = member_count;
    return st;
 }

--- a/src/core/fiber.c
+++ b/src/core/fiber.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/fiber.h
+++ b/src/core/fiber.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/filewatch.c
+++ b/src/core/filewatch.c
@@ -47,7 +47,7 @@ typedef struct {
 #ifndef JANET_WINDOWS
    JanetStream *stream;
 #endif
-    JanetTable* watch_descriptors;
+    JanetTable *watch_descriptors;
    JanetChannel *channel;
    uint32_t default_flags;
    int is_watching;
@@ -85,9 +85,9 @@ static uint32_t decode_watch_flags(const Janet *options, int32_t n) {
        }
        JanetKeyword keyw = janet_unwrap_keyword(options[i]);
        const JanetWatchFlagName *result = janet_strbinsearch(watcher_flags_linux,
-                sizeof(watcher_flags_linux) / sizeof(JanetWatchFlagName),
-                sizeof(JanetWatchFlagName),
-                keyw);
+                                           sizeof(watcher_flags_linux) / sizeof(JanetWatchFlagName),
+                                           sizeof(JanetWatchFlagName),
+                                           keyw);
        if (!result) {
            janet_panicf("unknown inotify flag %v", options[i]);
        }
@@ -154,99 +154,97 @@ static void watcher_callback_read(JanetFiber *fiber, JanetAsyncEvent event) {
            janet_schedule(fiber, janet_wrap_nil());
            janet_async_end(fiber);
            break;
-        case JANET_ASYNC_EVENT_ERR:
-            {
-                janet_schedule(fiber, janet_wrap_nil());
+        case JANET_ASYNC_EVENT_ERR: {
+            janet_schedule(fiber, janet_wrap_nil());
+            janet_async_end(fiber);
+            break;
+        }
+    read_more:
+        case JANET_ASYNC_EVENT_HUP:
+        case JANET_ASYNC_EVENT_INIT:
+        case JANET_ASYNC_EVENT_READ: {
+            Janet name = janet_wrap_nil();
+
+            /* Assumption - read will never return partial events *
+             * From documentation:
+             *
+             * The behavior when the buffer given to read(2) is too small to
+             * return information about the next event depends on the kernel
+             * version: before Linux 2.6.21, read(2) returns 0; since Linux
+             * 2.6.21, read(2) fails with the error EINVAL.  Specifying a buffer
+             * of size
+             *
+             *     sizeof(struct inotify_event) + NAME_MAX + 1
+             *
+             * will be sufficient to read at least one event. */
+            ssize_t nread;
+            do {
+                nread = read(stream->handle, buf, sizeof(buf));
+            } while (nread == -1 && errno == EINTR);
+
+            /* Check for errors - special case errors that can just be waited on to fix */
+            if (nread == -1) {
+                if (errno == EAGAIN || errno == EWOULDBLOCK) {
+                    break;
+                }
+                janet_cancel(fiber, janet_ev_lasterr());
+                fiber->ev_state = NULL;
                janet_async_end(fiber);
                break;
            }
-    read_more:
-    case JANET_ASYNC_EVENT_HUP:
-    case JANET_ASYNC_EVENT_INIT:
-    case JANET_ASYNC_EVENT_READ:
-            {
-                Janet name = janet_wrap_nil();
+            if (nread < (ssize_t) sizeof(struct inotify_event)) break;

-                /* Assumption - read will never return partial events *
-                 * From documentation:
-                 *
-                 * The behavior when the buffer given to read(2) is too small to
-                 * return information about the next event depends on the kernel
-                 * version: before Linux 2.6.21, read(2) returns 0; since Linux
-                 * 2.6.21, read(2) fails with the error EINVAL.  Specifying a buffer
-                 * of size
-                 *
-                 *     sizeof(struct inotify_event) + NAME_MAX + 1
-                 *
-                 * will be sufficient to read at least one event. */
-                ssize_t nread;
-                do {
-                    nread = read(stream->handle, buf, sizeof(buf));
-                } while (nread == -1 && errno == EINTR);
-
-                /* Check for errors - special case errors that can just be waited on to fix */
-                if (nread == -1) {
-                    if (errno == EAGAIN || errno == EWOULDBLOCK) {
-                        break;
-                    }
-                    janet_cancel(fiber, janet_ev_lasterr());
-                    fiber->ev_state = NULL;
-                    janet_async_end(fiber);
-                    break;
+            /* Iterate through all events read from the buffer */
+            char *cursor = buf;
+            while (cursor < buf + nread) {
+                struct inotify_event inevent;
+                memcpy(&inevent, cursor, sizeof(inevent));
+                cursor += sizeof(inevent);
+                /* Read path of inevent */
+                if (inevent.len) {
+                    name = janet_cstringv(cursor);
+                    cursor += inevent.len;
                }
-                if (nread < (ssize_t) sizeof(struct inotify_event)) break;

-                /* Iterate through all events read from the buffer */
-                char *cursor = buf;
-                while (cursor < buf + nread) {
-                    struct inotify_event inevent;
-                    memcpy(&inevent, cursor, sizeof(inevent));
-                    cursor += sizeof(inevent);
-                    /* Read path of inevent */
-                    if (inevent.len) {
-                        name = janet_cstringv(cursor);
-                        cursor += inevent.len;
+                /* Got an event */
+                Janet path = janet_table_get(watcher->watch_descriptors, janet_wrap_integer(inevent.wd));
+                JanetKV *event = janet_struct_begin(6);
+                janet_struct_put(event, janet_ckeywordv("wd"), janet_wrap_integer(inevent.wd));
+                janet_struct_put(event, janet_ckeywordv("wd-path"), path);
+                if (janet_checktype(name, JANET_NIL)) {
+                    /* We were watching a file directly, so path is the full path. Split into dirname / basename */
+                    JanetString spath = janet_unwrap_string(path);
+                    const uint8_t *cursor = spath + janet_string_length(spath);
+                    const uint8_t *cursor_end = cursor;
+                    while (cursor > spath && cursor[0] != '/') {
+                        cursor--;
                    }
-
-                    /* Got an event */
-                    Janet path = janet_table_get(watcher->watch_descriptors, janet_wrap_integer(inevent.wd));
-                    JanetKV *event = janet_struct_begin(6);
-                    janet_struct_put(event, janet_ckeywordv("wd"), janet_wrap_integer(inevent.wd));
-                    janet_struct_put(event, janet_ckeywordv("wd-path"), path);
-                    if (janet_checktype(name, JANET_NIL)) {
-                        /* We were watching a file directly, so path is the full path. Split into dirname / basename */
-                        JanetString spath = janet_unwrap_string(path);
-                        const uint8_t *cursor = spath + janet_string_length(spath);
-                        const uint8_t *cursor_end = cursor;
-                        while (cursor > spath && cursor[0] != '/') {
-                            cursor--;
-                        }
-                        if (cursor == spath) {
-                            janet_struct_put(event, janet_ckeywordv("dir-name"), path);
-                            janet_struct_put(event, janet_ckeywordv("file-name"), name);
-                        } else {
-                            janet_struct_put(event, janet_ckeywordv("dir-name"), janet_wrap_string(janet_string(spath, (cursor - spath))));
-                            janet_struct_put(event, janet_ckeywordv("file-name"), janet_wrap_string(janet_string(cursor + 1, (cursor_end - cursor - 1))));
-                        }
-                    } else {
+                    if (cursor == spath) {
                        janet_struct_put(event, janet_ckeywordv("dir-name"), path);
                        janet_struct_put(event, janet_ckeywordv("file-name"), name);
+                    } else {
+                        janet_struct_put(event, janet_ckeywordv("dir-name"), janet_wrap_string(janet_string(spath, (cursor - spath))));
+                        janet_struct_put(event, janet_ckeywordv("file-name"), janet_wrap_string(janet_string(cursor + 1, (cursor_end - cursor - 1))));
                    }
-                    janet_struct_put(event, janet_ckeywordv("cookie"), janet_wrap_integer(inevent.cookie));
-                    Janet etype = janet_ckeywordv("type");
-                    const JanetWatchFlagName *wfn_end = watcher_flags_linux + sizeof(watcher_flags_linux) / sizeof(watcher_flags_linux[0]);
-                    for (const JanetWatchFlagName *wfn = watcher_flags_linux; wfn < wfn_end; wfn++) {
-                        if ((inevent.mask & wfn->flag) == wfn->flag) janet_struct_put(event, etype, janet_ckeywordv(wfn->name));
-                    }
-                    Janet eventv = janet_wrap_struct(janet_struct_end(event));
-
-                    janet_channel_give(watcher->channel, eventv);
+                } else {
+                    janet_struct_put(event, janet_ckeywordv("dir-name"), path);
+                    janet_struct_put(event, janet_ckeywordv("file-name"), name);
                }
+                janet_struct_put(event, janet_ckeywordv("cookie"), janet_wrap_integer(inevent.cookie));
+                Janet etype = janet_ckeywordv("type");
+                const JanetWatchFlagName *wfn_end = watcher_flags_linux + sizeof(watcher_flags_linux) / sizeof(watcher_flags_linux[0]);
+                for (const JanetWatchFlagName *wfn = watcher_flags_linux; wfn < wfn_end; wfn++) {
+                    if ((inevent.mask & wfn->flag) == wfn->flag) janet_struct_put(event, etype, janet_ckeywordv(wfn->name));
+                }
+                Janet eventv = janet_wrap_struct(janet_struct_end(event));

-                /* Read some more if possible */
-                goto read_more;
+                janet_channel_give(watcher->channel, eventv);
            }
-            break;
+
+            /* Read some more if possible */
+            goto read_more;
+        }
+        break;
    }
 }

@@ -273,7 +271,8 @@ static void janet_watcher_unlisten(JanetWatcher *watcher) {
 #define WATCHFLAG_RECURSIVE 0x100000u

 static const JanetWatchFlagName watcher_flags_windows[] = {
-    {"all", 
+    {
+        "all",
        FILE_NOTIFY_CHANGE_ATTRIBUTES |
        FILE_NOTIFY_CHANGE_CREATION |
        FILE_NOTIFY_CHANGE_DIR_NAME |
@@ -282,7 +281,8 @@ static const JanetWatchFlagName watcher_flags_windows[] = {
        FILE_NOTIFY_CHANGE_LAST_WRITE |
        FILE_NOTIFY_CHANGE_SECURITY |
        FILE_NOTIFY_CHANGE_SIZE |
-        WATCHFLAG_RECURSIVE},
+        WATCHFLAG_RECURSIVE
+    },
    {"attributes", FILE_NOTIFY_CHANGE_ATTRIBUTES},
    {"creation", FILE_NOTIFY_CHANGE_CREATION},
    {"dir-name", FILE_NOTIFY_CHANGE_DIR_NAME},
@@ -302,9 +302,9 @@ static uint32_t decode_watch_flags(const Janet *options, int32_t n) {
        }
        JanetKeyword keyw = janet_unwrap_keyword(options[i]);
        const JanetWatchFlagName *result = janet_strbinsearch(watcher_flags_windows,
-                sizeof(watcher_flags_windows) / sizeof(JanetWatchFlagName),
-                sizeof(JanetWatchFlagName),
-                keyw);
+                                           sizeof(watcher_flags_windows) / sizeof(JanetWatchFlagName),
+                                           sizeof(JanetWatchFlagName),
+                                           keyw);
        if (!result) {
            janet_panicf("unknown windows filewatch flag %v", options[i]);
        }
@@ -339,19 +339,19 @@ typedef struct {

 static void read_dir_changes(OverlappedWatch *ow) {
    BOOL result = ReadDirectoryChangesW(ow->stream->handle,
-            (NotifyChange *) ow->buf,
-            FILE_INFO_PADDING,
-            (ow->flags & WATCHFLAG_RECURSIVE) ? TRUE : FALSE,
-            ow->flags & ~WATCHFLAG_RECURSIVE,
-            NULL,
-            (OVERLAPPED *) ow,
-            NULL);
+                                        (NotifyChange *) ow->buf,
+                                        FILE_INFO_PADDING,
+                                        (ow->flags & WATCHFLAG_RECURSIVE) ? TRUE : FALSE,
+                                        ow->flags & ~WATCHFLAG_RECURSIVE,
+                                        NULL,
+                                        (OVERLAPPED *) ow,
+                                        NULL);
    if (!result) {
        janet_panicv(janet_ev_lasterr());
    }
 }

-static const char* watcher_actions_windows[] = {
+static const char *watcher_actions_windows[] = {
    "unknown",
    "added",
    "removed",
@@ -382,48 +382,47 @@ static void watcher_callback_read(JanetFiber *fiber, JanetAsyncEvent event) {
        case JANET_ASYNC_EVENT_FAILED:
            janet_stream_close(ow->stream);
            break;
-        case JANET_ASYNC_EVENT_COMPLETE:
-            {
-                if (!watcher->is_watching) {
-                    janet_stream_close(ow->stream);
-                    break;
-                }
-
-                NotifyChange *fni = (NotifyChange *) ow->buf;
-
-                while (1) {
-                    /* Got an event */
-
-                    /* Extract name */
-                    Janet filename;
-                    if (fni->FileNameLength) {
-                        int32_t nbytes = (int32_t) WideCharToMultiByte(CP_UTF8, 0, fni->FileName, fni->FileNameLength / sizeof(wchar_t), NULL, 0, NULL, NULL);
-                        janet_assert(nbytes, "bad utf8 path");
-                        uint8_t *into = janet_string_begin(nbytes);
-                        WideCharToMultiByte(CP_UTF8, 0, fni->FileName, fni->FileNameLength / sizeof(wchar_t), (char *) into, nbytes, NULL, NULL);
-                        filename = janet_wrap_string(janet_string_end(into));
-                    } else {
-                        filename = janet_cstringv("");
-                    }
-
-                    JanetKV *event = janet_struct_begin(3);
-                    janet_struct_put(event, janet_ckeywordv("type"), janet_ckeywordv(watcher_actions_windows[fni->Action]));
-                    janet_struct_put(event, janet_ckeywordv("file-name"), filename);
-                    janet_struct_put(event, janet_ckeywordv("dir-name"), janet_wrap_string(ow->dir_path));
-                    Janet eventv = janet_wrap_struct(janet_struct_end(event));
-
-                    janet_channel_give(watcher->channel, eventv);
-
-                    /* Next event */
-                    if (!fni->NextEntryOffset) break;
-                    fni = (NotifyChange *) ((char *)fni + fni->NextEntryOffset);
-                }
-
-                /* Make another call to read directory changes */
-                read_dir_changes(ow);
-                janet_async_in_flight(fiber);
+        case JANET_ASYNC_EVENT_COMPLETE: {
+            if (!watcher->is_watching) {
+                janet_stream_close(ow->stream);
+                break;
            }
-            break;
+
+            NotifyChange *fni = (NotifyChange *) ow->buf;
+
+            while (1) {
+                /* Got an event */
+
+                /* Extract name */
+                Janet filename;
+                if (fni->FileNameLength) {
+                    int32_t nbytes = (int32_t) WideCharToMultiByte(CP_UTF8, 0, fni->FileName, fni->FileNameLength / sizeof(wchar_t), NULL, 0, NULL, NULL);
+                    janet_assert(nbytes, "bad utf8 path");
+                    uint8_t *into = janet_string_begin(nbytes);
+                    WideCharToMultiByte(CP_UTF8, 0, fni->FileName, fni->FileNameLength / sizeof(wchar_t), (char *) into, nbytes, NULL, NULL);
+                    filename = janet_wrap_string(janet_string_end(into));
+                } else {
+                    filename = janet_cstringv("");
+                }
+
+                JanetKV *event = janet_struct_begin(3);
+                janet_struct_put(event, janet_ckeywordv("type"), janet_ckeywordv(watcher_actions_windows[fni->Action]));
+                janet_struct_put(event, janet_ckeywordv("file-name"), filename);
+                janet_struct_put(event, janet_ckeywordv("dir-name"), janet_wrap_string(ow->dir_path));
+                Janet eventv = janet_wrap_struct(janet_struct_end(event));
+
+                janet_channel_give(watcher->channel, eventv);
+
+                /* Next event */
+                if (!fni->NextEntryOffset) break;
+                fni = (NotifyChange *)((char *)fni + fni->NextEntryOffset);
+            }
+
+            /* Make another call to read directory changes */
+            read_dir_changes(ow);
+            janet_async_in_flight(fiber);
+        }
+        break;
    }
 }

@@ -439,12 +438,12 @@ static void start_listening_ow(OverlappedWatch *ow) {

 static void janet_watcher_add(JanetWatcher *watcher, const char *path, uint32_t flags) {
    HANDLE handle = CreateFileA(path,
-            FILE_LIST_DIRECTORY | GENERIC_READ,
-            FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-            NULL,
-            OPEN_EXISTING,
-            FILE_FLAG_OVERLAPPED | FILE_FLAG_BACKUP_SEMANTICS,
-            NULL);
+                                FILE_LIST_DIRECTORY | GENERIC_READ,
+                                FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+                                NULL,
+                                OPEN_EXISTING,
+                                FILE_FLAG_OVERLAPPED | FILE_FLAG_BACKUP_SEMANTICS,
+                                NULL);
    if (handle == INVALID_HANDLE_VALUE) {
        janet_panicv(janet_ev_lasterr());
    }
@@ -574,20 +573,21 @@ static const JanetAbstractType janet_filewatch_at = {
 };

 JANET_CORE_FN(cfun_filewatch_make,
-        "(filewatch/new channel &opt default-flags)",
-        "Create a new filewatcher that will give events to a channel channel. See `filewatch/add` for available flags.\n\n"
-        "When an event is triggered by the filewatcher, a struct containing information will be given to channel as with `ev/give`. "
-        "The contents of the channel depend on the OS, but will contain some common keys:\n\n"
-        "* `:type` -- the type of the event that was raised.\n\n"
-        "* `:file-name` -- the base file name of the file that triggered the event.\n\n"
-        "* `:dir-name` -- the directory name of the file that triggered the event.\n\n"
-        "Events also will contain keys specific to the host OS.\n\n"
-        "Windows has no extra properties on events.\n\n"
-        "Linux has the following extra properties on events:\n\n"
-        "* `:wd` -- the integer key returned by `filewatch/add` for the path that triggered this.\n\n"
-        "* `:wd-path` -- the string path for watched directory of file. For files, will be the same as `:file-name`, and for directories, will be the same as `:dir-name`.\n\n"
-        "* `:cookie` -- a randomized integer used to associate related events, such as :moved-from and :moved-to events.\n\n"
-        "") {
+              "(filewatch/new channel &opt default-flags)",
+              "Create a new filewatcher that will give events to a channel channel. See `filewatch/add` for available flags.\n\n"
+              "When an event is triggered by the filewatcher, a struct containing information will be given to channel as with `ev/give`. "
+              "The contents of the channel depend on the OS, but will contain some common keys:\n\n"
+              "* `:type` -- the type of the event that was raised.\n\n"
+              "* `:file-name` -- the base file name of the file that triggered the event.\n\n"
+              "* `:dir-name` -- the directory name of the file that triggered the event.\n\n"
+              "Events also will contain keys specific to the host OS.\n\n"
+              "Windows has no extra properties on events.\n\n"
+              "Linux has the following extra properties on events:\n\n"
+              "* `:wd` -- the integer key returned by `filewatch/add` for the path that triggered this.\n\n"
+              "* `:wd-path` -- the string path for watched directory of file. For files, will be the same as `:file-name`, and for directories, will be the same as `:dir-name`.\n\n"
+              "* `:cookie` -- a randomized integer used to associate related events, such as :moved-from and :moved-to events.\n\n"
+              "") {
+    janet_sandbox_assert(JANET_SANDBOX_FS_READ);
    janet_arity(argc, 1, -1);
    JanetChannel *channel = janet_getchannel(argv, 0);
    JanetWatcher *watcher = janet_abstract(&janet_filewatch_at, sizeof(JanetWatcher));
@@ -597,44 +597,44 @@ JANET_CORE_FN(cfun_filewatch_make,
 }

 JANET_CORE_FN(cfun_filewatch_add,
-        "(filewatch/add watcher path &opt flags)",
-        "Add a path to the watcher. Available flags depend on the current OS, and are as follows:\n\n"
-        "Windows/MINGW (flags correspond to FILE_NOTIFY_CHANGE_* flags in win32 documentation):\n\n"
-        "* `:all` - trigger an event for all of the below triggers.\n\n"
-        "* `:attributes` - FILE_NOTIFY_CHANGE_ATTRIBUTES\n\n"
-        "* `:creation` - FILE_NOTIFY_CHANGE_CREATION\n\n"
-        "* `:dir-name` - FILE_NOTIFY_CHANGE_DIR_NAME\n\n"
-        "* `:last-access` - FILE_NOTIFY_CHANGE_LAST_ACCESS\n\n"
-        "* `:last-write` - FILE_NOTIFY_CHANGE_LAST_WRITE\n\n"
-        "* `:security` - FILE_NOTIFY_CHANGE_SECURITY\n\n"
-        "* `:size` - FILE_NOTIFY_CHANGE_SIZE\n\n"
-        "* `:recursive` - watch subdirectories recursively\n\n"
-        "Linux (flags correspond to IN_* flags from <sys/inotify.h>):\n\n"
-        "* `:access` - IN_ACCESS\n\n"
-        "* `:all` - IN_ALL_EVENTS\n\n"
-        "* `:attrib` - IN_ATTRIB\n\n"
-        "* `:close-nowrite` - IN_CLOSE_NOWRITE\n\n"
-        "* `:close-write` - IN_CLOSE_WRITE\n\n"
-        "* `:create` - IN_CREATE\n\n"
-        "* `:delete` - IN_DELETE\n\n"
-        "* `:delete-self` - IN_DELETE_SELF\n\n"
-        "* `:ignored` - IN_IGNORED\n\n"
-        "* `:modify` - IN_MODIFY\n\n"
-        "* `:move-self` - IN_MOVE_SELF\n\n"
-        "* `:moved-from` - IN_MOVED_FROM\n\n"
-        "* `:moved-to` - IN_MOVED_TO\n\n"
-        "* `:open` - IN_OPEN\n\n"
-        "* `:q-overflow` - IN_Q_OVERFLOW\n\n"
-        "* `:unmount` - IN_UNMOUNT\n\n\n"
-        "On Windows, events will have the following possible types:\n\n"
-        "* `:unknown`\n\n"
-        "* `:added`\n\n"
-        "* `:removed`\n\n"
-        "* `:modified`\n\n"
-        "* `:renamed-old`\n\n"
-        "* `:renamed-new`\n\n"
-        "On Linux, events will a `:type` corresponding to the possible flags, excluding `:all`.\n"
-        "") {
+              "(filewatch/add watcher path &opt flags)",
+              "Add a path to the watcher. Available flags depend on the current OS, and are as follows:\n\n"
+              "Windows/MINGW (flags correspond to FILE_NOTIFY_CHANGE_* flags in win32 documentation):\n\n"
+              "* `:all` - trigger an event for all of the below triggers.\n\n"
+              "* `:attributes` - FILE_NOTIFY_CHANGE_ATTRIBUTES\n\n"
+              "* `:creation` - FILE_NOTIFY_CHANGE_CREATION\n\n"
+              "* `:dir-name` - FILE_NOTIFY_CHANGE_DIR_NAME\n\n"
+              "* `:last-access` - FILE_NOTIFY_CHANGE_LAST_ACCESS\n\n"
+              "* `:last-write` - FILE_NOTIFY_CHANGE_LAST_WRITE\n\n"
+              "* `:security` - FILE_NOTIFY_CHANGE_SECURITY\n\n"
+              "* `:size` - FILE_NOTIFY_CHANGE_SIZE\n\n"
+              "* `:recursive` - watch subdirectories recursively\n\n"
+              "Linux (flags correspond to IN_* flags from <sys/inotify.h>):\n\n"
+              "* `:access` - IN_ACCESS\n\n"
+              "* `:all` - IN_ALL_EVENTS\n\n"
+              "* `:attrib` - IN_ATTRIB\n\n"
+              "* `:close-nowrite` - IN_CLOSE_NOWRITE\n\n"
+              "* `:close-write` - IN_CLOSE_WRITE\n\n"
+              "* `:create` - IN_CREATE\n\n"
+              "* `:delete` - IN_DELETE\n\n"
+              "* `:delete-self` - IN_DELETE_SELF\n\n"
+              "* `:ignored` - IN_IGNORED\n\n"
+              "* `:modify` - IN_MODIFY\n\n"
+              "* `:move-self` - IN_MOVE_SELF\n\n"
+              "* `:moved-from` - IN_MOVED_FROM\n\n"
+              "* `:moved-to` - IN_MOVED_TO\n\n"
+              "* `:open` - IN_OPEN\n\n"
+              "* `:q-overflow` - IN_Q_OVERFLOW\n\n"
+              "* `:unmount` - IN_UNMOUNT\n\n\n"
+              "On Windows, events will have the following possible types:\n\n"
+              "* `:unknown`\n\n"
+              "* `:added`\n\n"
+              "* `:removed`\n\n"
+              "* `:modified`\n\n"
+              "* `:renamed-old`\n\n"
+              "* `:renamed-new`\n\n"
+              "On Linux, events will a `:type` corresponding to the possible flags, excluding `:all`.\n"
+              "") {
    janet_arity(argc, 2, -1);
    JanetWatcher *watcher = janet_getabstract(argv, 0, &janet_filewatch_at);
    const char *path = janet_getcstring(argv, 1);
@@ -644,8 +644,8 @@ JANET_CORE_FN(cfun_filewatch_add,
 }

 JANET_CORE_FN(cfun_filewatch_remove,
-        "(filewatch/remove watcher path)",
-        "Remove a path from the watcher.") {
+              "(filewatch/remove watcher path)",
+              "Remove a path from the watcher.") {
    janet_fixarity(argc, 2);
    JanetWatcher *watcher = janet_getabstract(argv, 0, &janet_filewatch_at);
    const char *path = janet_getcstring(argv, 1);
@@ -654,8 +654,8 @@ JANET_CORE_FN(cfun_filewatch_remove,
 }

 JANET_CORE_FN(cfun_filewatch_listen,
-        "(filewatch/listen watcher)",
-        "Listen for changes in the watcher.") {
+              "(filewatch/listen watcher)",
+              "Listen for changes in the watcher.") {
    janet_fixarity(argc, 1);
    JanetWatcher *watcher = janet_getabstract(argv, 0, &janet_filewatch_at);
    janet_watcher_listen(watcher);
@@ -663,8 +663,8 @@ JANET_CORE_FN(cfun_filewatch_listen,
 }

 JANET_CORE_FN(cfun_filewatch_unlisten,
-        "(filewatch/unlisten watcher)",
-        "Stop listening for changes on a given watcher.") {
+              "(filewatch/unlisten watcher)",
+              "Stop listening for changes on a given watcher.") {
    janet_fixarity(argc, 1);
    JanetWatcher *watcher = janet_getabstract(argv, 0, &janet_filewatch_at);
    janet_watcher_unlisten(watcher);
--- a/src/core/gc.c
+++ b/src/core/gc.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/gc.h
+++ b/src/core/gc.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/inttypes.c
+++ b/src/core/inttypes.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose & contributors
+* Copyright (c) 2024 Calvin Rose & contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/io.c
+++ b/src/core/io.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/marsh.c
+++ b/src/core/marsh.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/math.c
+++ b/src/core/math.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/net.c
+++ b/src/core/net.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose and contributors.
+* Copyright (c) 2024 Calvin Rose and contributors.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -829,7 +829,7 @@ JANET_CORE_FN(cfun_stream_accept_loop,
 JANET_CORE_FN(cfun_stream_accept,
              "(net/accept stream &opt timeout)",
              "Get the next connection on a server stream. This would usually be called in a loop in a dedicated fiber. "
-              "Takes an optional timeout in seconds, after which will return nil. "
+              "Takes an optional timeout in seconds, after which will raise an error. "
              "Returns a new duplex stream which represents a connection to the client.") {
    janet_arity(argc, 1, 2);
    JanetStream *stream = janet_getabstract(argv, 0, &janet_stream_type);
@@ -844,7 +844,7 @@ JANET_CORE_FN(cfun_stream_read,
              "Read up to n bytes from a stream, suspending the current fiber until the bytes are available. "
              "`n` can also be the keyword `:all` to read into the buffer until end of stream. "
              "If less than n bytes are available (and more than 0), will push those bytes and return early. "
-              "Takes an optional timeout in seconds, after which will return nil. "
+              "Takes an optional timeout in seconds, after which will raise an error. "
              "Returns a buffer with up to n more bytes in it, or raises an error if the read failed.") {
    janet_arity(argc, 2, 4);
    JanetStream *stream = janet_getabstract(argv, 0, &janet_stream_type);
@@ -864,7 +864,7 @@ JANET_CORE_FN(cfun_stream_read,
 JANET_CORE_FN(cfun_stream_chunk,
              "(net/chunk stream nbytes &opt buf timeout)",
              "Same a net/read, but will wait for all n bytes to arrive rather than return early. "
-              "Takes an optional timeout in seconds, after which will return nil.") {
+              "Takes an optional timeout in seconds, after which will raise an error.") {
    janet_arity(argc, 2, 4);
    JanetStream *stream = janet_getabstract(argv, 0, &janet_stream_type);
    janet_stream_flags(stream, JANET_STREAM_READABLE | JANET_STREAM_SOCKET);
@@ -878,7 +878,7 @@ JANET_CORE_FN(cfun_stream_chunk,
 JANET_CORE_FN(cfun_stream_recv_from,
              "(net/recv-from stream nbytes buf &opt timeout)",
              "Receives data from a server stream and puts it into a buffer. Returns the socket-address the "
-              "packet came from. Takes an optional timeout in seconds, after which will return nil.") {
+              "packet came from. Takes an optional timeout in seconds, after which will raise an error.") {
    janet_arity(argc, 3, 4);
    JanetStream *stream = janet_getabstract(argv, 0, &janet_stream_type);
    janet_stream_flags(stream, JANET_STREAM_UDPSERVER | JANET_STREAM_SOCKET);
@@ -892,7 +892,7 @@ JANET_CORE_FN(cfun_stream_recv_from,
 JANET_CORE_FN(cfun_stream_write,
              "(net/write stream data &opt timeout)",
              "Write data to a stream, suspending the current fiber until the write "
-              "completes. Takes an optional timeout in seconds, after which will return nil. "
+              "completes. Takes an optional timeout in seconds, after which will raise an error. "
              "Returns nil, or raises an error if the write failed.") {
    janet_arity(argc, 2, 3);
    JanetStream *stream = janet_getabstract(argv, 0, &janet_stream_type);
@@ -911,7 +911,7 @@ JANET_CORE_FN(cfun_stream_write,
 JANET_CORE_FN(cfun_stream_send_to,
              "(net/send-to stream dest data &opt timeout)",
              "Writes a datagram to a server stream. dest is a the destination address of the packet. "
-              "Takes an optional timeout in seconds, after which will return nil. "
+              "Takes an optional timeout in seconds, after which will raise an error. "
              "Returns stream.") {
    janet_arity(argc, 3, 4);
    JanetStream *stream = janet_getabstract(argv, 0, &janet_stream_type);
--- a/src/core/os.c
+++ b/src/core/os.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose and contributors.
+* Copyright (c) 2024 Calvin Rose and contributors.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -27,9 +27,10 @@
 #include "gc.h"
 #endif

+#include <stdlib.h>
+
 #ifndef JANET_REDUCED_OS

-#include <stdlib.h>
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -174,6 +175,8 @@ JANET_CORE_FN(os_arch,
              "* :riscv64\n\n"
              "* :sparc\n\n"
              "* :wasm\n\n"
+              "* :s390\n\n"
+              "* :s390x\n\n"
              "* :unknown\n") {
    janet_fixarity(argc, 0);
    (void) argv;
@@ -200,6 +203,10 @@ JANET_CORE_FN(os_arch,
    return janet_ckeywordv("ppc");
 #elif (defined(__ppc64__) || defined(_ARCH_PPC64) || defined(_M_PPC))
    return janet_ckeywordv("ppc64");
+#elif (defined(__s390x__))
+    return janet_ckeywordv("s390x");
+#elif (defined(__s390__))
+    return janet_ckeywordv("s390");
 #else
    return janet_ckeywordv("unknown");
 #endif
@@ -245,7 +252,7 @@ JANET_CORE_FN(os_exit,
    }
    janet_deinit();
    if (argc >= 2 && janet_truthy(argv[1])) {
-        _exit(status);
+        _Exit(status);
    } else {
        exit(status);
    }
--- a/src/core/parse.c
+++ b/src/core/parse.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -231,7 +231,7 @@ static void delim_error(JanetParser *parser, size_t stack_index, char c, const c
                janet_buffer_push_u8(buffer, '`');
            }
        }
-        janet_formatb(buffer, " opened at line %d, column %d", s->line, s->column);
+        janet_formatb(buffer, " opened at line %d, column %d", (int32_t) s->line, (int32_t) s->column);
    }
    parser->error = (const char *) janet_string(buffer->data, buffer->count);
    parser->flag |= JANET_PARSER_GENERATED_ERROR;
--- a/src/core/peg.c
+++ b/src/core/peg.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -465,6 +465,16 @@ tail:
            return result;
        }

+        case RULE_ONLY_TAGS: {
+            CapState cs = cap_save(s);
+            down1(s);
+            const uint8_t *result = peg_rule(s, s->bytecode + rule[1], text);
+            up1(s);
+            if (!result) return NULL;
+            cap_load_keept(s, cs);
+            return result;
+        }
+
        case RULE_GROUP: {
            uint32_t tag = rule[2];
            int oldmode = s->mode;
@@ -486,6 +496,30 @@ tail:
            return result;
        }

+        case RULE_NTH: {
+            uint32_t nth = rule[1];
+            if (nth > INT32_MAX) nth = INT32_MAX;
+            uint32_t tag = rule[3];
+            int oldmode = s->mode;
+            CapState cs = cap_save(s);
+            s->mode = PEG_MODE_NORMAL;
+            down1(s);
+            const uint8_t *result = peg_rule(s, s->bytecode + rule[2], text);
+            up1(s);
+            s->mode = oldmode;
+            if (!result) return NULL;
+            int32_t num_sub_captures = s->captures->count - cs.cap;
+            Janet cap;
+            if (num_sub_captures > (int32_t) nth) {
+                cap = s->captures->data[cs.cap + nth];
+            } else {
+                return NULL;
+            }
+            cap_load_keept(s, cs);
+            pushcap(s, cap, tag);
+            return result;
+        }
+
        case RULE_SUB: {
            const uint8_t *text_start = text;
            const uint32_t *rule_window = s->bytecode + rule[1];
@@ -1061,6 +1095,9 @@ static void spec_thru(Builder *b, int32_t argc, const Janet *argv) {
 static void spec_drop(Builder *b, int32_t argc, const Janet *argv) {
    spec_onerule(b, argc, argv, RULE_DROP);
 }
+static void spec_only_tags(Builder *b, int32_t argc, const Janet *argv) {
+    spec_onerule(b, argc, argv, RULE_ONLY_TAGS);
+}

 /* Rule of the form [rule, tag] */
 static void spec_cap1(Builder *b, int32_t argc, const Janet *argv, uint32_t op) {
@@ -1084,6 +1121,15 @@ static void spec_unref(Builder *b, int32_t argc, const Janet *argv) {
    spec_cap1(b, argc, argv, RULE_UNREF);
 }

+static void spec_nth(Builder *b, int32_t argc, const Janet *argv) {
+    peg_arity(b, argc, 2, 3);
+    Reserve r = reserve(b, 4);
+    uint32_t nth = peg_getnat(b, argv[0]);
+    uint32_t rule = peg_compile1(b, argv[1]);
+    uint32_t tag = (argc == 3) ? emit_tag(b, argv[2]) : 0;
+    emit_3(r, RULE_NTH, nth, rule, tag);
+}
+
 static void spec_capture_number(Builder *b, int32_t argc, const Janet *argv) {
    peg_arity(b, argc, 1, 3);
    Reserve r = reserve(b, 4);
@@ -1262,7 +1308,9 @@ static const SpecialPair peg_specials[] = {
    {"line", spec_line},
    {"look", spec_look},
    {"not", spec_not},
+    {"nth", spec_nth},
    {"number", spec_capture_number},
+    {"only-tags", spec_only_tags},
    {"opt", spec_opt},
    {"position", spec_position},
    {"quote", spec_capture},
@@ -1619,6 +1667,7 @@ static void *peg_unmarshal(JanetMarshalContext *ctx) {
                break;
            case RULE_ERROR:
            case RULE_DROP:
+            case RULE_ONLY_TAGS:
            case RULE_NOT:
            case RULE_TO:
            case RULE_THRU:
@@ -1632,6 +1681,12 @@ static void *peg_unmarshal(JanetMarshalContext *ctx) {
                if (rule[1] > JANET_MAX_READINT_WIDTH) goto bad;
                i += 3;
                break;
+            case RULE_NTH:
+                /* [nth, rule, tag] */
+                if (rule[2] >= blen) goto bad;
+                op_flags[rule[2]] |= 0x01;
+                i += 4;
+                break;
            default:
                goto bad;
        }
--- a/src/core/pp.c
+++ b/src/core/pp.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/regalloc.c
+++ b/src/core/regalloc.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/regalloc.h
+++ b/src/core/regalloc.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/run.c
+++ b/src/core/run.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/specials.c
+++ b/src/core/specials.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/state.c
+++ b/src/core/state.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/state.h
+++ b/src/core/state.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/string.c
+++ b/src/core/string.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -71,10 +71,10 @@ int janet_string_compare(const uint8_t *lhs, const uint8_t *rhs) {
 int janet_string_equalconst(const uint8_t *lhs, const uint8_t *rhs, int32_t rlen, int32_t rhash) {
    int32_t lhash = janet_string_hash(lhs);
    int32_t llen = janet_string_length(lhs);
-    if (lhs == rhs)
-        return 1;
    if (lhash != rhash || llen != rlen)
        return 0;
+    if (lhs == rhs)
+        return 1;
    return !memcmp(lhs, rhs, rlen);
 }

--- a/src/core/strtod.c
+++ b/src/core/strtod.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -497,8 +497,8 @@ int janet_scan_numeric(
    Janet *out) {
    int result;
    double num;
-    int64_t i64;
-    uint64_t u64;
+    int64_t i64 = 0;
+    uint64_t u64 = 0;
    if (len < 2 || str[len - 2] != ':') {
        result = janet_scan_number_base(str, len, 0, &num);
        *out = janet_wrap_number(num);
--- a/src/core/struct.c
+++ b/src/core/struct.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/symcache.c
+++ b/src/core/symcache.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/symcache.h
+++ b/src/core/symcache.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/table.c
+++ b/src/core/table.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/tuple.c
+++ b/src/core/tuple.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -79,6 +79,7 @@ const char *const janet_type_names[16] = {
    "pointer"
 };

+/* Docstring for signal lists these */
 const char *const janet_signal_names[14] = {
    "ok",
    "error",
@@ -96,6 +97,7 @@ const char *const janet_signal_names[14] = {
    "await"
 };

+/* Docstring for fiber/status lists these */
 const char *const janet_status_names[16] = {
    "dead",
    "error",
@@ -115,14 +117,20 @@ const char *const janet_status_names[16] = {
    "alive"
 };

+uint32_t janet_hash_mix(uint32_t input, uint32_t more) {
+    uint32_t mix1 = (more + 0x9e3779b9 + (input << 6) + (input >> 2));
+    return input ^ (0x9e3779b9 + (mix1 << 6) + (mix1 >> 2));
+}
+
 #ifndef JANET_PRF

 int32_t janet_string_calchash(const uint8_t *str, int32_t len) {
-    if (NULL == str) return 5381;
+    if (NULL == str || len == 0) return 5381;
    const uint8_t *end = str + len;
    uint32_t hash = 5381;
    while (str < end)
        hash = (hash << 5) + hash + *str++;
+    hash = janet_hash_mix(hash, (uint32_t) len);
    return (int32_t) hash;
 }

@@ -238,11 +246,6 @@ int32_t janet_string_calchash(const uint8_t *str, int32_t len) {

 #endif

-uint32_t janet_hash_mix(uint32_t input, uint32_t more) {
-    uint32_t mix1 = (more + 0x9e3779b9 + (input << 6) + (input >> 2));
-    return input ^ (0x9e3779b9 + (mix1 << 6) + (mix1 >> 2));
-}
-
 /* Computes hash of an array of values */
 int32_t janet_array_calchash(const Janet *array, int32_t len) {
    const Janet *end = array + len;
--- a/src/core/util.h
+++ b/src/core/util.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/value.c
+++ b/src/core/value.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/vector.c
+++ b/src/core/vector.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/vector.h
+++ b/src/core/vector.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/vm.c
+++ b/src/core/vm.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/wrap.c
+++ b/src/core/wrap.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/include/janet.h
+++ b/src/include/janet.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -1442,6 +1442,7 @@ JANET_NO_RETURN JANET_API void janet_sleep_await(double sec);
 /* For use inside listeners - adds a timeout to the current fiber, such that
 * it will be resumed after sec seconds if no other event schedules the current fiber. */
 JANET_API void janet_addtimeout(double sec);
+JANET_API void janet_addtimeout_nil(double sec);
 JANET_API void janet_ev_inc_refcount(void);
 JANET_API void janet_ev_dec_refcount(void);

@@ -2180,7 +2181,9 @@ typedef enum {
    RULE_UNREF,        /* [rule, tag] */
    RULE_CAPTURE_NUM,  /* [rule, tag] */
    RULE_SUB,          /* [rule, rule] */
-    RULE_SPLIT         /* [rule, rule] */
+    RULE_SPLIT,        /* [rule, rule] */
+    RULE_NTH,          /* [nth, rule, tag] */
+    RULE_ONLY_TAGS,    /* [rule] */
 } JanetPegOpcod;

 typedef struct {
--- a/src/mainclient/shell.c
+++ b/src/mainclient/shell.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/test/amalg/main.c
+++ b/test/amalg/main.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/test/suite-boot.janet
+++ b/test/suite-boot.janet
@@ -986,4 +986,13 @@
 (assert (deep= (get (dyn 'a) :source-form) source))
 (setdyn *debug* nil)

+# issue #1516
+(assert-error "assertf 1 argument" (macex '(assertf true)))
+(assert (assertf true "fun message") "assertf 2 arguments")
+(assert (assertf true "%s message" "mystery") "assertf 3 arguments")
+(assert (assertf (not nil) "%s message" "ordinary") "assertf not nil")
+(assert-error "assertf error 2" (assertf false "fun message"))
+(assert-error "assertf error 3" (assertf false "%s message" "mystery"))
+(assert-error "assertf error 4" (assertf nil "%s %s" "alice" "bob"))
+
 (end-suite)
--- a/test/suite-bundle.janet
+++ b/test/suite-bundle.janet
@@ -117,6 +117,11 @@
 (assert (= 0 (length (bundle/list))) "bundles are listed correctly 7")
 (assert (= 0 (length (bundle/topolist))) "bundles are listed correctly 8")

+# Try installing a bundle that fails check
+(assert-error "bad test" (bundle/install "./examples/sample-bad-bundle" :check true))
+(assert (= 0 (length (bundle/list))) "check failure 0")
+(assert (= 0 (length (bundle/topolist))) "check failure 1")
+
 (rmrf syspath)

 (end-suite)
--- a/test/suite-ev.janet
+++ b/test/suite-ev.janet
@@ -375,4 +375,94 @@
 (ev/cancel f (gensym))
 (ev/take superv)

+# Chat server test
+(def conmap @{})
+
+(defn broadcast [em msg]
+  (eachk par conmap
+         (if (not= par em)
+           (if-let [tar (get conmap par)]
+             (net/write tar (string/format "[%s]:%s" em msg))))))
+
+(defn handler
+  [connection]
+  (net/write connection "Whats your name?\n")
+  (def name (string/trim (string (ev/read connection 100))))
+  (if (get conmap name)
+    (do
+      (net/write connection "Name already taken!")
+      (:close connection))
+    (do
+      (put conmap name connection)
+      (net/write connection (string/format "Welcome %s\n" name))
+      (defer (do
+               (put conmap name nil)
+               (:close connection))
+        (while (def msg (ev/read connection 100))
+          (broadcast name (string msg)))))))
+
+# Now launch the chat server
+(def chat-server (net/listen test-host test-port))
+(ev/spawn
+    (forever
+      (def [ok connection] (protect (net/accept chat-server)))
+      (if (and ok connection)
+        (ev/call handler connection)
+        (break))))
+
+# Read from socket
+
+(defn expect-read
+  [stream text]
+  (def result (string (net/read stream 100)))
+  (assert (= result text) (string/format "expected %v, got %v" text result)))
+
+# Now do our telnet chat
+(def bob (net/connect test-host test-port))
+(expect-read bob "Whats your name?\n")
+(net/write bob "bob")
+(expect-read bob "Welcome bob\n")
+(def alice (net/connect test-host test-port))
+(expect-read alice "Whats your name?\n")
+(net/write alice "alice")
+(expect-read alice "Welcome alice\n")
+
+# Bob says hello, alice gets the message
+(net/write bob "hello\n")
+(expect-read alice "[bob]:hello\n")
+
+# Alice says hello, bob gets the message
+(net/write alice "hi\n")
+(expect-read bob "[alice]:hi\n")
+
+# Ted joins the chat server
+(def ted (net/connect test-host test-port))
+(expect-read ted "Whats your name?\n")
+(net/write ted "ted")
+(expect-read ted "Welcome ted\n")
+
+# Ted says hi, alice and bob get message
+(net/write ted "hi\n")
+(expect-read alice "[ted]:hi\n")
+(expect-read bob "[ted]:hi\n")
+
+# Bob leaves for work. Now it's just ted and alice
+(:close bob)
+
+# Alice messages ted, ted gets message
+(net/write alice "wuzzup\n")
+(expect-read ted "[alice]:wuzzup\n")
+(net/write ted "not much\n")
+(expect-read alice "[ted]:not much\n")
+
+# Alice bounces
+(:close alice)
+
+# Ted can send messages, nobody gets them :(
+(net/write ted "hello?\n")
+(:close ted)
+
+# Close chat server
+(:close chat-server)
+
 (end-suite)
--- a/test/suite-ffi.janet
+++ b/test/suite-ffi.janet
@@ -52,5 +52,7 @@
  (assert (= 26 (ffi/size [:char :pack :int @[:char 21]]))
          "array struct size"))

-(end-suite)
+(compwhen has-ffi
+  (assert-error "bad struct issue #1512" (ffi/struct :void)))

+(end-suite)
--- a/test/suite-peg.janet
+++ b/test/suite-peg.janet
@@ -664,6 +664,8 @@
  @[]) "peg if not")

 (defn test [name peg input expected]
+  (assert-no-error "compile peg" (peg/compile peg))
+  (assert-no-error "marshal/unmarshal peg" (-> peg marshal unmarshal))
  (assert (deep= (peg/match peg input) expected) name))

 (test "sub: matches the same input twice"
@@ -756,5 +758,19 @@
  "a,b,c"
  @["a" "b" "c"])

+(test "nth 1"
+  ~{:prefix (number :d+ nil :n)
+    :word '(lenprefix (-> :n) :w)
+    :main (some (nth 1 (* :prefix ":" :word)))}
+  "5:apple6:banana6:cherry"
+  @["apple" "banana" "cherry"])
+
+(test "only-tags 1"
+  ~{:prefix (number :d+ nil :n)
+    :word (capture (lenprefix (-> :n) :w) :W)
+    :main (some (* (only-tags (* :prefix ":" :word)) (-> :W)))}
+  "5:apple6:banana6:cherry"
+  @["apple" "banana" "cherry"])
+
 (end-suite)

--- a/tools/symcharsgen.c
+++ b/tools/symcharsgen.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Calvin Rose
+* Copyright (c) 2024 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
Author	SHA1	Message	Date
Calvin Rose	bf6799bb67	Add path separator.	2024-12-05 20:14:33 -06:00
Calvin Rose	a4e7d2f142	Installer changes windows.	2024-12-05 20:11:39 -06:00
Calvin Rose	85cb35e68f	Prepare for 1.37.0 release.	2024-12-05 17:51:06 -06:00
Calvin Rose	5b79b48ae0	Address #1524 - fix meson cross compilation linking. In the cross compilation case, we need to resolve our dependencies on libc twice, once for the build machine and once for the target machine. This includes pthreads, -libc, and android-spawn.	2024-12-03 21:05:37 -06:00
Calvin Rose	7c44127bcb	Merge pull request #1526 from sogaiu/master Additional tweak to address #1523	2024-12-02 05:46:00 -08:00
sogaiu	9338312103	Additional tweak to address #1523	2024-12-02 11:21:56 +09:00
Calvin Rose	a0eeb630e7	Correct documentation for issue #1523 net/* API documentation was not consistent with the implementation. The `ev/*` module documentation was, however. On timeout, all networking function calls raise an error and do not return nil. That was the old behavior.	2024-12-01 09:04:03 -06:00
Calvin Rose	6535d72bd4	Merge pull request #1522 from sogaiu/remove-pstatus Remove unused var pstatus	2024-11-25 06:15:43 -08:00
sogaiu	a7d424bc81	Remove unused var pstatus	2024-11-25 12:39:53 +09:00
Calvin Rose	2bceba4a7a	Assertf with no arguments does not make sense.	2024-11-24 19:14:18 -06:00
Calvin Rose	e3159bb0f5	Update CHANGELOG.md	2024-11-23 10:29:03 -06:00
Calvin Rose	5d1bd8a932	Add an extra has mix round to string hashes. This should improve hashing quality of strings.	2024-11-17 11:31:12 -06:00
Calvin Rose	bafa6bfff0	Merge pull request #1519 from ianthehenry/fix-string-equal-with-byteview fix janet_string_equalconst	2024-11-17 07:33:47 -08:00
Ian Henry	e2eb7ab4b2	fix janet_string_equalconst Check string length before pointer equality, so that a string is not considered equal to a prefix slice of itself.	2024-11-16 21:20:26 -08:00
Calvin Rose	9f4497a5ae	Merge pull request #1518 from pyrmont/bugfix.s390x-workflow Update Docker command to use `--platform` flag	2024-11-11 12:24:20 -08:00
Michael Camilleri	70de8bf092	Update Docker command to use --platform flag	2024-11-12 04:02:54 +09:00
Calvin Rose	e52575e23a	Merge pull request #1517 from sogaiu/add-assertf Add assertf and use in boot.janet. Address #1516	2024-10-31 07:27:05 -07:00
sogaiu	10994cbc6a	Add some tests for assertf	2024-10-30 23:41:31 +09:00
sogaiu	abad9d7db9	Add assertf and use in boot.janet. Address #1516	2024-10-30 17:43:00 +09:00
Calvin Rose	5e443cd29d	Merge pull request #1514 from ArtSin/fix-formatb-int32_t-arg Cast arguments to `int32_t` before passing to `janet_formatb` with `%d` format specifier	2024-10-25 05:36:08 -07:00
Calvin Rose	7bf3a9d24c	Merge pull request #1515 from sogaiu/tweak-install-info-in-readme Clarify installation info a bit	2024-10-25 05:34:53 -07:00
sogaiu	d80a7094ae	Clarify installation info a bit	2024-10-25 20:04:56 +09:00
ArtSin	ad77bc391c	Cast arguments to `int32_t` before passing to `janet_formatb` with `%d` format specifier `s->line` and `s->column` in `delim_error` are `size_t`, which is typically 64-bit, but `va_arg` in `janet_formatbv` reads `int32_t` for `%d`.	2024-10-20 12:03:40 +04:00
Calvin Rose	2b84fb14b4	Fix Issue #1512	2024-10-18 18:17:06 -05:00
Calvin Rose	07155ce657	Don't error on empty struct.	2024-10-18 17:53:21 -05:00
Calvin Rose	046d28662d	Merge pull request #1513 from sogaiu/add-nth-and-only-tags-to-changelog Mention nth and only-tags in changelog	2024-10-18 05:45:36 -07:00
sogaiu	84dd3db620	Mention nth and only-tags in changelog	2024-10-16 14:16:05 +09:00
Calvin Rose	282f2671ea	Formatting.	2024-10-11 20:10:46 -05:00
Calvin Rose	3fc2be3e6e	Use _Exit since it is standard in c99	2024-10-11 20:10:04 -05:00
Calvin Rose	d10c1fe759	Use msvc compiler intrinsics for atomics. This will let us use GCC atomics on mingw.	2024-10-11 20:03:06 -05:00
Calvin Rose	d18472b07d	More CI testing - add meson min build for windows.	2024-10-10 20:42:12 -05:00
Calvin Rose	43a68dcd2a	Include windows.h for atomics always in capi.c	2024-10-10 20:32:28 -05:00
Calvin Rose	3d93028088	Test bundle	2024-10-05 12:37:23 -05:00
Calvin Rose	99f0af92bd	Fix bundle/install with :check true installation failure.	2024-10-05 12:34:10 -05:00
Calvin Rose	71d81b14a2	Setting a profile will mess with imports.	2024-10-05 12:13:44 -05:00
Calvin Rose	3894f4021a	Update copyright date.	2024-09-29 16:07:24 -05:00
Calvin Rose	72c659d1ee	Github has fewer runners than I thought.	2024-09-29 07:17:28 -05:00
Calvin Rose	8f879b4adc	Remove financial support link.	2024-09-29 07:15:56 -05:00
Calvin Rose	18f2847dc1	Add test for older windows.	2024-09-29 07:14:31 -05:00
Calvin Rose	89b7ff9daf	Merge pull request #1510 from sogaiu/badge-swap Replace gitter badge with zulip one	2024-09-27 17:52:16 -07:00
sogaiu	26c263d6be	Replace gitter badge with zulip one	2024-09-25 23:45:04 +09:00
Calvin Rose	2570e0f7a0	Add repl-prompt.	2024-09-21 08:58:04 -05:00
Calvin Rose	8084e4c728	Add support for multiple directories in JANET_PATH. Use a colon ":" as the separator on posix, and semicolon ";" on windows (and mingw).	2024-09-20 23:05:02 -05:00
Calvin Rose	ee90f9df62	Merge pull request #1506 from sogaiu/tweak-signal-doc Add some detail to signal docstring	2024-09-18 16:50:13 -07:00
sogaiu	906a982ace	Add some detail to signal docstring	2024-09-17 20:04:16 +09:00
Calvin Rose	88e60c309c	Add overflow check.	2024-09-12 17:28:53 -05:00
Calvin Rose	9694aee819	Add rules for nth and only-tags. Address #1503 These rules allow selecting from a number of sub-captures while dropping the rest. `nth` is more succinct in many cases, but `only-tags` is more general and corresponds to an internal mechanism already present.	2024-09-12 17:23:34 -05:00
Calvin Rose	2697b0e425	More CI testing. Add multiple windows versions, and differentiate between arm and intel macs.	2024-09-08 20:55:10 -05:00
Calvin Rose	c0d7a49b19	Prepare for 1.36.0 release.	2024-09-07 12:33:28 -05:00
Calvin Rose	f9a6f52d9c	Improve error messages even more for `copyfile`.	2024-09-07 10:02:26 -05:00
Calvin Rose	c02c2e3f02	Update CHANGELOG.md	2024-09-07 09:32:42 -05:00
Calvin Rose	1fcd47dd7b	Improve error messages in bundle/add if files are missing. Instead of cryptic "error: unknown method :close invoked on nil" errors, let user know file or path does not exist before failing to copy files.	2024-09-07 09:19:15 -05:00
Calvin Rose	384ee4f6a9	Merge pull request #1498 from sogaiu/remove-janet-def Don't try to copy janet.def	2024-09-06 17:03:25 -07:00
Calvin Rose	e9deec8231	Change directory before running make ...	2024-09-06 18:35:50 -05:00
Calvin Rose	2fc77a1b63	Tweak argumnets.	2024-09-06 18:31:57 -05:00
Calvin Rose	442fe8209d	Non interative run for qemu	2024-09-06 18:29:36 -05:00
Calvin Rose	968a0dc4ac	Follow github directions for qemu multiarch.	2024-09-06 18:28:00 -05:00
Calvin Rose	40c93d0786	Try using just scripts for testing.	2024-09-06 18:23:55 -05:00
Calvin Rose	83b0bc688c	Try running inside a container.	2024-09-06 18:05:03 -05:00
sogaiu	6185b253be	Don't try to copy janet.def	2024-09-07 00:57:13 +09:00
Calvin Rose	17da53d0d9	Add github workflow for qemu + s390x	2024-09-06 10:28:54 -05:00
Calvin Rose	9ffec43d2b	Fix endianess issues on s390x architecture. Endianess code should use memcpy instead of unions. This apparently is more correct on old, optimizing compilers. Technically, this is compilers being really stupid but we work with what we got. That said, this endianess code is more complicated than needed.	2024-09-06 10:23:31 -05:00
Calvin Rose	e4f4a42751	Add regression test for chat server issues. Address #1496	2024-09-06 08:05:56 -05:00