changeset 294: |
612ab733b36e |
parent 293: |
e2e5c4831389 |
child 295: |
10353e203e13 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Wed, 24 Apr 2024 23:27:21 +0000 |
files: |
lisp/lib/dat/sxp.lisp lisp/lib/skel/core/obj.lisp lisp/lib/vc/vc.asd x.lisp |
description: |
fixes |
1.1--- a/lisp/lib/dat/sxp.lisp Wed Apr 24 16:12:15 2024 -0400
1.2+++ b/lisp/lib/dat/sxp.lisp Wed Apr 24 23:27:21 2024 +0000
1.3@@ -91,7 +91,7 @@
1.4
1.5 (defun make-sxp (&rest form) (make-instance 'sxp :ast form))
1.6
1.7-(deftype sxp-fmt-designator () '(member :canonical :collapsed))
1.8+(deftype sxp-fmt-designator () '(member :canonical :collapsed :pretty))
1.9
1.10 (declaim (inline unwrap-object)) ;; inline -200
1.11 (defun unwrap-object (obj &key (slots t) (methods nil)
2.1--- a/lisp/lib/skel/core/obj.lisp Wed Apr 24 16:12:15 2024 -0400
2.2+++ b/lisp/lib/skel/core/obj.lisp Wed Apr 24 23:27:21 2024 +0000
2.3@@ -164,7 +164,7 @@
2.4 (scripts :initarg :scripts :type (or pathname list) :accessor sk-scripts)
2.5 (license :initarg :license :type license-designator :accessor sk-license)
2.6 (log-level :initarg :log-level :type log-level-designator)
2.7- (fmt :initarg :fmt :type symbol)
2.8+ (fmt :initform :pretty :initarg :fmt :type symbol)
2.9 (alias-list :initarg :alias-list
2.10 :type (or list vector)
2.11 :documentation "alist of aliases. currently used as a special cli-opt-parser by the skel binary.")
2.12@@ -330,9 +330,9 @@
2.13 :exclude exclude)))
2.14
2.15 ;; TODO 2023-09-26: This belongs in sxp
2.16-(defmethod write-sxp-stream ((self sk-project) stream &key (pretty t) (case :downcase) (fmt :collapsed))
2.17+(defmethod write-sxp-stream ((self sk-project) stream &key (pretty t) (case :downcase) (fmt :pretty))
2.18 (case fmt
2.19- (:collapsed
2.20+ (:pretty
2.21 (if (listp (ast self))
2.22 (loop for (k v . rest) on (ast self)
2.23 by #'cddr
3.1--- a/lisp/lib/vc/vc.asd Wed Apr 24 16:12:15 2024 -0400
3.2+++ b/lisp/lib/vc/vc.asd Wed Apr 24 23:27:21 2024 +0000
3.3@@ -5,8 +5,7 @@
3.4 (:file "ignore")
3.5 (:file "proto")
3.6 (:file "hg")
3.7- (:file "git")
3.8- (:file "vc"))
3.9+ (:file "git"))
3.10 :in-order-to ((test-op (test-op :vc/tests))))
3.11
3.12 (defsystem :vc/tests
4.1--- a/x.lisp Wed Apr 24 16:12:15 2024 -0400
4.2+++ b/x.lisp Wed Apr 24 23:27:21 2024 +0000
4.3@@ -19,7 +19,7 @@
4.4 (sb-ext:enable-debugger)
4.5
4.6 #-quicklisp
4.7-(let ((quicklisp-init (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname))))
4.8+(let ((quicklisp-init "/usr/local/share/quicklisp/setup.lisp"))
4.9 (when (probe-file quicklisp-init)
4.10 (load quicklisp-init)))
4.11