Skip to content

Commit

Permalink
Use IOLIB/ in package names
Browse files Browse the repository at this point in the history
  • Loading branch information
sionescu committed Nov 15, 2015
1 parent b1956ba commit f24a079
Show file tree
Hide file tree
Showing 96 changed files with 152 additions and 149 deletions.
7 changes: 4 additions & 3 deletions src/base/asdf.lisp
Expand Up @@ -3,13 +3,14 @@
;;; --- ASDF component classes
;;;

(defpackage :iolib.asdf
(:nicknames :iolib/asdf)
(defpackage :iolib/asdf
(:nicknames :iolib.asdf)
(:use :common-lisp)
(:export #:compile-wrapper)
#+sb-package-locks
(:lock t))
(in-package :iolib.asdf)

(in-package :iolib/asdf)

(defun compile-wrapper (continuation)
(let ((*readtable* (copy-readtable))
Expand Down
2 changes: 1 addition & 1 deletion src/base/conditions.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Error conditions.
;;;

(in-package :iolib.base)
(in-package :iolib/base)

;;;-------------------------------------------------------------------------
;;; Subtype Errors
Expand Down
2 changes: 1 addition & 1 deletion src/base/debug.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Debug helpers.
;;;

(in-package :iolib.base)
(in-package :iolib/base)

(defvar *safety-checks*
#+iolib-debug t #-iolib-debug nil
Expand Down
2 changes: 1 addition & 1 deletion src/base/defalias.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Creating aliases in CL namespaces
;;;

(in-package :iolib.base)
(in-package :iolib/base)

(defvar *namespaces* nil)

Expand Down
2 changes: 1 addition & 1 deletion src/base/deffoldable.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Declaring forms as foldable(pure)
;;;

(in-package :iolib.base)
(in-package :iolib/base)

#+sbcl
(defmacro %deffoldable (func argument-types return-type)
Expand Down
2 changes: 1 addition & 1 deletion src/base/defobsolete.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Declaring forms as obsolete.
;;;

(in-package :iolib.base)
(in-package :iolib/base)

(define-condition deprecation-warning (style-warning)
((function-name :initarg :function-name :reader deprecation-warning-function-name)
Expand Down
2 changes: 1 addition & 1 deletion src/base/dynamic-buffer.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Read/write adjustable buffer.
;;;

(in-package :iolib.base)
(in-package :iolib/base)

(defclass dynamic-buffer ()
((sequence :initform nil :accessor sequence-of)
Expand Down
2 changes: 1 addition & 1 deletion src/base/matching.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Match utils
;;;

(in-package :iolib.base)
(in-package :iolib/base)

(defmacro multiple-value-case ((values &key (test 'eql)) &body body)
(setf values (ensure-list values))
Expand Down
8 changes: 4 additions & 4 deletions src/base/pkgdcl.lisp
Expand Up @@ -3,11 +3,11 @@
;;; --- Package definition.
;;;

(in-package :iolib.common-lisp-user)
(in-package :iolib/common-lisp-user)

(defpackage :iolib.base
(:nicknames :iolib/base)
(:extend/excluding :iolib.common-lisp
(defpackage :iolib/base
(:nicknames :iolib.base)
(:extend/excluding :iolib/common-lisp
#:defun #:defmethod #:defmacro #:define-compiler-macro
#:constantp)
(:extend :alexandria :split-sequence)
Expand Down
2 changes: 1 addition & 1 deletion src/base/reader.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Reader utils
;;;

(in-package :iolib.base)
(in-package :iolib/base)

;; Literal object dispatcher

Expand Down
4 changes: 2 additions & 2 deletions src/base/return-star.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- RETURN* wrappers.
;;;

(in-package :iolib.base)
(in-package :iolib/base)

(cl:defmacro defun (name args &body body)
`(,(find-right-symbol :defun :series)
Expand Down Expand Up @@ -35,7 +35,7 @@
(cl:defun find-right-symbol (name &rest packages)
(multiple-value-bind (symbol foundp)
(if (eql (find-symbol (string name) *package*)
(find-symbol (string name) :iolib.base))
(find-symbol (string name) :iolib/base))
;; NAME has been imported from IOLIB.UTILS, so we must
;; find a default somewhere else, defaulting to the CL package
(find-symbol (string name) (find-right-package packages))
Expand Down
2 changes: 1 addition & 1 deletion src/base/sequence.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Sequence utils
;;;

(in-package :iolib.base)
(in-package :iolib/base)

(defmacro check-bounds (sequence start end)
(with-gensyms (length)
Expand Down
2 changes: 1 addition & 1 deletion src/base/time.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Time utils.
;;;

(in-package :iolib.base)
(in-package :iolib/base)

(deftype timeout ()
'double-float)
Expand Down
2 changes: 1 addition & 1 deletion src/base/types.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Types.
;;;

(in-package :iolib.base)
(in-package :iolib/base)

(deftype function-designator ()
'(or symbol function))
Expand Down
4 changes: 2 additions & 2 deletions src/conf/pkgdcl.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Package definition.
;;;

(cl:defpackage :iolib.conf
(:nicknames :iolib/conf)
(defpackage :iolib/conf
(:nicknames :iolib.conf)
(:use :common-lisp)
(:export #:load-gray-streams))
2 changes: 1 addition & 1 deletion src/conf/requires.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Load all non-ASDF deps - usually implementation-specific REQUIREs
;;;

(in-package :iolib.conf)
(in-package :iolib/conf)

(defun load-gray-streams ()
#+(and allegro (not (version>= 9 0)))
Expand Down
2 changes: 1 addition & 1 deletion src/grovel/asdf.lisp
Expand Up @@ -28,7 +28,7 @@
;;; DEALINGS IN THE SOFTWARE.
;;;

(in-package :iolib-grovel)
(in-package :iolib/grovel)

(defun ensure-pathname (thing)
(if (typep thing 'logical-pathname)
Expand Down
2 changes: 1 addition & 1 deletion src/grovel/grovel.lisp
Expand Up @@ -28,7 +28,7 @@
;;; DEALINGS IN THE SOFTWARE.
;;;

(in-package #:iolib-grovel)
(in-package :iolib/grovel)

;;;# Utils

Expand Down
8 changes: 5 additions & 3 deletions src/grovel/package.lisp
Expand Up @@ -23,9 +23,11 @@
;;; DEALINGS IN THE SOFTWARE.
;;;

(defpackage :iolib-grovel
(:nicknames :iolib/grovel)
(:use #:alexandria #:iolib/base)
(in-package :iolib/common-lisp-user)

(defpackage :iolib/grovel
(:nicknames :iolib-grovel)
(:use :alexandria :iolib/base)
(:import-from #:cffi-sys #:native-namestring)
(:export
;; Class name
Expand Down
4 changes: 2 additions & 2 deletions src/iolib/pkgdcl.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Package definition.
;;;

(in-package :common-lisp-user)
(in-package :iolib/common-lisp-user)

(macrolet
((defconduit (name &body clauses)
Expand All @@ -21,7 +21,7 @@
(:export ,@(get-symbols (cdar clauses)))))))

(defconduit :iolib
(:use :iolib.multiplex :iolib.streams :iolib.sockets)))
(:use :iolib/multiplex :iolib/streams :iolib/sockets)))

;; SBCL changes *package* if LOAD-OPing :iolib in the REPL
t
2 changes: 1 addition & 1 deletion src/multiplex/backend-epoll.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- epoll(2) multiplexer implementation.
;;;

(in-package :iolib.multiplex)
(in-package :iolib/multiplex)

(defconstant +epoll-priority+ 1)

Expand Down
2 changes: 1 addition & 1 deletion src/multiplex/backend-kqueue.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- kqueue(2) multiplexer implementation.
;;;

(in-package :iolib.multiplex)
(in-package :iolib/multiplex)

(defconstant +kqueue-priority+ 1)

Expand Down
2 changes: 1 addition & 1 deletion src/multiplex/backend-poll.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- poll(2) multiplexer implementation.
;;;

(in-package :iolib.multiplex)
(in-package :iolib/multiplex)

(defconstant +poll-priority+ 2)

Expand Down
2 changes: 1 addition & 1 deletion src/multiplex/backend-select.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- select(2) multiplexer implementation.
;;;

(in-package :iolib.multiplex)
(in-package :iolib/multiplex)

(defconstant +select-priority+ 3)

Expand Down
2 changes: 1 addition & 1 deletion src/multiplex/detect.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Detect available multiplexers.
;;;

(in-package :iolib.multiplex)
(in-package :iolib/multiplex)

;;; TODO: do real detecting here
(setf *default-multiplexer*
Expand Down
2 changes: 1 addition & 1 deletion src/multiplex/event-loop.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Main event loop.
;;;

(in-package :iolib.multiplex)
(in-package :iolib/multiplex)


;;;-------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/multiplex/fd-entry.lisp
Expand Up @@ -3,7 +3,7 @@
;;; fd-entry.lisp --- FD event structure.
;;;

(in-package :iolib.multiplex)
(in-package :iolib/multiplex)

;;;; EVENT

Expand Down
2 changes: 1 addition & 1 deletion src/multiplex/fd-wait.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Wait for events on single FDs.
;;;

(in-package :iolib.multiplex)
(in-package :iolib/multiplex)

(define-condition poll-error (error)
((fd :initarg :fd :reader poll-error-fd)
Expand Down
2 changes: 1 addition & 1 deletion src/multiplex/multiplexer.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Base class for multiplexers.
;;;

(in-package :iolib.multiplex)
(in-package :iolib/multiplex)

(defvar *available-multiplexers* nil
"An alist of (PRIORITY . MULTIPLEXER). Smaller values mean higher priority.")
Expand Down
8 changes: 4 additions & 4 deletions src/multiplex/pkgdcl.lisp
Expand Up @@ -3,11 +3,11 @@
;;; --- Package definition.
;;;

(in-package :common-lisp-user)
(in-package :iolib/common-lisp-user)

(defpackage :iolib.multiplex
(:nicknames :iomux :iolib/multiplex)
(:use :iolib.base :cffi)
(defpackage :iolib/multiplex
(:nicknames :iomux :iolib.multiplex)
(:use :iolib/base :cffi)
(:export
;; Classes and Types
#:timer
Expand Down
2 changes: 1 addition & 1 deletion src/multiplex/queue.lisp
Expand Up @@ -23,7 +23,7 @@
;;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
;;; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

(in-package :iolib.multiplex)
(in-package :iolib/multiplex)


;;;
Expand Down
2 changes: 1 addition & 1 deletion src/multiplex/scheduler.lisp
Expand Up @@ -23,7 +23,7 @@
;;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
;;; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

(in-package :iolib.multiplex)
(in-package :iolib/multiplex)

;;;
;;; Public interface
Expand Down
2 changes: 1 addition & 1 deletion src/multiplex/timers.lisp
Expand Up @@ -23,7 +23,7 @@
;;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
;;; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

(in-package :iolib.multiplex)
(in-package :iolib/multiplex)

;;;
;;; Timer
Expand Down
2 changes: 1 addition & 1 deletion src/multiplex/utils.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Miscellaneous utilities.
;;;

(in-package :iolib.multiplex)
(in-package :iolib/multiplex)

(defun timeout->timeval (timeout tv)
(with-foreign-slots ((isys:sec isys:usec) tv isys:timeval)
Expand Down
4 changes: 2 additions & 2 deletions src/new-cl/conduits.lisp
Expand Up @@ -25,7 +25,7 @@
;;; !!! TODO: more of the package operators probably need to be shadowed
;;; Errors should be signalled as subtypes of PACKAGE-ERROR

(cl:defpackage :iolib.internal.conduits
(defpackage :iolib/internal/conduits
(:use :common-lisp)
#+sb-package-locks
(:lock t)
Expand All @@ -35,7 +35,7 @@
;; non-CL thing
(:export #:recompute-conduits))

(in-package :iolib.internal.conduits)
(in-package :iolib/internal/conduits)

;;;; Hack to make the HP stuff `work' even when they are not loaded.
;;;
Expand Down
2 changes: 1 addition & 1 deletion src/new-cl/definitions.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- Various definers
;;;

(in-package :iolib.common-lisp)
(in-package :iolib/common-lisp)

(defmacro defconstant (name value &optional documentation
&environment env)
Expand Down
2 changes: 1 addition & 1 deletion src/new-cl/gray-streams.lisp
Expand Up @@ -3,7 +3,7 @@
;;; --- GRAY stream mixin.
;;;

(in-package :iolib.common-lisp)
(in-package :iolib/common-lisp)

(defclass trivial-gray-stream-mixin ()
((%open :initform t)))
Expand Down

0 comments on commit f24a079

Please sign in to comment.