vimamsa 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f68b029a6b5f374740c9afa2cb7c4ac628db4c4b9295b7e64db8294dac89659
-  data.tar.gz: c7c72c69ec7cd513e976caff3b0b1f2e619d890d8d84e616fcd747e4ab1193be
+  metadata.gz: 82ad35212b7d75bfd5b702943ff3ed3180f7f1bd0b3912840e9ecfdf6126e467
+  data.tar.gz: 8eff2ee35e1ecc2d791ff1fbf4a881e6aada9b38d35ce11e356b316b536bc642
 SHA512:
-  metadata.gz: 892b4011a44310ad05becbf108fce73d4cdda3a25d6241435b03519ad0dd264daa856502956f02f47386bce251aef3e0296cc682fc35b01fefa375fbffd5ee4a
-  data.tar.gz: 25c97fde0e225c7cb273bc0fa97d0db4d74376ea2ddca2baea8823dbb1e01d31334fabbaa8e319cc37d40eca23d37b3d64f2cbbbdcbbce88f7d30435cfb44a6f
+  metadata.gz: 440d5d3b5b537fc9d3848d0f187df77dd045cde34643db356cd88ae5591e4e8c1c8596aac50f170ef7124dbd8784deddaff2d436f46dac0a8a180ccfeae4a9aa
+  data.tar.gz: c058e9db468553e29f617186ea0d65d04014307b7797c5dad013b5b3738fab57c0f7a44e7401ae9606e88581ac4f557fad3665c6dc8f784781619a310c114b95

data/exe/vimamsa

@@ -16,7 +16,9 @@ listen_dir = File.expand_path("~/.vimamsa/listen")
 if File.exist?(listen_dir) and !ARGV[0].nil?
   tmpf = Tempfile.new("vmarun", listen_dir)
   fp = tmpf.path
-  tmpf.write(ARGV[0])
+  paramfn = File.expand_path(ARGV[0])
+  puts paramfn
+  tmpf.write(paramfn)
   tmpf.close
   tstart = Time.new
   timeout = false
@@ -36,5 +38,5 @@ $LOAD_PATH.unshift(File.expand_path("ext"))
 require "vimamsa"
 # Ilib:ext
 # r rbvma -e "puts VMA.new.run"
-$vmag = VMAg.new()
+$vmag = VMAgui.new()
 $vmag.run

data/lib/vimamsa/ack.rb

@@ -16,10 +16,6 @@ def gui_ack()
   gui_one_input_action(nfo, "Search:", "search", callback)
 end
 
-def invoke_ack_search()
-  start_minibuffer_cmd("", "", :ack_buffer)
-end
-
 def ack_buffer(instr, b = nil)
   instr = instr.gsub("'", ".") # TODO
   bufstr = ""

data/lib/vimamsa/actions.rb

@@ -1,73 +1,62 @@
 class Action
-  attr_accessor :id, :method_name, :method
+  attr_accessor :id, :method_name, :method, :opt
 
-  def initialize(id, method_name, method, scope = [])
+  def initialize(id, method_name, method, opt = {})
     @method_name = method_name
     @id = id
     @method = method
+    @opt = opt
+
     $actions[id] = self
   end
 end
 
 $actions = {}
 
-# def reg_act(id, callfunc, name = "", scope = [])
-  # if callfunc.class == Proc
-    # a = Action.new(id, name, callfunc, scope)
-  # else
-    # a = Action.new(id, name, method(callfunc), scope)
-  # end
-# end
-
-def reg_act(id, callfunc, name = "", scope = [])
+def reg_act(id, callfunc, name = "", opt = {})
   if callfunc.class == Proc
-    a = Action.new(id, name, callfunc, scope)
+    a = Action.new(id, name, callfunc, opt)
   else
     begin
       m = method(callfunc)
     rescue NameError
       m = method("missing_callfunc")
     end
-    a = Action.new(id, name, m, scope)
+    a = Action.new(id, name, m, opt)
   end
+  return a
 end
 
 def missing_callfunc
   puts "missing_callfunc"
 end
 
-
+#TODO: remove
 def call(id)
+  call_action(id)
+end
+
+def call_action(id)
   a = $actions[id]
   if a
-    #        Ripl.start :binding => binding
     a.method.call()
