Skip to content

Commit

Permalink
Opt for short package names
Browse files Browse the repository at this point in the history
We use short package names instead of fully qualified package name,
while still retaining fully qualified system names.
  • Loading branch information
foretspaisibles committed Jul 29, 2024
1 parent ed88d03 commit 9da1064
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 56 deletions.
5 changes: 3 additions & 2 deletions development/testsuite
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

: ${TOPLEVELDIR:=$(git rev-parse --show-toplevel)}
: ${testsuitesystem:="org.melusina.confidence/testsuite"}
: ${testsuitepackage:="confidence/testsuite"}
: ${testsuiteclean:='no'}
: ${testsuitelisp:='sbcl'}

Expand All @@ -38,8 +39,8 @@ testsuite_run()
testsuite_lisp\
--eval "(declaim (optimize safety) (optimize debug))"\
--eval "(ql:quickload \"${testsuitesystem}\" :silent t)"\
--eval "(${testsuitesystem}:$1)"\
--eval "(org.melusina.confidence:quit)"
--eval "(${testsuitepackage}:$1)"\
--eval "(confidence:quit)"
}

testsuite_main()
Expand Down
88 changes: 44 additions & 44 deletions doc/org.melusina.confidence.texinfo
Original file line number Diff line number Diff line change
Expand Up @@ -117,72 +117,72 @@ function. A special kind of function, but a function.

@node Define Assertions, Comparison Assertions, Assertions, Assertions
@section Define Assertions
@include include/macro-org.melusina.confidence-define-assertion.texinfo
@include include/macro-confidence-define-assertion.texinfo

@node Comparison Assertions, Condition Assertions, Define Assertions, Assertions
@section Comparison Assertions

@include include/fun-org.melusina.confidence-assert-t.texinfo
@include include/fun-org.melusina.confidence-assert-t-star.texinfo
@include include/fun-org.melusina.confidence-assert-nil.texinfo
@include include/fun-org.melusina.confidence-assert-type.texinfo
@include include/fun-org.melusina.confidence-assert-eq.texinfo
@include include/fun-org.melusina.confidence-assert-eql.texinfo
@include include/fun-org.melusina.confidence-assert-equal.texinfo
@include include/fun-org.melusina.confidence-assert-equalp.texinfo
@include include/fun-org.melusina.confidence-assert-equals.texinfo
@include include/fun-org.melusina.confidence-assert-lt.texinfo
@include include/fun-org.melusina.confidence-assert-gt.texinfo
@include include/fun-org.melusina.confidence-assert-lt-equals.texinfo
@include include/fun-org.melusina.confidence-assert-gt-equals.texinfo
@include include/fun-confidence-assert-t.texinfo
@include include/fun-confidence-assert-t-star.texinfo
@include include/fun-confidence-assert-nil.texinfo
@include include/fun-confidence-assert-type.texinfo
@include include/fun-confidence-assert-eq.texinfo
@include include/fun-confidence-assert-eql.texinfo
@include include/fun-confidence-assert-equal.texinfo
@include include/fun-confidence-assert-equalp.texinfo
@include include/fun-confidence-assert-equals.texinfo
@include include/fun-confidence-assert-lt.texinfo
@include include/fun-confidence-assert-gt.texinfo
@include include/fun-confidence-assert-lt-equals.texinfo
@include include/fun-confidence-assert-gt-equals.texinfo

@node Condition Assertions, Character Assertions, Comparison Assertions, Assertions
@section Condition Assertions

@include include/macro-org.melusina.confidence-assert-condition.texinfo
@include include/macro-confidence-assert-condition.texinfo

@node Character Assertions, String Assertions, Condition Assertions, Assertions
@section Character Assertions

@include include/fun-org.melusina.confidence-assert-char-equal.texinfo
@include include/fun-org.melusina.confidence-assert-char-equals.texinfo
@include include/fun-org.melusina.confidence-assert-char-gt.texinfo
@include include/fun-org.melusina.confidence-assert-char-gt-equals.texinfo
@include include/fun-org.melusina.confidence-assert-char-lt.texinfo
@include include/fun-org.melusina.confidence-assert-char-lt-equals.texinfo
@include include/fun-confidence-assert-char-equal.texinfo
@include include/fun-confidence-assert-char-equals.texinfo
@include include/fun-confidence-assert-char-gt.texinfo
@include include/fun-confidence-assert-char-gt-equals.texinfo
@include include/fun-confidence-assert-char-lt.texinfo
@include include/fun-confidence-assert-char-lt-equals.texinfo

@node String Assertions, List Assertions, Character Assertions, Assertions
@section String Assertions

@include include/fun-org.melusina.confidence-assert-string-equal.texinfo
@include include/fun-org.melusina.confidence-assert-string-equals.texinfo
@include include/fun-org.melusina.confidence-assert-string-gt.texinfo
@include include/fun-org.melusina.confidence-assert-string-gt-equals.texinfo
@include include/fun-org.melusina.confidence-assert-string-lt.texinfo
@include include/fun-org.melusina.confidence-assert-string-lt-equals.texinfo
@include include/fun-org.melusina.confidence-assert-string-match.texinfo
@include include/fun-confidence-assert-string-equal.texinfo
@include include/fun-confidence-assert-string-equals.texinfo
@include include/fun-confidence-assert-string-gt.texinfo
@include include/fun-confidence-assert-string-gt-equals.texinfo
@include include/fun-confidence-assert-string-lt.texinfo
@include include/fun-confidence-assert-string-lt-equals.texinfo
@include include/fun-confidence-assert-string-match.texinfo

