From 4efc27ba374b1f587476cb3847b37e27dda601ae Mon Sep 17 00:00:00 2001
From: AJ Rossini <blindglobe@gmail.com>
Date: Sun, 28 Jan 2007 22:23:53 +0100
Subject: [PATCH] more ANSI cleanup

---
 defsys.lsp     |  2 ++
 lispstat.asd   | 59 ++++++++++++++++++++++++++++++++++++----------------------
 lsobjects.lsp  |  6 ++----
 lspackages.lsp |  2 +-
 4 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/defsys.lsp b/defsys.lsp
index c55e6d3..e56f2b8 100644
--- a/defsys.lsp
+++ b/defsys.lsp
@@ -1,3 +1,5 @@
+;;; -*- mode: lisp -*-
+
 ;;;; defsys -- System setup for CL version of Lisp-Stat
 ;;;; 
 ;;;; Copyright (c) 1991, by Luke Tierney. Permission is granted for
diff --git a/lispstat.asd b/lispstat.asd
index a2061b2..d713562 100644
--- a/lispstat.asd
+++ b/lispstat.asd
@@ -46,30 +46,45 @@ Last touched 1991, then in 2005--2007."
 
   :components ((:static-file "version" :pathname #p"version.lisp-expr")
 	       (:lispstat-lsp-source-file "lspackages")
-	       (:lispstat-lsp-source-file "lsobjects" :depends-on ("lspackages"))
-	       (:lispstat-lsp-source-file "fastmap" :depends-on ("lsobjects"))
-	       (:lispstat-lsp-source-file "compound" :depends-on ("lsobjects" "fastmap"))
-	       (:lispstat-lsp-source-file "lsmacros" :depends-on ("compound"))
-	       (:lispstat-lsp-source-file "lsbasics" :depends-on ("lsobjects" "lsmacros")) 
-	       (:lispstat-lsp-source-file "dists" :depends-on ("lsbasics"))
-	       (:lispstat-lsp-source-file "ladata" :depends-on ("lsbasics")) ;; in lisp-stat-basics
-	       (:lispstat-lsp-source-file "linalg" :depends-on ("ladata")) ;; in lisp-stat-basics
-	       (:lispstat-lsp-source-file "matrices" :depends-on ("lsbasics"))
-	       (:lispstat-lsp-source-file "lsfloat" :depends-on ("lsbasics")) ;; in lisp-stat-basics
-	       (:lispstat-lsp-source-file "lsmath" :depends-on ("lsbasics"))
+	       (:lispstat-lsp-source-file "lsobjects"
+					  :depends-on ("lspackages"))
+	       (:lispstat-lsp-source-file "fastmap"
+					  :depends-on ("lsobjects"))
+	       (:lispstat-lsp-source-file "compound"
+					  :depends-on ("lsobjects"
+						       "fastmap"))
+	       (:lispstat-lsp-source-file "lsmacros"
+					  :depends-on ("compound"))
+	       (:lispstat-lsp-source-file "lsbasics"
+					  :depends-on ("lsobjects"
+						       "lsmacros")) 
+	       (:lispstat-lsp-source-file "dists"
+					  :depends-on ("lsbasics"))
+	       (:lispstat-lsp-source-file "ladata"
+					  :depends-on ("lsbasics")) ;; in lisp-stat-basics
+	       (:lispstat-lsp-source-file "linalg"
+					  :depends-on ("ladata")) ;; in lisp-stat-basics
+	       (:lispstat-lsp-source-file "matrices"
+					  :depends-on ("lsbasics"))
+	       (:lispstat-lsp-source-file "lsfloat"
+					  :depends-on ("lsbasics")) ;; in lisp-stat-basics
+	       (:lispstat-lsp-source-file "lsmath"
+					  :depends-on ("lsbasics"))
 	       
 	       ;; Applications
-	       (:lispstat-lsp-source-file "regression" :depends-on ("lsobjects"))
-	       (:lispstat-lsp-source-file "nonlin" :depends-on ("lsobjects" "regression"))
-	       (:lispstat-lsp-source-file "statistics" :depends-on ("lsobjects"))
-	       (:lispstat-lsp-source-file "maximize" :depends-on ("lsobjects"))
-	       (:lispstat-lsp-source-file "bayes" :depends-on ("lsobjects"
-					   "dists")) ; in lisp-stat
+	       (:lispstat-lsp-source-file "regression"
+					  :depends-on ("lsobjects"))
+	       (:lispstat-lsp-source-file "nonlin"
+					  :depends-on ("lsobjects"
+						       "regression"))
+	       (:lispstat-lsp-source-file "statistics"
+					  :depends-on ("lsobjects"))
+	       (:lispstat-lsp-source-file "maximize"
+					  :depends-on ("lsobjects"))
+	       (:lispstat-lsp-source-file "bayes"
+					  :depends-on ("lsobjects"
+						       "dists")) ; in lisp-stat
 	       
 	       (:lispstat-lsp-source-file "numlib")
 	       (:lispstat-lsp-source-file "defsys")
-	       (:lispstat-lsp-source-file "lstoplevel")
-
-	       ;; Testing comes last!
-	       ;; (:lispstat-lsp-source-file "unittests" :depends-on ("lsobjects"))
-	       ))
\ No newline at end of file
+	       (:lispstat-lsp-source-file "lstoplevel")))
diff --git a/lsobjects.lsp b/lsobjects.lsp
index 3cf26a8..7f149d3 100644
--- a/lsobjects.lsp
+++ b/lsobjects.lsp
@@ -51,8 +51,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(provide "lsobjects")
-
 ;;;;
 ;;;; Package Setup
 ;;;;
@@ -60,12 +58,12 @@
 (defpackage :lisp-stat-object-system
  (:nicknames :ls-objects :lsos)
  (:use :common-lisp)
- (:shadow "CALL-NEXT-METHOD" "SLOT-VALUE")
+ (:shadow call-next-method slot-value)
  (:export ls-object objectp *object* kind-of-p make-object *message-hook*
 	  *set-slot-hook* slot-value self send call-next-method call-method
 	  defmeth defproto instance-slots proto-name))
 
-(in-package #:LISP-STAT-OBJECT-SYSTEM)
+(in-package :lisp-stat-object-system)
 
 (defun use-lsos ()
   (shadowing-import (package-shadowing-symbols 'lisp-stat-object-system))
diff --git a/lspackages.lsp b/lspackages.lsp
index 98392ea..cbc3824 100644
--- a/lspackages.lsp
+++ b/lspackages.lsp
@@ -21,7 +21,7 @@
 (defpackage :lisp-stat-object-system
  (:nicknames :ls-objects :lsos)
  (:use :common-lisp)
- (:shadow :call-next-method slot-value)
+ (:shadow call-next-method slot-value)
  (:export ls-object objectp *object* kind-of-p make-object *message-hook*
 	  *set-slot-hook* slot-value self send call-next-method call-method
 	  defmeth defproto instance-slots proto-name))
-- 
2.11.4.GIT