Enable append/list.

Rename ERROR-BEHAVIOUR to ERROR-BEHAVIOR, as per Google Common Lisp Guidelines.

diff --git a/base/lists.lisp b/base/lists.lisp
index f745895..e17c2df 100644 (file)
--- a/base/lists.lisp
+++ b/base/lists.lisp
@@ -31,9 +31,10 @@
   "N first elements of list L -- complement of (NTHCDR N L)"
   (subseq l 0 n))
 
-#| ;; use ALEXANDRIA:MAPPEND instead
 (defun append/list (list)
   (reduce #'append list :from-end t))
+
+#| ;; use ALEXANDRIA:MAPPEND instead
 (defun mappend (&rest rest)
   "like mapcan, but works on lists resulting from quasi-quoted expressions"
   (append/list (apply #'mapcar rest)))

diff --git a/base/macros.lisp b/base/macros.lisp
index def74a8..856f358 100644 (file)
--- a/base/macros.lisp
+++ b/base/macros.lisp
@@ -408,13 +408,13 @@ outputs a tag plus a list of variable and their values, returns the last value"
 ; -----------------------------------------------------------------------------
 ;;; Manipulating Source
 
-(defun error-behaviour (e &rest r)
-  "generic way to specify behaviour in exceptional situations"
+(defun error-behavior (e &rest r)
+  "generic way to specify behavior in exceptional situations"
   (etypecase e
    (function (apply e r))
    (null nil)
    ((eql t) (error "Something bad happened. Check the backtrace."))
-   (cons (apply 'error-behaviour (append e r)))
+   (cons (apply 'error-behavior (append e r)))
    ((or string symbol)
     (with-standard-io-syntax
       (let ((*read-eval* nil)
@@ -429,10 +429,10 @@ outputs a tag plus a list of variable and their values, returns the last value"
   "checks whether X is an instance of a something made with a maker
 defined by (MAKE-SINGLE-ARG-FORM TAG). If ON-ERROR is defined, and
 X looks like it is such an instance but is malformed, then ON-ERROR
-is invoked as an ERROR-BEHAVIOUR."
+is invoked as an ERROR-BEHAVIOR."
   (and (form-starting-with-p tag x)
        (or (and (consp (cdr x)) (null (cddr x)))
-          (error-behaviour on-error tag x))))
+          (error-behavior on-error tag x))))
 
 #| ;; if you need it, use it from alexandria
 (defun proper-list-p (x)
@@ -468,7 +468,7 @@ is invoked as an ERROR-BEHAVIOUR."
 to be evaluated as function call, macro call, or special form?"
   (and (consp x)
        (if on-error
-          (or (listp #|not bothering with proper-list-p|# x) (error-behaviour on-error x))
+          (or (listp #|not bothering with proper-list-p|# x) (error-behavior on-error x))
         t)))
 (defun literalp (x)
   "predicate that tells whether X is the source form for a literal expression."

diff --git a/package.lisp b/package.lisp
index 7303f73..ead8cb2 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -44,7 +44,7 @@
    #:define-values-post-modify-macro #:defmsv #:defsubst
    #:defun-inline #:delete-item! #:delete-node! #:disable-fun
    #:dolist-with-rest #:dolist-with-rest-fun #:empty-container!
-   #:enable-fun #:equal-array #:error-behaviour #:eval-now
+   #:enable-fun #:equal-array #:error-behavior #:eval-now
    #:eval-once #:evaluating-once #:exchange-nodes #:export*
    #:export-symbols #:export-symbols* #:exporting-definitions
    #:featurify ;; #:extremum
@@ -60,7 +60,7 @@
    #:list->vector #:list-of-integers
    #:literalp #:make-collector #:make-defpackage-form
    #:make-node #:make-predicate-symbol
-   #:make-single-arg-form #:mapcar2 #:mapmacro ;; #:mappend #:append/list
+   #:make-single-arg-form #:mapcar2 #:mapmacro #:append/list ;; #:mappend
    #:maybe-adjust-size-down #:maybe-adjust-size-up
    #:msg #:multiple-value-quote #:mvbind
    #:mvcall #:mvlist #:mvprog1 #:mvquote #:mvsetq