From 424fc8ce80af45cdf64037eee9de7773971194aa Mon Sep 17 00:00:00 2001 From: Goheeca Date: Tue, 20 Aug 2013 16:57:25 +0200 Subject: [PATCH 1/2] Fixing typos --- common-lisp.html.markdown | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common-lisp.html.markdown b/common-lisp.html.markdown index a917304c..0a8ce990 100644 --- a/common-lisp.html.markdown +++ b/common-lisp.html.markdown @@ -205,7 +205,7 @@ nil ; for false - and the empty list ;; Or use concatenate - -(concatenate +(concatenate 'list '(1 2) '(3 4)) ;; Lists are a very central type, so there is a wide variety of functionality for ;; them, a few examples: @@ -279,10 +279,10 @@ nil ; for false - and the empty list ;; not. ;; Retrieving a non-present value returns nil - (gethash *m* 'd) ;=> nil, nil + (gethash 'd *m*) ;=> nil, nil ;; You can provide a default value for missing keys -(gethash *m* 'd :not-found) ; => :NOT-FOUND +(gethash 'd *m* :not-found) ; => :NOT-FOUND ;; Let's handle the multiple return values here in code. @@ -457,8 +457,8 @@ nil ; for false - and the empty list :accessor velocity :initarg :velocity) (average-efficiency - :accessor average-efficiency) - :initarg :average-efficiency) + :accessor average-efficiency + :initarg :average-efficiency)) (:documentation "A human powered conveyance")) ;; defclass, followed by name, followed by the superclass list, @@ -506,7 +506,7 @@ nil ; for false - and the empty list ; Direct superclasses: STANDARD-OBJECT ; Direct subclasses: UNICYCLE, BICYCLE, CANOE ; Not yet finalized. -(defparameter *foo#\u03BBooo* nil) ; Direct slots: +; Direct slots: ; VELOCITY ; Readers: VELOCITY ; Writers: (SETF VELOCITY) From edf839bfaefcdeb567ead6af0572d1e5195b4a3d Mon Sep 17 00:00:00 2001 From: Goheeca Date: Tue, 20 Aug 2013 17:58:33 +0200 Subject: [PATCH 2/2] added adjustable vectors --- common-lisp.html.markdown | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/common-lisp.html.markdown b/common-lisp.html.markdown index 0a8ce990..bf4844f3 100644 --- a/common-lisp.html.markdown +++ b/common-lisp.html.markdown @@ -219,7 +219,7 @@ nil ; for false - and the empty list ;;; Vectors -;; Vectors are fixed-length arrays +;; Vector's literals are fixed-length arrays #(1 2 3) ; => #(1 2 3) ;; Use concatenate to add vectors together @@ -253,6 +253,23 @@ nil ; for false - and the empty list ; => 0 +;;; Adjustable vectors + +;; Adjustable vectors have the same printed representation +;; as fixed-length vector's literals. + +(defparameter *adjvec* (make-array '(3) :initial-contents '(1 2 3) + :adjustable t :fill-pointer t)) + +*adjvec* ; => #(1 2 3) + +;; Adding new element: +(vector-push-extend 4 *adjvec*) ; => 3 + +*adjvec* ; => #(1 2 3 4) + + + ;;; Naively, sets are just lists: (set-difference '(1 2 3 4) '(4 5 6 7)) ; => (3 2 1)