Merge pull request 'Fix CI' (#17) from fix-ci into main

Reviewed-on: https://codeberg.org/playXE/capy/pulls/17

Author: playXE

.forgejo/workflows/nightly.yml

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
 jobs:
   check-and-run:
-    runs-on: self 
+    runs-on: fedora-latest 
     outputs:
       recent_commits: ${{ steps.check_commits.outputs.recent_commits }}
       date: ${{ steps.check_commits.outputs.date }}
@@ -35,22 +35,32 @@ jobs:
       matrix:
         arch: [x86_64]
 
-    runs-on: self
+    runs-on: fedora-latest
     env:
-      VERSION: nightly-${{ needs.check-and-run.outputs.date }}-${{ needs.check-and-run.outputs.short_sha }}
-      MMTK_GC_TRIGGER: DynamicHeapSize:1G,4G
+      VERSION: nightly-${{ needs.check-and-run.outputs.date }}
+      MMTK_GC_TRIGGER: DynamicHeapSize:1G,8G
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Rust toolchain
         uses: https://codeberg.org/wackbyte/rust-toolchain@trunk
         with: 
           toolchain: nightly
+      - name: Cache Rust dependencies
+        uses: https://github.com/Swatinem/rust-cache@v2
+     
+      - name: Cache apt dependencies
+        uses: actions/cache@v4
+        with:
+          path: /var/cache/apt/archives
+          key: ${{ runner.os }}-apt-v1
+          restore-keys: |
+            ${{ runner.os }}-apt-
       - name: Install system deps
         shell: bash
         run: |
-          apt-get update
-          apt-get install -y clang lld rsync make
+          apt update -y
+          apt install -y gcc rsync make
 
       - name: Build Capy
         shell: bash
@@ -60,4 +70,17 @@ jobs:
         shell: bash
         run: |
           make dist-portable
-          
+      - name: Publish/Update Codeberg Release "nightly"
+        uses: actions/forgejo-release@v2.7.3
+        with: 
+          direction: upload 
+          url: https://codeberg.org
+          repo: playxe/capy
+          token: ${{ secrets.CODEBERG_TOKEN }}
+          release-dir: dist
+          override: true 
+          tag: nightly
+          release-notes: |
+            Nightly build of CapyScheme
+            - Date: ${{ needs.check-and-run.outputs.date }}
+            - Commit: ${{ needs.check-and-run.outputs.short_sha }}

.forgejo/workflows/release.yml

@@ -0,0 +1,52 @@
+on: 
+  push: 
+    tags: 
+      - 'v1.*'
+  workflow_dispatch:
+  workflow_call:
+
+jobs: 
+  release:
+    runs-on: fedora-latest
+    env:
+      VERSION: ${{ github.ref_name }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install Rust toolchain
+        uses: https://codeberg.org/wackbyte/rust-toolchain@trunk
+        with: 
+          toolchain: nightly
+      - name: Install system deps
+        shell: bash
+        run: |
+          apt update -y
+          apt install -y clang lld rsync make
+      - name: Build Capy
+        shell: bash
+        run: |
+          make build
+      - name: Create portable tarball
+        shell: bash
+        run: |
+          make dist-portable
+      - name: Create deb package 
+        shell: bash
+        run: |
+          make dist-deb
+      - name: Create rpm package 
+        shell: bash
+        run: |
+          make dist-rpm
+      - name: Publish release
+        uses: actions/forgejo-release@v2.7.3
+        with: 
+          direction: upload 
+          url: https://codeberg.org
+          repo: playxe/capy
+          token: ${{ secrets.CODEBERG_TOKEN }}
+          release-dir: dist
+          override: true 
+          tag: ${{ env.VERSION }}
+          release-notes: |
+            "Release of CapyScheme ${{ env.VERSION }}"

Cargo.lock

@@ -52,11 +52,11 @@ capy-derive = { path = "capy-derive" }
 [profile.release]
 incremental = true
 rpath = true
-debug = false
+debug = true
 debug-assertions = false
 lto = false
 panic = "abort"
-opt-level = 3
+opt-level = 2
 
 [profile.dev]
 incremental = true

Cargo.toml

@@ -81,23 +81,24 @@ CAPY_ENV = \
 	LD_LIBRARY_PATH="$(TARGET_PATH)" \
 	DYLD_FALLBACK_LIBRARY_PATH="$(TARGET_PATH)"
 
-# -------------------------
-# Source lists ("arrays")
-# -------------------------
 
 BOOT_SRCS := \
 	lib/boot/prim.scm \
 	lib/boot/control.scm \
 	lib/boot/modules.scm \
 	lib/boot/records.scm \
 	lib/boot/conditions.scm \
+	lib/boot/violations.scm \
+	lib/boot/raise.scm \
 	lib/boot/exceptions.scm \
 	lib/boot/expand.scm \
 	lib/boot/interpreter.scm \
 	lib/boot/enums.scm \
 	lib/boot/sys.scm \
 	lib/boot/osdep.scm \
 	lib/boot/iosys.scm \
+	lib/boot/iosys2.scm \
+	lib/boot/iosys3.scm \
 	lib/boot/portio.scm \
 	lib/boot/bytevectorio.scm \
 	lib/boot/fileio.scm \
@@ -316,14 +317,14 @@ stage-0: build-runtime-bootstrap
 	$(CC) bin/capyc.c -L$(TARGET_PATH) -o stage-0/capyc -lcapy -Wl,-rpath,$(RPATH_PORTABLE)
 	cp $(TARGET_PATH)/libcapy.* stage-0/
 
-	XDG_CACHE_HOME="stage-0/cache" CAPY_LOAD_PATH=./lib LD_LIBRARY_PATH=stage-0/ DYLD_FALLBACK_LIBRARY_PATH=$(TARGET_PATH) stage-0/capy -L lib --fresh-auto-compile -c 42
-	XDG_CACHE_HOME="stage-0/cache" CAPY_LOAD_PATH=./lib LD_LIBRARY_PATH=stage-0/ DYLD_FALLBACK_LIBRARY_PATH=$(TARGET_PATH) stage-0/capy -L lib --fresh-auto-compile -c '(import (rnrs))'
-	XDG_CACHE_HOME="stage-0/cache" CAPY_LOAD_PATH=./lib LD_LIBRARY_PATH=stage-0/ DYLD_FALLBACK_LIBRARY_PATH=$(TARGET_PATH) stage-0/capy -L lib --fresh-auto-compile -c '(import (scheme base))'
-	XDG_CACHE_HOME="stage-0/cache" CAPY_LOAD_PATH=./lib LD_LIBRARY_PATH=stage-0/ DYLD_FALLBACK_LIBRARY_PATH=$(TARGET_PATH) stage-0/capy -L lib --fresh-auto-compile -c '(import (srfi 1))'
-	XDG_CACHE_HOME="stage-0/cache" CAPY_LOAD_PATH=./lib LD_LIBRARY_PATH=stage-0/ DYLD_FALLBACK_LIBRARY_PATH=$(TARGET_PATH) stage-0/capy -L lib --fresh-auto-compile -c '(import (srfi 13))'
+	RUST_MIN_STACK=134217728 MMTK_PLAN=StickyImmix MMTK_GC_TRIGGER=DynamicHeapSize:2G,8G XDG_CACHE_HOME="stage-0/cache" CAPY_LOAD_PATH=./lib LD_LIBRARY_PATH=stage-0/ DYLD_FALLBACK_LIBRARY_PATH=$(TARGET_PATH) stage-0/capy -L lib --fresh-auto-compile -c 42
+	RUST_MIN_STACK=134217728 MMTK_PLAN=StickyImmix MMTK_GC_TRIGGER=DynamicHeapSize:2G,8G XDG_CACHE_HOME="stage-0/cache" CAPY_LOAD_PATH=./lib LD_LIBRARY_PATH=stage-0/ DYLD_FALLBACK_LIBRARY_PATH=$(TARGET_PATH) stage-0/capy -L lib --fresh-auto-compile -c '(import (rnrs))'
+	RUST_MIN_STACK=134217728 MMTK_PLAN=StickyImmix MMTK_GC_TRIGGER=DynamicHeapSize:2G,8G XDG_CACHE_HOME="stage-0/cache" CAPY_LOAD_PATH=./lib LD_LIBRARY_PATH=stage-0/ DYLD_FALLBACK_LIBRARY_PATH=$(TARGET_PATH) stage-0/capy -L lib --fresh-auto-compile -c '(import (scheme base))'
+	RUST_MIN_STACK=134217728 MMTK_PLAN=StickyImmix MMTK_GC_TRIGGER=DynamicHeapSize:2G,8G XDG_CACHE_HOME="stage-0/cache" CAPY_LOAD_PATH=./lib LD_LIBRARY_PATH=stage-0/ DYLD_FALLBACK_LIBRARY_PATH=$(TARGET_PATH) stage-0/capy -L lib --fresh-auto-compile -c '(import (srfi 1))'
+	RUST_MIN_STACK=134217728 MMTK_PLAN=StickyImmix MMTK_GC_TRIGGER=DynamicHeapSize:2G,8G XDG_CACHE_HOME="stage-0/cache" CAPY_LOAD_PATH=./lib LD_LIBRARY_PATH=stage-0/ DYLD_FALLBACK_LIBRARY_PATH=$(TARGET_PATH) stage-0/capy -L lib --fresh-auto-compile -c '(import (srfi 13))'
 ifeq ($(COMPILE_PSYNTAX),1)
-	XDG_CACHE_HOME="stage-0/cache" CAPY_LOAD_PATH=./lib LD_LIBRARY_PATH=stage-0/ DYLD_FALLBACK_LIBRARY_PATH=$(TARGET_PATH) stage-0/capy -L lib -s lib/boot/compile-psyntax.scm lib/boot/psyntax.scm lib/boot/psyntax-exp.scm
-	XDG_CACHE_HOME="stage-0/cache" CAPY_LOAD_PATH=./lib LD_LIBRARY_PATH=stage-0/ DYLD_FALLBACK_LIBRARY_PATH=$(TARGET_PATH) stage-0/capy -L lib --fresh-auto-compile -c '(import (scheme base) (rnrs))'
+	MMTK_PLAN=StickyImmix MMTK_GC_TRIGGER=DynamicHeapSize:2G,8G XDG_CACHE_HOME="stage-0/cache" CAPY_LOAD_PATH=./lib LD_LIBRARY_PATH=stage-0/ DYLD_FALLBACK_LIBRARY_PATH=$(TARGET_PATH) stage-0/capy -L lib -s lib/boot/compile-psyntax.scm lib/boot/psyntax.scm lib/boot/psyntax-exp.scm
+	RUST_MIN_STACK=134217728 MMTK_PLAN=StickyImmix MMTK_GC_TRIGGER=DynamicHeapSize:2G,8G XDG_CACHE_HOME="stage-0/cache" CAPY_LOAD_PATH=./lib LD_LIBRARY_PATH=stage-0/ DYLD_FALLBACK_LIBRARY_PATH=$(TARGET_PATH) stage-0/capy -L lib --fresh-auto-compile -c '(import (scheme base) (rnrs))'
 endif
 
 
@@ -332,7 +333,7 @@ endif
 compile-all: compile-boot compile-core compile-rnrs compile-srfi compile-r7rs compile-cli compile-capy
 
 stage-1: 
-	$(MAKE) compile-all COMPILER=stage-0/capyc OUT=stage-1/compiled -j
+	$(MAKE) compile-all COMPILER=stage-0/capyc OUT=stage-1/compiled
 	@echo "Creating stage-1 CapyScheme"
 	mkdir -p stage-1
 	cp stage-0/capy stage-1/capy
@@ -341,7 +342,7 @@ stage-1:
 stage-2:
 	@echo "Creating stage-2 CapyScheme"
 	mkdir -p stage-2
-	$(MAKE) compile-all COMPILER=stage-1/capyc OUT=stage-2/compiled -j
+	$(MAKE) compile-all COMPILER=stage-1/capyc OUT=stage-2/compiled
 	cp stage-1/capy stage-2/capy
 	cp stage-1/capyc stage-2/capyc
 
@@ -466,8 +467,8 @@ install-portable: build build-runtime-portable
 	@echo "Installing CapyScheme to $(PREFIX)/capy/$(VERSION)"
 	mkdir -p $(PREFIX)/capy/$(VERSION)/extensions
 	rsync --checksum -r lib $(PREFIX)/capy/$(VERSION)
-	cp stage-2/capy-full $(PREFIX)/capy/$(VERSION)/
-	cp stage-2/capyc-full $(PREFIX)/capy/$(VERSION)/
+	cp bin/capy-full $(PREFIX)/capy/$(VERSION)/capy 
+	cp bin/capyc-full $(PREFIX)/capy/$(VERSION)/capyc
 	ln -sf $(PREFIX)/capy/$(VERSION)/capy $(PREFIX)/capy/$(VERSION)/capy-$(VERSION)
 	cp $(TARGET_PATH)/libcapy.* $(PREFIX)/capy/$(VERSION)/
 	cp -r stage-2/compiled $(PREFIX)/capy/$(VERSION)/
@@ -482,16 +483,16 @@ dist-portable: build build-runtime-portable
 	stagedir=$${STAGEDIR:-stage-dist}; \
 	outname=$${OUTNAME:-}; \
 	mkdir -p "$$outdir"; \
-	archive_name=$${outname:-capyscheme-$(VERSION)-$(TARGET)-$(ARCH)-$(PROFILE).tar.gz}; \
+	archive_name=$${outname:-capyscheme-$(VERSION)-$(TARGET).tar.gz}; \
 	stage_root="$$stagedir"; \
 	stage_prefix="$$stage_root"; \
 	stage_install_dir="$$stage_prefix/capy/$(VERSION)"; \
 	echo "Staging portable install into $$stage_install_dir"; \
 	rm -rf "$$stage_root"; \
 	mkdir -p "$$stage_install_dir/extensions"; \
 	rsync --checksum -r lib "$$stage_install_dir"; \
-	cp stage-2/capy-full "$$stage_install_dir/"; \
-	cp stage-2/capyc-full "$$stage_install_dir/"; \
+	cp bin/capy-full "$$stage_install_dir/capy"; \
+	cp bin/capyc-full "$$stage_install_dir/capyc"; \
 	cp $(TARGET_PATH)/libcapy.* "$$stage_install_dir/"; \
 	cp -r stage-2/compiled "$$stage_install_dir/"; \
 	echo "Creating $$outdir/$$archive_name"; \

Makefile

@@ -1,6 +1,6 @@
 [package]
 name = "capy"
-version = "0.1.0"
+version = "1.0.0"
 edition = "2024"
 
 [dependencies]

capy/Cargo.toml

@@ -54,7 +54,7 @@ type ContPair<'gc> = (LVarRef<'gc>, LVarRef<'gc>);
 /// Entry point: repeatedly applies `rec` until no further contifiable
 /// opportunities remain (idempotent fixed point).
 pub fn contify<'gc>(ctx: Context<'gc>, t: TermRef<'gc>) -> TermRef<'gc> {
-    fixedpoint(t, Some(1))(|&t| rec(ctx, t))
+    fixedpoint(t, Some(2))(|&t| rec(ctx, t))
 }
 
 /// Recursive traversal that performs contification *inside* each `Fix`

capy/src/cps/contify.rs

@@ -630,11 +630,11 @@ pub fn shrink<'gc>(ctx: Context<'gc>, term: TermRef<'gc>) -> TermRef<'gc> {
 }
 
 pub fn rewrite<'gc>(ctx: Context<'gc>, term: TermRef<'gc>) -> TermRef<'gc> {
-    let simplified_tree = fixedpoint(term, Some(2))(|term| shrink(ctx, *term));
+    let simplified_tree = fixedpoint(term, Some(3))(|term| shrink(ctx, *term));
 
     let max_size = size(simplified_tree) * 3 / 2;
 
-    fixedpoint(simplified_tree, Some(1))(|term| inline(ctx, *term, max_size))
+    fixedpoint(simplified_tree, Some(2))(|term| inline(ctx, *term, max_size))
 }
 
 pub fn rewrite_func<'gc>(ctx: Context<'gc>, func: FuncRef<'gc>) -> FuncRef<'gc> {

capy/src/cps/optimizer.rs

@@ -26,13 +26,17 @@
 ($primitive-load "boot/modules.scm")
 ($primitive-load "boot/records.scm")
 ($primitive-load "boot/conditions.scm")
+($primitive-load "boot/violations.scm")
+($primitive-load "boot/raise.scm")
 ($primitive-load "boot/exceptions.scm")
 ($primitive-load "boot/expand.scm")
 ($primitive-load "boot/interpreter.scm")
 ($primitive-load "boot/enums.scm")
 ($primitive-load "boot/sys.scm")
 ($primitive-load "boot/osdep.scm")
 ($primitive-load "boot/iosys.scm")
+($primitive-load "boot/iosys2.scm")
+($primitive-load "boot/iosys3.scm")
 ($primitive-load "boot/portio.scm")
 ($primitive-load "boot/bytevectorio.scm")
 ($primitive-load "boot/fileio.scm")