Changed comment syntax to /* ... */ and added new sequence generator

Small fixes and changed comment syntax to /* ... */. Also added new generator for inventory sequence.

Author: amiika

lib/enumerables.rb

@@ -433,11 +433,29 @@ def dress(e=Float::INFINITY)
       (0..e).lazy.collect {|n| A001316(n) }
     end
 
+    # Dress sequence https://oeis.org/A001316
     def A001316(n)
       return n+1 if n <= 1
       A001316(n/2) << n%2
     end
 
+    def inventory(e=Float::INFINITY)
+      (0..e).lazy.collect {|n| A342585(n) }
+    end
+
+  # Inventory sequence: http://oeis.org/A342585
+  def A342585(n)
+    values = []
+    current_val = 0
+    new_val = 0
+    n.times do |i|
+      new_val = values.count(current_val)
+      values.append(new_val)
+      current_val = new_val == 0 ? 0 : current_val+=1
+    end
+    new_val
+  end
+
     # https://oeis.org/A030101
     def binrev(base=2)
     Enumerator.new do |y|

lib/parser/generative.treetop

@@ -113,11 +113,17 @@ grammar GenerativeSyntax
           end
         end
 
+        # Suffle and take random or pick random
         if p and p.text_value != ""
-          set = set.shuffle if p.text_value[0]=="~"
-          set = p.text_value[0]=="~" ? set.take(p.text_value[1..].to_i) : set.pick(p.text_value[1..].to_i) if p.text_value.length>1
+          if p.text_value[0]=="~"
+            set = set.shuffle
+            set = set.take(p.text_value[1..].to_i) if p.text_value.length>1
+          else
+            set = p.text_value.length>1 ? set.pick(p.text_value[1..].to_i) : set.pick(1)
+          end
         end
 
+        # Operations
         if !o.empty? then
           o.elements.each do |op|
             if op.methods.include?(:value) then
@@ -447,6 +453,7 @@ grammar GenerativeSyntax
      }
   end
 
