music-transcription 0.17.1 → 0.19.0

data/lib/music-transcription/packing/part_packing.rb

@@ -16,7 +16,7 @@ class Part
   end
   
   def self.unpack packing
-    unpacked_notes = Parsing::notes(packing["notes"])
+    unpacked_notes = Note.split_parse(packing["notes"])
     unpacked_dcs = Hash[ packing["dynamic_changes"].map do |offset,change|
       [ offset,Change.unpack(change) ]
     end ]

data/lib/music-transcription/packing/program_packing.rb

@@ -9,7 +9,7 @@ class Program
   end
   
   def self.unpack packing
-    segments = packing.map {|str| Parsing::segment(str) }
+    segments = packing.map {|str| Segment.parse(str) }
     new segments
   end
 end

data/lib/music-transcription/parsing/convenience_methods.rb

@@ -1,103 +1,82 @@
 module Music
 module Transcription
-module Parsing
-  DURATION_PARSER = DurationParser.new
-  PITCH_PARSER = PitchParser.new
-  NOTE_PARSER = NoteParser.new
-  METER_PARSER = MeterParser.new
-  SEGMENT_PARSER = SegmentParser.new
-  
-  def duration dur_str
-    DURATION_PARSER.parse(dur_str).to_r
+
+  class Duration
+    PARSER = Parsing::DurationParser.new
+    CONVERSION_METHOD = :to_r
+    include Parseable
   end
-  alias :dur :duration
-  module_function :duration
-  module_function :dur
   
-  def durations durs_str
-    durs_str.split.map do |dur_str|
-      duration(dur_str)
-    end
+  class Pitch
+    PARSER = Parsing::PitchParser.new
+    CONVERSION_METHOD = :to_pitch
+    include Parseable
   end
-  alias :durs :durations
-  module_function :durs
-  module_function :durations
   
-  def pitch p_str
-    PITCH_PARSER.parse(p_str).to_pitch
+  class Note
+    PARSER = Parsing::NoteParser.new
+    CONVERSION_METHOD = :to_note
+    include Parseable
   end
-  module_function :pitch
 
-  def pitches ps_str
-    ps_str.split.map do |p_str|
-      pitch(p_str)
-    end
-  end
-  module_function :pitches
-  
-  def note note_str
-    NOTE_PARSER.parse(note_str).to_note
+  class Meter
+    PARSER = Parsing::MeterParser.new
+    CONVERSION_METHOD = :to_meter
+    include Parseable
   end
-  module_function :note
   
-  def notes notes_str
-    notes_str.split.map do |note_str|
-      note(note_str)
-    end
+  class Segment
+    PARSER = Parsing::SegmentParser.new
+    CONVERSION_METHOD = :to_range
+    include Parseable
   end
-  module_function :notes
   
-  def meter meter_str
-    METER_PARSER.parse(meter_str).to_meter
+  class Tempo
+    PARSER = Parsing::TempoParser.new
+    CONVERSION_METHOD = :to_tempo
+    include Parseable
   end
-  module_function :meter
-  
-  def segment seg_str
-    SEGMENT_PARSER.parse(seg_str).to_range
-  end
-  module_function :segment
-end
 end
 end
 
 class String
   def to_duration
-    Music::Transcription::Parsing::duration(self)
+    Music::Transcription::Duration.parse(self)
   end
   alias :to_dur :to_duration
   alias :to_d :to_duration
   
-  def to_durations
-    Music::Transcription::Parsing::durations(self)
+  def to_durations pattern=" "
+    Music::Transcription::Duration.split_parse(self, pattern)
   end
   alias :to_durs :to_durations
   alias :to_ds :to_durations
   
-  def to_pitch
-    Music::Transcription::Parsing::pitch(self)
+  def to_pitch 
+    Music::Transcription::Pitch.parse(self)
   end
   alias :to_p :to_pitch
   
-  def to_pitches
-    Music::Transcription::Parsing::pitches(self)
+  def to_pitches pattern=" "
+    Music::Transcription::Pitch.split_parse(self, pattern)
   end
   alias :to_ps :to_pitches
   
   def to_note
-    Music::Transcription::Parsing::note(self)
+    Music::Transcription::Note.parse(self)
   end
   alias :to_n :to_note
   
-  def to_notes
-    Music::Transcription::Parsing::notes(self)
+  def to_notes pattern=" "
+    Music::Transcription::Note.split_parse(self, pattern)
   end
   alias :to_ns :to_notes
   
   def to_meter
-    Music::Transcription::Parsing::meter(self)
+    Music::Transcription::Meter.parse(self)
   end
   
   def to_segment
-    Music::Transcription::Parsing::segment(self)
+    Music::Transcription::Segment.parse(self)
   end
 end

data/lib/music-transcription/parsing/numbers/nonnegative_float_parsing.rb

@@ -13,12 +13,6 @@ module NonnegativeFloat
   end
 
   module NonnegativeFloat0
-  end
-
-  module NonnegativeFloat1
-  end
-
-  module NonnegativeFloat2
     def to_f
       text_value.to_f
     end
@@ -37,6 +31,100 @@ module NonnegativeFloat
       return cached
     end
 
