changeset 558: |
1acb5e37e493 |
parent 557: |
da10aabba6a7 |
child 559: |
e6c6713c17ff |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Thu, 25 Jul 2024 21:08:26 -0400 |
files: |
lisp/ffi/readline/tests.lisp lisp/lib/gui/pkg.lisp lisp/lib/gui/slint.lisp lisp/lib/skel/comp/dir-locals.lisp lisp/lib/skel/core/obj.lisp lisp/lib/skel/core/pkg.lisp lisp/lib/skel/core/vars.lisp lisp/std/tests/tasks.lisp |
description: |
removed slint, skel fixes, init more tests for STD (specifically tasks) |
1.1--- a/lisp/ffi/readline/tests.lisp Wed Jul 24 21:22:33 2024 -0400
1.2+++ b/lisp/ffi/readline/tests.lisp Thu Jul 25 21:08:26 2024 -0400
1.3@@ -11,7 +11,6 @@
1.4
1.5 (load-readline)
1.6
1.7-(deftest readline ()
1.8+(deftest sanity ()
1.9 (is readline::*history-base*)
1.10 (is readline::*history-length*))
1.11-
2.1--- a/lisp/lib/gui/pkg.lisp Wed Jul 24 21:22:33 2024 -0400
2.2+++ b/lisp/lib/gui/pkg.lisp Thu Jul 25 21:08:26 2024 -0400
2.3@@ -20,11 +20,6 @@
2.4 :with-gui-handlers
2.5 :gui-main
2.6 :def-gui))
2.7-
2.8-(defpackage :gui/slint
2.9- (:use :cl :std :log :gui/core :gui/ext :parse) ;; yacc or lex
2.10- (:export :compile-slint :compile-to-slint-file :compile-to-slint-string
2.11- :*slint-grammar* :with-slint))
2.12
2.13 (uiop:define-package :gui
2.14 (:use-reexport :gui/core :gui/wm :gui/ext))
3.1--- a/lisp/lib/gui/slint.lisp Wed Jul 24 21:22:33 2024 -0400
3.2+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3@@ -1,36 +0,0 @@
3.4-;;; gui/slint.lisp --- Slint UI Compiler
3.5-
3.6-;; This package provides a simple compiler for .slint files.
3.7-
3.8-;; see also: core/rust/lib/ui and core/rust/ui
3.9-
3.10-;;; Commentary:
3.11-
3.12-;; The DSL is S-expression based and can be extended with macros.
3.13-
3.14-;; https://releases.slint.dev/1.5.1/docs/slint/ - Language Docs
3.15-
3.16-;; https://releases.slint.dev/1.5.1/docs/rust/slint/ - Rust API Docs
3.17-
3.18-;; https://slintpad.com/ - online playground
3.19-
3.20-;;; Code:
3.21-(in-package :gui/slint)
3.22-
3.23-(define-matcher slint-import-statement
3.24- (matcher-string "import"))
3.25-
3.26-(define-grammar *slint-grammar*
3.27- (:start-symbol expr)
3.28- (expr
3.29- tok)
3.30- (tok t))
3.31-
3.32-;; (with-lexer-environment ...)
3.33-;; (parse-with-lexer #'terpri (make-parser *slint-grammar*))
3.34-
3.35-(defmacro with-slint (&body body) `(progn ,@body nil))
3.36-(defun compile-slint (slint-expr &key output)
3.37- "Compile the SLINT-EXPR to a Slint UI definition, optionally sending to
3.38-OUTPUT."
3.39- nil)
4.1--- a/lisp/lib/skel/comp/dir-locals.lisp Wed Jul 24 21:22:33 2024 -0400
4.2+++ b/lisp/lib/skel/comp/dir-locals.lisp Thu Jul 25 21:08:26 2024 -0400
4.3@@ -16,4 +16,3 @@
4.4 (defmethod sk-load-component ((kind (eql :dir-locals)) (name pathname))
4.5 (declare (ignore kind))
4.6 (sk-new :dir-locals :ast (read-sxp-file (make-pathname :name (namestring name) :type "el"))))
4.7-
5.1--- a/lisp/lib/skel/core/obj.lisp Wed Jul 24 21:22:33 2024 -0400
5.2+++ b/lisp/lib/skel/core/obj.lisp Thu Jul 25 21:08:26 2024 -0400
5.3@@ -404,9 +404,10 @@
5.4 (setf (slot-value self s) v))) ;; needs to be correct package
5.5 ;;; SRC
5.6 (if (bound-string-p self 'src)
5.7- (setf (sk-src self) (probe-file (pathname (sk-src self))))
5.8+ (setf (sk-src self) (probe-file (sk-src self)))
5.9 (setf (sk-src self) (pathname (sk-dir self))))
5.10 (let ((*default-pathname-defaults* (sk-src self)))
5.11+ (setq *skel-path* *default-pathname-defaults*)
5.12 (when (bound-string-p self 'stash) (setf (sk-stash self) (pathname (the simple-string (sk-stash self)))))
5.13 (when (bound-string-p self 'store) (setf (sk-store self) (pathname (the simple-string (sk-store self)))))
5.14 ;; INCLUDE
5.15@@ -421,7 +422,8 @@
5.16 ;; COMPONENTS
5.17 (when (slot-boundp self 'components)
5.18 (setf (sk-components self) (map 'vector
5.19- (lambda (c) (sk-load-component (car c) (pathname (cadr c))))
5.20+ (lambda (c)
5.21+ (sk-load-component (car c) (merge-pathnames (cadr c) *skel-path*)))
5.22 (sk-components self))))
5.23 ;; SCRIPTS
5.24 (if (bound-string-p self 'scripts)
6.1--- a/lisp/lib/skel/core/pkg.lisp Wed Jul 24 21:22:33 2024 -0400
6.2+++ b/lisp/lib/skel/core/pkg.lisp Thu Jul 25 21:08:26 2024 -0400
6.3@@ -52,7 +52,7 @@
6.4 :*skel-env* :*skel-project*
6.5 :*skel-registry* :*skel-cache* :*skel-store* :*skel-stash*
6.6 :*skel-registry* :*default-skelfile* :*default-skel-user* :*default-skel-vc-kind*
6.7- :*default-skel-cache* :*skelfile-extension* :*skelfile-boundary*))
6.8+ :*default-skel-cache* :*skelfile-extension* :*skelfile-boundary* :*skel-path*))
6.9
6.10 (defpackage :skel/core/obj
6.11 (:use :cl :std :obj
7.1--- a/lisp/lib/skel/core/vars.lisp Wed Jul 24 21:22:33 2024 -0400
7.2+++ b/lisp/lib/skel/core/vars.lisp Thu Jul 25 21:08:26 2024 -0400
7.3@@ -22,6 +22,8 @@
7.4
7.5 (defparameter *skel-registry* #P"/usr/local/share/skel/registry/")
7.6
7.7+(defparameter *skel-path* *default-pathname-defaults*)
7.8+
7.9 (defvar *skel-project* nil)
7.10
7.11 (defvar *skel-env* (make-hash-table :test 'equal)
8.1--- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2+++ b/lisp/std/tests/tasks.lisp Thu Jul 25 21:08:26 2024 -0400
8.3@@ -0,0 +1,7 @@
8.4+;;; tasks.lisp --- Task Pool Tests
8.5+
8.6+;;
8.7+
8.8+;;; Code:
8.9+(in-package :std/tests)
8.10+(in-suite :std)