Opt for short package names

We use short package names instead of fully qualified package name, while still retaining fully qualified system names.
melusina-org · Jul 29, 2024 · 3bae92d · 3bae92d
1 parent af22fd9
commit 3bae92d
Show file tree

Hide file tree

Showing 30 changed files with 56 additions and 58 deletions.
diff --git a/development/makedoc b/development/makedoc
@@ -17,6 +17,7 @@
 : ${subrdir:=${TOPLEVELDIR}/subr}
 : ${makedocdir:=${TOPLEVELDIR}/obj/makedoc}
 : ${makedocsystem:="org.melusina.atelier"}
+: ${makedocpackage:=${makedocsystem#'org.melusina.'}}
 
 . "${subrdir}/stdlib.sh"
 
@@ -44,7 +45,7 @@ makedoc_extract()
 	--eval '(with-compilation-unit () (load "libexec/lisp/docstrings.lisp"))' \
 	--eval "(sb-texinfo:generate-includes\
                   \"obj/makedoc/include/\"\
-                  (list :${makedocsystem}) :base-package :${makedocsystem})" \
+                  (list :${makedocpackage}) :base-package :${makedocpackage})" \
 	--eval '(quit)'
 }
 

diff --git a/development/testsuite b/development/testsuite
@@ -15,6 +15,7 @@
 
 : ${TOPLEVELDIR:=$(git rev-parse --show-toplevel)}
 : ${testsuitesystem:="org.melusina.atelier/testsuite"}
