ramekin 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1454704618e8123c1ade7251f1a30cc66b2f2febacd10e1e8f438e4b3fe3023c
-  data.tar.gz: 82453a74e36685f30e7637092fc47d242a63b609c7e4b1f586b17fafae05289f
+  metadata.gz: f9fce3c7ec61c39d7597621bf02fbd71788df731ee7a98cb89018549275eb44e
+  data.tar.gz: 0c123977b81c24d92f4f6b3514973ca4713aedf4c8292aa30d126f6b20d541ea
 SHA512:
-  metadata.gz: f33e028002e58ad86ae808bcc4a0a77b9c8b324e3a47f652bf20dcf1bc4a83381f13e23e3ec980f5350cad8686f13097f1996e08c3de798614e4092ca55a8cbf
-  data.tar.gz: 4df89465d887a660c7353a6e4b16e3817603efd861c60315c39ca531026af27b5a72bf0a7b32aa73328f9b0160f3f7f5aa868a2de9fbe6bf493bb4f1cc345aff
+  metadata.gz: 0d4484cc76d708e7b1d36929e2a4b95efe19b34ad5882f51e71d526bd08d1c500725de40054b17e5401922fd388854a2866fca0a2210a15589bdbd5e46bc85b4
+  data.tar.gz: cd54afeb74289aaf055344b45aca6b75679b494db546308c0d86d05866c0a4e4cc855921232f7c6507ac8cc6a2b8e6656247ba6ea579806c1589786470ce2f31

data/lib/ramekin/cli.rb

@@ -172,6 +172,7 @@ module Ramekin
         NoteAggregator,
         RestAggregator,
         Legato,
+        LoopAllocator,
         Inspector,
       )
 

data/lib/ramekin/errors.rb

@@ -15,7 +15,7 @@ module Ramekin
     def self.error!(e, nesting: 0)
       all << e
 
-      if ENV['RAMEKIN_DEBUG'] == '1'
+      if ENV['RAMEKIN_DEBUG'] == '1' && ENV['DISABLE_PRY'] != 'true'
         if nesting >= 0
           Pry.config.hooks.add_hook(:before_session, :ramekin) do |output, binding, pry|
             Pry.config.hooks.delete_hook(:before_session, :ramekin)
@@ -25,6 +25,8 @@ module Ramekin
 
         binding.pry
       end
+
+      nil
     end
 
     def initialize(start, fin, message)

data/lib/ramekin/legato.rb

@@ -32,10 +32,10 @@ module Ramekin
       @note.ticks / 2
     end
 
-    def to_amk(current_octave=nil)
+    def to_amk(current_octave=nil, divisor=1)
       post_ticks = @note.ticks - ticks
       post_len = KNOWN_LENGTHS.fetch(post_ticks) { "=#{post_ticks}" }
-      "#{octave_amk(current_octave)}#{note_name}#{length_amk}$f4$01^#{post_len}"
+      "#{octave_amk(current_octave)}#{note_name}#{length_amk(divisor)}$f4$01^#{post_len}"
     end
 
     def inspect

data/lib/ramekin/loop_allocator.rb

@@ -0,0 +1,47 @@
+module Ramekin
+  class LoopAllocator < Processor
+    def call(&b)
+      tokens = @stream.to_a
+
+      loop_defs = tokens.select do |tok|
+        Token === tok && tok.type == :loop && !tok.value.empty?
+      end
+
+      index = 0
+      indices = {}
+      used = Set.new
+
+      numbered, named = loop_defs.partition do |tok|
+        /\A\d+\z/.match?(tok.value)
+      end
+
+      numbered.each do |tok|
+        num = indices[tok.value] = tok.value.to_i
+        tok.meta[:number] = num
+        used << num
+      end
+
+      named.each do |tok|
+        if indices.key?(tok.value)
+          error! "multiple definitions of (#{tok.value})", el: tok
+          next
+        end
+
+        index += 1
+        index += 1 while used.include?(index)
+        indices[tok.value] = index
+        tok.meta[:number] = index
+      end
+
+      tokens.each do |token|
+        if Token === token && token.type == :loop_call
+          token.meta[:number] = indices.fetch(token.value) do
+            error! "no such loop", el: token
+          end
+        end
+
+        yield token
+      end
+    end
+  end
+end

data/lib/ramekin/meta.rb

@@ -48,6 +48,34 @@ module Ramekin
       )
     end
 