+  else
+    message("Unknown action: " + id.inspect)
   end
 end
 
 def search_actions()
   l = []
   $select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
-  qt_select_update_window(l, $select_keys.collect { |x| x.upcase },
-                          "search_actions_select_callback",
-                          "search_actions_update_callback")
+  gui_select_update_window(l, $select_keys.collect { |x| x.upcase },
+                           "search_actions_select_callback",
+                           "search_actions_update_callback")
 end
 
 $item_list = []
 
 def search_actions_update_callback(search_str = "")
-  #    item_list = $actions.collect {|x| x[1].id.to_s}
   return [] if search_str == ""
-  # item_list = $action_list.collect { |x|
-    # actname = x[:action].to_s
-    # if x[:action].class == Symbol
-      # mn = $actions[x[:action]].method_name
-      # actname = mn if mn.size > 0
-    # end
-    # r = { :str => actname, :key => x[:key], :action => x[:action] }
-  # }
-
-  # => {:str=>"insert_new_line", :key=>"I return", :action=>:insert_new_line}
 
   item_list2 = []
   for act_id in $actions.keys
@@ -81,7 +70,7 @@ def search_actions_update_callback(search_str = "")
     end
     item_list2 << item
   end
-  # Ripl.start :binding => binding
+
   item_list = item_list2
 
   a = filter_items(item_list, 0, search_str)
@@ -90,7 +79,6 @@ def search_actions_update_callback(search_str = "")
   r = a.collect { |x| [x[0][0], 0, x] }
   puts r.inspect
   $item_list = r
-  # Ripl.start :binding => binding
 
   r = a.collect { |x| ["[#{x[0][:key]}] #{x[0][:str]}", 0, x] }
   return r
@@ -101,7 +89,7 @@ def search_actions_select_callback(search_str, idx)
   acc = item[0][:action]
 
   puts "Selected:" + acc.to_s
-  qt_select_window_close(0)
+  gui_select_window_close(0)
 
   if acc.class == String
     eval(acc)

data/lib/vimamsa/buffer.rb

@@ -15,7 +15,7 @@ class Buffer < String
 
   attr_reader :pos, :lpos, :cpos, :deltas, :edit_history, :fname, :call_func, :pathname, :basename, :update_highlight, :marks, :is_highlighted, :syntax_detect_failed, :id, :lang
   attr_writer :call_func, :update_highlight
-  attr_accessor :qt_update_highlight, :update_hl_startpos, :update_hl_endpos, :hl_queue, :syntax_parser, :highlights, :qt_reset_highlight, :is_parsing_syntax, :line_ends, :bt, :line_action_handler, :module, :active_kbd_mode, :title, :subtitle
+  attr_accessor :gui_update_highlight, :update_hl_startpos, :update_hl_endpos, :hl_queue, :syntax_parser, :highlights, :gui_reset_highlight, :is_parsing_syntax, :line_ends, :bt, :line_action_handler, :module, :active_kbd_mode, :title, :subtitle
 
   @@num_buffers = 0
 
@@ -26,7 +26,7 @@ class Buffer < String
     @lang = nil
     @id = @@num_buffers
     @@num_buffers += 1
-    qt_create_buffer(@id)
+    gui_create_buffer(@id)
     puts "NEW BUFFER fn=#{fname} ID:#{@id}"
 
     @module = nil
@@ -58,7 +58,7 @@ class Buffer < String
     end
 
     t1 = Time.now
-    qt_set_current_buffer(@id)
+    gui_set_current_buffer(@id)
     gui_set_window_title(@title, @subtitle)
 
     set_content(str)
@@ -76,7 +76,7 @@ class Buffer < String
     else
       $kbd.set_mode_to_default
     end
-    # qt_set_current_buffer(@id)
+    # gui_set_current_buffer(@id)
   end
 
   def detect_file_language
@@ -108,8 +108,7 @@ class Buffer < String
   def add_image(imgpath, pos)
     return if !is_legal_pos(pos)
     # insert_txt_at(" ", pos)
-    qt_process_deltas
-    qt_add_image(imgpath, pos)
+    gui_add_image(imgpath, pos)
   end
 
   def is_legal_pos(pos, op = :read)
@@ -141,7 +140,6 @@ class Buffer < String
     b = " \n"
     txt = a + b
     insert_txt_at(txt, lr.end + 1)
