From 4580850fc3ce2bf1881411e43d8284a5a32b7926 Mon Sep 17 00:00:00 2001
From: Matt Davidson <MED139@student.aru.ac.uk>
Date: Fri, 4 Nov 2022 13:42:32 +0000
Subject: [PATCH] Finished first koan and some answers for second

---
 src/koans/01_equalities.clj | 11 ++++++-----
 src/koans/02_strings.clj    | 36 ++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/koans/01_equalities.clj b/src/koans/01_equalities.clj
index bc96860..6e0e448 100644
--- a/src/koans/01_equalities.clj
+++ b/src/koans/01_equalities.clj
@@ -24,16 +24,17 @@
   (= true (not (= 1 nil)))
 
   "Strings, and keywords, and symbols: oh my!"
-  (= __ (= "hello" :hello 'hello))
+  (= false (= "hello" :hello 'hello)) 
 
   "Make a keyword with your keyboard"
-  (= :hello (keyword __))
+  (= :hello (keyword 'hello))
+
 
   "Symbolism is all around us"
-  (= 'hello (symbol __))
+  (= 'hello (symbol "hello"))
 
   "What could be equivalent to nothing?"
-  (= __ nil)
+  (= nil nil)
 
   "When things cannot be equal, they must be different"
-  (not= :fill-in-the-blank __))
+  (not= :fill-in-the-blank "fill-in-the-blank"))
diff --git a/src/koans/02_strings.clj b/src/koans/02_strings.clj
index f2d9623..d6c8eff 100644
--- a/src/koans/02_strings.clj
+++ b/src/koans/02_strings.clj
@@ -4,52 +4,52 @@
 
 (meditations
   "A string is nothing more than text surrounded by double quotes"
-  (= __ "hello")
+  (= "hello" "hello")
 
   "But double quotes are just magic on top of something deeper"
-  (= __ (str 'world))
+  (= "world" (str 'world))
 
   "You can do more than create strings, you can put them together"
-  (= "Cool right?" (str __ __))
+  (= "Cool right?" (str "Cool" " right?"))
 
   "You can even get certain characters"
-  (= \C (get "Characters" __))
+  (= \C (get "Characters" 0))
 
   "Or even count the characters"
-  (= __ (count "Hello World"))
+  (= 11 (count "Hello World"))
 
   "But strings and characters are not the same"
-  (= __ (= \c "c"))
+  (= false (= \c "c"))
 
   "What if you only wanted to get part of a string?"
-  (= "World" (subs "Hello World" __ __))
+  (= "World" (subs "Hello World" 6 11))
 
   "How about joining together elements in a list?"
-  (= __ (string/join '(1 2 3)))
+  (= "123" (string/join '(1 2 3)))
 
   "What if you wanted to separate them out?"
-  (= "1, 2, 3" (string/join __ '(1 2 3)))
+  (= "1, 2, 3" (string/join ", " '(1 2 3)))
 
   "Maybe you want to separate out all your lines"
-  (= [__ __ __] (string/split-lines "1\n2\n3"))
+  (= ["1" "2" "3"] (string/split-lines "1\n2\n3"))
 
   "You may want to make sure your words are backwards"
-  (= __ (string/reverse "hello"))
+  (= "olleh" (string/reverse "hello"))
 
   "Maybe you want to find the index of the first occurrence of a substring"
-  (= 0 (string/index-of "hello world" __))
+  (= 0 (string/index-of "hello world" "h"))
 
   "Or maybe the last index of the same"
-  (= __ (string/last-index-of "hello world, hello" "hello"))
-
+  (= 13 (string/last-index-of "hello world, hello" "hello"))   
+  
   "But when something doesn't exist, nothing is found"
-  (= __ (string/index-of "hello world" "bob"))
+  (= nil (string/index-of "hello world" "bob"))
 
   "Sometimes you don't want whitespace cluttering the front and back"
-  (= __ (string/trim "  \nhello world \t \n"))
+  (= "hello world" (string/trim "  \nhello world \t \n"))
 
-  "You can check if something is a char"
-  (= __ (char? \c))
+  "You can check if something is a char" 
+  (= true (char? \c)) 
 
   "But it may not be"
   (= __ (char? "a"))