# HG changeset patch # User Richard Westhaver # Date 1723268423 14400 # Node ID 7a5d6e45de7acb24bb255b5fc0dc9e957ebd8e96 # Parent 35bb0d5ec95ebd6a40ca4e391ea4b90ee783c446 srv syn diff -r 35bb0d5ec95e -r 7a5d6e45de7a emacs/default.el --- a/emacs/default.el Sat Aug 10 00:30:45 2024 -0400 +++ b/emacs/default.el Sat Aug 10 01:40:23 2024 -0400 @@ -46,16 +46,17 @@ view-read-only t) (add-to-list 'treesit-extra-load-path "/usr/local/lib/") -;; (let ((grammar-dir "/usr/local/share/tree-sitter/")) -;; (when (file-exists-p grammar-dir) -;; (append -;; (flatten -;; (mapcar -;; (lambda (f) -;; (unless (or (string= "." f) (string= ".." f)) -;; (concat grammar-dir f))) -;; (directory-files "/usr/local/share/tree-sitter"))) -;; treesit-extra-load-path))) +(let ((grammar-dir "/usr/local/share/tree-sitter/")) + (when (file-exists-p grammar-dir) + (setq treesit-extra-load-path + (append + (flatten + (mapcar + (lambda (f) + (unless (or (string= "." f) (string= ".." f)) + (concat grammar-dir f))) + (directory-files "/usr/local/share/tree-sitter"))) + treesit-extra-load-path)))) ;;; Variables (defvar user-emacs-lib-directory (expand-file-name (join-paths user-emacs-directory "lib"))) @@ -719,6 +720,7 @@ (setq org-todo-keywords '((type "TBD(0!)" "TODO(t!)" "|") (type "WIP(w!)" "|") + (type "HOLD(H@!)" "WAIT(/j@!)" "|") (sequence "FIND(q!)" "READ(r@!)" "WATCH(W@!)" "|") (sequence "RESEARCH(s!)" "RECORD(e!)" "|") (sequence "OUTLINE(O!)" "RESEARCH(A!)" "DRAFT(M!)" "REVIEW(R!)" "|") diff -r 35bb0d5ec95e -r 7a5d6e45de7a lisp/lib/net/srv.lisp --- a/lisp/lib/net/srv.lisp Sat Aug 10 00:30:45 2024 -0400 +++ b/lisp/lib/net/srv.lisp Sat Aug 10 01:40:23 2024 -0400 @@ -47,7 +47,7 @@ ;;; Conditions ;; from hunchentoot (define-condition srv-condition (condition) ()) -(deferror srv-error (srv-condition error) () (:auto t)) +(deferror srv-error (srv-condition error) () ()) (deferror srv-simple-error (srv-error simple-condition) () (:auto t)) (define-condition srv-warning (srv-condition warning) ()) diff -r 35bb0d5ec95e -r 7a5d6e45de7a lisp/lib/syn/pkg.lisp --- a/lisp/lib/syn/pkg.lisp Sat Aug 10 00:30:45 2024 -0400 +++ b/lisp/lib/syn/pkg.lisp Sat Aug 10 01:40:23 2024 -0400 @@ -10,3 +10,17 @@ (:export)) (in-package :syn) + +(defvar *syntax-tree* nil) +(defclass syntax () ()) + +;; does not need tree-sitter lang loaded before use +(defclass tree-sitter-syntax (syntax) + (path + info)) + +;; needs tree-sitter lang loaded before use +(defstruct tree-sitter-syntax-info + version + symbols + fields) diff -r 35bb0d5ec95e -r 7a5d6e45de7a readme.org --- a/readme.org Sat Aug 10 00:30:45 2024 -0400 +++ b/readme.org Sat Aug 10 01:40:23 2024 -0400 @@ -9,15 +9,10 @@ - [[https://compiler.company/docs/core/stats.html][Stats]] :: Project Statistics * Overview -The Compiler Company (aka CC) is a small software research laboratory + is a small software research laboratory concerned with the future of Mechanical Freedom. -This repository contains the monolothic core of all our products and -projects. - -- NOTE :: This is *not* a portable library. Starting in version =1.0= - we will be depending on separately distributed forks of SBCL and - Rust. +This repository contains the monolothic core of the Compiler Company. To bootstrap the core you will need recent versions of [[https://www.rust-lang.org/][Rust]], [[http://www.sbcl.org/][SBCL]], and a C compiler (clang or gcc). Only Unix systems are explicitly @@ -32,25 +27,25 @@ platform-specific [[https://packy.compiler.company/dist][binary distributions]]. #+NAME: Optional Dependencies -| dependency | dependents | src | dist | -|-------------+------------------------+-----------------------------------------------+------| -| Blake3 | ffi/blake3 | https://vc.compiler.company/packy/blake3 | | -| Tree-sitter | ffi/tree-sitter | https://vc.compiler.company/packy/tree-sitter | | -| Uring | ffi/uring | https://vc.compiler.company/packy/uring | | -| Btrfs | ffi/btrfs | https://vc.compiler.company/packy/btrfs | | -| Ublksrv | ffi/ublk | https://vc.compiler.company/packy/ublksrv | | -| OpenSSL | lib/net | | | -| RocksDB | ffi/rocksdb | https://vc.compiler.company/packy/rocksdb | | -| Git | lib/vc/git | https://vc.compiler.company/packy/git | | -| Hg | lib/vc/hg | https://vc.compiler.company/packy/hg | | -| Zstd | ffi/zstd | https://vc.compiler.company/packy/zstd | | -| Qemu | lib/box | https://vc.compiler.company/packy/qemu | | -| Podman | lib/pod | https://vc.compiler.company/packy/podman | | -| Emacs | emacs | https://vc.compiler.company/packy/emacs | | -| StumpWM | lib/gui/wm/x11/stumpwm | https://vc.compiler.company/packy/stumpwm | | -| Readline | ffi/readline | | | -| Keyutils | ffi/keyutils | | | -| Mpd | lib/aud/mpd | https://vc.compiler.company/packy/mpd | | +| dependency | dependents | src | +|-------------+------------------------+-----------------------------------------------+ +| Blake3 | ffi/blake3 | https://vc.compiler.company/packy/blake3 | +| Tree-sitter | ffi/tree-sitter | https://vc.compiler.company/packy/tree-sitter | +| Uring | ffi/uring | https://vc.compiler.company/packy/uring | +| Btrfs | ffi/btrfs | https://vc.compiler.company/packy/btrfs | +| Ublksrv | ffi/ublk | https://vc.compiler.company/packy/ublksrv | +| OpenSSL | lib/net | | +| RocksDB | ffi/rocksdb | https://vc.compiler.company/packy/rocksdb | +| Git | lib/vc/git | https://vc.compiler.company/packy/git | +| Hg | lib/vc/hg | https://vc.compiler.company/packy/hg | +| Zstd | ffi/zstd | https://vc.compiler.company/packy/zstd | +| Qemu | lib/box | https://vc.compiler.company/packy/qemu | +| Podman | lib/pod | https://vc.compiler.company/packy/podman | +| Emacs | emacs | https://vc.compiler.company/packy/emacs | +| StumpWM | lib/gui/wm/x11/stumpwm | https://vc.compiler.company/packy/stumpwm | +| Readline | ffi/readline | | +| Keyutils | ffi/keyutils | | +| Mpd | lib/aud/mpd | https://vc.compiler.company/packy/mpd | * Build The Core consists of two major system: the *lisp* system and the @@ -86,7 +81,7 @@ #+RESULTS: x-help #+begin_example -This is SBCL 2.4.5, an implementation of ANSI Common Lisp. +This is SBCL 2.4.7:dc890089a, an implementation of ANSI Common Lisp. More information about SBCL is available at . SBCL is free software, provided as is, with absolutely no warranty. @@ -119,7 +114,7 @@ #+RESULTS: #+begin_example -This is SBCL 2.4.5, an implementation of ANSI Common Lisp. +This is SBCL 2.4.7:dc890089a, an implementation of ANSI Common Lisp. More information about SBCL is available at . SBCL is free software, provided as is, with absolutely no warranty. @@ -142,20 +137,22 @@ ; Loading "std/tests" in suite STD: -; with 13 tests -# +; with 15 tests +# +# +# +# +# +# +# +# +# +# # -# -# -# +# +# +# # -# -# -# -# -# -# -# No tests failed. #+end_example @@ -240,7 +237,7 @@ #+RESULTS: #+begin_example -skel v0.1.1:0e043dcda8f4+ --- A hacker's project compiler. +skel v0.1.1:ce91ffc6cc7a+ --- A hacker's project compiler. usage: skel [global] [] @@ -265,7 +262,6 @@ vc : version control -r/--root : repository path id : print the project id - rev : print the current vc revision id inspect : inspect the project skelfile -f/--file : path to skelfile make : build project targets @@ -289,6 +285,7 @@ commit : commit changes to the project vc edit : edit a project file in emacs. shell : open the sk-shell interpreter + #+end_example ** organ :lisp: #+begin_src shell :results output :exports both @@ -320,7 +317,6 @@ #+RESULTS: #+begin_example -#:debug 0.44; (#S(CLI-NODE :KIND OPT :FORM #)) packy v0.1.0 --- Universal Package Manager usage: packy [global] [] @@ -332,10 +328,10 @@ commands: show -#:debug 0.453333; /home/ellis/comp/core -; #(#) -; NIL -; #() + -n/--name* + -t/--target + -t/--thunk* + -p/--pk-target* #+end_example ** rdb :lisp: @@ -344,25 +340,6 @@ #+end_src #+RESULTS: -#+begin_example -rdb v0.1.0 --- A simple helper for RocksDB. - - usage: rdb [global] [] - -options: - -l/--level* : set the log level - -h/--help* : print help - -v/--version* : print version - -d/--db* : target db - -commands: - new - show - set - get - fuzz - destroy -#+end_example ** homer :lisp: #+begin_src shell :results output :exports both