Fixed issues in imports.

src/doc/changelog.lisp

@@ -26,6 +26,14 @@
                                                    "HTML"
                                                    "HTTP")
                                     :external-links (("Ultralisp" . "https://ultralisp.org")))
+  (0.41.0 2022-01-05
+          """
+Removed
+=======
+
+* Function `reblocks/utils/misc:asdf-system-directory`. Use `asdf:system-source-directory` instead.
+
+""")
   (0.40.0 2022-01-03
           """
 Added

src/linguistic/grammar.lisp

@@ -1,5 +1,10 @@
 (defpackage #:reblocks/linguistic/grammar
   (:use #:cl)
+  (:import-from #:metatilities
+                #:substring
+                #:string-ends-with)
+  (:import-from #:reblocks/utils/i18n
+                #:translate)
   (:export #:pluralize
            #:singularize
            #:proper-number-form
@@ -157,8 +162,6 @@ apple' for 'apple' and 'a table' for 'table'."
     :masculine))
 
 (defun default-translation-function (string &key plural-p genitive-form-p items-count accusative-form-p &allow-other-keys)
-  (declare (ignore args))
-
   (when plural-p  
     (setf string (pluralize string)))
 
@@ -172,3 +175,9 @@ apple' for 'apple' and 'a table' for 'table'."
     (setf string (proper-number-form items-count string)))
 
   string)
+
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (unless *translation-function*
+    (setf *translation-function*
+          'default-translation-function)))

src/utils/clos.lisp

@@ -1,5 +1,14 @@
 (defpackage #:reblocks/utils/clos
   (:use #:cl)
+  (:import-from #:closer-mop
+                #:slot-definition-name
+                #:class-slots
+                #:class-direct-superclasses
+                #:class-direct-slots)
+  (:import-from #:alexandria
+                #:compose)
+  (:import-from #:metatilities
+                #:curry-after)
   (:export #:slot-value-by-path 
            #:find-slot-dsd
            #:find-slot-esd
@@ -87,7 +96,7 @@ method to change the name for particular objects.")
     (when diff
       (error "Objects with differing slot names detected. Difference: ~S~%" diff))
     (dolist (slotname slotnames-o1 t)
-      (unless (member slotname (ensure-list exclude) :test #'eq)
+      (unless (member slotname (uiop:ensure-list exclude) :test #'eq)
         (cond
           ((or (and (slot-boundp o1 slotname) (not (slot-boundp o2 slotname)))
                (and (slot-boundp o2 slotname) (not (slot-boundp o1 slotname))))

src/utils/i18n.lisp

@@ -1,8 +1,5 @@
 (defpackage #:reblocks/utils/i18n
   (:use #:cl)
-  (:import-from #:reblocks/linguistic/grammar
-                #:default-translation-function)
-
   (:export #:*translation-function*
            #:translate
            #:default-translation-function))
@@ -13,8 +10,7 @@
 ;;       it more pluggable, probably by making translate a
 ;;       a generic function. Or may be to remove i18n at all?
 
-
-(defvar *translation-function* 'default-translation-function)
+(defvar *translation-function* nil)
 
 
 (defun translate (string &rest scope)

src/utils/list.lisp

@@ -1,5 +1,8 @@
 (defpackage #:reblocks/utils/list
   (:use #:cl)
+  (:import-from #:anaphora
+                #:it
+                #:aif)
   (:export #:safe-subseq
            #:alist->plist
            #:insert-after
@@ -86,7 +89,7 @@ item before passing it to 'predicate'."
 
 (defun list-starts-with (list elements &key (test 'eq))
   "Determines if a list starts with the given elements."
-  (let ((elements (ensure-list elements)))
+  (let ((elements (uiop:ensure-list elements)))
     (if elements
         (when (funcall test (car list) (car elements))
           (list-starts-with (cdr list) (cdr elements) :test test))

src/utils/misc.lisp

@@ -7,6 +7,15 @@
                 #:digest-sequence)
   (:import-from #:babel
                 #:string-to-octets)
+  (:import-from #:anaphora
+                #:it
+                #:aand)
+  (:import-from #:f-underscore
+                #:_
+                #:f_)
+  (:import-from #:closer-mop
+                #:funcallable-standard-object
+                #:required-args)
   (:export #:gen-id
            #:safe-apply
            #:safe-funcall
@@ -15,7 +24,6 @@
            #:public-file-relative-path
            #:public-files-relative-paths
            #:symbol-status
-           #:asdf-system-directory
            #:hash-keys
            #:append-custom-fields
            #:function-designator-p
@@ -103,15 +111,6 @@ etc.)"
 
 (defvar *asdf-system-cache* (make-hash-table :test #'equalp))
 
-(defun asdf-system-directory (asdf-system-name)
-  "Computes the directory in which the .asdf file for a given ASDF
-system resides."
-  (sor (gethash asdf-system-name *asdf-system-cache*)
-       (setf it (make-pathname :directory
-                               (pathname-directory
-                                 (truename
-                                   (asdf:system-definition-pathname
-                                     (asdf:find-system asdf-system-name))))))))
 
 (defun hash-keys (hashtable)
   "Returns all keys in the hashtable."

src/utils/string.lisp

@@ -2,6 +2,8 @@
   (:use #:cl)
   (:import-from #:cl-fad
                 #:pathname-as-directory)
+  (:import-from #:metatilities
+                #:whitespacep)
   (:export #:humanize-name
            #:attributize-name
            #:string-whitespace-p

src/widgets/mop.lisp

@@ -3,6 +3,8 @@
   (:import-from #:anaphora
                 #:awhen
                 #:it)
+  (:import-from #:closer-mop
+                #:subclassp)
   (:shadowing-import-from #:closer-mop
                           #:standard-class
                           #:validate-superclass