Skip to content

Commit

Permalink
Move *.lsp files to *.lisp
Browse files Browse the repository at this point in the history
  • Loading branch information
phoe committed May 5, 2020
1 parent fc24722 commit d2bf630
Show file tree
Hide file tree
Showing 38 changed files with 27 additions and 27 deletions.
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@

### One-time Method

From a terminal, execute your lisp interpreter on the file 'contemplate.lsp' e.g.
From a terminal, execute your lisp interpreter on the file 'contemplate.lisp' e.g.

abcl --noinform --noinit --load contemplate.lsp --eval '(quit)'
ccl -n -l contemplate.lsp -e '(quit)'
clisp -q -norc -ansi contemplate.lsp
ecl -norc -load contemplate.lsp -eval '(quit)'
sbcl --script contemplate.lsp
abcl --noinform --noinit --load contemplate.lisp --eval '(quit)'
ccl -n -l contemplate.lisp -e '(quit)'
clisp -q -norc -ansi contemplate.lisp
ecl -norc -load contemplate.lisp -eval '(quit)'
sbcl --script contemplate.lisp

### Watching the Koans

On Linux and MacOS systems, the shell scripts `meditate-linux.sh` and
`meditate-macos.sh` can be used to automatically evaluate 'contemplate.lsp'
`meditate-macos.sh` can be used to automatically evaluate 'contemplate.lisp'
whenever the koan files are modified, providing immediate feedback on changes
to the koans. To run the MacOS version you need to have
[`fswatch`](https://github.com/emcrisostomo/fswatch) installed. From a terminal:
Expand All @@ -36,15 +36,15 @@ You have not yet reached enlightenment ...
A koan is incomplete.
Please meditate on the following code:
File "koans/asserts.lsp"
File "koans/asserts.lisp"
Koan "ASSERT-TRUE"
Current koan assert status is "(INCOMPLETE)"
You are now 0/169 koans and 0/25 lessons closer to reaching enlightenment
```

This indicates that the script has completed, and that the learner should look
to asserts.lsp to locate and fix the problem. The problem will be within
to asserts.lisp to locate and fix the problem. The problem will be within
a define-test expression such as

(define-test assert-true
Expand Down Expand Up @@ -81,5 +81,5 @@ For information and instructions on installing Quicklisp
please see:
https://www.quicklisp.org/beta/
The user can either remove #+quicklisp and uncomment
(load "~/.quicklisp/setup.lisp") in threads.lsp, or if they know
quicklisp will be loaded while running contemplate.lsp do nothing.
(load "~/.quicklisp/setup.lisp") in threads.lisp, or if they know
quicklisp will be loaded while running contemplate.lisp do nothing.
6 changes: 3 additions & 3 deletions contemplate.lsp → contemplate.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
(in-package :cl-user)

;;; Though Clozure / CCL runs lisp-koans on the command line using
;;; "ccl -l contemplate.lsp", the following lines are needed to
;;; "ccl -l contemplate.lisp", the following lines are needed to
;;; meditate on the koans within the CCL IDE.
;;; (The :hemlock is used to distiguish between ccl commandline and the IDE)
#+(and :ccl :hemlock)
(setf *default-pathname-defaults* (directory-namestring *load-pathname*))

(load "test-framework.lsp")
(load "lisp-koans.lsp")
(load "test-framework.lisp")
(load "lisp-koans.lisp")

(com.google.lisp-koans:main)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions lisp-koans.lsp → lisp-koans.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

(defun load-koan-group-named (koan-group-name)
(let* ((koan-name (string-downcase (string koan-group-name)))
(koan-file-name (concatenate 'string koan-name ".lsp"))
(koan-file-name (concatenate 'string koan-name ".lisp"))
(koan-package-name (package-name-from-group-name koan-group-name)))
(unless (find-package koan-package-name)
(make-package koan-package-name
Expand Down Expand Up @@ -96,7 +96,7 @@
(format t "You have not yet reached enlightenment.
~A
Please meditate on the following code:
File \"koans/~(~A~).lsp\"
File \"koans/~(~A~).lisp\"
Koan \"~A\"
Current koan assert status is \"~A\"~%~%"
(koan-status-message koan-status) filename koan-name koan-status)))
Expand All @@ -106,7 +106,7 @@
That was the last one, well done! ENLIGHTENMENT IS YOURS!
*********************************************************
If you demand greater challenge, take a look at extra-credit.lsp
If you demand greater challenge, take a look at extra-credit.lisp
Or, let the student become the teacher:
Write and submit your own improvements to https://github.com/google/lisp-koans!
"))
Expand Down
10 changes: 5 additions & 5 deletions meditate-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ fi
choose_command_line() {
case "$1" in
'abcl' )
echo "abcl --noinform --noinit --load contemplate.lsp --eval '(quit)'"
echo "abcl --noinform --noinit --load contemplate.lisp --eval '(quit)'"
;;
'ccl' )
echo "ccl -n -l contemplate.lsp -e '(quit)'"
echo "ccl -n -l contemplate.lisp -e '(quit)'"
;;
'clisp' )
echo "clisp -q -norc -ansi contemplate.lsp"
echo "clisp -q -norc -ansi contemplate.lisp"
;;
'ecl' )
echo "ecl -norc -load contemplate.lsp -eval '(quit)'"
echo "ecl -norc -load contemplate.lisp -eval '(quit)'"
;;
'sbcl' )
echo "sbcl --script contemplate.lsp"
echo "sbcl --script contemplate.lisp"
;;
* )
echo ""
Expand Down
10 changes: 5 additions & 5 deletions meditate-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ fi
choose_command_line() {
case "$1" in
'abcl' )
echo "abcl --noinform --noinit --load contemplate.lsp --eval '(quit)'"
echo "abcl --noinform --noinit --load contemplate.lisp --eval '(quit)'"
;;
'ccl' )
echo "ccl -n -l contemplate.lsp -e '(quit)'"
echo "ccl -n -l contemplate.lisp -e '(quit)'"
;;
'clisp' )
echo "clisp -q -norc -ansi contemplate.lsp"
echo "clisp -q -norc -ansi contemplate.lisp"
;;
'ecl' )
echo "ecl -norc -load contemplate.lsp -eval '(quit)'"
echo "ecl -norc -load contemplate.lisp -eval '(quit)'"
;;
'sbcl' )
echo "sbcl --script contemplate.lsp"
echo "sbcl --script contemplate.lisp"
;;
* )
echo ""
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit d2bf630

Please sign in to comment.