-    qt_process_deltas
     imgpos = lr.end + 1 + a.size
     add_image(fname, imgpos)
   end
@@ -209,7 +207,7 @@ class Buffer < String
 
   def set_content(str)
     @encrypted_str = nil
-    @qt_update_highlight = true
+    @gui_update_highlight = true
     @ftype = nil
     if str[0..10] == "VMACRYPT001"
       @encrypted_str = str[11..-1]
@@ -263,7 +261,7 @@ class Buffer < String
     @update_hl_startpos = 0 #TODO
     @update_hl_endpos = self.size - 1
 
-    qt_set_buffer_contents(@id, self.to_s)
+    gui_set_buffer_contents(@id, self.to_s)
 
     # add_hl_update(@update_hl_startpos, @update_hl_endpos)
   end
@@ -272,6 +270,12 @@ class Buffer < String
     @fname = filename
     @pathname = Pathname.new(fname) if @fname
     @basename = @pathname.basename if @fname
+
+    @title = File.basename(@fname)
+    @dirname = File.dirname(@fname)
+    userhome = File.expand_path("~")
+    @subtitle = @dirname.gsub(/^#{userhome}/, "~")
+
     detect_file_language
   end
 
@@ -752,7 +756,7 @@ class Buffer < String
     elsif new_pos >= 0
       @pos = new_pos
     end
-    qt_set_cursor_pos(@id, @pos)
+    gui_set_cursor_pos(@id, @pos)
     calculate_line_and_column_pos
   end
 
@@ -1481,7 +1485,6 @@ class Buffer < String
   def start_visual_mode()
     @visual_mode = true
     @selection_start = @pos
-    qt_set_selection_start(@id, selection_start)
     $kbd.set_mode(:visual)
   end
 
@@ -1637,9 +1640,14 @@ class Buffer < String
       savepath = buflist.get_last_dir
     end
     # Ripl.start :binding => binding
-    qt_file_saveas(savepath)
+    gui_file_saveas(savepath)
     # calls back to file_saveas
-    # TODO:?
+  end
+
+  def save_as_callback(fpath)
+    set_filename(fpath)
+    save()
+    gui_set_window_title(@title, @subtitle) #TODO: if not active buffer?
   end
 
   def write_contents_to_file(fpath)
@@ -1720,14 +1728,13 @@ class Buffer < String
   def backup()
     fname = @fname
     return if !@fname
-    message("Backup buffer #{fname}")
     spfx = fname.gsub("=", "==").gsub("/", "=:")
-    spath = File.expand_path("~/autosave")
+    spath = File.expand_path("~/.vimamsa/backup")
     return false if !can_save_to_directory?(spath)
     datetime = DateTime.now().strftime("%d%m%Y:%H%M%S")
     savepath = "#{spath}/#{spfx}_#{datetime}"
+    message("Backup buffer #{fname} TO: #{savepath}")
     if is_path_writable(savepath)
-      debug "BACKUP BUFFER TO: #{savepath}"
       write_contents_to_file(savepath)
     else
       message("PATH NOT WRITABLE: #{savepath}")

data/lib/vimamsa/buffer_list.rb

@@ -30,8 +30,8 @@ class BufferList < Array
     $buffer_history << @current_buf
     @recent_ind = 0
     $hook.call(:change_buffer, $buffer)
-    qt_set_current_buffer($buffer.id)
-    qt_set_cursor_pos($buffer.id, $buffer.pos)
+    gui_set_current_buffer($buffer.id)
+    gui_set_cursor_pos($buffer.id, $buffer.pos)
   end
 
   def switch()
@@ -83,7 +83,7 @@ class BufferList < Array
     $hook.call(:change_buffer, $buffer)
     $buffer.set_active
 
-    qt_set_current_buffer($buffer.id)
+    gui_set_current_buffer($buffer.id)
     gui_set_window_title($buffer.title,$buffer.subtitle)   
 
     # hpt_scan_images() if $debug # experimental

data/lib/vimamsa/debug.rb

@@ -95,16 +95,16 @@ def run_test(test_id)
   $buffer = old_buffer
 end
 
-def qt_sleep(t2)
+#TODO: remove?
+def gui_sleep(t2)
   t1 = Time.now()
   while Time.now < t1 + t2
-    qt_process_events
     sleep(0.02)
   end
 end
 
 def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
-  open_new_file("TODO"); qt_sleep(0.1)
+  open_new_file("TODO"); gui_sleep(0.1)
 
   ttstart = Time.now
   Kernel.srand(1231)
@@ -114,7 +114,7 @@ def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
     buf.jump_to_random_pos
     buf.insert_txt("Z") if rand() > 0.25
     buf.reset_highlight() if rand() > 0.1
-    qt_trigger_event
+    gui_trigger_event
 
     # puts "========line:========="
     # puts buf.current_line()
@@ -122,12 +122,12 @@ def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
 
     render_buffer($buffer)
 
-    qt_sleep(rand() / 2)
+    gui_sleep(rand() / 2)
     if rand() < (1 / 40.0)
       buf.revert
     end
 
-    qt_trigger_event
+    gui_trigger_event
     buf.insert_txt("X") if rand() > 0.25
     render_buffer($buffer)
 

data/lib/vimamsa/easy_jump.rb

@@ -1,161 +1,165 @@
-
 # Similar feature as Vim EasyMotion https://github.com/easymotion/vim-easymotion
 class EasyJump
-  def initialize()
-    make_jump_sequence
+  # def self.initialize()
+  # make_jump_sequence
+  # end
+
+  def self.start()
+    @@cur = EasyJump.new
   end
-end
 
-def easy_jump(direction)
-  # message "EASY JUMP"
-  visible_range = get_visible_area()
-  visible_text = $buffer[visible_range[0]..visible_range[1]]
-  wsmarks = scan_word_start_marks(visible_text)
-  line_starts = scan_indexes(visible_text, /^/)
-  lsh = Hash[line_starts.collect { |x| [x, true] }]
-  wsmh = Hash[wsmarks.collect { |x| [x, true] }]
-
-  wsmarks.select! { |x|
-    r = true
-    r = false if lsh[x] or lsh[x - 1] or lsh[x - 2]
-    r
-  }
-
-  linestart_buf = (line_starts).collect { |x| x + visible_range[0] }
-  wsmarks_buf = (wsmarks).collect { |x| x + visible_range[0] }
-
-  # All line starts should be accessible with just two key presses, so put them first in order
-  # Other word start positions ordered by distance from current pos
-  wsmarks_buf.sort_by! { |x| (x - $buffer.pos).abs }
-  $easy_jump_wsmarks = linestart_buf + wsmarks_buf
-
-  $jump_sequence = make_jump_sequence($easy_jump_wsmarks.size)
-
-  $input_char_call_func = method(:easy_jump_input_char)
-  $kbd.set_mode(:readchar)
-  $easy_jump_input = ""
-  easy_jump_draw
-end
+  def initialize()
+    # message "EASY JUMP"
+    visible_range = get_visible_area()
+    visible_text = buf[visible_range[0]..visible_range[1]]
+    wsmarks = scan_word_start_marks(visible_text)
+    line_starts = scan_indexes(visible_text, /^/)
+    lsh = Hash[line_starts.collect { |x| [x, true] }]
+    wsmh = Hash[wsmarks.collect { |x| [x, true] }]
+
+    wsmarks.select! { |x|
+      r = true
+      r = false if lsh[x] or lsh[x - 1] or lsh[x - 2]
+      r
+    }
+
+    linestart_buf = (line_starts).collect { |x| x + visible_range[0] }
+    wsmarks_buf = (wsmarks).collect { |x| x + visible_range[0] }
+
+    # All line starts should be accessible with just two key presses, so put them first in order
+    # Other word start positions ordered by distance from current pos
+    wsmarks_buf.sort_by! { |x| (x - buf.pos).abs }
+    @easy_jump_wsmarks = linestart_buf + wsmarks_buf
 
-def easy_jump_input_char(c)
-  # vma.paint_stack = []
-  puts "EASY JUMP: easy_jump_input_char [#{c}]"
-  $easy_jump_input << c.upcase
-  if $jump_sequence.include?($easy_jump_input)
-    jshash = Hash[$jump_sequence.map.with_index.to_a]
-    nthword = jshash[$easy_jump_input]
-    puts "nthword:#{nthword} #{[$easy_jump_wsmarks[nthword],$jump_sequence[nthword]]}"
-    $buffer.set_pos($easy_jump_wsmarks[nthword])
-    $kbd.set_mode(:command)
-    $input_char_call_func = nil
-    $jump_sequence = []
-    $vmag.clear_overlay()
+    @jump_sequence = make_jump_sequence(@easy_jump_wsmarks.size)
+
+    vma.kbd.set_keyhandling_override(self.method(:easy_jump_input_char))
+    @easy_jump_input = ""
+    easy_jump_draw
   end
-  if $easy_jump_input.size > 2
-    $kbd.set_mode(:command)
-    $input_char_call_func = nil
-    $jump_sequence = []
-    $vmag.clear_overlay()
+
+  def easy_jump_input_char(c, event_type)
+    return true if event_type != :key_press
+    # vma.paint_stack = []
+    puts "EASY JUMP: easy_jump_input_char [#{c}]"
+    @easy_jump_input << c.upcase
+    if @jump_sequence.include?(@easy_jump_input)
+      jshash = Hash[@jump_sequence.map.with_index.to_a]
+      nthword = jshash[@easy_jump_input]
+      puts "nthword:#{nthword} #{[@easy_jump_wsmarks[nthword], @jump_sequence[nthword]]}"
+      buf.set_pos(@easy_jump_wsmarks[nthword])
+      # @kbd.set_mode(:command)
+      vma.kbd.remove_keyhandling_override
+      @jump_sequence = []
+      vma.gui.clear_overlay()
+    end
+    if @easy_jump_input.size > 2
+      # @kbd.set_mode(:command)
+      vma.kbd.remove_keyhandling_override
+      @jump_sequence = []
+      vma.gui.clear_overlay()
+    end
+    return true
   end
-end
 
-def easy_jump_draw()
-  # puts $jump_sequence.inspect
-  # puts $easy_jump_wsmarks.inspect
-  $vmag.start_overlay_draw
-  for i in 0..($easy_jump_wsmarks.size - 1)
-    $vmag.overlay_draw_text($jump_sequence[i], $easy_jump_wsmarks[i])
+  def easy_jump_draw()
+    # puts @jump_sequence.inspect
+    # puts @easy_jump_wsmarks.inspect
+    vma.gui.start_overlay_draw
+    for i in 0..(@easy_jump_wsmarks.size - 1)
+      vma.gui.overlay_draw_text(@jump_sequence[i], @easy_jump_wsmarks[i])
+    end
+    vma.gui.end_overlay_draw
+
+    return
+    return if @jump_sequence.empty?
+    puts "EASY JUMP DRAW"
+    screen_cord = cpp_function_wrapper(0, [@easy_jump_wsmarks])
+    screen_cord = screen_cord[1..@jump_sequence.size]
+    screen_cord.each_with_index { |point, i|
+      mark_str = @jump_sequence[i]
+      #puts "draw #{point[0]}x#{point[1]}"
+      draw_text(mark_str, point[0] + 3, point[1])
+      #break if m > @cpos
+    }
   end
-  $vmag.end_overlay_draw
-  
-  return
-  return if $jump_sequence.empty?
-  puts "EASY JUMP DRAW"
-  screen_cord = cpp_function_wrapper(0, [$easy_jump_wsmarks])
-  screen_cord = screen_cord[1..$jump_sequence.size]
-  screen_cord.each_with_index { |point, i|
-    mark_str = $jump_sequence[i]
-    #puts "draw #{point[0]}x#{point[1]}"
-    draw_text(mark_str, point[0] + 3, point[1])
-    #break if m > $cpos
-  }
-end
 
-def make_jump_sequence(num_items)
-  left_hand = "asdfvgbqwertzxc123".upcase.split("")
-  right_hand = "jklhnnmyuiop890".upcase.split("")
+  def make_jump_sequence(num_items)
+    left_hand = "asdfvgbqwertzxc123".upcase.split("")
+    right_hand = "jklhnnmyuiop890".upcase.split("")
 
-  sequence = []
-  left_hand_fast = "asdf".upcase.split("")
-  right_hand_fast = "jkl;".upcase.split("")
+    sequence = []
+    left_hand_fast = "asdf".upcase.split("")
+    right_hand_fast = "jkl;".upcase.split("")
 
-  left_hand_slow = "wergc".upcase.split("") # v
-  right_hand_slow = "uiophnm,".upcase.split("")
+    left_hand_slow = "wergc".upcase.split("") # v
+    right_hand_slow = "uiophnm,".upcase.split("")
 
-  left_hand_slow2 = "tzx23".upcase.split("")
-  right_hand_slow2 = "yb9'".upcase.split("")
+    left_hand_slow2 = "tzx23".upcase.split("")
+    right_hand_slow2 = "yb9'".upcase.split("")
 
-  # Rmoved characters that can be mixed: O0Q, 8B, I1, VY
+    # Rmoved characters that can be mixed: O0Q, 8B, I1, VY
 
-  left_fast_slow = Array.new(left_hand_fast).concat(left_hand_slow)
-  right_fast_slow = Array.new(right_hand_fast).concat(right_hand_slow)
+    left_fast_slow = Array.new(left_hand_fast).concat(left_hand_slow)
+    right_fast_slow = Array.new(right_hand_fast).concat(right_hand_slow)
 
-  left_hand_all = Array.new(left_hand_fast).concat(left_hand_slow).concat(left_hand_slow2)
-  right_hand_all = Array.new(right_hand_fast).concat(right_hand_slow).concat(right_hand_slow2)
+    left_hand_all = Array.new(left_hand_fast).concat(left_hand_slow).concat(left_hand_slow2)
+    right_hand_all = Array.new(right_hand_fast).concat(right_hand_slow).concat(right_hand_slow2)
 
-  left_hand_fast.each { |x|
-    left_hand_fast.each { |y|
-      sequence << "#{x}#{y}"
+    left_hand_fast.each { |x|
+      left_hand_fast.each { |y|
+        sequence << "#{x}#{y}"
+      }
     }
-  }
 
-  right_hand_fast.each { |x|
-    right_hand_fast.each { |y|
-      sequence << "#{x}#{y}"
+    right_hand_fast.each { |x|
+      right_hand_fast.each { |y|
+        sequence << "#{x}#{y}"
+      }
     }
-  }
 
-  right_hand_fast.each { |x|
-    left_hand_fast.each { |y|
-      sequence << "#{x}#{y}"
+    right_hand_fast.each { |x|
+      left_hand_fast.each { |y|
+        sequence << "#{x}#{y}"
+      }
     }
-  }
 
-  left_hand_fast.each { |x|
-    right_hand_fast.each { |y|
-      sequence << "#{x}#{y}"
+    left_hand_fast.each { |x|
+      right_hand_fast.each { |y|
+        sequence << "#{x}#{y}"
+      }
     }
-  }
 
-  left_hand_slow.each { |x|
-    right_fast_slow.each { |y|
-      sequence << "#{x}#{y}"
+    left_hand_slow.each { |x|
+      right_fast_slow.each { |y|
+        sequence << "#{x}#{y}"
+      }
     }
-  }
 
-  right_hand_slow.each { |x|
-    left_fast_slow.each { |y|
-      sequence << "#{x}#{y}"
+    right_hand_slow.each { |x|
+      left_fast_slow.each { |y|
+        sequence << "#{x}#{y}"
+      }
     }
-  }
 
-  left_hand_slow2.each { |x|
-    right_hand_all.each { |y|
-      left_hand_all.each { |z|
-        sequence << "#{x}#{y}#{z}"
+    left_hand_slow2.each { |x|
+      right_hand_all.each { |y|
+        left_hand_all.each { |z|
+          sequence << "#{x}#{y}#{z}"
+        }
       }
     }
-  }
 
-  right_hand_slow2.each { |x|
-    left_hand_all.each { |y|
-      right_hand_all.each { |z|
-        sequence << "#{x}#{y}#{z}"
+    right_hand_slow2.each { |x|
+      left_hand_all.each { |y|
+        right_hand_all.each { |z|
+          sequence << "#{x}#{y}#{z}"
+        }
       }
     }
-  }
 
-  #printf("Size of sequence: %d\n",sequence.size)
-  #puts sequence.inspect
-  return sequence
+    #printf("Size of sequence: %d\n",sequence.size)
+    #puts sequence.inspect
+    return sequence
+  end
 end