From bbb2580e4a0ca59b1479476c207a969f9f617e26 Mon Sep 17 00:00:00 2001 From: dlichteblau Date: Tue, 2 Jan 2007 12:50:39 +0000 Subject: [PATCH] removed all top-level calls to EXPORT in favour of the defpackage --- src/glisp/dep-acl.lisp | 5 ----- src/glisp/dep-clisp.lisp | 9 +-------- src/glisp/dep-cmucl.lisp | 11 ++--------- src/glisp/dep-openmcl.lisp | 11 ++--------- src/glisp/dep-sbcl.lisp | 11 ++--------- src/glisp/dep-scl.lisp | 6 ------ src/glisp/package.lisp | 8 +++++++- 7 files changed, 14 insertions(+), 47 deletions(-) diff --git a/src/glisp/dep-acl.lisp b/src/glisp/dep-acl.lisp index 2518ad4..7b9a728 100644 --- a/src/glisp/dep-acl.lisp +++ b/src/glisp/dep-acl.lisp @@ -26,11 +26,6 @@ ;;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -(export 'glisp::read-byte-sequence :glisp) -(export 'glisp::read-char-sequence :glisp) -(export 'glisp::run-unix-shell-command :glisp) -(export 'glisp::getenv :glisp) - (defun glisp::read-byte-sequence (&rest ap) (apply #'read-sequence ap)) diff --git a/src/glisp/dep-clisp.lisp b/src/glisp/dep-clisp.lisp index d6dbfd2..cd4fa90 100644 --- a/src/glisp/dep-clisp.lisp +++ b/src/glisp/dep-clisp.lisp @@ -30,14 +30,6 @@ (setq lisp:*load-paths* '(#P"./")) -(import 'lisp:read-byte-sequence :glisp) -(export 'lisp:read-byte-sequence :glisp) -(import 'lisp:read-char-sequence :glisp) -(export 'lisp:read-char-sequence :glisp) -(export 'glisp::run-unix-shell-command :glisp) -(export 'glisp::make-server-socket :glisp) - - (defmacro glisp::with-timeout ((&rest ignore) &body body) (declare (ignore ignore)) `(progn @@ -48,6 +40,7 @@ (lisp:socket-connect port hostname) :byte)) +(export 'glisp::make-server-socket :glisp) (defun glisp:make-server-socket (port) (lisp:socket-server port)) diff --git a/src/glisp/dep-cmucl.lisp b/src/glisp/dep-cmucl.lisp index 36d90b0..5b52201 100644 --- a/src/glisp/dep-cmucl.lisp +++ b/src/glisp/dep-cmucl.lisp @@ -26,15 +26,6 @@ ;;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -(export 'glisp::read-byte-sequence :glisp) -(export 'glisp::read-char-sequence :glisp) -(export 'glisp::run-unix-shell-command :glisp) - -(export 'glisp::getenv :glisp) - -(export 'glisp::make-server-socket :glisp) -(export 'glisp::close-server-socket :glisp) - (defun glisp::read-byte-sequence (&rest ap) (apply #'read-sequence ap)) @@ -85,6 +76,7 @@ element-type port) +(export 'glisp::make-server-socket :glisp) (defun glisp::make-server-socket (port &key (element-type '(unsigned-byte 8))) (make-server-socket-struct :fd (ext:create-inet-listener port) :element-type element-type @@ -101,6 +93,7 @@ (t :char)))) +(export 'glisp::close-server-socket :glisp) (defun glisp::close-server-socket (socket) (unix:unix-close (server-socket-fd socket))) diff --git a/src/glisp/dep-openmcl.lisp b/src/glisp/dep-openmcl.lisp index 9720560..45156be 100644 --- a/src/glisp/dep-openmcl.lisp +++ b/src/glisp/dep-openmcl.lisp @@ -26,15 +26,6 @@ ;;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -(export 'glisp::read-byte-sequence :glisp) -(export 'glisp::read-char-sequence :glisp) -(export 'glisp::run-unix-shell-command :glisp) - -(export 'glisp::getenv :glisp) - -(export 'glisp::make-server-socket :glisp) -(export 'glisp::close-server-socket :glisp) - (defun glisp::read-byte-sequence (&rest ap) (apply #'read-sequence ap)) @@ -61,6 +52,7 @@ #|| +(export 'glisp::make-server-socket :glisp) (defun glisp::make-server-socket (port &key (element-type '(unsigned-byte 8))) (make-server-socket-struct :fd (ext:create-inet-listener port) :element-type element-type @@ -78,6 +70,7 @@ (t :char)))) +(export 'glisp::close-server-socket :glisp) (defun glisp::close-server-socket (socket) (unix:unix-close (server-socket-fd socket))) ||# diff --git a/src/glisp/dep-sbcl.lisp b/src/glisp/dep-sbcl.lisp index f1cedfd..4e9c42b 100644 --- a/src/glisp/dep-sbcl.lisp +++ b/src/glisp/dep-sbcl.lisp @@ -26,15 +26,6 @@ ;;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -(export 'glisp::read-byte-sequence :glisp) -(export 'glisp::read-char-sequence :glisp) -(export 'glisp::run-unix-shell-command :glisp) - -(export 'glisp::getenv :glisp) - -(export 'glisp::make-server-socket :glisp) -(export 'glisp::close-server-socket :glisp) - (defun glisp::read-byte-sequence (&rest ap) (apply #'read-sequence ap)) @@ -67,6 +58,7 @@ #|| +(export 'glisp::make-server-socket :glisp) (defun glisp::make-server-socket (port &key (element-type '(unsigned-byte 8))) (make-server-socket-struct :fd (ext:create-inet-listener port) :element-type element-type @@ -84,6 +76,7 @@ (t :char)))) +(export 'glisp::close-server-socket :glisp) (defun glisp::close-server-socket (socket) (unix:unix-close (server-socket-fd socket))) ||# diff --git a/src/glisp/dep-scl.lisp b/src/glisp/dep-scl.lisp index 04fb278..0c5f09f 100644 --- a/src/glisp/dep-scl.lisp +++ b/src/glisp/dep-scl.lisp @@ -26,12 +26,6 @@ ;;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -(export 'glisp::read-byte-sequence :glisp) -(export 'glisp::read-char-sequence :glisp) -(export 'glisp::run-unix-shell-command :glisp) - -(export 'glisp::getenv :glisp) - (defun glisp::read-byte-sequence (&rest ap) (apply #'read-sequence ap)) diff --git a/src/glisp/package.lisp b/src/glisp/package.lisp index ca3133a..c89660e 100644 --- a/src/glisp/package.lisp +++ b/src/glisp/package.lisp @@ -119,7 +119,13 @@ ;; match.lisp "DEFINE-MATCH-MACRO" "IF-MATCH" - "GSTREAM-AS-STRING")) + "GSTREAM-AS-STRING" + + ;; dep-* + "READ-BYTE-SEQUENCE" + "READ-CHAR-SEQUENCE" + "RUN-UNIX-SHELL-COMMAND" + "GETENV")) (defpackage "GLUSER" (:use "CL" "GLISP")) -- 2.11.4.GIT