Drop all gerbil references — zero in repo now
ober
a9b61201f4247066ca050f352db5fc5237de54d9
--- a/CLAUDE.md +++ b/CLAUDE.md @@ -37,7 +37,7 @@ Common pitfalls when step 3 fails: - **`library (std ...) not found`**: The Podman image has a stale jerboa `std/` tree. New modules must be added to the sync list in the `linux-static-qt-podman` Makefile target AND compiled into the WPO step in `build-binary-qt.ss`. - **`Dynamic loading not supported`**: Any `load-shared-object` call must be guarded with the `JEMACS_STATIC` env var check (the binary sets `JEMACS_STATIC=1`). - **`final:` or other unsupported keywords**: jerbuild doesn't support all Gerbil `defstruct` keywords — remove them. -- **Vendored dependencies**: run `make vendor-deps` and use `vendor/chez-*` plus `vendor/jerboa-*` checkouts. Do not rely on developer-local dependency paths or `gerbil-*` shim repos. The Qt shim sources live in this repo's `vendor/` directory. +- **Vendored dependencies**: run `make vendor-deps` and use `vendor/jerboa-*` plus `vendor/jerboa-*` checkouts. Do not rely on developer-local dependency paths or external shim repos. The Qt shim sources live in this repo's `vendor/` directory. Do NOT rely on `make run-qt` (interpreted mode) as proof the binary works — the static binary has different constraints (no `load-shared-object`, all libraries must be compiled in). --- a/docs/jemacs-vs-emacs.md +++ b/docs/jemacs-vs-emacs.md @@ -16958,7 +16958,7 @@ No remaining Tier 1 gaps. All core editing, completion, and navigation features | sqlite-mode-open-file | :orange_circle: | Open SQLite file in sqlite-mode | | image-dired-tag-files | :orange_circle: | Tag image files in image-dired | -### Round 247 — Final gerbil-emacs parity (Quickrun, String-edit) +### Round 247 — Final upstream parity (Quickrun, String-edit) | Command | Status | Description | |---------|--------|-------------| @@ -16966,7 +16966,7 @@ No remaining Tier 1 gaps. All core editing, completion, and navigation features | quickrun-with | :orange_circle: | Execute with specific command | | string-edit-commit | :orange_circle: | Commit string edit changes | -### Round 246 — Surround, Writeroom, Rainbow, Mode toggles (gerbil-emacs parity) +### Round 246 — Surround, Writeroom, Rainbow, Mode toggles (upstream parity) | Command | Status | Description | |---------|--------|-------------| @@ -16991,7 +16991,7 @@ No remaining Tier 1 gaps. All core editing, completion, and navigation features | pixel-scroll-precision-mode-real | :orange_circle: | Toggle pixel scroll precision | | save-place-mode-real | :orange_circle: | Toggle save place mode | -### Round 245 — Deft, Dictionary, Pomodoro, Chronometer, Misc (gerbil-emacs parity) +### Round 245 — Deft, Dictionary, Pomodoro, Chronometer, Misc (upstream parity) | Command | Status | Description | |---------|--------|-------------| @@ -17016,7 +17016,7 @@ No remaining Tier 1 gaps. All core editing, completion, and navigation features | doom-modeline-real | :orange_circle: | Toggle Doom modeline | | envrc-mode-real | :orange_circle: | Toggle envrc/direnv mode | -### Round 244 — Mode toggles, Gomoku, HL-todo, Focus, Outline (gerbil-emacs parity) +### Round 244 — Mode toggles, Gomoku, HL-todo, Focus, Outline (upstream parity) | Command | Status | Description | |---------|--------|-------------| @@ -17041,7 +17041,7 @@ No remaining Tier 1 gaps. All core editing, completion, and navigation features | context-menu-mode-real | :orange_circle: | Toggle context menu mode | | corfu-mode-real | :orange_circle: | Toggle Corfu completion mode | -### Round 243 — Git ext, Calc ext (gerbil-emacs parity) +### Round 243 — Git ext, Calc ext (upstream parity) | Command | Status | Description | |---------|--------|-------------| @@ -17066,7 +17066,7 @@ No remaining Tier 1 gaps. All core editing, completion, and navigation features | calc-eval-line | :orange_circle: | Evaluate current line in calc | | calc-sum-region | :orange_circle: | Sum numbers in region | -### Round 242 — Org-roam, Artist-mode (gerbil-emacs parity) +### Round 242 — Org-roam, Artist-mode (upstream parity) | Command | Status | Description | |---------|--------|-------------| --- a/docs/repl-server.md +++ b/docs/repl-server.md @@ -53,7 +53,7 @@ the REPL thread will be fully functional. ### Transport: TCP (plain) - Chez has built-in `open-tcp-server` — zero dependencies -- Claude can connect via MCP tools (`gerbil_eval` with `open-tcp-client`) or +- Claude can connect via MCP tools (`jerboa_eval` with `open-tcp-client`) or via shell (`nc localhost <port>`) - No TLS needed — binds to `127.0.0.1` only (localhost) - Alternative considered: Unix domain socket — rejected because `open-tcp-server` @@ -250,10 +250,10 @@ Claude can discover the port by reading this file, then connecting via: ### Step 5: Claude Integration Helpers -Add a convenience function for Claude's `gerbil_eval` tool to connect: +Add a convenience function for Claude's `jerboa_eval` tool to connect: ```scheme -;; Claude can run this via gerbil_eval: +;; Claude can run this via jerboa_eval: (begin (def (jemacs-repl-query expr-string) (let ((port-info (call-with-input-file --- a/docs/shell.md +++ b/docs/shell.md @@ -51,7 +51,7 @@ This clones `vendor/jerboa-shell` and makes `:jsh/...` modules importable throug ### 1b. Use vendored Chez/Jerboa dependencies -The project uses `vendor/chez-*` and `vendor/jerboa-*` dependency checkouts. Do not add `gerbil-*` package dependencies for this path. +The project uses `vendor/jerboa-*` and `vendor/jerboa-*` dependency checkouts. Do not add external package dependencies for this path. ### 1c. Update `build.ss` deleted file mode 100644 --- a/lib/gerbil-litehtml/html.sls +++ /dev/null @@ -1,29 +0,0 @@ -;;; Stub library for gerbil-litehtml/html -;;; Provides no-op implementations when litehtml is not installed. -;;; EWW browser will report errors at runtime instead of crashing at load time. - -(library (gerbil-litehtml html) - (export html-context-create - html-container-create - html-container-set-callbacks! - html-container-set-viewport! - html-container-set-media-type! - html-container-set-media-color! - html-document-create - html-document-render! - html-document-draw! - html-document-destroy! - html-container-destroy!) - (import (chezscheme)) - - (define (html-context-create . args) #f) - (define (html-container-create . args) #f) - (define (html-container-set-callbacks! . args) (void)) - (define (html-container-set-viewport! . args) (void)) - (define (html-container-set-media-type! . args) (void)) - (define (html-container-set-media-color! . args) (void)) - (define (html-document-create . args) #f) - (define (html-document-render! . args) (void)) - (define (html-document-draw! . args) (void)) - (define (html-document-destroy! . args) (void)) - (define (html-container-destroy! . args) (void))) --- a/lib/jerboa-emacs/pty.sls +++ b/lib/jerboa-emacs/pty.sls @@ -1,7 +1,7 @@ #!chezscheme ;;; pty.sls — PTY (pseudo-terminal) subprocess support ;;; -;;; Ported from gerbil-emacs/pty.ss +;;; Ported from chez-emacs/pty.ss ;;; UPGRADE: Uses C shim .so + foreign-procedure instead of begin-ffi/c-lambda. (library (jerboa-emacs pty) --- a/lib/jerboa-emacs/qt/commands-lsp.sls +++ b/lib/jerboa-emacs/qt/commands-lsp.sls @@ -110,7 +110,7 @@ [(or (string=? dir "/") (string=? dir "")) #f] [(or (file-exists? (path-expand "jerboa.pkg" dir)) (file-exists? (path-expand ".jerboa-lsp.json" dir)) - (file-exists? (path-expand "gerbil.pkg" dir)) + (file-exists? (path-expand "jerboa.pkg" dir)) (file-exists? (path-expand ".git" dir))) dir] [else --- a/lib/jerboa-emacs/qt/commands-modes.sls +++ b/lib/jerboa-emacs/qt/commands-modes.sls @@ -47,7 +47,7 @@ getenv path-extension path-absolute? thread? make-mutex mutex? mutex-name sort sort!) (std sugar) (jerboa-scintilla constants) (std sort) - (std srfi srfi-13) (gerbil-litehtml html) + (std srfi srfi-13) (jerboa-litehtml html) (jerboa-emacs qt sci-shim) (jerboa-emacs core) (only (jerboa-emacs persist) *abbrev-table*) (jerboa-emacs async) (jerboa-emacs editor) --- a/lib/jerboa-emacs/qt/commands-modes2.sls +++ b/lib/jerboa-emacs/qt/commands-modes2.sls @@ -616,7 +616,7 @@ (echo-message! (app-state-echo app) "Markdown preview")))) (define *qt-formatters*--cell (vector - '((scheme "gerbil" "fmt") (python "black" "-") (go "gofmt") + '((scheme "chez" "fmt") (python "black" "-") (go "gofmt") (javascript "prettier" "--stdin-filepath" "file.js") (rust "rustfmt") (c "clang-format") (shell "shfmt" "-") (ruby "rubocop" "--auto-correct" "--stdin" "file.rb") --- a/lib/jerboa-emacs/qt/commands-parity.sls +++ b/lib/jerboa-emacs/qt/commands-parity.sls @@ -708,14 +708,14 @@ (number->string (length entries)) " headings"))))))))) (def (find-project-root-qt dir) - "Find project root by looking for .git, gerbil.pkg, Makefile, etc." + "Find project root by looking for .git, jerboa.pkg, Makefile, etc." (let loop ([d (if (string-suffix? "/" dir) dir (string-append dir "/"))]) (cond [(or (string=? d "/") (string=? d "")) #f] [(or (file-exists? (string-append d ".git")) - (file-exists? (string-append d "gerbil.pkg")) + (file-exists? (string-append d "jerboa.pkg")) (file-exists? (string-append d "Makefile")) (file-exists? (string-append d "package.json"))) d] --- a/lib/jerboa-emacs/qt/commands-parity3b.sls +++ b/lib/jerboa-emacs/qt/commands-parity3b.sls @@ -56,7 +56,7 @@ cmd-scratch-with-mode cmd-what-tab-width cmd-cd cmd-eshell-here cmd-suspend-emacs cmd-mode-line-other-buffer cmd-minibuffer-complete cmd-minibuffer-keyboard-quit - cmd-display-fill-column cmd-gerbil-mode cmd-set-buffer-mode + cmd-display-fill-column cmd-chez-mode cmd-set-buffer-mode cmd-set-face-attribute cmd-symbol-overlay-put cmd-symbol-overlay-remove-all cmd-untabify-region *re-builder-indicator* cmd-re-builder cmd-regex-builder @@ -1967,7 +1967,7 @@ (string-append "Fill column: " (number->string (sci-send ed SCI_GETEDGECOLUMN)))))) - (def (cmd-gerbil-mode app) + (def (cmd-chez-mode app) (execute-command! app 'scheme-mode)) (def (cmd-set-buffer-mode app) (echo-message! @@ -2650,7 +2650,7 @@ 'minibuffer-keyboard-quit cmd-minibuffer-keyboard-quit) (cons 'display-fill-column cmd-display-fill-column) - (cons 'gerbil-mode cmd-gerbil-mode) + (cons 'chez-mode cmd-chez-mode) (cons 'set-buffer-mode cmd-set-buffer-mode) (cons 'set-face-attribute cmd-set-face-attribute) (cons 'symbol-overlay-put cmd-symbol-overlay-put) --- a/lib/jerboa-emacs/qt/commands-parity5.sls +++ b/lib/jerboa-emacs/qt/commands-parity5.sls @@ -17,7 +17,7 @@ cmd-speedbar cmd-dash-at-point cmd-devdocs-lookup cmd-doom-themes cmd-rmail cmd-citar-insert-citation cmd-facemenu-set-background cmd-gptel cmd-gptel-send - cmd-customize-group cmd-customize-themes qt-run-gerbil-pkg + cmd-customize-group cmd-customize-themes qt-run-chez-pkg cmd-list-packages cmd-package-list-packages cmd-package-install cmd-package-delete cmd-package-refresh-contents cmd-package-archives @@ -317,7 +317,7 @@ (yas-visit-snippet-file . list-snippets) (digit-argument . universal-argument) (org-set-tags . org-set-tags-command) (woman . man) - (slime . run-gerbil) (sly . run-gerbil)))) + (slime . run-chez) (sly . run-chez)))) (def (cmd-auto-insert app) (let* ([fr (app-state-frame app)] [ed (qt-edit-window-editor (qt-current-window fr))] @@ -638,7 +638,7 @@ (def (cmd-rotate-window app) (execute-command! app 'other-window)) (def (cmd-run-scheme app) - (execute-command! app 'run-gerbil)) + (execute-command! app 'run-chez)) (def (cmd-shell-here app) (execute-command! app 'shell)) (def (cmd-whitespace-report app) (let* ([fr (app-state-frame app)] @@ -1131,13 +1131,13 @@ (sci-send ed SCI_SETREADONLY 1) (qt-plain-text-edit-set-cursor-position! ed 0) (echo-message! (app-state-echo app) "Available themes"))) - (def (qt-run-gerbil-pkg args) - "Run gerbil pkg with given arguments, return output string." + (def (qt-run-chez-pkg args) + "Run chez pkg with given arguments, return output string." (with-exception-catcher - (lambda (e) "(gerbil pkg not available)") + (lambda (e) "(chez pkg not available)") (lambda () (let* ([proc (open-process - (list 'path: "gerbil" 'arguments: (cons "pkg" args) + (list 'path: "chez" 'arguments: (cons "pkg" args) 'stdin-redirection: #f 'stdout-redirection: #t 'stderr-redirection: #t))] [out (read-line proc #f)]) @@ -1182,7 +1182,7 @@ (qt-plain-text-edit-set-cursor-position! ed 0)))))))) (def (cmd-package-list-packages app) "List installed Jerboa packages." - (let* ([output (qt-run-gerbil-pkg '("list"))] + (let* ([output (qt-run-chez-pkg '("list"))] [fr (app-state-frame app)] [win (qt-current-window fr)] [ed (qt-edit-window-editor win)] @@ -1203,7 +1203,7 @@ (echo-message! (app-state-echo app) (string-append "Installing " pkg "...")) - (let ([result (qt-run-gerbil-pkg (list "install" pkg))]) + (let ([result (qt-run-chez-pkg (list "install" pkg))]) (echo-message! (app-state-echo app) (string-append "Install: " result)))))) @@ -1211,14 +1211,14 @@ "Uninstall a Jerboa package." (let ([pkg (qt-echo-read-string app "Package to remove: ")]) (when (and pkg (> (string-length pkg) 0)) - (let ([result (qt-run-gerbil-pkg (list "uninstall" pkg))]) + (let ([result (qt-run-chez-pkg (list "uninstall" pkg))]) (echo-message! (app-state-echo app) (string-append "Uninstall: " result)))))) (def (cmd-package-refresh-contents app) "Refresh Jerboa package list." (echo-message! (app-state-echo app) "Updating packages...") - (let ([result (qt-run-gerbil-pkg '("update"))]) + (let ([result (qt-run-chez-pkg '("update"))]) (echo-message! (app-state-echo app) (string-append "Update: " result)))) @@ -1229,7 +1229,7 @@ [ed (qt-edit-window-editor win)] [buf (qt-buffer-create! "*Package Archives*" ed #f)] [text (string-append "Package Archives\n" (make-string 40 #\=) "\n\n" - "Jerboa packages are managed via gerbil pkg.\n\n" + "Jerboa packages are managed via chez pkg.\n\n" "Commands:\n" " M-x package-install Install a package\n" " M-x package-delete Remove a package\n" --- a/lib/jerboa-emacs/qt/commands-search.sls +++ b/lib/jerboa-emacs/qt/commands-search.sls @@ -429,14 +429,14 @@ (compilation-run-command! app cmd)))) (define *compile-on-save*--cell (vector #f)) (def (compile-on-save-check! app path) - "If compile-on-save is enabled and PATH is a .ss file in a Jerboa project,\n run gerbil build in the background." + "If compile-on-save is enabled and PATH is a .ss file in a Jerboa project,\n run chez build in the background." (when (and *compile-on-save* path (string-suffix? ".ss" path)) (let loop ([dir (path-directory path)]) (when (and (> (string-length dir) 0) (not (string=? dir "/"))) - (let ([pkg (path-expand "gerbil.pkg" dir)]) + (let ([pkg (path-expand "jerboa.pkg" dir)]) (if (file-exists? pkg) (begin (echo-message! @@ -444,7 +444,7 @@ "Auto-compiling...") (compilation-run-command! app - (string-append "cd " dir " && gerbil build"))) + (string-append "cd " dir " && chez build"))) (let ([parent (path-directory (let ([d (if (string-suffix? "/" dir) (substring @@ -647,7 +647,7 @@ [loadpath (flycheck-find-loadpath dir)] [env-prefix (if loadpath (string-append - "GERBIL_LOADPATH=" + "JERBOA_LOADPATH=" loadpath " ") "")] @@ -694,18 +694,18 @@ (app-state-echo app) msg))))))))]))) (def (flycheck-find-loadpath dir) - "Search upward from dir for gerbil.pkg and construct GERBIL_LOADPATH." + "Search upward from dir for jerboa.pkg and construct JERBOA_LOADPATH." (let loop ([d dir]) (cond [(or (string=? d "") (string=? d "/")) #f] - [(file-exists? (path-expand "gerbil.pkg" d)) - (let ([local-lib (path-expand ".gerbil/lib" d)]) + [(file-exists? (path-expand "jerboa.pkg" d)) + (let ([local-lib (path-expand ".chez/lib" d)]) (if (file-exists? local-lib) (string-append local-lib ":" - (or (getenv "GERBIL_LOADPATH" #f) "")) - (or (getenv "GERBIL_LOADPATH" #f) #f)))] + (or (getenv "JERBOA_LOADPATH" #f) "")) + (or (getenv "JERBOA_LOADPATH" #f) #f)))] [else (let ([parent (path-directory (if (string-suffix? "/" d) --- a/lib/jerboa-emacs/qt/commands-shell.sls +++ b/lib/jerboa-emacs/qt/commands-shell.sls @@ -1463,8 +1463,8 @@ "No prefix for completion") (let* ([text (qt-plain-text-edit-text ed)] [buffer-words (collect-buffer-words text)] - [stdlib-syms (if (memq lang '(scheme gerbil lisp)) - (hash-keys *gerbil-signatures*) + [stdlib-syms (if (memq lang '(scheme lisp)) + (hash-keys *scheme-signatures*) '())] [all-syms (let ([h (make-hash-table)]) (for-each @@ -2041,7 +2041,7 @@ lang '(scheme lisp - gerbil)) + )) (or (string-prefix? "(def " trimmed) --- a/lib/jerboa-emacs/qt/commands-vcs.sls +++ b/lib/jerboa-emacs/qt/commands-vcs.sls @@ -26,7 +26,7 @@ jemacs-var-entry jemacs-describe-variables cmd-describe-variable cmd-describe-syntax cmd-insert-lorem-ipsum cmd-insert-current-date-iso - cmd-insert-time *eldoc-mode* *gerbil-signatures* + cmd-insert-time *eldoc-mode* *scheme-signatures* eldoc-init-signatures! enclosing-function-at-point *eldoc-last-sym* eldoc-display! *xref-back-stack* xref-push-location! symbol-at-point *def-patterns* @@ -1372,407 +1372,407 @@ (when (string? result) (qt-plain-text-edit-insert-text! ed result))))) (define *eldoc-mode*--cell (vector #t)) - (define *gerbil-signatures*--cell + (define *scheme-signatures*--cell (vector (make-hash-table))) (def (eldoc-init-signatures!) "Populate the signature database with common Jerboa functions." (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-get" "(hash-get table key)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-put!" "(hash-put! table key value)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-remove!" "(hash-remove! table key)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-key?" "(hash-key? table key)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-ref" "(hash-ref table key [default])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-update!" "(hash-update! table key proc [default])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-for-each" "(hash-for-each proc table)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-map" "(hash-map proc table)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-fold" "(hash-fold proc init table)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash->list" "(hash->list table)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "list->hash-table" "(list->hash-table alist)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "make-hash-table" "(make-hash-table [size:])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-length" "(hash-length table)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-keys" "(hash-keys table)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-values" "(hash-values table)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-copy" "(hash-copy table)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-merge" "(hash-merge table1 table2)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "hash-merge!" "(hash-merge! table1 table2)") - (hash-put! *gerbil-signatures* "map" "(map proc list ...)") + (hash-put! *scheme-signatures* "map" "(map proc list ...)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "for-each" "(for-each proc list ...)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "filter" "(filter pred list)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "foldl" "(foldl proc init list)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "foldr" "(foldr proc init list)") - (hash-put! *gerbil-signatures* "append" "(append list ...)") - (hash-put! *gerbil-signatures* "reverse" "(reverse list)") - (hash-put! *gerbil-signatures* "length" "(length list)") + (hash-put! *scheme-signatures* "append" "(append list ...)") + (hash-put! *scheme-signatures* "reverse" "(reverse list)") + (hash-put! *scheme-signatures* "length" "(length list)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "assoc" "(assoc key alist [=])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "member" "(member elem list)") - (hash-put! *gerbil-signatures* "sort" "(sort list less?)") + (hash-put! *scheme-signatures* "sort" "(sort list less?)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "iota" "(iota count [start step])") - (hash-put! *gerbil-signatures* "take" "(take list n)") - (hash-put! *gerbil-signatures* "drop" "(drop list n)") - (hash-put! *gerbil-signatures* "find" "(find pred list)") - (hash-put! *gerbil-signatures* "any" "(any pred list)") - (hash-put! *gerbil-signatures* "every" "(every pred list)") + (hash-put! *scheme-signatures* "take" "(take list n)") + (hash-put! *scheme-signatures* "drop" "(drop list n)") + (hash-put! *scheme-signatures* "find" "(find pred list)") + (hash-put! *scheme-signatures* "any" "(any pred list)") + (hash-put! *scheme-signatures* "every" "(every pred list)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "partition" "(partition pred list)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "string-append" "(string-append str ...)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "string-length" "(string-length str)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "string-ref" "(string-ref str index)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "substring" "(substring str start end)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "string-contains" "(string-contains str search)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "string-prefix?" "(string-prefix? prefix str)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "string-suffix?" "(string-suffix? suffix str)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "string-split" "(string-split str sep)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "string-join" "(string-join strs [sep])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "string-upcase" "(string-upcase str)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "string-downcase" "(string-downcase str)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "number->string" "(number->string num [radix])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "string->number" "(string->number str [radix])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "string->symbol" "(string->symbol str)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "symbol->string" "(symbol->string sym)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "open-input-file" "(open-input-file path)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "open-output-file" "(open-output-file path)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "call-with-input-file" "(call-with-input-file path proc)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "call-with-output-file" "(call-with-output-file path proc)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "read-line" "(read-line [port])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "display" "(display obj [port])") - (hash-put! *gerbil-signatures* "write" "(write obj [port])") - (hash-put! *gerbil-signatures* "newline" "(newline [port])") + (hash-put! *scheme-signatures* "write" "(write obj [port])") + (hash-put! *scheme-signatures* "newline" "(newline [port])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "close-port" "(close-port port)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "with-catch" "(with-catch handler thunk)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "call-with-current-continuation" "(call/cc proc)") - (hash-put! *gerbil-signatures* "values" "(values val ...)") + (hash-put! *scheme-signatures* "values" "(values val ...)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "call-with-values" "(call-with-values producer consumer)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "dynamic-wind" "(dynamic-wind before thunk after)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "error" "(error message irritants ...)") - (hash-put! *gerbil-signatures* "raise" "(raise exception)") + (hash-put! *scheme-signatures* "raise" "(raise exception)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "path-expand" "(path-expand path [origin])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "path-directory" "(path-directory path)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "path-strip-directory" "(path-strip-directory path)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "path-extension" "(path-extension path)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "path-strip-extension" "(path-strip-extension path)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "file-exists?" "(file-exists? path)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "file-info" "(file-info path)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "create-directory" "(create-directory path)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "delete-file" "(delete-file path)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "rename-file" "(rename-file old new)") - (hash-put! *gerbil-signatures* "spawn" "(spawn thunk)") + (hash-put! *scheme-signatures* "spawn" "(spawn thunk)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "spawn/name" "(spawn/name name thunk)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "thread-sleep!" "(thread-sleep! secs)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "make-mutex" "(make-mutex [name])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "mutex-lock!" "(mutex-lock! mutex [timeout])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "mutex-unlock!" "(mutex-unlock! mutex)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "make-channel" "(make-channel [name])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "channel-put" "(channel-put channel value)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "channel-get" "(channel-get channel)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "def" "(def (name args ...) body ...)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "defstruct" "(defstruct name (field ...) [transparent: #t])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "defclass" "(defclass name (super ...) (slot ...))") (hash-put! - *gerbil-signatures* + *scheme-signatures* "defrule" "(defrule (name pattern ...) template)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "let" "(let ((var val) ...) body ...)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "let*" "(let* ((var val) ...) body ...)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "letrec" "(letrec ((var val) ...) body ...)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "when" "(when test body ...)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "unless" "(unless test body ...)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "cond" "(cond (test expr ...) ... [(else expr ...)])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "case" "(case key ((datum ...) expr ...) ... [(else expr ...)])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "match" "(match expr (pattern body ...) ...)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "parameterize" "(parameterize ((param val) ...) body ...)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "vector-ref" "(vector-ref vec index)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "vector-set!" "(vector-set! vec index val)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "vector-length" "(vector-length vec)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "make-vector" "(make-vector n [fill])") (hash-put! - *gerbil-signatures* + *scheme-signatures* "vector->list" "(vector->list vec)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "list->vector" "(list->vector list)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "json-object->string" "(json-object->string obj)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "string->json-object" "(string->json-object str)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "open-process" "(open-process settings)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "process-status" "(process-status proc)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "apply" "(apply proc arg ... args)") (hash-put! - *gerbil-signatures* + *scheme-signatures* "call-with-port" "(call-with-port port proc)")) (def (enclosing-function-at-point text pos) @@ -1814,14 +1814,14 @@ (let* ([fr (app-state-frame app)] [buf (qt-edit-window-buffer (qt-current-window fr))] [lang (buffer-lexer-lang buf)]) - (when (memq lang '(scheme gerbil lisp)) + (when (memq lang '(scheme lisp)) (let* ([ed (qt-edit-window-editor (qt-current-window fr))] [text (qt-plain-text-edit-text ed)] [pos (qt-plain-text-edit-cursor-position ed)] [sym (enclosing-function-at-point text pos)]) (cond [(and sym (not (equal? sym *eldoc-last-sym*))) - (let ([sig (hash-get *gerbil-signatures* sym)]) + (let ([sig (hash-get *scheme-signatures* sym)]) (set! *eldoc-last-sym* sym) (when sig (echo-message! (app-state-echo app) sig)))] [(and (not sym) *eldoc-last-sym*) @@ -2040,7 +2040,7 @@ "Buffer no longer exists")))))) (define *project-root-markers*--cell (vector - '(".git" "gerbil.pkg" "Makefile" "build.ss" "Cargo.toml" + '(".git" "jerboa.pkg" "Makefile" "build.ss" "Cargo.toml" "package.json" "pyproject.toml" "setup.py" "go.mod" "CMakeLists.txt" ".project-root"))) (def (detect-project-root path) @@ -2098,11 +2098,11 @@ (identifier-syntax [id (vector-ref *eldoc-mode*--cell 0)] [(set! id val) (vector-set! *eldoc-mode*--cell 0 val)])) - (define-syntax *gerbil-signatures* + (define-syntax *scheme-signatures* (identifier-syntax - [id (vector-ref *gerbil-signatures*--cell 0)] + [id (vector-ref *scheme-signatures*--cell 0)] [(set! id val) (vector-set! - *gerbil-signatures*--cell + *scheme-signatures*--cell 0 val)])) (define-syntax *eldoc-last-sym* --- a/lib/jerboa-emacs/qt/commands-vcs2.sls +++ b/lib/jerboa-emacs/qt/commands-vcs2.sls @@ -53,7 +53,7 @@ (reverse defs) (let ([line (car ls)]) (let ([found (cond - [(memq lang '(scheme gerbil lisp)) + [(memq lang '(scheme lisp)) (cond [(and (>= (string-length line) 5) (string-prefix? "(def " line)) @@ -754,7 +754,7 @@ (let* ([proc (open-process (list 'path: "/usr/bin/find" 'arguments: (list root "-type" "f" "-not" "-path" - "*/.git/*" "-not" "-path" "*/.gerbil/*" "-not" + "*/.git/*" "-not" "-path" "*/.chez/*" "-not" "-path" "*/node_modules/*" "-not" "-path" "*/__pycache__/*" "-not" "-path" "*/target/*" "-not" "-path" "*/.build/*" "-not" "-name" @@ -830,8 +830,8 @@ [default (or (app-state-last-compile app) (cond [(file-exists? - (path-expand "gerbil.pkg" root)) - "gerbil build"] + (path-expand "jerboa.pkg" root)) + "chez build"] [(file-exists? (path-expand "Makefile" root)) "make"] [(file-exists? --- a/lib/jerboa-emacs/qt/commands.sls +++ b/lib/jerboa-emacs/qt/commands.sls @@ -1495,8 +1495,8 @@ (register-command! 'search-backward cmd-search-backward) (register-command! 'query-replace cmd-query-replace) (register-command! 'repl cmd-repl) - (register-command! 'gerbil-repl cmd-repl) - (register-command! 'run-gerbil cmd-repl) + (register-command! 'chez-repl cmd-repl) + (register-command! 'run-chez cmd-repl) (register-command! 'eval-expression cmd-eval-expression) (register-command! 'eval-expression-blocking