From b200222f8cbf67455c760444ed13173719742bf9 Mon Sep 17 00:00:00 2001 From: Trashtalk Date: Sat, 20 Oct 2018 16:41:57 +0200 Subject: [PATCH 1/3] Renamed lisp to clisp and Lisp to Common lisp --- book.json | 4 ++-- contents/bogo_sort/bogo_sort.md | 8 ++++---- .../bogo_sort/code/{lisp => clisp}/bogo-sort.lisp | 0 contents/bubble_sort/bubble_sort.md | 8 ++++---- .../code/{lisp => clisp}/bubble_sort.lisp | 0 .../code/{lisp => clisp}/euclidean_algorithm.lisp | 0 contents/euclidean_algorithm/euclidean_algorithm.md | 12 ++++++------ .../code/{lisp => clisp}/jarvis-march.lisp | 0 contents/jarvis_march/jarvis_march.md | 4 ++-- .../code/{lisp => clisp}/monte-carlo.lisp | 0 .../monte_carlo_integration.md | 8 ++++---- 11 files changed, 22 insertions(+), 22 deletions(-) rename contents/bogo_sort/code/{lisp => clisp}/bogo-sort.lisp (100%) rename contents/bubble_sort/code/{lisp => clisp}/bubble_sort.lisp (100%) rename contents/euclidean_algorithm/code/{lisp => clisp}/euclidean_algorithm.lisp (100%) rename contents/jarvis_march/code/{lisp => clisp}/jarvis-march.lisp (100%) rename contents/monte_carlo_integration/code/{lisp => clisp}/monte-carlo.lisp (100%) diff --git a/book.json b/book.json index 7fae5c319..93698b3f1 100644 --- a/book.json +++ b/book.json @@ -133,8 +133,8 @@ "name": "PHP" }, { - "lang": "lisp", - "name": "Lisp" + "lang": "clisp", + "name": "Common Lisp" }, { "lang": "nim", diff --git a/contents/bogo_sort/bogo_sort.md b/contents/bogo_sort/bogo_sort.md index 4704f9fb4..77b6f12af 100644 --- a/contents/bogo_sort/bogo_sort.md +++ b/contents/bogo_sort/bogo_sort.md @@ -57,8 +57,8 @@ In code, it looks something like this: [import:2-6, lang:"st"](code/smalltalk/bogosort.st) {% sample lang="asm-x64" %} [import:93-113, lang:"asm-x64"](code/asm-x64/bogosort.s) -{% sample lang="lisp" %} -[import:20-24, lang:"lisp"](code/lisp/bogo-sort.lisp) +{% sample lang="clisp" %} +[import:20-24, lang:"lisp"](code/clisp/bogo-sort.lisp) {% endmethod %} That's it. @@ -115,8 +115,8 @@ We are done here! [import, lang:"st"](code/smalltalk/bogosort.st) {% sample lang="asm-x64" %} [import, lang:"asm-x64"](code/asm-x64/bogosort.s) -{% sample lang="lisp" %} -[import, lang:"lisp"](code/lisp/bogo-sort.lisp) +{% sample lang="clisp" %} +[import, lang:"lisp"](code/clisp/bogo-sort.lisp) {% endmethod %} diff --git a/contents/bogo_sort/code/lisp/bogo-sort.lisp b/contents/bogo_sort/code/clisp/bogo-sort.lisp similarity index 100% rename from contents/bogo_sort/code/lisp/bogo-sort.lisp rename to contents/bogo_sort/code/clisp/bogo-sort.lisp diff --git a/contents/bubble_sort/bubble_sort.md b/contents/bubble_sort/bubble_sort.md index 8fa02a786..49525f44f 100644 --- a/contents/bubble_sort/bubble_sort.md +++ b/contents/bubble_sort/bubble_sort.md @@ -48,8 +48,8 @@ This means that we need to go through the vector $$\mathcal{O}(n^2)$$ times with [import:1-11, lang:"crystal"](code/crystal/bubble.cr) {% sample lang="php" %} [import:3-15, lang:"php"](code/php/bubble_sort.php) -{% sample lang="lisp" %} -[import:3-28, lang:"lisp"](code/lisp/bubble_sort.lisp) +{% sample lang="clisp" %} +[import:3-28, lang:"lisp"](code/clisp/bubble_sort.lisp) {% sample lang="nim" %} [import:5-9, lang:"nim"](code/nim/bubble_sort.nim) {% sample lang="st" %} @@ -119,8 +119,8 @@ Trust me, there are plenty of more complicated algorithms that do precisely the [import, lang:"crystal"](code/crystal/bubble.cr) {% sample lang="php" %} [import, lang:"php"](code/php/bubble_sort.php) -{% sample lang="lisp" %} -[import, lang:"lisp"](code/lisp/bubble_sort.lisp) +{% sample lang="clisp" %} +[import, lang:"lisp"](code/clisp/bubble_sort.lisp) {% sample lang="nim" %} [import, lang:"nim"](code/nim/bubble_sort.nim) {% sample lang="asm-x64" %} diff --git a/contents/bubble_sort/code/lisp/bubble_sort.lisp b/contents/bubble_sort/code/clisp/bubble_sort.lisp similarity index 100% rename from contents/bubble_sort/code/lisp/bubble_sort.lisp rename to contents/bubble_sort/code/clisp/bubble_sort.lisp diff --git a/contents/euclidean_algorithm/code/lisp/euclidean_algorithm.lisp b/contents/euclidean_algorithm/code/clisp/euclidean_algorithm.lisp similarity index 100% rename from contents/euclidean_algorithm/code/lisp/euclidean_algorithm.lisp rename to contents/euclidean_algorithm/code/clisp/euclidean_algorithm.lisp diff --git a/contents/euclidean_algorithm/euclidean_algorithm.md b/contents/euclidean_algorithm/euclidean_algorithm.md index ff05c7af9..58d6ca45b 100644 --- a/contents/euclidean_algorithm/euclidean_algorithm.md +++ b/contents/euclidean_algorithm/euclidean_algorithm.md @@ -17,8 +17,8 @@ The algorithm is a simple way to find the *greatest common divisor* (GCD) of two [import:3-16, lang="java"](code/java/EuclideanAlgo.java) {% sample lang="js" %} [import:15-29, lang="javascript"](code/javascript/euclidean_example.js) -{% sample lang="lisp" %} -[import:3-12, lang="lisp"](code/lisp/euclidean_algorithm.lisp) +{% sample lang="clisp" %} +[import:3-12, lang="lisp"](code/clisp/euclidean_algorithm.lisp) {% sample lang="py" %} [import:11-22, lang="python"](code/python/euclidean_example.py) {% sample lang="haskell" %} @@ -86,8 +86,8 @@ Modern implementations, though, often use the modulus operator (%) like so [import:18-26, lang="java"](code/java/EuclideanAlgo.java) {% sample lang="js" %} [import:1-13, lang="javascript"](code/javascript/euclidean_example.js) -{% sample lang="lisp" %} -[import:13-17, lang="lisp"](code/lisp/euclidean_algorithm.lisp) +{% sample lang="clisp" %} +[import:13-17, lang="lisp"](code/clisp/euclidean_algorithm.lisp) {% sample lang="py" %} [import:1-9, lang="python"](code/python/euclidean_example.py) {% sample lang="haskell" %} @@ -160,8 +160,8 @@ The Euclidean Algorithm is truly fundamental to many other algorithms throughout [import, lang="java"](code/java/EuclideanAlgo.java) {% sample lang="js" %} [import, lang="javascript"](code/javascript/euclidean_example.js) -{% sample lang="lisp" %} -[import, lang="lisp"](code/lisp/euclidean_algorithm.lisp) +{% sample lang="clisp" %} +[import, lang="lisp"](code/clisp/euclidean_algorithm.lisp) {% sample lang="py" %} [import, lang="python"](code/python/euclidean_example.py) {% sample lang="haskell" %} diff --git a/contents/jarvis_march/code/lisp/jarvis-march.lisp b/contents/jarvis_march/code/clisp/jarvis-march.lisp similarity index 100% rename from contents/jarvis_march/code/lisp/jarvis-march.lisp rename to contents/jarvis_march/code/clisp/jarvis-march.lisp diff --git a/contents/jarvis_march/jarvis_march.md b/contents/jarvis_march/jarvis_march.md index 6697807b0..4f5318c99 100644 --- a/contents/jarvis_march/jarvis_march.md +++ b/contents/jarvis_march/jarvis_march.md @@ -40,8 +40,8 @@ Since this algorithm, there have been many other algorithms that have advanced t [import, lang:"python"](code/python/jarvisMarch.py) {% sample lang="cpp" %} [import, lang:"c_cpp"](code/c++/jarvis_march.cpp) -{% sample lang="lisp" %} -[import, lang:"lisp"](code/lisp/jarvis-march.lisp) +{% sample lang="clisp" %} +[import, lang:"lisp"](code/clisp/jarvis-march.lisp) {% sample lang="java" %} [import, lang:"java"](code/java/JarvisMarch.java) {% sample lang="go" %} diff --git a/contents/monte_carlo_integration/code/lisp/monte-carlo.lisp b/contents/monte_carlo_integration/code/clisp/monte-carlo.lisp similarity index 100% rename from contents/monte_carlo_integration/code/lisp/monte-carlo.lisp rename to contents/monte_carlo_integration/code/clisp/monte-carlo.lisp diff --git a/contents/monte_carlo_integration/monte_carlo_integration.md b/contents/monte_carlo_integration/monte_carlo_integration.md index 7070f2d48..5385b5995 100644 --- a/contents/monte_carlo_integration/monte_carlo_integration.md +++ b/contents/monte_carlo_integration/monte_carlo_integration.md @@ -83,8 +83,8 @@ each point is tested to see whether it's in the circle or not: [import:2-4, lang:"lisp"](code/racket/monte_carlo.rkt) {% sample lang="scala" %} [import:3-3, lang:"scala"](code/scala/monte_carlo.scala) -{% sample lang="lisp" %} -[import:3-5, lang:"lisp"](code/scala/monte-carlo.lisp) +{% sample lang="clisp" %} +[import:3-5, lang:"lisp"](code/clisp/monte-carlo.lisp) {% sample lang="asm-x64" %} [import:21-32, lang:"asm-x64"](code/asm-x64/monte_carlo.s) {% endmethod %} @@ -169,8 +169,8 @@ Feel free to submit your version via pull request, and thanks for reading! [import, lang:"lisp"](code/racket/monte_carlo.rkt) {% sample lang="scala" %} [import, lang:"scala"](code/scala/monte_carlo.scala) -{% sample lang="lisp" %} -[import, lang:"lisp"](code/scala/monte-carlo.lisp) +{% sample lang="clisp" %} +[import, lang:"lisp"](code/clisp/monte-carlo.lisp) {% sample lang="asm-x64" %} [import, lang:"asm-x64"](code/asm-x64/monte_carlo.s) {% endmethod %} From a61080ea1bbd8f3a362ad3e457a16b1c8481b7c7 Mon Sep 17 00:00:00 2001 From: Trashtalk Date: Sun, 21 Oct 2018 19:34:22 +0200 Subject: [PATCH 2/3] changed lang variable back to file extension name. --- book.json | 2 +- contents/bogo_sort/bogo_sort.md | 4 ++-- contents/bubble_sort/bubble_sort.md | 4 ++-- contents/euclidean_algorithm/euclidean_algorithm.md | 6 +++--- contents/jarvis_march/jarvis_march.md | 2 +- contents/monte_carlo_integration/monte_carlo_integration.md | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/book.json b/book.json index 93698b3f1..a6326ffef 100644 --- a/book.json +++ b/book.json @@ -133,7 +133,7 @@ "name": "PHP" }, { - "lang": "clisp", + "lang": "lisp", "name": "Common Lisp" }, { diff --git a/contents/bogo_sort/bogo_sort.md b/contents/bogo_sort/bogo_sort.md index 77b6f12af..3c8a26fce 100644 --- a/contents/bogo_sort/bogo_sort.md +++ b/contents/bogo_sort/bogo_sort.md @@ -57,7 +57,7 @@ In code, it looks something like this: [import:2-6, lang:"st"](code/smalltalk/bogosort.st) {% sample lang="asm-x64" %} [import:93-113, lang:"asm-x64"](code/asm-x64/bogosort.s) -{% sample lang="clisp" %} +{% sample lang="lisp" %} [import:20-24, lang:"lisp"](code/clisp/bogo-sort.lisp) {% endmethod %} @@ -115,7 +115,7 @@ We are done here! [import, lang:"st"](code/smalltalk/bogosort.st) {% sample lang="asm-x64" %} [import, lang:"asm-x64"](code/asm-x64/bogosort.s) -{% sample lang="clisp" %} +{% sample lang="lisp" %} [import, lang:"lisp"](code/clisp/bogo-sort.lisp) {% endmethod %} diff --git a/contents/bubble_sort/bubble_sort.md b/contents/bubble_sort/bubble_sort.md index 49525f44f..a7e720478 100644 --- a/contents/bubble_sort/bubble_sort.md +++ b/contents/bubble_sort/bubble_sort.md @@ -48,7 +48,7 @@ This means that we need to go through the vector $$\mathcal{O}(n^2)$$ times with [import:1-11, lang:"crystal"](code/crystal/bubble.cr) {% sample lang="php" %} [import:3-15, lang:"php"](code/php/bubble_sort.php) -{% sample lang="clisp" %} +{% sample lang="lisp" %} [import:3-28, lang:"lisp"](code/clisp/bubble_sort.lisp) {% sample lang="nim" %} [import:5-9, lang:"nim"](code/nim/bubble_sort.nim) @@ -119,7 +119,7 @@ Trust me, there are plenty of more complicated algorithms that do precisely the [import, lang:"crystal"](code/crystal/bubble.cr) {% sample lang="php" %} [import, lang:"php"](code/php/bubble_sort.php) -{% sample lang="clisp" %} +{% sample lang="lisp" %} [import, lang:"lisp"](code/clisp/bubble_sort.lisp) {% sample lang="nim" %} [import, lang:"nim"](code/nim/bubble_sort.nim) diff --git a/contents/euclidean_algorithm/euclidean_algorithm.md b/contents/euclidean_algorithm/euclidean_algorithm.md index 58d6ca45b..aed4719b3 100644 --- a/contents/euclidean_algorithm/euclidean_algorithm.md +++ b/contents/euclidean_algorithm/euclidean_algorithm.md @@ -17,7 +17,7 @@ The algorithm is a simple way to find the *greatest common divisor* (GCD) of two [import:3-16, lang="java"](code/java/EuclideanAlgo.java) {% sample lang="js" %} [import:15-29, lang="javascript"](code/javascript/euclidean_example.js) -{% sample lang="clisp" %} +{% sample lang="lisp" %} [import:3-12, lang="lisp"](code/clisp/euclidean_algorithm.lisp) {% sample lang="py" %} [import:11-22, lang="python"](code/python/euclidean_example.py) @@ -86,7 +86,7 @@ Modern implementations, though, often use the modulus operator (%) like so [import:18-26, lang="java"](code/java/EuclideanAlgo.java) {% sample lang="js" %} [import:1-13, lang="javascript"](code/javascript/euclidean_example.js) -{% sample lang="clisp" %} +{% sample lang="lisp" %} [import:13-17, lang="lisp"](code/clisp/euclidean_algorithm.lisp) {% sample lang="py" %} [import:1-9, lang="python"](code/python/euclidean_example.py) @@ -160,7 +160,7 @@ The Euclidean Algorithm is truly fundamental to many other algorithms throughout [import, lang="java"](code/java/EuclideanAlgo.java) {% sample lang="js" %} [import, lang="javascript"](code/javascript/euclidean_example.js) -{% sample lang="clisp" %} +{% sample lang="lisp" %} [import, lang="lisp"](code/clisp/euclidean_algorithm.lisp) {% sample lang="py" %} [import, lang="python"](code/python/euclidean_example.py) diff --git a/contents/jarvis_march/jarvis_march.md b/contents/jarvis_march/jarvis_march.md index 4f5318c99..a4fa86130 100644 --- a/contents/jarvis_march/jarvis_march.md +++ b/contents/jarvis_march/jarvis_march.md @@ -40,7 +40,7 @@ Since this algorithm, there have been many other algorithms that have advanced t [import, lang:"python"](code/python/jarvisMarch.py) {% sample lang="cpp" %} [import, lang:"c_cpp"](code/c++/jarvis_march.cpp) -{% sample lang="clisp" %} +{% sample lang="lisp" %} [import, lang:"lisp"](code/clisp/jarvis-march.lisp) {% sample lang="java" %} [import, lang:"java"](code/java/JarvisMarch.java) diff --git a/contents/monte_carlo_integration/monte_carlo_integration.md b/contents/monte_carlo_integration/monte_carlo_integration.md index 5385b5995..c6bb2810b 100644 --- a/contents/monte_carlo_integration/monte_carlo_integration.md +++ b/contents/monte_carlo_integration/monte_carlo_integration.md @@ -169,7 +169,7 @@ Feel free to submit your version via pull request, and thanks for reading! [import, lang:"lisp"](code/racket/monte_carlo.rkt) {% sample lang="scala" %} [import, lang:"scala"](code/scala/monte_carlo.scala) -{% sample lang="clisp" %} +{% sample lang="lisp" %} [import, lang:"lisp"](code/clisp/monte-carlo.lisp) {% sample lang="asm-x64" %} [import, lang:"asm-x64"](code/asm-x64/monte_carlo.s) From ffed2032d2b2db238620a91910687edce39ebc2d Mon Sep 17 00:00:00 2001 From: Trashtalk217 Date: Sun, 21 Oct 2018 23:21:01 +0200 Subject: [PATCH 3/3] Fixed missed update --- contents/monte_carlo_integration/monte_carlo_integration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents/monte_carlo_integration/monte_carlo_integration.md b/contents/monte_carlo_integration/monte_carlo_integration.md index c6bb2810b..2ee2b64ed 100644 --- a/contents/monte_carlo_integration/monte_carlo_integration.md +++ b/contents/monte_carlo_integration/monte_carlo_integration.md @@ -83,7 +83,7 @@ each point is tested to see whether it's in the circle or not: [import:2-4, lang:"lisp"](code/racket/monte_carlo.rkt) {% sample lang="scala" %} [import:3-3, lang:"scala"](code/scala/monte_carlo.scala) -{% sample lang="clisp" %} +{% sample lang="lisp" %} [import:3-5, lang:"lisp"](code/clisp/monte-carlo.lisp) {% sample lang="asm-x64" %} [import:21-32, lang:"asm-x64"](code/asm-x64/monte_carlo.s)