Use CLOSER-COMMON-LISP package to resolve conflicts between CL and C2MOP
[clinton/lisp-on-lines.git] / src / packages.lisp
index e456cf0..c67c325 100644 (file)
@@ -1,8 +1,7 @@
 (defpackage #:lisp-on-lines
   (:use 
 (defpackage #:lisp-on-lines
   (:use 
-   :common-lisp
    #:contextl
    #:contextl
-   #:closer-mop
+   #:closer-common-lisp
 
    #:alexandria)
   (:nicknames #:lol)
 
    #:alexandria)
   (:nicknames #:lol)
    
 ;; Descriptions
    #:*description*
    
 ;; Descriptions
    #:*description*
+   #:description
+   #:defdescription
    #:find-description   
    #:find-description   
+   #:current-description
    #:description-of
    #:define-description
    #:description-of
    #:define-description
+   #:defining-description
    #:described-object
    #:with-described-object
    #:described-object
    #:with-described-object
+   #:funcall-with-described-object
    #:described-class
    #:described-standard-class
    #:with-active-descriptions
    #:described-class
    #:described-standard-class
    #:with-active-descriptions
    #:attribute-object
    #:attribute-label
    #:attribute-delimiter
    #:attribute-object
    #:attribute-label
    #:attribute-delimiter
+   #:attribute-setter
    #:attribute-slot-name
    #:label
    #:attribute-slot-name
    #:label
+   #:attribute-active-p
    #:attribute-function
    #:attribute-value
    #:display-attribute-value
    #:active-attributes
    #:attribute-delimiter
    #:standard-attribute
    #:attribute-function
    #:attribute-value
    #:display-attribute-value
    #:active-attributes
    #:attribute-delimiter
    #:standard-attribute
+   #:funcall-with-attribute-context
+   #:with-attribute-context
 
    ;; Standard Library
    
 
    ;; Standard Library