Permalink
Browse files

now it compiles, but the + macro proves a problem

  • Loading branch information...
1 parent 3e13d44 commit 5154e4a72bd2af0a5811346f447aafe3eae6f6c7 @gthomas gthomas committed Jul 3, 2012
Showing with 7 additions and 6 deletions.
  1. +1 −1 src/music_as_data/core.clj
  2. +6 −5 src/music_as_data/semantics.clj
@@ -13,7 +13,7 @@
[music-as-data.elements]
[music-as-data.globals]
[music-as-data.record]
- [music-as-data.mfunctions]
+ [music-as-data.semantics]
[music-as-data.signalsnotes]))
(defn setup []
@@ -1,15 +1,16 @@
(ns music-as-data.semantics
- (:use [music-as-data.elements]
+ (:use
+ [music-as-data.elements]
[music-as-data.mfunctions])
(:import [music_as_data.elements Melement]))
-
(defn join [& notes]
(Melement. 0 0 0 play-chord
(first (conj [] notes))))
;; Maybe defmulti?
-(defmacro + [& more]
- ;; make chords like (+ kick hihat)
- `(join ~@more))
+;; + is causing an NPE!
+;;(defmacro + [& more]
+;; make chords like (+ kick hihat)
+;;`(join ~@more))

0 comments on commit 5154e4a

Please sign in to comment.