Kibitised.

resources/public/docs/mw-parser/uberdoc.html

@@ -3115,7 +3115,7 @@ front of the sequence of tokens it returns nil.</p>
 </td><td class="codes"></td></tr><tr><td class="docs"><p>Parse a number.</p>
 </td><td class="codes"><pre class="brush: clojure">(defn parse-numeric-value
   [[value &amp; remainder]]
-  (if (re-matches re-number value) [(read-string value) remainder]))</pre></td></tr><tr><td class="docs"><p>Parse a token assumed to be the name of a property of the current cell, 
+  (if (and value (re-matches re-number value)) [(read-string value) remainder]))</pre></td></tr><tr><td class="docs"><p>Parse a token assumed to be the name of a property of the current cell, 
   whose value is assumed to be an integer.</p>
 </td><td class="codes"><pre class="brush: clojure">(defn parse-property-int
   [[value &amp; remainder]]
@@ -3217,7 +3217,7 @@ front of the sequence of tokens it returns nil.</p>
         comparator (cond (= MORE &quot;more&quot;) '&gt;
                      (member? MORE '(&quot;fewer&quot; &quot;less&quot;)) '&lt;)]       
     (cond
-      (not (= WITHIN &quot;within&quot;))
+      (not= WITHIN &quot;within&quot;)
       (parse-comparator-neighbours-condition 
         (flatten 
           ;; two tokens were mis-parsed as 'within distance' that weren't
@@ -3256,7 +3256,7 @@ front of the sequence of tokens it returns nil.</p>
     (cond
       (and quantity (= NEIGHBOURS &quot;neighbours&quot;))
       (cond
-        (not (= WITHIN &quot;within&quot;))
+        (not= WITHIN &quot;within&quot;)
         (parse-simple-neighbours-condition
           (flatten 
             ;; two tokens were mis-parsed as 'within distance' that weren't
@@ -3325,7 +3325,7 @@ front of the sequence of tokens it returns nil.</p>
 </td><td class="codes"><pre class="brush: clojure">(defn- parse-arithmetic-action 
   [previous [prop1 SHOULD BE prop2 operator value &amp; rest]]
   (cond
-    (member? prop2 '(&quot;x&quot; &quot;y&quot;))
+    (member? prop1 '(&quot;x&quot; &quot;y&quot;))
     (throw 
       (Exception. reserved-properties-error))
     (and (= SHOULD &quot;should&quot;)

resources/public/docs/mw-ui/uberdoc.html

@@ -3157,7 +3157,7 @@ net.brehaut.ClojureTools = (function (SH) {
                                     (compiler/compile-file
                                       (io/get-resource "/rulesets/basic.txt")))
                     (session/get :rules)))
-        generation (+ (or (session/get :generation) 0) 1)
+        generation (inc (or (session/get :generation) 0))
         w2 (engine/transform-world world rules)
         ]
     (session/put! :world w2)
@@ -3167,7 +3167,7 @@ net.brehaut.ClojureTools = (function (SH) {
                  (cons :table
                        (map render-world-row w2)))
       [:p
-       (str &quot;Generation &quot; generation)]]))</pre></td></tr><tr><td class="docs">
+       (str &quot;Generation &quot; generation)]]))</pre></td></tr><tr><td class="docs"><p>Render in Hiccup format the HTML content of an inspector on this cell.</p>
 </td><td class="codes"><pre class="brush: clojure">(defn render-inspector
   [cell table]
   [:table {:class &quot;music-ruled&quot;}
@@ -3229,8 +3229,8 @@ net.brehaut.ClojureTools = (function (SH) {
   (let [params (keywordize-keys (:params request))
         xs (:x params)
         ys (:y params)
-        x (if (not (empty? xs)) (read-string xs) 0)
+        x (if (seq xs) (read-string xs) 0)
-        y (if (not (empty? ys)) (read-string ys) 0)
+        y (if (seq ys) (read-string ys) 0)
         world (session/get :world)
         cell (engine-utils/get-cell world x y)
         state (:state params)]
@@ -3267,7 +3267,7 @@ net.brehaut.ClojureTools = (function (SH) {
                     :content (util/md-&gt;html (str &quot;/md/&quot; content))})))</pre></td></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(defn list-states []
   (sort
-    (filter #(not (nil? %)) 
+    (remove nil?
             (map #(first (rest (re-matches #&quot;([0-9a-z-]+).png&quot; (.getName %))))
                  (file-seq (clojure.java.io/file &quot;resources/public/img/tiles&quot;))))))</pre></td></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(defn docs-page []
@@ -3318,15 +3318,14 @@ net.brehaut.ClojureTools = (function (SH) {
             pause (:pause params)
             rulefile (:ruleset params)
             rulepath (str &quot;/rulesets/&quot; rulefile &quot;.txt&quot;)]
-        (if (not (= map &quot;&quot;)) 
+        (if (not= map &quot;&quot;) 
           (session/put! :world 
                         (heightmap/apply-heightmap 
                           (io/get-resource (str &quot;/img/heightmaps/&quot; map &quot;.png&quot;)))))
-        (if (not (= rulefile &quot;&quot;))
+        (when (not= rulefile &quot;&quot;)
-          (do
+          (session/put! :rule-text (io/slurp-resource rulepath))
-            (session/put! :rule-text (io/slurp-resource rulepath))
+          (session/put! :rules (compiler/compile-file (io/get-resource rulepath))))
-            (session/put! :rules (compiler/compile-file (io/get-resource rulepath)))))
+        (if (not= pause &quot;&quot;)
-        (if (not (= pause &quot;&quot;))
           (session/put! :pause pause))
         (layout/render &quot;params.html&quot; 
                        (merge (send-params) 
@@ -3404,7 +3403,7 @@ net.brehaut.ClojureTools = (function (SH) {
     [path (str (io/resource-path) directory)]
     (session/put! :list-resources-path path)
     (sort
-      (filter #(not (nil? %)) 
+      (remove nil? 
             (map #(first (rest (re-matches pattern (.getName %))))
                  (file-seq (clojure.java.io/file path)))))))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr></table><div class="footer">Generated by <a href="https://github.com/fogus/marginalia">Marginalia</a>.&nbsp;&nbsp;Syntax highlighting provided by Alex Gorbatchev's <a href="http://alexgorbatchev.com/SyntaxHighlighter/">SyntaxHighlighter</a></div><script type="text/javascript">SyntaxHighlighter.defaults['gutter'] = false;
        SyntaxHighlighter.all()</script></body></html>

src/mw_ui/render_world.clj

@@ -47,7 +47,7 @@
                                     (compiler/compile-file
                                       (io/get-resource "/rulesets/basic.txt")))
                     (session/get :rules)))
-        generation (+ (or (session/get :generation) 0) 1)
+        generation (inc (or (session/get :generation) 0))
         w2 (engine/transform-world world rules)
         ]
     (session/put! :world w2)

src/mw_ui/routes/home.clj

@@ -19,8 +19,8 @@
   (let [params (keywordize-keys (:params request))
         xs (:x params)
         ys (:y params)
-        x (if (not (empty? xs)) (read-string xs) 0)
+        x (if (seq xs) (read-string xs) 0)
-        y (if (not (empty? ys)) (read-string ys) 0)
+        y (if (seq ys) (read-string ys) 0)
         world (session/get :world)
         cell (engine-utils/get-cell world x y)
         state (:state params)]
@@ -61,7 +61,7 @@
 
 (defn list-states []
   (sort
-    (filter #(not (nil? %)) 
+    (remove nil?
             (map #(first (rest (re-matches #"([0-9a-z-]+).png" (.getName %))))
                  (file-seq (clojure.java.io/file "resources/public/img/tiles"))))))
 

src/mw_ui/routes/params.clj

@@ -31,15 +31,14 @@
             pause (:pause params)
             rulefile (:ruleset params)
             rulepath (str "/rulesets/" rulefile ".txt")]
-        (if (not (= map "")) 
+        (if (not= map "") 
           (session/put! :world 
                         (heightmap/apply-heightmap 
                           (io/get-resource (str "/img/heightmaps/" map ".png")))))
-        (if (not (= rulefile ""))
+        (when (not= rulefile "")
-          (do
+          (session/put! :rule-text (io/slurp-resource rulepath))
-            (session/put! :rule-text (io/slurp-resource rulepath))
+          (session/put! :rules (compiler/compile-file (io/get-resource rulepath))))
-            (session/put! :rules (compiler/compile-file (io/get-resource rulepath)))))
+        (if (not= pause "")
-        (if (not (= pause ""))
           (session/put! :pause pause))
         (layout/render "params.html" 
                        (merge (send-params) 

src/mw_ui/util.clj

@@ -16,6 +16,6 @@
     [path (str (io/resource-path) directory)]
     (session/put! :list-resources-path path)
     (sort
-      (filter #(not (nil? %)) 
+      (remove nil? 
             (map #(first (rest (re-matches pattern (.getName %))))
                  (file-seq (clojure.java.io/file path)))))))