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
dissimilarity index 98%
index 8c971ce..c67c325 100644 (file)
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -1,34 +1,79 @@
-(defpackage :meta-model
-  (:use :common-lisp )
-  (:export
-   :meta-model-class
-   :meta-model.base-type
-   :meta-model.instance
-   :meta-model.metadata
-   :def-meta-model
-   :def-base-class
-   :%def-base-class
-   :def-view-class/table
-   :def-view-class/meta
-   :view-class-metadata
-   :create-table-from-model
-   :list-slots
-   :list-slot-types
-   :slot-type
-   :display-slot
-   :list-joins
-   :list-join-attributes
-   :list-keys
-   :list-view-classes
-   :display-slot
-   :primary-key-p
-   :list-foreign-keys
-   :foreign-key-p
-   :explode-foreign-key
-   :find-join-class
-   :find-join-key
-   :find-default-value
-   :explode-foreign-key
-   :list-has-many
-   :list-many-to-many))
-
+(defpackage #:lisp-on-lines
+  (:use 
+   #:contextl
+   #:closer-common-lisp
+
+   #:alexandria)
+  (:nicknames #:lol)
+  (:export
+
+   
+;; Descriptions
+   #:*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*
+   
+   ;; Attributes
+   #:find-attribute
+   #:attribute
+   #: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
+   #: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))
+
+