mini for eculids

spec/mini_spec.moon

@@ -1,7 +1,7 @@
 import describe, it from require "busted"
 -- import Span from require "xi.types"
 import parse from require "xi.mini.grammar"
-import mini, pure, silence, slowcat, fastcat, timecat, randcat, fast, slow, degrade, stack, C from require "xi.pattern"
+import mini, pure, silence, euclid, slowcat, fastcat, timecat, randcat, fast, slow, degrade, stack, C from require "xi.pattern"
 local *
 
 same = (name) -> assert.same visitor_targets[name], parse name
@@ -100,6 +100,10 @@ describe "Mini Interpreter for", ->
 --       eval "bd hh@2"
 --       -- eval "bd hh@3 sd@2"
 --       eval "bd! hh? ~ sd/2 cp*3"
+
+  describe "euclidian rhythm", ->
+    it "should pass", ->
+      eval "bd(3,8,1)"
 --
 --   describe "repeat", ->
 --     it "should pass", ->
@@ -112,7 +116,7 @@ describe "Mini Interpreter for", ->
 --   describe "weight", ->
 --     it "should pass", ->
 --       eval "hh@2"
---
+
   describe "fast&slow", ->
     it "should pass", ->
       eval "bd*2"
@@ -166,6 +170,7 @@ interpreter_targets = {
   -- sequences
   "bd sd": fastcat "bd", "sd"
   "bd hh sd": fastcat "bd", "hh", "sd"
+  "bd(3,8,1)": euclid 3, 8, 1, pure"bd"
 --   "hh@2": pure "hh"
 --   "bd hh@2": timecat { { 1, mini"bd" }, { 2, mini"hh" } }
 --   -- "bd hh@3 sd@2": timecat { { 1, "bd" }, { 3, "hh" }, { 2, "sd" } }

src/core/pattern.lua

@@ -41,7 +41,9 @@ applyOptions = function(parent, enter)
           else
             print("mini: stretch: type must be one of fast of slow")
           end
-          return pat
+        elseif "euclid" == _exp_0 then
+          local steps, pulse, rotation = op.arguments.steps, op.arguments.pulse, op.arguments.rotation
+          pat = euclid(enter(pulse), enter(steps), enter(rotation), pat)
         end
       end
     end
@@ -898,7 +900,7 @@ sometimes = function(func, pat)
   return sometimesBy(0.5, func, pat)
 end
 struct = function(boolpat, pat)
-  return boolpat:fmap(function(b)
+  return (fastcat(boolpat)):fmap(function(b)
     return function(val)
       if b then
         return val
@@ -1202,7 +1204,7 @@ apply = function(x, pat)
   return pat .. x
 end
 sl = string_lambda
-print(mini("bd/3"))
+print(mini("bd(3,8,1)"))
 return {
   C = C,
   Pattern = Pattern,

src/core/pattern.moon

@@ -31,7 +31,9 @@ applyOptions = (parent, enter) ->
                 pat = slow enter(amount), pat
               else
                 print("mini: stretch: type must be one of fast of slow")
-            return pat
+          when "euclid"
+            steps, pulse, rotation = op.arguments.steps, op.arguments.pulse, op.arguments.rotation
+            pat = euclid(enter(pulse), enter(steps), enter(rotation), pat)
     return pat
 
 resolveReplications = id
@@ -624,7 +626,7 @@ sometimes = (func, pat) -> sometimesBy(0.5, func, pat)
 
 -- @section manipulating structure
 struct = (boolpat, pat) ->
-  boolpat\fmap((b) -> (val) -> if b return val else nil)\appLeft(pat)\removeNils!
+  (fastcat boolpat)\fmap((b) -> (val) -> if b return val else nil)\appLeft(pat)\removeNils!
 
 _euclid = (n, k, offset, pat) -> struct bjork(n, k, offset), reify(pat)
 euclid = _patternify_p_p_p _euclid
@@ -779,7 +781,7 @@ scale = _patternify _scale
 apply = (x, pat) -> pat .. x
 sl = string_lambda
 
--- print mini "bd/3"
+print mini "bd(3,8,1)"
 
 -- TODO: wchoose, tests for the new functions
 return {