From bf8e416456463a34abf03674fa0614947783f712 Mon Sep 17 00:00:00 2001 From: tony Date: Sun, 15 Jun 2008 08:14:19 +0200 Subject: [PATCH] whitespace. assistance, sdl comment --- compound.lsp | 9 ++++++--- init.lisp | 5 ++++- ls-demo.lisp | 9 ++++++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/compound.lsp b/compound.lsp index 8f5c7a4..e928d9a 100644 --- a/compound.lsp +++ b/compound.lsp @@ -64,8 +64,10 @@ "Predicate to determine if argument is compound. Most common non-compound types are checked first." (declare (inline numberp symbolp stringp consp arrayp array-total-size)) - (cond ((or (numberp x) (symbolp x) (stringp x)) nil) - ((or (consp x) (and (arrayp x) (< 0 (array-total-size x)))) t) + (cond ((or (numberp x) (symbolp x) (stringp x)) + nil) + ((or (consp x) (and (arrayp x) (< 0 (array-total-size x)))) + t) (t (compound-object-p x)))) (defun find-compound-data (list) @@ -103,7 +105,8 @@ than as a list of lists." (let ((n (length (compound-data-sequence shape)))) (if (/= n (length sequence)) (error "compound data not the same shape")) (cond - ((consp shape) (if (consp sequence) sequence (coerce sequence 'list))) + ((consp shape) + (if (consp sequence) sequence (coerce sequence 'list))) ((vectorp shape) (if (vectorp sequence) sequence (coerce sequence 'vector))) ((arrayp shape) diff --git a/init.lisp b/init.lisp index 0e3053d..e0d8113 100644 --- a/init.lisp +++ b/init.lisp @@ -1,8 +1,11 @@ ;;; Basic ASDF stuff, was: basic initialization for LispStat -;;; Time-stamp: <2008-05-17 09:39:54 tony> +;;; Time-stamp: <2008-06-02 08:56:01 tony> ;;; Created: <2007-05-30 17:09:47 blindglobe> +(pushnew #p "/home/tony/Desktop/sandbox/CLS.git/ASDF/" + asdf:*central-registy*) + (asdf:oos 'asdf:compile-op :cffi) (asdf:oos 'asdf:compile-op :lift) (asdf:oos 'asdf:compile-op :lispstat) diff --git a/ls-demo.lisp b/ls-demo.lisp index 9c5269a..401e8c4 100644 --- a/ls-demo.lisp +++ b/ls-demo.lisp @@ -3,7 +3,7 @@ ;;; See COPYRIGHT file for any additional restrictions (BSD license). ;;; Since 1991, ANSI was finally finished. Edited for ANSI Common Lisp. -;;; Time-stamp: <2008-06-03 15:35:13 tony> +;;; Time-stamp: <2008-06-15 08:07:18 tony> ;;; Creation: <2007-01-01 09:21:50 user> WRONG ;;; File: ls-demo.lisp ;;; Author: AJ Rossini @@ -208,6 +208,7 @@ my-chol-decomp-test (defvar my-proto-instance nil) (setf my-proto-instance (send *test-proto* :new)) (send *test-proto* :own-slots) +;;; The following fail and I do not know why? (send *test-proto* :has-slot 'proto-name) (send *test-proto* :has-slot 'PROTO-NAME) (send *test-proto* :has-slot 'make-data) @@ -440,11 +441,13 @@ tplist (listp tlist) (getf tlist :THIS) -;;; CL-SDL demos +;;; CL-SDL demos, working in Debian unstable, 15.6.08. (clc:clc-require :sdl-demos) -;;(sdl-test:start) ; locks up SBCL.? +(sdl-test:start) ;;; where is 2-11, 16, :solar-system, :vertex-arrays, (nehe:run-tutorial 2) +(nehe:run-tutorial 3) + -- 2.11.4.GIT