1.0.0-rc40: bugfix - report actual error message when a non-parse-rel…

…ated error occurs

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.0.0-rc40 (9/17/16)
+
+* Bugfix: prior to this release, if evaluating an Alda score resulted in any error, the client would report `ERROR Invalid Alda syntax.`. Now it will report the error message. (This may have been working at some point and then regressed in a recent release. Sorry about that!)
+
 ## 1.0.0-rc39 (9/17/16)
 
 * There is [a CPU usage issue](https://github.com/alda-lang/alda/issues/266) that can cause poor performance when cycling out workers, a feature that was implemented in the last release.

resources/version.txt

@@ -1 +1 @@
-1.0.0-rc39
+1.0.0-rc40

server/src/alda/worker.clj

@@ -41,21 +41,22 @@
   (try
     (log/debug "Requiring alda.lisp...")
     (require '[alda.lisp :refer :all])
-    (if-let [score (try
-                     (log/debug "Parsing input...")
-                     (parse-input code :map)
-                     (catch Throwable e
-                       (log/error e e)
-                       nil))]
-      (do
-        (log/debug "Playing score...")
-        (future
-          (reset! playing? true)
-          (now/play-score! score {:async? false :one-off? false})
-          (log/debug "Done playing score.")
-          (reset! playing? false))
-        (success-response "Playing..."))
-      (error-response "Invalid Alda syntax."))
+    (let [score (try
+                  (log/debug "Parsing input...")
+                  (parse-input code :map)
+                  (catch Throwable e
+                    (log/error e e)
+                    {:error e}))]
+      (if-let [error (:error score)]
+        (error-response error)
+        (do
+          (log/debug "Playing score...")
+          (future
+            (reset! playing? true)
+            (now/play-score! score {:async? false :one-off? false})
+            (log/debug "Done playing score.")
+            (reset! playing? false))
+          (success-response "Playing..."))))
     (catch Throwable e
       (log/error e e)
       (error-response e))))
@@ -70,7 +71,7 @@
                         :map  (parse-input code mode)))
     (catch Throwable e
       (log/error e e)
-      (error-response "Invalid Alda syntax."))))
+      (error-response e))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;