rbx-linecache 1.3-universal-rubinius-2.0

data/NEWS

@@ -0,0 +1,49 @@
+1.3
+- CompiledMethod#lines tuple changes and allow rubinius 2.0.pre
+
+1.2
+- Add CompiledMethod caching.
+
+1.1.1
+March 15, 2011
+- Cache compiled methods for rbx-trepanning
+
+1.1
+February 23, 2011
+- Minor revision to description and to tolerate all Rubinius 1.2.x versions
+
+December 25, 2010
+- Handle Rubinius eval_source to temp file remapping.
+
+October 27, 2010
+- First gemcutter rubinius release 
+
+
+0.43
+06-12-08
+- tolerance for finding windows extension in lib rather than ext.
+
+0.41 
+- add test/data/* to gem.
+
+0.4
+- Credit Ryan Davis and ParseTree.
+
+0.3
+- Add tracelines: get line numbers that can be stopped at.
+
+- Add routines to allow line-number 
+  remapping and filename remapping. 
+
+- Add access methods to get the number of lines in a file.
+
+0.2
+- Make this work with ruby-debug-base. Add reload-on-change parameters.
+  add checkcache, cache, cached? sha1, and stat methods. 
+  
+- Use SCRIPT_LINES__.
+
+0.1
+
+- Initial release of LineCache, a module for reading and caching lines.
+

data/README

@@ -0,0 +1,50 @@
+= LineCache - A module to read and cache file information of a Ruby program.
+
+== SYNOPSIS
+
+The LineCache module allows one to get any line from any file, caching
+the lines and file information on first access to the file. Although
+the file may be any file, the common use is when the file is a Ruby
+script since parsing of the file is done to figure out where the
+statement boundaries are.
+
+The routines here may be is useful when a small random sets of lines
+are read from a single file, in particular in a debugger to show
+source lines.
+
+== Summary
+
+  require 'linecache'
+  lines = LineCache::getlines('/tmp/myruby.rb')
+  # The following lines have same effect as the above.
+  $: << '/tmp'
+  Dir.chdir('/tmp') {lines = LineCache::getlines('myruby.rb')
+
+  line = LineCache::getline('/tmp/myruby.rb', 6)
+  # Note lines[6] == line (if /tmp/myruby.rb has 6 lines)
+
+  LineCache::clear_file_cache
+  LineCache::clear_file_cache('/tmp/myruby.rb')
+  LineCache::update_cache   # Check for modifications of all cached files.
+
+== Credits
+
+  This is a port of the module of the same name from the Python distribution.
+
+  The idea for how TraceLineNumbers works, and some code was taken
+  from ParseTree by Ryan Davis.
+
+== Other stuff
+
+Author::   Rocky Bernstein <rockyb@rubyforge.net>
+License::  Copyright (c) 2007, 2008 Rocky Bernstein
+           Released under the GNU GPL 2 license
+
+== Warranty
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+$Id: README 169 2009-02-08 17:19:33Z rockyb $

data/Rakefile

@@ -0,0 +1,97 @@
+#!/usr/bin/env rake
+# Are we Rubinius? The right versions of it? 
+raise RuntimeError, 
+'This package is for Rubinius 1.2.[34] or 2.0.x only!' unless
+  Object.constants.include?('Rubinius') && 
+  Rubinius.constants.include?('VM') && 
+  Rubinius::VERSION =~ /1\.2\.[34]/ || Rubinius::VERSION =~ /2\.0/
+
+require 'rubygems'
+require 'rubygems/package_task'
+require 'rdoc/task'
+require 'rake/testtask'
+
+ROOT_DIR = File.dirname(__FILE__)
+Gemspec_filename = 'rbx-linecache.gemspec'
+require File.join %W(#{ROOT_DIR} lib linecache)
+
+def gemspec
+  @gemspec ||= eval(File.read(Gemspec_filename), binding, Gemspec_filename)
+end
+
+desc "Build the gem"
+task :package=>:gem
+task :gem=>:gemspec do
+  Dir.chdir(ROOT_DIR) do
+    sh "gem build #{Gemspec_filename}"
+    FileUtils.mkdir_p 'pkg'
+    FileUtils.mv("#{gemspec.file_name}", "pkg/")
+
+    # Now make a 2.0 package by changing 1.2 to 2.0 in the gemspec
+    # and creating another gemspec and moving that accordingly
+    lines = File.open(Gemspec_filename).readlines.map{|line|
+      line.gsub(/'universal', 'rubinius', '1\.2'/,
+                "'universal', 'rubinius', '2.0'");
+    }
+
+    two_filename = gemspec.file_name.gsub(/1\.2/, '2.0')
+    gemspec_filename2 = "rbx-linecache2.gemspec"
+    f = File.open(gemspec_filename2, "w")
+    f.write(lines); f.close
+    sh "gem build #{gemspec_filename2}"
+    FileUtils.mv("#{two_filename}", "pkg/")
+  end
+end
+
+task :default => [:test]
+
+desc 'Install the gem locally'
+task :install => :package do
+  Dir.chdir(ROOT_DIR) do
+    sh %{gem install --local pkg/#{gemspec.file_name}}
+  end
+end    
+
+desc "Create a GNU-style ChangeLog via svn2cl"
+task :ChangeLog do
+  system("svn2cl --authors=svn2cl_usermap")
+end
+
+desc 'Test units - the smaller tests'
+Rake::TestTask.new(:'test') do |t|
+  t.test_files = FileList['test/test-*.rb']
+  # t.pattern = 'test/**/*test-*.rb' # instead of above
+  t.options = '--verbose' if $VERBOSE
+end
+
+desc "Generate the gemspec"
+task :generate do
+  puts gemspec.to_ruby
+end
+
+desc "Validate the gemspec"
+task :gemspec do
+  gemspec.validate
+end
+
+# ---------  RDoc Documentation ------
+desc "Generate rdoc documentation"
+Rake::RDocTask.new("rdoc") do |rdoc|
+  rdoc.rdoc_dir = 'doc'
+  rdoc.title    = "rbx-linecache #{LineCache::VERSION} Documentation"
+  rdoc.rdoc_files.include(%w(lib/*.rb))
+end
+
+desc "Same as rdoc"
+task :doc => :rdoc
+
+task :clobber_package do
+  FileUtils.rm_rf File.join(ROOT_DIR, 'pkg')
+end
+
+task :clobber_rdoc do
+  FileUtils.rm_rf File.join(ROOT_DIR, 'doc')
+end
+
+desc "Remove built files"
+task :clean => [:clobber_package, :clobber_rdoc]

data/lib/linecache.rb

@@ -0,0 +1,560 @@
+#!/usr/bin/env ruby
+#   Copyright (C) 2007, 2008, 2010, 2011
+#     Rocky Bernstein <rockyb@rubyforge.net>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+#    02110-1301 USA.
+#
+
+# Author::    Rocky Bernstein  (mailto:rockyb@rubyforge.net)
+#
+# = linecache
+# A module to read and cache lines of a Ruby program. 
+
+# == SYNOPSIS
+#
+# The LineCache module allows one to get any line from any file,
+# caching lines of the file on first access to the file. Although the 
+# file may be any file, the common use is when the file is a Ruby
+# script since parsing of the file is done to figure out where the
+# statement boundaries are.
+#
+# The routines here may be is useful when a small random sets of lines
+# are read from a single file, in particular in a debugger to show
+# source lines.
+#
+#
+#  require 'linecache'
+#  lines = LineCache::getlines('/tmp/myruby.rb')
+#  # The following lines have same effect as the above.
+#  $: << '/tmp'
+#  Dir.chdir('/tmp') {lines = LineCache::getlines('myruby.rb')
+#
+#  line = LineCache::getline('/tmp/myruby.rb', 6)
+#  # Note lines[6] == line (if /tmp/myruby.rb has 6 lines)
+#
+#  LineCache::clear_file_cache
+#  LineCache::clear_file_cache('/tmp/myruby.rb')
+#  LineCache::update_cache   # Check for modifications of all cached files.
+#
+# Some parts of the interface is derived from the Python module of the
+# same name.
+#
+
+require 'tempfile'
+require 'digest/sha1'
+require 'set'
+
+require 'rubygems'
+require 'require_relative'
+require_relative 'tracelines'
+
+# = module LineCache
+# A module to read and cache lines of a Ruby program. 
+module LineCache
+  VERSION = '1.3'
+  LineCacheInfo = Struct.new(:stat, :line_numbers, :lines, :path, 
+                             :sha1, :compiled_method) unless
+    defined?(LineCacheInfo)
+ 
+  # The file cache. The key is a name as would be given by Ruby for 
+  # __FILE__. The value is a LineCacheInfo object. 
+  @@file_cache = {} 
+  @@script_cache = {} 
+
+
+  # Used for CodeRay syntax highlighting
+  @@ruby_highlighter = nil
+  
+  # Maps a string filename (a String) to a key in @@file_cache (a
+  # String).
+  #
+  # One important use of @@file2file_remap is mapping the a full path
+  # of a file into the name stored in @@file_cache or given by Ruby's
+  # __FILE__. Applications such as those that get input from users,
+  # may want canonicalize a file name before looking it up. This map
+  # gives a way to do that.
+  #
+  # Another related use is when a template system is used.  Here we'll
+  # probably want to remap not only the file name but also line
+  # ranges. Will probably use this for that, but I'm not sure.
+  @@file2file_remap = {} 
+  @@file2file_remap_lines = {}
+
+  @@script2file = {} 
+
+  module_function
+
+  def remove_script_temps
+    @@script2file.values.each do |filename|
+      File.unlink(filename) if File.exist?(filename)
+    end
+  end
+  at_exit { remove_script_temps }
+
+  
+  # Clear the file cache entirely.
+  def clear_file_cache(filename=nil)
+    if filename 
+      if @@file_cache[filename]
+        @@file_cache.delete(filename)
+      end
+    else
+      @@file_cache = {}
+      @@file2file_remap = {}
+      @@file2file_remap_lines = {}
+    end
+  end
+
+  # Remove syntax-formatted lines in the cache. Use this
+  # when you change the CodeRay syntax or Token formatting
+  # and want to redo how files may have previously been 
+  # syntax marked.
+  def clear_file_format_cache
+    @@file_cache.each_pair do |fname, cache_info|
+      cache_info.lines.each_pair do |format, lines|
+        next if :plain == format
+        @@file_cache[fname].lines[format] = nil
+      end
+    end
+  end
+
+  # Clear the script cache entirely.
+  def clear_script_cache()
+    @@script_cache = {}
+  end
+
+  # Return an array of cached file names
+  def cached_files()
+    @@file_cache.keys
+  end
+
+  # Discard cache entries that are out of date. If +filename+ is +nil+
+  # all entries in the file cache +@@file_cache+ are checked.
+  # If we don't have stat information about a file, which can happen
+  # if the file was read from __SCRIPT_LINES but no corresponding file
+  # is found, it will be kept. Return a list of invalidated filenames.
+  # nil is returned if a filename was given but not found cached.
+  def checkcache(filename=nil, opts={})
+
+    if !filename
+      filenames = @@file_cache.keys()
+    elsif @@file_cache.member?(filename)
+      filenames = [filename]
+    else
+      return nil
+    end
+
+    result = []
+    for filename in filenames
+      next unless @@file_cache.member?(filename)
+      path = @@file_cache[filename].path
+      if File.exist?(path)
+        cache_info = @@file_cache[filename].stat
+        stat = File.stat(path)
+        if cache_info
+          if stat && 
+              (cache_info.size != stat.size or cache_info.mtime != stat.mtime)
+            result << filename
+            update_cache(filename, opts)
+          end
+        else
+          result << filename
+          update_cache(filename, opts)
+        end
+      end
+    end
+    return result
+  end
+
+  # Cache script if it's not already cached.
+  def cache_script(script, opts={})
+    if !@@script_cache.member?(script)
+      update_script_cache(script, opts)
+    end
+    script
+  end
+
+  # Cache file name or script object if it's not already cached.
+  # Return the expanded filename for it in the cache if a filename,
+  # or the script, or nil if we can't find the file.
+  def cache(file_or_script, reload_on_change=false)
+    if file_or_script.kind_of?(String)
+      cache_file(file_or_script, reload_on_change)
+    else
+      cache_script(file_or_script)
+    end
+  end
+
+  # Cache filename if it's not already cached.
+  # Return the expanded filename for it in the cache
+  # or nil if we can't find the file.
+  def cache_file(filename, reload_on_change=false, opts={})
+    if @@file_cache.member?(filename)
+      checkcache(filename) if reload_on_change
+    else
+      opts[:use_script_lines] = true
+      update_cache(filename, opts)
+    end
+    if @@file_cache.member?(filename)
+      @@file_cache[filename].path
+    else
+      nil
+    end
+  end
+      
+  # Return true if file_or_script is cached
+  def cached?(file_or_script)
+    if file_or_script.kind_of?(String) 
+      @@file_cache.member?(map_file(file_or_script))
+    else 
+      cached_script?(file_or_script)
+    end
+  end
+
+  def cached_script?(script)
+      @@script_cache.member?(script)
+  end
+      
+  def empty?(filename)
+    filename=map_file(filename)
+    !!@@file_cache[filename].lines[:plain]
+  end
+
+  # Get line +line_number+ from file named +filename+. Return nil if
+  # there was a problem. If a file named filename is not found, the
+  # function will look for it in the $: array.
+  # 
+  # Examples:
+  # 
+  #  lines = LineCache::getline('/tmp/myfile.rb')
+  #  # Same as above
+  #  $: << '/tmp'
+  #  lines = LineCache.getlines('myfile.rb')
+  #
+  def getline(file_or_script, line_number, opts={})
+    lines = 
+      if file_or_script.kind_of?(String)
+        filename = map_file(file_or_script)
+        filename, line_number = map_file_line(filename, line_number)
+        getlines(filename, opts)
+      else
+        script_getlines(file_or_script)
+      end
+    if lines and (1..lines.size) === line_number
+        return lines[line_number-1]
+    else
+        return nil
+    end
+  end
+
+  # Read lines of +script+ and cache the results. However +script+ was
+  # previously cached use the results from the cache. Return nil
+  # if we can't get lines
+  def script_getlines(script, opts={})
+    format = opts[:output] || :plain
+    line_formats = 
+      if @@script_cache.member?(script)
+        @@script_cache[script].lines
+      else
+        update_script_cache(script, opts)
+        if @@script_cache.member?(script)
+          @@script_cache[script].lines
+        else
+          nil
+        end
+      end
+    return nil unless line_formats
+    if format != :plain && !line_formats[format]
+      highlight_string(line_formats[:plain].join('')).split(/\n/)
+    else
+      line_formats[format]
+    end
+  end
+
+  # Read lines of +filename+ and cache the results. However +filename+ was
+  # previously cached use the results from the cache. Return nil
+  # if we can't get lines
+  def getlines(filename, opts={})
+    filename = map_file(filename)
+    checkcache(filename) if opts[:reload_on_change]
+    format = opts[:output] || :plain
+    if @@file_cache.member?(filename)
+      lines = @@file_cache[filename].lines
+      if opts[:output] && !lines[format]
+        lines[format] = 
+          highlight_string(lines[:plain].join(''), format).split(/\n/)
+      end
+      return lines[format]
+    else
+      opts[:use_script_lines] = true
+      update_cache(filename, opts)
+      if @@file_cache.member?(filename)
+        return @@file_cache[filename].lines[format]
+      else
+        return nil
+      end
+    end
+  end
+
+  def highlight_string(string, output_type)
+    require 'rubygems'
+    begin
+      require 'coderay'
+      require 'term/ansicolor'
+    rescue LoadError
+      return string
+    end
+    @@ruby_highlighter ||= CodeRay::Duo[:ruby, output_type]
+    @@ruby_highlighter.encode(string)
+  end
+
+  # Return full filename path for filename
+  def path(filename)
+    return unless filename.kind_of?(String)
+    filename = map_file(filename)
+    return nil unless @@file_cache.member?(filename)
+    @@file_cache[filename].path
+  end
+
+  def remap_file(from_file, to_file)
+    @@file2file_remap[from_file] = to_file
+    cache_file(to_file)
+  end
+
+  def remap_file_lines(from_file, to_file, range, start)
+    range = (range..range) if range.kind_of?(Fixnum)
+    to_file = from_file unless to_file
+    if @@file2file_remap_lines[to_file] 
+      # FIXME: need to check for overwriting ranges: whether
+      # they intersect or one encompasses another.
+      @@file2file_remap_lines[to_file] << [from_file, range, start]
+    else
+      @@file2file_remap_lines[to_file]  = [[from_file, range, start]]
+    end
+  end
+  module_function :remap_file_lines
+  
+  # Return any compiled method saved for a filename.
+  def compiled_method(filename)
+    if (file = map_file(filename)) && @@file_cache[file]
+      return @@file_cache[file].compiled_method 
+    else
+      return nil
+    end
+  end
+
+  # Return SHA1 of filename.
+  def sha1(filename)
+    filename = map_file(filename)
+    return nil unless @@file_cache.member?(filename)
+    return @@file_cache[filename].sha1.hexdigest if 
+      @@file_cache[filename].sha1
+    sha1 = Digest::SHA1.new
+    @@file_cache[filename].lines[:plain].each do |line|
+      sha1 << line + "\n"
+    end
+    @@file_cache[filename].sha1 = sha1
+    sha1.hexdigest
+  end
+      
+  # Return the number of lines in filename
+  def size(file_or_script)
+    cache(file_or_script)
+    if file_or_script.kind_of?(String)
+      file_or_script = map_file(file_or_script)
+      return nil unless @@file_cache.member?(file_or_script)
+      @@file_cache[file_or_script].lines[:plain].length
+    else
+      return nil unless @@script_cache.member?(file_or_script)
+      @@script_cache[file_or_script].lines[:plain].length
+    end
+  end
+
+  # Return File.stat in the cache for filename.
+  def stat(filename)
+    return nil unless @@file_cache.member?(filename)
+    @@file_cache[filename].stat
+  end
+  module_function :stat
+
+  # Return an Array of breakpoints in filename.
+  # The list will contain an entry for each distinct line event call
+  # so it is possible (and possibly useful) for a line number appear more
+  # than once.
+  def trace_line_numbers(filename, reload_on_change=false)
+    fullname = cache(filename, reload_on_change)
+    return nil unless fullname
+    e = @@file_cache[filename]
+    unless e.line_numbers
+      e.line_numbers = 
+        TraceLineNumbers.lnums_for_str_array(e.lines[:plain])
+      e.line_numbers = false unless e.line_numbers
+    end
+    e.line_numbers
+  end
+    
+  def map_file(file)
+    @@file2file_remap[file] ? @@file2file_remap[file] : file
+  end
+
+  def map_script(script)
+    if @@script2file[script] 
+      @@script2file[script] 
+    else 
+      # Doc says there's new takes an optional string parameter
+      # But it doesn't work for me
+      sha1 = Digest::SHA1.new
+      string = script.eval_source
+      sha1 << script.eval_source
+      tempfile = Tempfile.new(["eval-#{sha1.hexdigest[0...7]}-", '.rb'])
+      tempfile.open.puts(string)
+      tempfile.close
+      @@script2file[script] = tempfile.path
+      tempfile.path
+    end
+  end
+
+  def map_file_line(file, line)
+    if @@file2file_remap_lines[file]
+      @@file2file_remap_lines[file].each do |from_file, range, start|
+        if range === line
+          from_file = from_file || file 
+          return [from_file, start+line-range.begin] 
+        end
+      end
+    end
+    return [map_file(file), line]
+  end
+
+  def script_is_eval?(script)
+    !!script.eval_source
+  end
+
+  # Update a cache entry.  If something is wrong, return nil. Return
+  # true if the cache was updated and false if not. 
+  def update_script_cache(script, opts)
+    return false unless script_is_eval?(script)
+    string = opts[:string] || script.eval_source
+    lines = {:plain => string.split(/\n/)}
+    lines[opts[:output]] = highlight_string(string, opts[:output]) if
+      opts[:output]
+    @@script_cache[script] = 
+      LineCacheInfo.new(nil, nil, lines, nil, opts[:sha1], 
+                        opts[:compiled_method])
+    return true
+  end
+
+  # Update a cache entry.  If something's wrong, return nil. Return
+  # true if the cache was updated and false if not.  If
+  # opts[:use_script_lines] is true, use that as the source for the
+  # lines of the file
+  def update_cache(filename, opts={})
+    return nil unless filename
+
+    @@file_cache.delete(filename)
+    path = File.expand_path(filename)
+    
+    if File.exist?(path)
+      stat = File.stat(path)
+    elsif File.basename(filename) == filename
+      # try looking through the search path.
+      stat = nil
+      for dirname in $:
+        path = File.join(dirname, filename)
+        if File.exist?(path)
+            stat = File.stat(path)
+            break
+        end
+      end
+      return false unless stat
+    end
+    begin
+      fp = File.open(path, 'r')
+      raw_string = fp.read
+      fp.rewind
+      lines = {:plain => fp.readlines}
+      fp.close()
+      lines[opts[:output]] = 
+        highlight_string(raw_string, opts[:output]).split(/\n/) if 
+        opts[:output]
+    rescue 
+      ##  print '*** cannot open', path, ':', msg
+      return nil
+    end
+    @@file_cache[filename] = 
+      LineCacheInfo.new(File.stat(path), nil, lines, path, nil, 
+                        opts[:compiled_method])
+    @@file2file_remap[path] = filename
+    return true
+  end
+end
+
+# example usage
+if __FILE__ == $0 
+  def yes_no(var) 
+    return var ? "" : "not "
+  end
+
+  lines = LineCache::getlines(__FILE__)
+  puts "#{__FILE__} has #{LineCache.size(__FILE__)} lines"
+  line = LineCache::getline(__FILE__, 6)
+  puts "The 6th line is\n#{line}" 
+  line = LineCache::remap_file(__FILE__, 'another_name')
+  puts LineCache::getline('another_name', 7)
+
+  puts("Files cached: #{LineCache::cached_files.inspect}")
+  LineCache::update_cache(__FILE__)
+  LineCache::checkcache(__FILE__)
+  puts "#{__FILE__} has #{LineCache::size(__FILE__)} lines"
+  puts "#{__FILE__} trace line numbers:\n" + 
+    "#{LineCache::trace_line_numbers(__FILE__).to_a.sort.inspect}"
+  puts("#{__FILE__} is %scached." % 
+       yes_no(LineCache::cached?(__FILE__)))
+  puts LineCache::stat(__FILE__).inspect
+  puts "Full path: #{LineCache::path(__FILE__)}"
+  LineCache::checkcache # Check all files in the cache
+  LineCache::clear_file_cache 
+  puts("#{__FILE__} is now %scached." % 
+       yes_no(LineCache::cached?(__FILE__)))
+  # digest = SCRIPT_LINES__.select{|k,v| k =~ /digest.rb$/}
+  # puts digest.first[0] if digest
+  line = LineCache::getline(__FILE__, 7)
+  puts "The 7th line is\n#{line}" 
+  LineCache::remap_file_lines(__FILE__, 'test2', (10..20), 6)
+  puts LineCache::getline('test2', 10)
+  puts "Remapped 10th line of test2 is\n#{line}" 
+  eval("loc = Rubinius::VM::backtrace(0)[0]
+  puts LineCache::getline(loc.static_scope.script, 1)")
+  eval("loc = Rubinius::VM::backtrace(0)[0]
+  puts LineCache::size(loc.static_scope.script)")
+  eval("loc = Rubinius::VM::backtrace(0)[0]
+  puts LineCache::map_script(loc.static_scope.script)")
+
+  # Try new ANSI Terminal syntax coloring
+  LineCache::clear_file_cache(__FILE__)
+  LineCache::update_cache(__FILE__, :output => :term)
+  50.upto(60) do |i|
+    line = LineCache::getline(__FILE__, i, :output => :term)
+    # puts line.inspect
+    puts line
+  end
+  puts '-' * 20
+  50.upto(60) do |i|
+    line = LineCache::getline(__FILE__, i)
+    # puts line.inspect
+    puts line
+  end
+end