+: ${testsuitepackage:=${testsuitesystem#'org.melusina.'}}
 : ${testsuiteclean:='no'}
 : ${testsuitelisp:='sbcl'}
 
@@ -41,7 +42,7 @@ testsuite_run()
                   (pushnew #p\".\" ql:*local-project-directories*)
                   (ql:register-local-projects))"\
 	--eval "(ql:quickload \"${testsuitesystem}\" :silent t)"\
-	--eval "(${testsuitesystem}:$1)"\
+	--eval "(${testsuitepackage}:$1)"\
 	--eval "(org.melusina.confidence:quit)"
 }
 

diff --git a/doc/org.melusina.atelier.texinfo b/doc/org.melusina.atelier.texinfo
@@ -85,12 +85,12 @@ for Lisp developpers such as project templates and a linter.
 @node Template, Linter, Introduction, Top
 @chapter File templates and project scaffolding
 
-@include include/fun-org.melusina.atelier-find-template.texinfo
-@include include/fun-org.melusina.atelier-list-templates.texinfo
-@include include/fun-org.melusina.atelier-write-template.texinfo
+@include include/fun-atelier-find-template.texinfo
+@include include/fun-atelier-list-templates.texinfo
+@include include/fun-atelier-write-template.texinfo
 @c Lisp Projects
-@include include/fun-org.melusina.atelier-new-lisp-file.texinfo
-@include include/fun-org.melusina.atelier-new-lisp-project.texinfo
+@include include/fun-atelier-new-lisp-file.texinfo
+@include include/fun-atelier-new-lisp-project.texinfo
 
 @example
 (atelier:new-lisp-project
@@ -108,34 +108,34 @@ for Lisp developpers such as project templates and a linter.
 @end example
 
 @c License
-@include include/fun-org.melusina.atelier-list-licenses.texinfo
+@include include/fun-atelier-list-licenses.texinfo
 @c Parameters
-@include include/fun-org.melusina.atelier-list-template-parameter-names.texinfo
-@include include/fun-org.melusina.atelier-parameter-keyword.texinfo
+@include include/fun-atelier-list-template-parameter-names.texinfo
+@include include/fun-atelier-parameter-keyword.texinfo
 
 @node Linter, Configuration, Template, Top
 @chapter Linter
 
-@include include/var-org.melusina.atelier-star-linter-interactive-p-star.texinfo
-@include include/fun-org.melusina.atelier-lint.texinfo
-@include include/macro-org.melusina.atelier-define-inspector.texinfo
-@include include/fun-org.melusina.atelier-list-inspectors.texinfo
+@include include/var-atelier-star-linter-interactive-p-star.texinfo
+@include include/fun-atelier-lint.texinfo
+@include include/macro-atelier-define-inspector.texinfo
+@include include/fun-atelier-list-inspectors.texinfo
 @c Linter Classes
-@include include/class-org.melusina.atelier-linter.texinfo
-@include include/class-org.melusina.atelier-canonical-source-linter.texinfo
-@include include/class-org.melusina.atelier-extensive-linter.texinfo
-@include include/class-org.melusina.atelier-plain-line-comment-linter.texinfo
-@include include/class-org.melusina.atelier-plain-block-comment-linter.texinfo
+@include include/class-atelier-linter.texinfo
+@include include/class-atelier-canonical-source-linter.texinfo
+@include include/class-atelier-extensive-linter.texinfo
+@include include/class-atelier-plain-line-comment-linter.texinfo
+@include include/class-atelier-plain-block-comment-linter.texinfo
 @c Linter Generic
-@include include/fun-org.melusina.atelier-content-inspectors.texinfo
-@include include/fun-org.melusina.atelier-file-inspectors.texinfo
-@include include/fun-org.melusina.atelier-hint-at-file-line.texinfo
-@include include/fun-org.melusina.atelier-hint-at-file.texinfo
-@include include/fun-org.melusina.atelier-lint-file.texinfo
+@include include/fun-atelier-content-inspectors.texinfo
+@include include/fun-atelier-file-inspectors.texinfo
+@include include/fun-atelier-hint-at-file-line.texinfo
+@include include/fun-atelier-hint-at-file.texinfo
+@include include/fun-atelier-lint-file.texinfo
 
 @node Configuration, , Linter, Top
 @chapter Configuration of program parameters
 
-@include include/var-org.melusina.atelier-star-parameter-bindings-star.texinfo
+@include include/var-atelier-star-parameter-bindings-star.texinfo
 
 @bye
diff --git a/src/configuration.lisp b/src/configuration.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 (defparameter *resourcedir* #.(or (uiop:getenv "ATELIER_RESOURCEDIR")
 				  (when *compile-file-pathname*

diff --git a/src/inspector/codestyle-0001.lisp b/src/inspector/codestyle-0001.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 (define-inspector :codestyle-0001 hint-at-file-when-character-encoding-is-not-utf8 (pathname)
   "Hint at PATHNAME when it is not a valid UTF8 file."

diff --git a/src/inspector/codestyle-0002.lisp b/src/inspector/codestyle-0002.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 (define-inspector :codestyle-0002 hint-at-file-line-when-it-is-very-long (line &key (maximum-length 100))
   "Hint at very long LINE.

diff --git a/src/inspector/codestyle-0003.lisp b/src/inspector/codestyle-0003.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 (defun string-shebang-end-position (string)
   "The end position of a possible shebang line in STRING."

diff --git a/src/inspector/codestyle-0004.lisp b/src/inspector/codestyle-0004.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 (define-inspector :codestyle-004 hint-at-file-when-it-lacks-canonical-footer-line (contents)
   "Hint at file when it lacks the canonical footer line.

diff --git a/src/inspector/codestyle-0005.lisp b/src/inspector/codestyle-0005.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 (define-inspector :codestyle-005 hint-at-file-when-it-lacks-canonical-project-identification (contents)
   "Hint at file when it lacks the canonical project identification.

diff --git a/src/inspector/codestyle-0006.lisp b/src/inspector/codestyle-0006.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 (define-inspector :codestyle-006 hint-at-file-when-it-lacks-project-license-information (contents)
   "Hint at file when it lacks the canonical project license information."

diff --git a/src/license.lisp b/src/license.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 (defparameter *license-repository-pathname* (merge-pathnames "license/" *resourcedir*)
   "The pathname to our license repository.")

diff --git a/src/lint.lisp b/src/lint.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 (defparameter *linter-interactive-p*
   (and (position :swank *features*) t)

diff --git a/src/main.lisp b/src/main.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 (defun initialize ()
   (license-repository-load)

diff --git a/src/package.lisp b/src/package.lisp
@@ -11,8 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(defpackage #:org.melusina.atelier
-  (:local-nicknames (#:rashell #:org.melusina.rashell))
+(defpackage #:atelier
   (:use #:common-lisp)
   (:import-from #:alexandria
    #:hash-table-keys
@@ -55,7 +54,7 @@
    #:list-inspectors
    ))
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 (declaim (ftype (function nil (values null)) initialize))
 

diff --git a/src/parameter.lisp b/src/parameter.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 ;;;
 ;;; Parameters

diff --git a/src/project.lisp b/src/project.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 (defparameter *project* nil
   "The default project for atelier operations.")

diff --git a/src/template.lisp b/src/template.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 (defparameter *template-repository-pathname*
   (merge-pathnames "template/" *resourcedir*)

diff --git a/src/utilities.lisp b/src/utilities.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier)
+(in-package #:atelier)
 
 (defun string-match (pattern text)
   "Predicate recognising TEXT matching a globbing PATTERN."

diff --git a/testsuite/entrypoint.lisp b/testsuite/entrypoint.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier/testsuite)
+(in-package #:atelier/testsuite)
 
 (define-testcase run-all-tests ()
   (atelier:initialize)

diff --git a/testsuite/inspector/codestyle-0001.lisp b/testsuite/inspector/codestyle-0001.lisp
@@ -11,6 +11,6 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier/testsuite)
+(in-package #:atelier/testsuite)
 
 ;;;; End of file `codestyle-0001.lisp'
diff --git a/testsuite/inspector/codestyle-0002.lisp b/testsuite/inspector/codestyle-0002.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier/testsuite)
+(in-package #:atelier/testsuite)
 
 (define-testcase validate-codestyle-0002-hint-at-file-line-when-it-is-very-long ()
     (let ((short-line

diff --git a/testsuite/inspector/codestyle-0003.lisp b/testsuite/inspector/codestyle-0003.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier/testsuite)
+(in-package #:atelier/testsuite)
 
 (define-testcase validate-codestyle-0003-hint-at-file-when-it-lacks-canonical-header-line ()
   (let ((file-1

diff --git a/testsuite/inspector/codestyle-0004.lisp b/testsuite/inspector/codestyle-0004.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier/testsuite)
+(in-package #:atelier/testsuite)
 (define-testcase validate-codestyle-0004-hint-at-file-when-it-lacks-canonical-footer-line ()
   (let ((file-1
 	  (atelier::join-lines

diff --git a/testsuite/inspector/codestyle-0005.lisp b/testsuite/inspector/codestyle-0005.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier/testsuite)
+(in-package #:atelier/testsuite)
 
 (define-testcase validate-codestyle-0005-hint-at-file-when-it-lacks-canonical-project-identification ()
   (let ((file-1

diff --git a/testsuite/inspector/codestyle-0006.lisp b/testsuite/inspector/codestyle-0006.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier/testsuite)
+(in-package #:atelier/testsuite)
 
 (define-testcase validate-codestyle-0006-hint-at-file-when-it-lacks-project-license-information ()
   (let ((file-1

diff --git a/testsuite/lint.lisp b/testsuite/lint.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier/testsuite)
+(in-package #:atelier/testsuite)
 
 (define-testcase validate-lint-contents ()
   (flet ((linter1 (contents)

diff --git a/testsuite/package.lisp b/testsuite/package.lisp
@@ -11,12 +11,9 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(defpackage #:org.melusina.atelier/testsuite
-  (:local-nicknames
-   (#:rashell #:org.melusina.rashell)
-   (#:atelier #:org.melusina.atelier))
+(defpackage #:atelier/testsuite
   (:use #:common-lisp)
-  (:import-from #:org.melusina.confidence
+  (:import-from #:confidence
    #:define-testcase
    #:define-assertion
    #:assert-t

diff --git a/testsuite/parameter.lisp b/testsuite/parameter.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier/testsuite)
+(in-package #:atelier/testsuite)
 
 (defparameter *parameter-bindings*
   '((:project-name . "Atelier")

diff --git a/testsuite/template.lisp b/testsuite/template.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier/testsuite)
+(in-package #:atelier/testsuite)
 
 (rashell:define-test grep (pattern pathname)
   ((fixed-string :flag "-F")

diff --git a/testsuite/utilities.lisp b/testsuite/utilities.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.atelier/testsuite)
+(in-package #:atelier/testsuite)
 
 (defmacro with-fixed-parameter-bindings
   ((&key (copyright-holder "A. U. Thor")