+    def t_value
+      t_with_divisor[0]
+    end
+
+    def divisor
+      t_with_divisor[1]
+    end
+
+    def t_with_divisor
+      return [50, 1] if @tempo.nil?
+
+      @t_with_divisor ||= begin
+        t = case @tempo.type
+        when :t then @tempo.value
+        when :bpm then (@tempo.value.to_f * 8192 / 20025.0)
+        end
+
+        t = t.to_f
+        divisor = 1
+        while t > 60
+          t /= 2
+          divisor *= 2
+        end
+
+        [t.round, divisor]
+      end
+    end
+
     def parse
       loop do
         break if @elements.empty?
@@ -58,7 +86,7 @@ module Ramekin
         when :amk then @amk = @current
         when :option then @options[@current.value] = true
         when :w then @volume = @current
-        when :t, :bpm then @tempo = @current
+        when :t, :bpm then @tempo = @current; @t_with_divisor = nil
         else
           error! 'invalid token in header'
         end
@@ -282,7 +310,7 @@ module Ramekin
 
     def ext_gain
       gain = @extensions.select { |e| e.type == :gain }.last
-      gain && gain.value
+      gain && to_hex(gain.value.to_i(16))
     end
 
     def gain
@@ -299,7 +327,13 @@ module Ramekin
       adsr1 = ((7 - d)*16 | 0x80) + (15 - a)
       adsr2 = (s*32 + (31-r))
 
-      [adsr1.to_s(16), adsr2.to_s(16), g, t1, t2]
+      [to_hex(adsr1), to_hex(adsr2), g, t1, t2]
+    end
+
+    def to_hex(x)
+      return x if x.is_a?(String)
+
+      sprintf("%02x", x)
     end
 
     def to_amk

data/lib/ramekin/note_aggregator.rb

@@ -57,10 +57,16 @@ module Ramekin
       end
     end
 
-    def length_amk
+    def length_amk(div)
+      if ticks % div != 0
+        divisible = div == 2 ? 'even' : "divisible by #{div}"
+        error!("too fast! tick count must be #{divisible} at this tempo", el: self)
+      end
+
+      t = ticks / div
       # we use l16
-      return '' if ticks == 12
-      KNOWN_LENGTHS.fetch(ticks) { "=#{ticks}" }
+      return '' if t == 12
+      KNOWN_LENGTHS.fetch(t) { "=#{t}" }
     end
 
     def octave_amk(current_octave=nil)
@@ -80,8 +86,8 @@ module Ramekin
       end
     end
 
-    def to_amk(current_octave=nil)
-      return "#{octave_amk(current_octave)}#{note_name}#{length_amk}"
+    def to_amk(current_octave=nil, divisor=1)
+      return "#{octave_amk(current_octave)}#{note_name}#{length_amk(divisor)}"
     end
 
     def repr
@@ -94,7 +100,7 @@ module Ramekin
 
     def ticks
       if @extensions.empty? && default_length.nil?
-        error! "no length and no default specified with l", el: @note
+        return 192 / 16
       end
 
       exts = @extensions

data/lib/ramekin/renderer.rb

@@ -58,7 +58,7 @@ module Ramekin
 
       render_preamble(&b)
 
-      @track.channels.each { |c| render_channel(c, &b) }
+      @track.channels.compact.each { |c| render_channel(c, &b) }
     end
 
     def render_preamble(&b)
@@ -101,7 +101,7 @@ module Ramekin
         yield "}\n\n"
       end
 
-      yield "t#{tempo_of(m.tempo)} ; main tempo (0-60)\n" if m.tempo
+      yield "t#{m.t_value} ; main tempo (0-60)\n" if m.tempo
       yield "w#{m.volume.value} ; main volume (0-255)\n" if m.volume
       yield "l16\n\n"
 
@@ -143,12 +143,14 @@ module Ramekin
           if (old_tick-1) / 192 != (@tick-1) / 192
             yield "\n"
           end
-          yield el.to_amk(@octave)
+          divisor = @track.meta.divisor
+
+          yield el.to_amk(@octave, @track.meta.divisor)
           @octave = el.octave unless el.rest?
         when MacroDefinition
           # pass
         when LegatoStart, LegatoLastNote
-          yield el.to_amk
+          yield el.to_amk(@octave, @track.meta.divisor)
         when Instrument
           yield "@#{@instrument_index[el.name.value]}"
         when Token
@@ -188,13 +190,25 @@ module Ramekin
         end
       when :v
         vol, time = token.values.compact.map(&:to_i)
-        yield velocity_command(vol, time)
+
+        unless Token === peek && [:v, :relv].include?(peek.type)
+          yield velocity_command(vol, time)
+        end
+
         @volume = vol
       when :relv
         relvol, duration = token.values
