From 3cbfa05f4a6ce10e21b5d4294a5e40556b872ee0 Mon Sep 17 00:00:00 2001
From: AJ Rossini <blindglobe@gmail.com>
Date: Sat, 4 Oct 2008 15:35:27 +0200
Subject: [PATCH] two more packages left off.  Whoops! (and corrected).

---
 src/basics/defsys.lsp | 17 +++--------------
 src/basics/lsmath.lsp | 44 +++++++++-----------------------------------
 src/packages.lisp     | 34 +++++++++++++++++++++++++++++++++-
 3 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/src/basics/defsys.lsp b/src/basics/defsys.lsp
index bd17a27..120d34a 100644
--- a/src/basics/defsys.lsp
+++ b/src/basics/defsys.lsp
@@ -1,25 +1,14 @@
 ;;; -*- mode: lisp -*-
 
-(in-package :cl-user)
-
-(defpackage :lisp-stat-config
-  (:use :common-lisp)
-  (:export *default-path*
-	   *lsos-files* *basic-files* *ls-files*
-
-	   *lispstat-data-dir* *lispstat-examples-dir*
-	   ))
-
 (in-package :lisp-stat-config)
 
-;; KCL
+;;; KCL
+
 ;; (proclaim '(optimize (safety 2) (space 3) (speed 3)))
 ;; (setf *break-enable* nil)
 
 
-;;;;
-;;;; EXCL (Allegro)
-;;;;
+;;; EXCL (Allegro)
 
 ;; (setf *read-default-float-format* 'double-float)
 
diff --git a/src/basics/lsmath.lsp b/src/basics/lsmath.lsp
index 1baa4b0..50093ab 100644
--- a/src/basics/lsmath.lsp
+++ b/src/basics/lsmath.lsp
@@ -1,40 +1,14 @@
 ;;; -*- mode: lisp -*-
-;;; Copyright (c) 2005--2007, by A.J. Rossini <blindglobe@gmail.com>
+
+;;; Copyright (c) 2005--2008, by A.J. Rossini <blindglobe@gmail.com>
 ;;; See COPYRIGHT file for any additional restrictions (BSD license).
-;;; Since 1991, ANSI was finally finished.  Edited for ANSI Common Lisp. 
-
-;;;; lsmath -- Install vectorized arithmetic functions
-;;;; 
-;;;; Copyright (c) 1991, by Luke Tierney. Permission is granted for
-;;;; unrestricted use.
-
-;;; Package Setup
-
-(in-package :cl-user)
-
-(defpackage :lisp-stat-math
-   (:use :common-lisp
-	 :lisp-stat-object-system
-	 :lisp-stat-macros
-	 :lisp-stat-compound-data
-	 :lisp-stat-float)
-   (:shadowing-import-from :lisp-stat-object-system
-			   slot-value call-method call-next-method)
-   (:shadow expt + - * / ** mod rem abs 1+ 1- log exp sqrt sin cos tan
- 	   asin acos atan sinh cosh tanh asinh acosh atanh float random
- 	   truncate floor ceiling round minusp zerop plusp evenp oddp 
- 	   < <= = /= >= > ;; complex
-	   conjugate realpart imagpart phase
- 	   min max logand logior logxor lognot ffloor fceiling
- 	   ftruncate fround signum cis)
-   (:export ^ ** expt + - * / mod rem pmin pmax abs 1+ 1- log exp sqrt sin cos 
- 	   tan asin acos atan sinh cosh tanh asinh acosh atanh float random
- 	   truncate floor ceiling round minusp zerop plusp evenp oddp < <= =
- 	   /= >= > ;; complex
-	   conjugate realpart imagpart phase min max
- 	   logand logior logxor lognot ffloor fceiling ftruncate fround 
- 	   signum cis)
-   (:documentation "Vectorization of numerical functions"))
+;;; Since 1991, ANSI Common Lisp was finally finished and those
+;;; changes are reflected in this update.
+
+;;; lsmath -- Install vectorized arithmetic functions
+;;; 
+;;; Copyright (c) 1991, by Luke Tierney. Permission is granted for
+;;; unrestricted use.
 
 (in-package :lisp-stat-math)
 
diff --git a/src/packages.lisp b/src/packages.lisp
index 02e46c3..9dd7d0d 100644
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -1,6 +1,6 @@
 ;;; -*- mode: lisp -*-
 
-;;; Time-stamp: <2008-10-04 15:06:10 tony>
+;;; Time-stamp: <2008-10-04 15:34:06 tony>
 ;;; Creation:   <2008-03-11 19:18:34 user> 
 ;;; File:       packages.lisp
 ;;; Author:     AJ Rossini <blindglobe@gmail.com>
@@ -204,6 +204,31 @@
       la-vector la-free-vector la-vector-to-data la-data-to-vector ))
 
 
+(defpackage :lisp-stat-math
+   (:use :common-lisp
+	 :lisp-stat-object-system
+	 :lisp-stat-macros
+	 :lisp-stat-compound-data
+	 :lisp-stat-float)
+   (:shadowing-import-from :lisp-stat-object-system
+			   slot-value call-method call-next-method)
+   (:shadow expt + - * / ** mod rem abs 1+ 1- log exp sqrt sin cos tan
+ 	   asin acos atan sinh cosh tanh asinh acosh atanh float random
+ 	   truncate floor ceiling round minusp zerop plusp evenp oddp 
+ 	   < <= = /= >= > ;; complex
+	   conjugate realpart imagpart phase
+ 	   min max logand logior logxor lognot ffloor fceiling
+ 	   ftruncate fround signum cis)
+   (:export ^ ** expt + - * / mod rem pmin pmax abs 1+ 1- log exp sqrt sin cos 
+ 	   tan asin acos atan sinh cosh tanh asinh acosh atanh float random
+ 	   truncate floor ceiling round minusp zerop plusp evenp oddp < <= =
+ 	   /= >= > ;; complex
+	   conjugate realpart imagpart phase min max
+ 	   logand logior logxor lognot ffloor fceiling ftruncate fround 
+ 	   signum cis)
+   (:documentation "Vectorization of numerical functions"))
+
+
 (defpackage :lisp-stat-linalg
   (:use :common-lisp
 	:cffi
@@ -233,6 +258,13 @@
 	   lowess))
 
 
+(defpackage :lisp-stat-config
+  (:use :common-lisp)
+  (:export *default-path*
+	   *lsos-files* *basic-files* *ls-files*
+	   *lispstat-data-dir* *lispstat-examples-dir*))
+
+
 (defpackage :lisp-stat-data
   (:documentation "Data management, integration, I/O, and other data technologies.")
   (:nicknames :ls-data)
-- 
2.11.4.GIT