+  # Deprecated. Still works but consider using (1 2 3)? or (1 2 (3 3))~4 instead.
   rule array
     '[' first:(set_items) rest:(',' i:set_items)+ ']'
     {
@@ -556,7 +563,7 @@ grammar GenerativeSyntax
 
   # Characters ignored by generative parsing and parsed using ziffers parser
   rule ignore
-    v:(reset  / slide / arpeggio / ignore_function / ignore_comment / ignore_params)
+    v:(ignore_comment / reset  / slide / arpeggio / ignore_function / ignore_params)
     {
       def value
         v.value.to_s
@@ -614,10 +621,28 @@ grammar GenerativeSyntax
   end
 
   rule ignore_comment
-    '<!' [a-zA-Z0-9_\-\s\n\r\|#+\-*]+ '>'
+    comment:(multi_line_comment / one_line_comment)
     {
       def value
-        text_value
+        comment.value
+      end
+    }
+  end
+
+  rule multi_line_comment
+    '/*' ((s [*] s) / [a-zA-Z0-9_\-\|#+\-] / s)+ '*/'
+    {
+      def value
+        nil
+      end
+    }
+  end
+
+  rule one_line_comment
+    '//' ([^\n]*)
+    {
+      def value
+        nil
       end
     }
   end
@@ -1261,13 +1286,13 @@ end
    end
 
    rule zchar
-   s:([mklpdcwyhnqaefsxtgujz]+)
-   {
-     def value
-       sum = s.text_value.split('').inject(0){|sum,x| sum + Thread.current[:default_durs][x.to_sym]}
-       sum.to_f
-    end
-   }
+     s:([mklpdcwyhnqaefsxtgujz]+)
+     {
+       def value
+         sum = s.text_value.split('').inject(0){|sum,x| sum + Thread.current[:default_durs][x.to_sym]}
+         sum.to_f
+      end
+     }
    end
 
 end

lib/parser/zgrammar.rb

@@ -165,7 +165,7 @@ def parse_ziffers(text, opts, shared)
         zlog text
         zlog opts
         zlog shared
-        raise "Invalid syntax after: "+parse_failure(zparser.failure_reason)+ ". Check parentheses!"
+        raise "Invalid syntax after: "+parse_failure(zparser.failure_reason)
       end
 
       ziffers = ZiffArray.new(result.value)
@@ -235,7 +235,7 @@ def parse_generative(text, opts={}, shared={}, return_shared_opts=false)
         zlog text
         zlog opts
         zlog shared
-        raise "Invalid syntax after: "+parse_failure(rparser.failure_reason)+ ". Check parentheses!"
+        raise "Invalid syntax after: "+parse_failure(rparser.failure_reason)
       end
       return_shared_opts ? [result.value,Thread.current[:tshared]] : result.value
     end
@@ -257,7 +257,7 @@ def parse_params(text,opts={})
         zlog lparser.failure_line
         zlog lparser.failure_column
         zlog text
-        raise "Invalid syntax after: "+parse_failure(lparser.failure_reason)+ ". Check parentheses!"
+        raise "Invalid syntax after: "+parse_failure(lparser.failure_reason)
       end
 
       result.value
@@ -276,7 +276,7 @@ def unroll_repeats(text)
         zlog repeatparser.failure_line
         zlog repeatparser.failure_column
         zlog text
-        raise "Invalid syntax after: "+parse_failure(repeatparser.failure_reason)+ ". Check parentheses!"
+        raise "Invalid syntax after: "+parse_failure(repeatparser.failure_reason)
       end
       result.value
     end

lib/parser/ziffers.treetop

@@ -1,7 +1,7 @@
 grammar Ziffers
 
   rule line
-    (s / comment / opt_list / continue / bar / relative_duration / multi_duration / multi_scale / arpeggio / chords / pitch_classes / control / multiuse / use / multi_escaped_opts / fixed_octave / numeric_octave / call / eval / rest / slide / reset / skip)*
+    (comment / s / opt_list / continue / bar / relative_duration / multi_duration / multi_scale / arpeggio / chords / pitch_classes / control / multiuse / use / multi_escaped_opts / fixed_octave / numeric_octave / call / eval / rest / slide / reset)*
     {
       def value
         e = elements.collect {|v| v.value }.flatten.compact
@@ -168,7 +168,25 @@ grammar Ziffers
   end
 
   rule comment
-    '<!' [a-zA-Z0-9_\-\s\n\r\|#+\-*]+ '>'
+    comment:(multi_line_comment / one_line_comment)
+    {
+      def value
+        comment.value
+      end
+    }
+  end
+
+  rule multi_line_comment
+    '/*' ((s [*] s) / [a-zA-Z0-9_\-\|#+\-] / s)+ '*/'
+    {
+      def value
+        nil
+      end
+    }
+  end
+
+  rule one_line_comment
+    '//' ([^\n]*)
     {
       def value
         nil
@@ -577,20 +595,9 @@ end
     }
   end
 
-  rule skip
-    '# '
-    {
-    def value
-      Thread.current[:topts][:skip] = Thread.current[:topts][:skip] ? false : true
-      nil
-    end
-  }
-  end
-
   rule bar
      '|' {
        def value
-          Thread.current[:topts].except!(:skip)
           Thread.current[:topts][:octave] = 0
           Thread.current[:topts][:duration] = Thread.current[:topts_orig][:duration] ? Thread.current[:topts_orig][:duration] : 0.25
           Thread.current[:topts][:measure] = !Thread.current[:topts][:measure] ? 0 : Thread.current[:topts][:measure] += 1

test/run_wiki_test_multi.rb

@@ -3,9 +3,9 @@
 Ziffers.debug
 
 def test_play
-  
+
   # Multistaff
-  
+
   a = parse_rows "
 / synth: :pretty_bell
 [:q 2 2 2 4 q. 4 e 3 h 2 q 2 1 2 4 q. 2 e 1 h 0 :] [: 4 e 5 4 3 2 h 3 e 4 3 2 1 h 2 e 3 2 1 0 q. 1 e _ 4 h 4 q ^ 0 1 2 3 h 2 1 :]
@@ -14,7 +14,7 @@ def test_play
 [: q 0 0 2 2 1 _ 4 h ^ 0 q 0 _ 4 ^ 0 _ 2 4 4 h ^ 0 :] [: h 0 q _ 5 ^ 0 h 1 q _ 4 6 h ^ 0 q _ 3 5 6 r 4 r 2 4 r 3 h 0 4 :] / octave: -1
 "
   assert_equal(a[:rows].length,4)
-  
+
   a = parse_rows "
 / synth: :kalimba
 h H X / X: :bd_808, H: {sample: :drum_cowbell, amp: 0.025}
@@ -24,7 +24,7 @@ def test_play
 h0 q 0 _ 6 h 5 4 5 3 q 5 6 h ^0 4 ^ 0 0 1 1 w. _4 h 0 h. _ 3 q 3 h 1 q 2 3 h 4 5 4 ^0 4 5 3 4 w. ^ 0
 "
   assert_equal(a[:rows].length,5)
-  
+
   a = parse_rows "
 / synth: :piano
 |[: q 2 2 1 0  | h _ 6 5  | q 2 2 #3 #4  | h 5 #4  | q 5 ^ 0 q. _ 6 e 5  | w 5 :] | \
@@ -43,7 +43,7 @@ def test_play
 | q __ 5 #4 5 5  | h __ 4 5  | q __ 5 5 4 0  | q __ 0 0 h 1  | h __ 2 e 5 6 q ^ 0  | e __ 3 4 q 5 1 3  | w ___ 5  |
 "
   assert_equal(a[:rows].length,4)
-  
+
 end
 
 def test_methods

test/run_wiki_tests.rb

@@ -274,10 +274,17 @@ def test_play
 
   # Comments
 
-  a = zparse "| 2 3 |q <! This is a comment > 2 | e 4 2 |"
+  a = zparse "| 2 3 |q /* This is a comment */ 2 | e 4 2 |"
   assert_equal(a.pcs,[2,3,2,4,2])
-  a = zparse "|q 2 3 <! | q 1 2 > |  e 4 2 |"
+  a = zparse "|q 2 3 /* | q 1 2 */ |  e 4 2 |"
   assert_equal(a.pcs,[2,3,4,2])
+  a = zparse "|q 2 3 /* This is | q 1
+  2 comment */ |  e 4 2 |"
+  assert_equal(a.pcs,[2,3,4,2])
+  a = zparse "|q 2 3 // | q 1 2 |  e 4 2 |
+  5 6"
+  assert_equal(a.pcs,[2,3,5,6])
+
 
 end
 

ziffers.rb

@@ -708,7 +708,7 @@ def zplay_multi_line(input, opts={}, shared={},merge_opts={})
     def parse_rows(input)
       lines = input.split("\n").to_a.filter {|v| !v.strip.empty? }
       lines = lines.filter {|n| !n.start_with? "//" }
-      parameters = lines.map {|l| l.split("/") }
+      parameters = lines.map {|l| l.split("/ ") }
       rows = parameters.map{|p| p[0]}.filter {|v| !v.strip.empty? }.map {|l| l.split("|").filter {|v| !v.strip.empty? } }
       rows_length = rows.map(&:length).max
       rows = rows.map {|v| v.length<rows_length ? v+Array.new(rows_length-v.length){ nil } : v }