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 234a7be..c67c325 100644 (file)
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -1,29 +1,25 @@
 (defpackage #:lisp-on-lines
   (:use 
-   :common-lisp
    #:contextl
-   #:closer-mop
-   #:postmodern
+   #:closer-common-lisp
+
    #:alexandria)
   (:nicknames #:lol)
   (:export
 
-;; ROFL stuff here temporarily
-   #:standard-db-access-class
-   #:make-object-from-plist
-   #:described-db-access-class
-   #:select-only
-   #:select
-   #:insert-into   
-   #:select-objects
-   #:select-only-n-objects
-   #:insert-object
    
 ;; 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
@@ -34,6 +30,7 @@
    #:define-display
    #:display
    #:display-using-description
+   #:display-attribute-label
    #:*display*
    #:*object*
    
@@ -43,13 +40,20 @@
    #:attributes
    #:attribute-object
    #:attribute-label
+   #:attribute-delimiter
+   #:attribute-setter
+   #:attribute-slot-name
    #:label
+   #:attribute-active-p
    #:attribute-function
    #:attribute-value
    #:display-attribute-value
    #:active-attributes
    #:attribute-delimiter
    #:standard-attribute
+   #:funcall-with-attribute-context
+   #:with-attribute-context
+
    ;; Standard Library
    
    ;; editing
@@ -60,6 +64,14 @@
    #:password-attribute-editor
    #:password
 
+   ;; :validation
+   #:validation
+   #:validate
+   #:validp
+
+   ;; CLOS
+   #:slot-definition-attribute
+
    ;; html
    #:display-html-attribute-editor
    #:make-attribute-value-writer))