-        yield velocity_command(@volume + relvol.to_i, duration)
+
+        unless Token === peek && [:v, :relv].include?(peek.type)
+          yield velocity_command(@volume + relvol.to_i, duration)
+        end
       when :q
-        yield "q#{token.value}"
+        token.value =~ /(\d),?(\h)?/
+        qval = $1
+        gain = $2 || 'F'
+        yield "q#{qval}#{gain}"
+      when :w
+        yield "w#{token.value}"
       when :adsr
         vals = token.value.split(',').map { |x| x.to_i(16) }
         error! 'invalid #adsr, expected 4 arguments' unless vals.size == 4
@@ -229,14 +243,14 @@ module Ramekin
         yield " [[ "
       when :loop
         if token.value
-          yield " (#{token.value})[ "
+          yield " (#{token.meta[:number]})[ "
         else
           yield " [ "
         end
       when :loop_end
         yield " ]#{token.value} "
       when :loop_call
-        yield " (#{token.values[0]})#{token.values[1]} "
+        yield " (#{token.meta[:number]})#{token.values[1]} "
       when :star
         yield "*#{token.value}"
       when :superloop_end

data/lib/ramekin/tokenizer.rb

@@ -228,7 +228,6 @@ module Ramekin
       return [:instrument, m(1)] if match /@(\w+)/
       return [:hex, m(1)] if match /[$](\h\h)/
       return [:t, m(1)] if match /t(\d+)/
-      return [:q, m(1)] if match /q(\d\h?)/
 
       return note(:note, m) if match /[abcdefg][+-]?/
       return note(:r) if match /r/
@@ -244,9 +243,9 @@ module Ramekin
       return [:superloop_end, m(1)] if match /\]\](\d*)/
 
       return [:remote_def, m(1)] if match /[(]!(\d+)[)]\[/
-      return [:loop, m(1)] if match /(?:[(](\d+)[)])?\[/
+      return [:loop, m(1)] if match /(?:[(]([\w-]+)[)])?\[/
       return [:loop_end, m(1)] if match /\](\d*)/
-      return [:loop_call, m(1), m(2)] if match /[(](\d+)[)](\d+)?/
+      return [:loop_call, m(1), m(2)] if match /[(]([\w-]+)[)](\d+)?/
 
       # this needs a reparse
       return remote(:remote_call, m(1)) if match /[(]!(\d*)/
@@ -258,7 +257,7 @@ module Ramekin
       return [:w, m(1)] if match /w(\d+)/
       return [:l, m(1)] if match /l(\d+)/
       return [:amp] if match /[&]/
-      return [:q, m(1)] if match /q(\h\h)/
+      return [:q, m(1)] if match /q(\d(?:,\h)?)/
       return [:n, m(1)] if match /n(\h\h?)/
 
       error! "unknown token near: #{@scanner.peek(10)}", el: @last_token

data/lib/ramekin/util.rb

@@ -44,11 +44,24 @@ module Ramekin
       env = {}
       kw.each { |k, v| env[k.to_s] = v }
 
+      $stderr.puts "run: #{a.map(&method(:shell_inspect)).join(' ')}"
       system(env, *a.map(&:to_s))
     rescue Interrupt
       # allow interrupt out of the subprocess but capture it for ramekin itself
     end
 
+    # for diagnostic purposes only, not a real escape system.
+    # our shellouts don't need escapes since they are not actually
+    # interpreted by a shell.
+    def shell_inspect(s)
+      s = s.to_s
+      if s =~ /[\s'"&*]/
+        s.inspect
+      else
+        s
+      end
+    end
+
     def executable?(path)
       stat = File.stat(path)
       stat.file? && stat.executable?

data/lib/ramekin.rb

@@ -11,6 +11,7 @@ require_relative 'ramekin/processor'
 require_relative 'ramekin/macros'
 require_relative 'ramekin/note_aggregator'
 require_relative 'ramekin/legato'
+require_relative 'ramekin/loop_allocator'
 require_relative 'ramekin/meta'
 require_relative 'ramekin/channel_separator'
 require_relative 'ramekin/volume'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ramekin
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - jneen
 autorequire:
 bindir: gembin
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strscan
@@ -85,6 +85,7 @@ files:
 - lib/ramekin/element.rb
 - lib/ramekin/errors.rb
 - lib/ramekin/legato.rb
+- lib/ramekin/loop_allocator.rb
 - lib/ramekin/macros.rb
 - lib/ramekin/meta.rb
 - lib/ramekin/note_aggregator.rb