Commit f00506bc authored by Dave Cooper's avatar Dave Cooper
Browse files

Add stubs for inflate/deflate. Deal with :net.uri package redef.

Added stubs for non-implemented inflate and deflate functions.

Deal with the situation where Puri is loaded (e.g. from Drakma) before
Zacl is loaded, which was giving a package conflict for "net.uri"
package.
parent a8d41385
......@@ -3,3 +3,8 @@
(in-package #:zacl)
(defclass util.zip:inflate-stream () ())
(defclass util.zip:deflate-stream () ())
(defun util.zip:deflate-target-stream (stream)
(error "util.zip:deflate-target-stream is not yet implemented.~%"))
......@@ -281,7 +281,39 @@
(defpackage #:util.zip
(:use)
(:export #:inflate-stream))
(:export #:inflate-stream #:deflate-stream #:deflate-target-stream))
(eval-when (:compile-toplevel :load-toplevel :execute)
(let ((net.uri (find-package :net.uri))
(net.aserve (find-package :net.aserve)))
(if (and net.uri (not (and net.aserve (member net.uri (package-use-list net.aserve)))))
(let ((puri? (and (find-package :puri)
(string-equal (first (package-nicknames :puri)) "net.uri"))))
(if puri?
(progn
(warn "
Existing \"net.uri\" package was detected as a nickname of the \"puri\" package.
Removing the \"net.uri\" nickname from \"puri\" because ZACL needs to
define this package name.
")
(rename-package :puri :puri nil))
(progn
(warn "
-Existing \"net.uri\" package was detected.
Deleting the \"net.uri\" package, because ZACL needs to define this
package name.
")
(delete-package :net.uri)))))))
(defpackage #:net.uri
(:use)
......@@ -357,3 +389,5 @@
(defpackage #:util.string
(:use)
(:export #:string+))
(defpackage #:acl-socket (:use))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment