Skip to content

Commit 5b06fb7

Browse files
committed
Bump dependency versions; minor corrections to tutorial text.
1 parent e6e12a4 commit 5b06fb7

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

project.clj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
:description "A simple web-based Clojure REPL for trying out Clojure without having to install it."
33
:dependencies [[org.clojure/clojure "1.6.0"]
44
[enlive "1.1.5"]
5-
[lib-noir "0.8.1"]
6-
[compojure "1.1.6"]
5+
[lib-noir "0.8.4"]
6+
[compojure "1.1.8"]
77
[ring-server "0.3.1"]
88
[commons-lang/commons-lang "2.5"]
99
[clojail "1.0.6"]]
1010
:jvm-opts ["-Djava.security.policy=example.policy" "-Xmx80M"]
1111
:min-lein-version "2.0.0"
1212
:uberjar-name "tryclojure-standalone.jar"
13-
:plugins [[lein-ring "0.8.10"]]
13+
:plugins [[lein-ring "0.8.11"]]
1414
:ring {:handler tryclojure.server/app :port 8801}
1515
:profiles {:dev {:ring {:nrepl? true}}})

resources/public/tutorial.html

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<code>def</code> binds the newly defined function to a name.
114114
</p>
115115
<p>
116-
If you want, you can create a named functions without
116+
If you want, you can create a named function without
117117
using <code>defn</code>; type
118118
<pre class="codeblock">
119119
<code class="expr">
@@ -150,7 +150,7 @@
150150
elements, you actually get a brand new list. (Fortunately,
151151
Clojure is amazingly efficient at creating new lists). In
152152
general, Clojure encourages you to have as little mutable state
153-
as possible. For example, instead qof "for" loops and other
153+
as possible. For example, instead of "for" loops and other
154154
state-changing constructs, most of the time you'll see functions
155155
doing transformations on immutable data and returning new
156156
collections, without changing the old one.
@@ -601,7 +601,7 @@
601601
<div class="page" data-exitexpr="true">
602602
<p>
603603
Before we go on to solve the puzzle, let's write a function to
604-
pretty-print our grid. We'd like the output to look like:
604+
pretty-print our grid. We'd like the output to look like this:
605605
</p>
606606
<pre>
607607
+---+---+---+
@@ -1168,7 +1168,8 @@
11681168
Hmm. In this case, <code>eliminate-one</code> is returning <code>nil</code> when
11691169
we try to eliminate 5 as a value for A1, and <code>reduce</code> carries on looping
11701170
with a <code>nil</code> accumulator. We need a way to short-circuit the reduce
1171-
when we run into a <code>nil</code> value:
1171+
when we run into a <code>nil</code> value. Try this new version
1172+
of <code>eliminate</code>:
11721173
</p>
11731174
<pre class="codeblock">
11741175
<code class="expr">
@@ -1356,7 +1357,9 @@
13561357
</code>
13571358
</pre>
13581359
<p>
1359-
Try solving this grid: <code class="expr">(render-grid (solve hard-grid))</code>.
1360+
Try solving this grid:
1361+
<code class="expr">(render-grid (solve hard-grid))</code>.
1362+
(Again, it may take a few seconds.)
13601363
</p>
13611364
</div>
13621365
<div class="page" data-exitexpr='(find-unsolved hard-grid)'>
@@ -1371,7 +1374,8 @@
13711374
<p>
13721375
This is where Clojure's immutable data structures really show their strength:
13731376
backtracking comes for free, as trying a value creates a new grid without mutating
1374-
the original one! Let's take a look at our <code>solve</code> function:
1377+
the original one! Let's take a look at our <code>solve</code>
1378+
function so far:
13751379
</p>
13761380
<pre class="codeblock">
13771381
<code class="expr">

0 commit comments

Comments
 (0)