diff options
| author | ckonstanski <ckonstanski@pippiandcarlos.com> | 2020-12-22 20:57:44 -0700 |
|---|---|---|
| committer | ckonstanski <ckonstanski@pippiandcarlos.com> | 2020-12-22 20:57:44 -0700 |
| commit | 4850ffaef859a3f33f03c5500602881e30b1039c (patch) | |
| tree | 4bcf433abc72ba0c01b4a5ead79081367aada2a9 /entity/entity.lisp | |
| parent | e5947122bae1115b024be354ace6885cb360037e (diff) | |
Moved core to its own library
Diffstat (limited to 'entity/entity.lisp')
| -rw-r--r-- | entity/entity.lisp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/entity/entity.lisp b/entity/entity.lisp index c7f9842..327fb2f 100644 --- a/entity/entity.lisp +++ b/entity/entity.lisp @@ -15,26 +15,26 @@ on those slots. `slot' is the iterator." `(remove-if #'null (mapcar (lambda (slot) (when (slot-is-field-p slot) ,@body)) - (map-slot-names ,entity)))) + (org-ckons-core::map-slot-names ,entity)))) (defmethod attribute-value-list ((entity entity) &optional (keep-nulls nil)) (with-entity-slots-to-list (entity slot) (when (or keep-nulls (and (not keep-nulls) - (not (null-or-empty-p (slot-value entity slot))))) + (not (org-ckons-core::null-or-empty-p (slot-value entity slot))))) `(,slot . ,(slot-value entity slot))))) (defmethod get-slots-regex ((entity entity) regex) - (sort (remove-if-not (lambda (x) (match-it regex (symbol-name x))) - (map-slot-names entity)) + (sort (remove-if-not (lambda (x) (org-ckons-core::match-it regex (symbol-name x))) + (org-ckons-core::map-slot-names entity)) (lambda (x y) (string< (symbol-name x) (symbol-name y))))) (defmethod intersect-slots ((entity entity) slots) (let ((intersect-slots ())) - (loop for class-slot in (map-slot-names entity) do - (let ((class-slot-string (parse-symbol class-slot))) + (loop for class-slot in (org-ckons-core::map-slot-names entity) do + (let ((class-slot-string (org-ckons-core::parse-symbol class-slot))) (loop for arg-slot in slots do - (let ((arg-slot-string (parse-symbol arg-slot))) + (let ((arg-slot-string (org-ckons-core::parse-symbol arg-slot))) (when (string-equal class-slot-string arg-slot-string) (push class-slot intersect-slots)))))) (nreverse intersect-slots))) |