From 225b75a85ecda1697487fe8de7f41845fb4c8038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=22phoe=22=20Herda?= Date: Sat, 9 May 2020 19:16:57 +0200 Subject: [PATCH] Change package names to avoid com.google --- contemplate.lisp | 2 +- lisp-koans.lisp | 10 +++++----- test-framework.lisp | 4 ++-- test.lisp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/contemplate.lisp b/contemplate.lisp index 605675a5..c9ec921a 100644 --- a/contemplate.lisp +++ b/contemplate.lisp @@ -26,4 +26,4 @@ #+quicklisp (ql:quickload :bordeaux-threads) -(com.google.lisp-koans:main) +(lisp-koans.core:main) diff --git a/lisp-koans.lisp b/lisp-koans.lisp index 39d15271..f7c53668 100644 --- a/lisp-koans.lisp +++ b/lisp-koans.lisp @@ -12,12 +12,12 @@ ;;; See the License for the specific language governing permissions and ;;; limitations under the License. -(defpackage #:com.google.lisp-koans +(defpackage #:lisp-koans.core (:use #:common-lisp - #:com.google.lisp-koans.test) + #:lisp-koans.test) (:export #:main)) -(in-package :com.google.lisp-koans) +(in-package :lisp-koans.core) (defvar *all-koan-groups* (with-open-file (in #p".koans") @@ -28,7 +28,7 @@ ;;; Functions for loading koans (defun package-name-from-group-name (group-name) - (format nil "COM.GOOGLE.LISP-KOANS.KOANS.~A" group-name)) + (format nil "LISP-KOANS.KOANS.~A" group-name)) (defun load-koan-group-named (dirname koan-group-name) (let* ((koan-name (string-downcase (string koan-group-name))) @@ -36,7 +36,7 @@ (koan-package-name (package-name-from-group-name koan-group-name))) (unless (find-package koan-package-name) (make-package koan-package-name - :use '(#:common-lisp #:com.google.lisp-koans.test))) + :use '(#:common-lisp #:lisp-koans.test))) (let ((*package* (find-package koan-package-name))) (load (concatenate 'string dirname "/" koan-file-name))))) diff --git a/test-framework.lisp b/test-framework.lisp index 78cbc90d..8ef1904f 100644 --- a/test-framework.lisp +++ b/test-framework.lisp @@ -44,7 +44,7 @@ ;;; 4) Rename the system to not collide with the original LISP-UNIT. ;;; Packages -(defpackage #:com.google.lisp-koans.test +(defpackage #:lisp-koans.test (:use #:common-lisp) ;; Assertions (:export #:assert-eq #:assert-eql #:assert-equal #:assert-equalp #:true-or-false? @@ -54,7 +54,7 @@ ;; Test blank (:export #:____)) -(in-package #:com.google.lisp-koans.test) +(in-package #:lisp-koans.test) ;; The self-evaluating test blank allows many Lisp forms in the koans to compile ;; without errors. diff --git a/test.lisp b/test.lisp index dbca2fb2..9441a1dd 100644 --- a/test.lisp +++ b/test.lisp @@ -26,4 +26,4 @@ #+quicklisp (ql:quickload :bordeaux-threads) -(com.google.lisp-koans:main "koans-solved") +(lisp-koans.core:main "koans-solved")