@node List Assertions, Vector Assertions, String Assertions, Assertions
@section List Assertions

@include include/fun-org.melusina.confidence-assert-list-equal.texinfo
@include include/fun-org.melusina.confidence-assert-set-equal.texinfo
@include include/fun-org.melusina.confidence-assert-subsetp.texinfo
@include include/fun-confidence-assert-list-equal.texinfo
@include include/fun-confidence-assert-set-equal.texinfo
@include include/fun-confidence-assert-subsetp.texinfo

@node Vector Assertions, Floating Number Assertions, List Assertions, Assertions
@section Vector Assertions

@include include/fun-org.melusina.confidence-assert-vector-equal.texinfo
@include include/fun-confidence-assert-vector-equal.texinfo

@node Floating Number Assertions, Testcases, Vector Assertions, Assertions
@section Floating Number Assertions

@include include/var-org.melusina.confidence-star-double-float-precision-star.texinfo
@include include/var-org.melusina.confidence-star-single-float-precision-star.texinfo
@include include/fun-org.melusina.confidence-assert-float-is-approximately-equal.texinfo
@include include/fun-org.melusina.confidence-assert-float-is-essentially-equal.texinfo
@include include/fun-org.melusina.confidence-assert-float-is-definitely-greater-than.texinfo
@include include/fun-org.melusina.confidence-assert-float-is-definitely-less-than.texinfo
@include include/var-confidence-star-double-float-precision-star.texinfo
@include include/var-confidence-star-single-float-precision-star.texinfo
@include include/fun-confidence-assert-float-is-approximately-equal.texinfo
@include include/fun-confidence-assert-float-is-essentially-equal.texinfo
@include include/fun-confidence-assert-float-is-definitely-greater-than.texinfo
@include include/fun-confidence-assert-float-is-definitely-less-than.texinfo

@node Testcases, Specialities, Floating Number Assertions, Top
@chapter Testcases
Expand All @@ -198,16 +198,16 @@ is that some specific @i{restarts} are available in this context.

@section Define a Testcase

@include include/macro-org.melusina.confidence-define-testcase.texinfo
@include include/class-org.melusina.confidence-testcase-outcome.texinfo
@include include/macro-confidence-define-testcase.texinfo
@include include/class-confidence-testcase-outcome.texinfo

@section Describe Failed Assertions

When an assertion fails, it prints a description on the
@code{*error-output*}, unless the following configuration variable
is set to @code{nil}.

@include include/var-org.melusina.confidence-star-testcase-describe-failed-assertions-star.texinfo
@include include/var-confidence-star-testcase-describe-failed-assertions-star.texinfo


@section Run Testcases in Batch
Expand All @@ -224,8 +224,8 @@ assertion, the debugger is invoked. To do so, modify the variable
@code{*testcase-break-into-the-debugger-on-errors*} either directly
or with the function @code{testcase-break-into-the-debugger-on-errors}.

@include include/var-org.melusina.confidence-star-testcase-break-into-the-debugger-on-errors-star.texinfo
@include include/fun-org.melusina.confidence-testcase-break-into-the-debugger-on-errors.texinfo
@include include/var-confidence-star-testcase-break-into-the-debugger-on-errors-star.texinfo
@include include/fun-confidence-testcase-break-into-the-debugger-on-errors.texinfo

When this configuration is active, the following @i{restarts} are
available in the debugger:
Expand Down Expand Up @@ -259,7 +259,7 @@ generated documentation. It could however be desirable to explciitly
add them to the export list of a package. To support this, the
@b{Confidence} system exports the following function:

@include include/fun-org.melusina.confidence-print-export-list-for-testcases.texinfo
@include include/fun-confidence-print-export-list-for-testcases.texinfo


@node Specialities, , Testcases, Top
Expand Down
8 changes: 3 additions & 5 deletions libexec/lisp/development.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@
;;;; you should have received as part of this distribution. The terms
;;;; are also available at https://opensource.org/licenses/MIT

(defpackage #:org.melusina.confidence/development
(:use #:cl)
(:local-nicknames
(#:atelier #:org.melusina.atelier))
(defpackage #:confidence/development
(:use #:common-lisp)
(:export
#:lint
#+quicklisp
#:reload))

(in-package #:org.melusina.confidence/development)
(in-package #:confidence/development)

(defun system-relative-pathname (pathname)
(flet ((system-source-directory ()
Expand Down
5 changes: 3 additions & 2 deletions src/package.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +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.confidence
(defpackage #:confidence
(:use #:common-lisp)
(:nicknames #:org.melusina.confidence)
(:export
#:quit
;; Results
Expand Down Expand Up @@ -93,6 +94,6 @@
#:assert-float-is-essentially-equal
))

(in-package #:org.melusina.confidence)
(in-package #:confidence)

;;;; End of file `package.lisp'
6 changes: 3 additions & 3 deletions testsuite/package.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +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.confidence/testsuite
(:local-nicknames (#:confidence #:org.melusina.confidence))
(defpackage #:confidence/testsuite
(:use #:common-lisp #:org.melusina.confidence)
(:nicknames #:org.melusina.confidence/testsuite)
(:export
#:a-compound-failing-testsuite
#:a-failing-argument-testsuite
Expand Down Expand Up @@ -50,6 +50,6 @@
#:validate-outcome-can-be-described
#:validate-supervise-assertion))

(in-package #:org.melusina.confidence/testsuite)
(in-package #:confidence/testsuite)

;;;; End of file `package.lisp'

0 comments on commit 9da1064

Please sign in to comment.