+    i0 = index
+    r1 = _nt_float1
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+      r0.extend(NonnegativeFloat0)
+    else
+      r2 = _nt_float2
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+        r0.extend(NonnegativeFloat0)
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:nonnegative_float][start_index] = r0
+
+    r0
+  end
+
+  module Float10
+    def exponent
+      elements[1]
+    end
+  end
+
+  def _nt_float1
+    start_index = index
+    if node_cache[:float1].has_key?(index)
+      cached = node_cache[:float1][index]
+      if cached
+        node_cache[:float1][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    s1, i1 = [], index
+    loop do
+      if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
+        r2 = true
+        @index += 1
+      else
+        terminal_parse_failure('[0-9]')
+        r2 = nil
+      end
+      if r2
+        s1 << r2
+      else
+        break
+      end
+    end
+    if s1.empty?
+      @index = i1
+      r1 = nil
+    else
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+    end
+    s0 << r1
+    if r1
+      r3 = _nt_exponent
+      s0 << r3
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Float10)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:float1][start_index] = r0
+
+    r0
+  end
+
+  module Float20
+  end
+
+  def _nt_float2
+    start_index = index
+    if node_cache[:float2].has_key?(index)
+      cached = node_cache[:float2][index]
+      if cached
+        node_cache[:float2][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
     i0, s0 = index, []
     s1, i1 = [], index
     loop do
@@ -93,56 +181,7 @@ module NonnegativeFloat
         end
         s0 << r4
         if r4
-          i7, s7 = index, []
-          if (match_len = has_terminal?("e", false, index))
-            r8 = true
-            @index += match_len
-          else
-            terminal_parse_failure("e")
-            r8 = nil
-          end
-          s7 << r8
-          if r8
-            if has_terminal?(@regexps[gr = '\A[+-]'] ||= Regexp.new(gr), :regexp, index)
-              r9 = true
-              @index += 1
-            else
-              terminal_parse_failure('[+-]')
-              r9 = nil
-            end
-            s7 << r9
-            if r9
-              s10, i10 = [], index
-              loop do
-                if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
-                  r11 = true
-                  @index += 1
-                else
-                  terminal_parse_failure('[0-9]')
-                  r11 = nil
-                end
-                if r11
-                  s10 << r11
-                else
-                  break
-                end
-              end
-              if s10.empty?
-                @index = i10
-                r10 = nil
-              else
-                r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
-              end
-              s7 << r10
-            end
-          end
-          if s7.last
-            r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
-            r7.extend(NonnegativeFloat0)
-          else
-            @index = i7
-            r7 = nil
-          end
+          r7 = _nt_exponent
           if r7
             r6 = r7
           else
@@ -154,14 +193,88 @@ module NonnegativeFloat
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(NonnegativeFloat1)
-      r0.extend(NonnegativeFloat2)
+      r0.extend(Float20)
     else
       @index = i0
       r0 = nil
     end
 
-    node_cache[:nonnegative_float][start_index] = r0
+    node_cache[:float2][start_index] = r0
+
+    r0
+  end
+
+  module Exponent0
+  end
+
+  def _nt_exponent
+    start_index = index
+    if node_cache[:exponent].has_key?(index)
+      cached = node_cache[:exponent][index]
+      if cached
+        node_cache[:exponent][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    if (match_len = has_terminal?("e", false, index))
+      r1 = true
+      @index += match_len
+    else
+      terminal_parse_failure("e")
+      r1 = nil
+    end
+    s0 << r1
+    if r1
+      if has_terminal?(@regexps[gr = '\A[+-]'] ||= Regexp.new(gr), :regexp, index)
+        r3 = true
+        @index += 1
+      else
+        terminal_parse_failure('[+-]')
+        r3 = nil
+      end
+      if r3
+        r2 = r3
+      else
+        r2 = instantiate_node(SyntaxNode,input, index...index)
+      end
+      s0 << r2
+      if r2
+        s4, i4 = [], index
+        loop do
+          if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
+            r5 = true
+            @index += 1
+          else
+            terminal_parse_failure('[0-9]')
+            r5 = nil
+          end
+          if r5
+            s4 << r5
+          else
+            break
+          end
+        end
+        if s4.empty?
+          @index = i4
+          r4 = nil
+        else
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+        end
+        s0 << r4
+      end
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Exponent0)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:exponent][start_index] = r0
 
     r0
   end

data/lib/music-transcription/parsing/numbers/nonnegative_float_parsing.treetop

@@ -4,7 +4,7 @@ module Parsing
 
 grammar NonnegativeFloat
   rule nonnegative_float
-    [0-9]+ [.] [0-9]+ ("e" [+-] [0-9]+)? {
+    (float1 / float2) {
       def to_f
         text_value.to_f
       end
@@ -12,6 +12,18 @@ grammar NonnegativeFloat
       alias :to_num :to_f
     }
   end
+
+  rule float1
+    [0-9]+ exponent
+  end
+
+  rule float2
+    [0-9]+ [.] [0-9]+ exponent?
+  end
+    
+  rule exponent
+    "e" [+-]? [0-9]+
+  end
 end
 
 end