X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/9d6c69fb50810bef64e6f3357a21b4f4397e2b1b..4358148e6c67fcc2ae24050c54d8050b4dc03f9d:/src/packages.lisp?ds=sidebyside

diff --git a/src/packages.lisp b/src/packages.lisp
dissimilarity index 99%
index 2466038..e65ff7c 100644
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -1,74 +1,30 @@
-(defpackage :meta-model
-  (:use :common-lisp :clsql)
-  (: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
-   :sync-instance
-   :explode-has-many
-   :expr-ends-with
-   :expr-starts-with
-   :expr-contains
-   :expr-=
-   :expr-<
-   :expr->
-   :expr-and
-   :expr-or
-   :expr-not
-   :select-instances
-   ))
-
-
-(defpackage :mewa 
-  (:use :ucw :common-lisp)
-  (:export 
-   :mewa 
-   :mewa-object-presentation 
-   :mewa-one-line-presentation
-   :mewa-presentation-search
-   :find-attribute 
-   :set-default-attributes 
-   :make-presentation 
-   :call-presentation 
-   :label 
-   :set-attribute 
-   :find-class-attributes 
-   :default-attributes 
-   :ok
-   :edit-instance
-   :save-instance
-   :cancel-save-instance
-   :global-properties
-   :search-expr
-   :search-query))
-
-
-(defpackage :lisp-on-lines
-  (:use :mewa :meta-model :common-lisp :it.bese.ucw))
\ No newline at end of file
+(defpackage #:lisp-on-lines
+  (:use 
+   :common-lisp
+   #:contextl
+   #:closer-mop
+   #:alexandria)
+  (:nicknames #:lol)
+  (:export
+   
+;; Descriptions
+   #:find-description
+   #:define-description
+   #:with-active-descriptions
+
+   ;; Displays
+   #:define-display
+   #:display
+   #:display-using-description
+   #:*display*
+   #:*object*
+   
+   ;; Attributes
+   #:find-attribute
+   #:attribute
+   #:attributes
+   #:attribute-label
+   #:attribute-function
+   #:attribute-value))
+
+