Use CLOSER-COMMON-LISP package to resolve conflicts between CL and C2MOP

[clinton/lisp-on-lines.git] / src / packages.lisp

diff --git a/src/packages.lisp b/src/packages.lisp
index e65ff7c..c67c325 100644 (file)
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -1,21 +1,36 @@
 (defpackage #:lisp-on-lines
   (:use 
-   :common-lisp
    #:contextl
-   #:closer-mop
+   #:closer-common-lisp
+
    #:alexandria)
   (:nicknames #:lol)
   (:export
+
    
 ;; Descriptions
-   #:find-description
+   #:*description*
+   #:description
+   #:defdescription
+   #:find-description   
+   #:current-description
+   #:description-of
    #:define-description
+   #:defining-description
+   #:described-object
+   #:with-described-object
+   #:funcall-with-described-object
+   #:described-class
+   #:described-standard-class
    #:with-active-descriptions
+   #:with-inactive-descriptions
+
 
    ;; Displays
    #:define-display
    #:display
    #:display-using-description
+   #:display-attribute-label
    #:*display*
    #:*object*
    
@@ -23,8 +38,42 @@
    #:find-attribute
    #:attribute
    #:attributes
+   #:attribute-object
    #:attribute-label
+   #:attribute-delimiter
+   #:attribute-setter
+   #:attribute-slot-name
+   #:label
+   #:attribute-active-p
    #:attribute-function
-   #:attribute-value))
+   #:attribute-value
+   #:display-attribute-value
+   #:active-attributes
+   #:attribute-delimiter
+   #:standard-attribute
+   #:funcall-with-attribute-context
+   #:with-attribute-context
+
+   ;; Standard Library
+   
+   ;; editing
+   #:editable
+   #:attribute-editor
+   #:string-attribute-editor
+   #:number-attribute-editor
+   #:password-attribute-editor
+   #:password
+
+   ;; :validation
+   #:validation
+   #:validate
+   #:validp
+
+   ;; CLOS
+   #:slot-definition-attribute
+
+   ;; html
+   #:display-html-attribute-editor
+   #:make-attribute-value-writer))