Dropped arnesi.
Mon Jun 23 03:29:26 PDT 2008 levente.meszaros@gmail.com
* Dropped arnesi.
diff -rN -u old-computed-class/api.lisp new-computed-class/api.lisp
--- old-computed-class/api.lisp 2014-07-30 16:22:37.000000000 -0700
+++ new-computed-class/api.lisp 2014-07-30 16:22:37.000000000 -0700
@@ -42,7 +42,7 @@
;; mark on the symbol that this is a compute-as macro
(declare (type symbol compute-as-macro-name))
(let ((primitive-compute-as-macro-name (concatenate-symbol compute-as-macro-name "*"))
- (docstring (strcat "Use this macro to set the value of a computed slot to a computation in the universe '" (string name) "'.")))
+ (docstring (concatenate 'string "Use this macro to set the value of a computed slot to a computation in the universe '" (string name) "'.")))
`(eval-always
(setf (get ',compute-as-macro-name 'computed-as-macro-p) t)
(setf (get ',compute-as-macro-name 'primitive-compute-as-macro) ',primitive-compute-as-macro-name)
diff -rN -u old-computed-class/computed-class.asd new-computed-class/computed-class.asd
--- old-computed-class/computed-class.asd 2014-07-30 16:22:37.000000000 -0700
+++ new-computed-class/computed-class.asd 2014-07-30 16:22:37.000000000 -0700
@@ -26,7 +26,10 @@
(asdf:operate 'asdf:load-op :closer-mop))
(defpackage :computed-class-system
- (:use :cl :asdf :closer-mop)
+ (:use :common-lisp
+ :asdf
+ :closer-mop
+ :cl-syntax-sugar)
(:export
#:optimize-declaration
#:*load-with-debug-p*))
@@ -61,8 +64,15 @@
"Levente Mészáros <levente.meszaros@gmail.com>")
:licence "BSD"
:description "Computed class is a class meta object which supports computed slots."
- ;; TODO: kill arnesi
- :depends-on (:cl-def :arnesi :closer-mop)
+ :default-component-class cl-source-file-with-readtable
+ :class system-with-readtable
+ :setup-readtable-function "computed-class::setup-readtable"
+ :depends-on (:cl-def
+ :cl-yalog
+ :cl-syntax-sugar
+ :anaphora
+ :alexandria
+ :closer-mop)
:default-component-class computed-class-file
:components
((:file "package")
diff -rN -u old-computed-class/configuration.lisp new-computed-class/configuration.lisp
--- old-computed-class/configuration.lisp 2014-07-30 16:22:37.000000000 -0700
+++ new-computed-class/configuration.lisp 2014-07-30 16:22:37.000000000 -0700
@@ -27,6 +27,10 @@
;;; These definitions need to be available by the time we are reading the other files, therefore
;;; they are in a standalone file.
+(defmacro eval-always (&body body)
+ `(eval-when (:compile-toplevel :load-toplevel :execute)
+ ,@body))
+
;; TODO: this should be in closer-mop?
(progn
(defclass test ()
@@ -60,8 +64,7 @@
(defun file-header ()
`(eval-always
- (declaim ,(inline-declaration))
- (setup-readtable)))
+ (declaim ,(inline-declaration))))
(defun setup-readtable ()
(enable-sharp-boolean-syntax))
diff -rN -u old-computed-class/duplicates.lisp new-computed-class/duplicates.lisp
--- old-computed-class/duplicates.lisp 2014-07-30 16:22:37.000000000 -0700
+++ new-computed-class/duplicates.lisp 2014-07-30 16:22:37.000000000 -0700
@@ -24,27 +24,6 @@
;;; THE CONTENT OF THIS FILE IS COPIED OVER FROM SOME OTHER LIBRARIES TO DECREASE DEPENDENCIES
-(defmacro enable-sharp-boolean-syntax ()
- "Copies *readtable* and enables #t and #f readers for t and nil in the copy."
- '(eval-when (:compile-toplevel :execute)
- (setf *readtable* (copy-readtable *readtable*))
- (%enable-sharp-boolean-syntax)))
-
-(defun %enable-sharp-boolean-syntax ()
- (set-dispatch-macro-character
- #\# #\t
- (lambda (s c n)
- (declare (ignore s c n))
- t))
- (set-dispatch-macro-character
- #\# #\f
- (lambda (s c n)
- (declare (ignore s c n))
- nil)))
-
-(defmacro aprog1 (ret &body body)
- `(prog1-bind it ,ret ,@body))
-
(defmacro prog1-bind (var ret &body body)
`(let ((,var ,ret))
,@body
@@ -136,7 +115,7 @@
'parent-context-of) ,context-instance)
,parent)))
(unless ,context-instance
- (error ,',(strcat "Called with nil " (string-downcase name))))
+ (error ,',(concatenate 'string "Called with nil " (string-downcase name))))
,@forms)))
;; generate the in-... macro
(defmacro ,(concatenate-symbol "in-" name) (var-name-or-slot-name-list &body forms)
@@ -147,7 +126,7 @@
,@forms)
`(let ((,var-name-or-slot-name-list (,',extractor-name)))
(unless ,var-name-or-slot-name-list
- (error ,',(strcat "There's no " (string-downcase name))))
+ (error ,',(concatenate 'string "There's no " (string-downcase name))))
,@forms))))
;; generate the current-... function
(declaim (inline ,extractor-name))
@@ -157,27 +136,3 @@
(declaim (inline ,has-checker-name))
(defun ,has-checker-name ()
(boundp ',special-var-name)))))
-
-
-;;; from alexandria
-(defun parse-body (body &key documentation whole)
- "Parses BODY into (values remaining-forms declarations doc-string).
-Documentation strings are recognized only if DOCUMENTATION is true.
-Syntax errors in body are signalled and WHOLE is used in the signal
-arguments when given."
- (let ((doc nil)
- (decls nil)
- (current nil))
- (tagbody
- :declarations
- (setf current (car body))
- (when (and documentation (stringp current) (cdr body))
- (if doc
- (error "Too many documentation strings in ~S." (or whole body))
- (setf doc (pop body)))
- (go :declarations))
- (when (and (consp current)
- (eq 'declare (first current)))
- (push (pop body) decls)
- (go :declarations)))
- (values body (nreverse decls) doc)))
diff -rN -u old-computed-class/engine.lisp new-computed-class/engine.lisp
--- old-computed-class/engine.lisp 2014-07-30 16:22:37.000000000 -0700
+++ new-computed-class/engine.lisp 2014-07-30 16:22:37.000000000 -0700
@@ -24,9 +24,8 @@
#.(file-header)
-(eval-always
- (defconstant +invalid-pulse+ -1
- "The invalid pulse will be set in the computed-state whenever it has to be recomputed on the next read operation."))
+(def constant +invalid-pulse+ -1
+ "The invalid pulse will be set in the computed-state whenever it has to be recomputed on the next read operation.")
;;;;;;;;;;;;;;;;;;;
;;; Computed states
diff -rN -u old-computed-class/mop.lisp new-computed-class/mop.lisp
--- old-computed-class/mop.lisp 2014-07-30 16:22:37.000000000 -0700
+++ new-computed-class/mop.lisp 2014-07-30 16:22:37.000000000 -0700
@@ -122,7 +122,7 @@
(defmethod initialize-instance :around ((slot computed-direct-slot-definition-with-custom-accessors)
&rest args &key readers writers &allow-other-keys)
- (remf-keywords args :readers :writers)
+ (remove-from-plistf args :readers :writers)
(apply #'call-next-method slot :computed-readers readers :computed-writers writers args))
(defun needs-to-be-computed-direct-slot-p (slot-initargs)
@@ -422,11 +422,11 @@
(defmethod shared-initialize :around ((class computed-class) slot-names &rest args
&key direct-slots &allow-other-keys)
"Support :computed-in #f slot argument for documentation purposes."
- (remf-keywords args :direct-slots)
+ (remove-from-plistf args :direct-slots)
(let* ((direct-slots (loop for direct-slot :in direct-slots
collect (progn
(unless (getf direct-slot :computed-in)
- (remf-keywords direct-slot :computed-in))
+ (remove-from-plistf direct-slot :computed-in))
direct-slot))))
(apply #'call-next-method class slot-names :direct-slots direct-slots args)))
diff -rN -u old-computed-class/package.lisp new-computed-class/package.lisp
--- old-computed-class/package.lisp 2014-07-30 16:22:37.000000000 -0700
+++ new-computed-class/package.lisp 2014-07-30 16:22:37.000000000 -0700
@@ -27,7 +27,14 @@
(:shadow #:log)
- (:use :cl :cl-def :closer-mop :arnesi :computed-class-system)
+ (:use :common-lisp
+ :cl-def
+ :cl-yalog
+ :cl-syntax-sugar
+ :anaphora
+ :alexandria
+ :closer-mop
+ :computed-class-system)
(:export #:defcclass
#:computed-class
diff -rN -u old-computed-class/swank-integration.lisp new-computed-class/swank-integration.lisp
--- old-computed-class/swank-integration.lisp 2014-07-30 16:22:37.000000000 -0700
+++ new-computed-class/swank-integration.lisp 2014-07-30 16:22:37.000000000 -0700
@@ -46,7 +46,7 @@
((computed-state-p value)
`(,(if (computed-state-valid-p value) "Valid: " "Invalid: ")
(:value ,(cs-value value))
- ,(strcat ", pulse: " (cs-computed-at-pulse value) "/" (cs-validated-at-pulse value))
+ ,(concatenate 'string ", pulse: " (princ-to-string (cs-computed-at-pulse value)) "/" (princ-to-string (cs-validated-at-pulse value)))
", " (:value ,value ,(cu-name (cs-universe value)))
" "
,(if (computed-state-valid-p value)
diff -rN -u old-computed-class/test.lisp new-computed-class/test.lisp
--- old-computed-class/test.lisp 2014-07-30 16:22:37.000000000 -0700
+++ new-computed-class/test.lisp 2014-07-30 16:22:37.000000000 -0700
@@ -23,7 +23,7 @@
(in-package :computed-class)
(defpackage :computed-class-test
- (:use :cl :computed-class :closer-mop :arnesi :stefil))
+ (:use :common-lisp :cl-def :anaphora :computed-class :closer-mop :stefil))
(eval-always
(import '(find-slot computed-state-or-nil computed-effective-slot-definition current-pulse
Warning: CRC errors found. These are probably harmless but should be repaired.
See 'darcs gzcrcs --help' for more information.