1.0.0-rc47: fix #284

alda-lang · Nov 9, 2016 · 0a4fc77 · 0a4fc77
1 parent 9cf0160
commit 0a4fc77
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.0.0-rc47 (11/9/16)
+
+* Fixed [#284](https://github.com/alda-lang/alda/issues/284), bugs related to comment spacing. Thanks [elyisgreat] for reporting!
+
 ## 1.0.0-rc46 (11/2/16)
 
 This release includes improvements to the system that assigns instrument parts and groups in an Alda score ([#249](https://github.com/alda-lang/alda/issues/249)). Thanks, [elyisgreat] and [jimcheetham], for helping to talk me through all the different scenarios!

diff --git a/resources/version.txt b/resources/version.txt
@@ -1 +1 @@
-1.0.0-rc46
+1.0.0-rc47
diff --git a/server/grammar/comments.bnf b/server/grammar/comments.bnf
@@ -1,4 +1,4 @@
-score         = (non-comment | <comment> | clj-expr)*
+score         = (non-comment | comment | clj-expr)*
 comment       = <"#"> #".*" <#"(\n|\r|$)+">
 <non-comment> = #"[^\#\(\)]+"
 
diff --git a/server/src/alda/parser.clj b/server/src/alda/parser.clj
@@ -108,14 +108,15 @@
                   check-for-failure
                   (insta/transform
                     (merge clj-expr-transforms
-                           {:score
-                            #(reduce (fn [acc x]
-                                       (if (string? x)
-                                         (str acc x)
-                                         (str acc (store-in-cache!
-                                                    cache "clj-expr" x))))
-                                     ""
-                                     %&)})))]
+                           {:comment (constantly "\n")
+                            :score   #(reduce
+                                        (fn [acc x]
+                                          (if (string? x)
+                                            (str acc x)
+                                            (str acc (store-in-cache!
+                                                       cache "clj-expr" x))))
+                                        ""
+                                        %&)})))]
     [code cache]))
 
 (defn separate-parts

diff --git a/server/test/alda/parser/comments_test.clj b/server/test/alda/parser/comments_test.clj
@@ -3,14 +3,19 @@
             [alda.parser  :refer (parse-input)]))
 
 (def expected
-  '(alda.lisp/score 
-     (alda.lisp/part {:names ["piano"]} 
-       (alda.lisp/note (alda.lisp/pitch :c)) 
+  '(alda.lisp/score
+     (alda.lisp/part {:names ["piano"]}
+       (alda.lisp/note (alda.lisp/pitch :c))
        (alda.lisp/note (alda.lisp/pitch :e)))))
 
 (deftest short-comment-tests
   (testing "a short comment"
     (is (= expected (parse-input "piano: c
                                   # d
-                                  e")))))
+                                  e")))
+    (testing "at the end of a line"
+      (is (= expected (parse-input "piano: c # d
+                                    e")))
+      (testing "without a leading space"
+        (is (= expected (parse-input "piano: c#d\ne")))))))