glark 1.9.0 → 1.10.0

data/lib/glark/output/count.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+require 'glark/output/common'
+
+class Count < Common
+  def display_matches?
+    false
+  end
+
+  def write_count ct
+    if @show_file_name
+      print_file_name
+    end
+    print_count ct
+  end
+
+  def process_end lnum
+    if @invert_match
+      write_count @file.get_lines.size - @count
+    elsif matched?
+      write_count @count
+    end
+  end
+end

data/lib/glark/output/file_header.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+require 'glark/util/highlight'
+
+class FileHeader
+  include Loggable, Highlight
+  
+  def initialize name, highlighter
+    @name = name
+    @highlighter = highlighter
+  end
+
+  def print out
+    name = @name.to_s
+    fname = @highlighter ? adorn(@highlighter, name) : name
+    out.puts fname
+  end
+end

data/lib/glark/output/file_name_only.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+require 'glark/output/common'
+
+class FileNameOnly < Common
+  def initialize fname, spec
+    super
+    @write_null = spec.write_null
+  end
+
+  def at_match_limit?
+    @count > 0
+  end
+
+  def display_matches?
+    false
+  end
+
+  def print_file_name
+    if @write_null
+      @out.print @file.fname
+      @out.print "\0"
+    else
+      @out.puts @file.fname
+    end
+  end
+
+  def process_end lnum
+    if matched? != @invert_match
+      print_file_name
+    end
+  end
+end

data/lib/glark/output/formatted.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+# Output that has (possibly) been reformatted, i.e., highlighting of regular
+# expressions.
+
+require 'glark/io/file/file'
+require 'glark/output/results'
+
+class Formatted < Results
+  attr_reader :formatted
+
+  def initialize
+    super
+    @formatted = []
+  end
+
+  def get_line_to_print lnum 
+    @formatted[lnum] || @file.get_line(lnum)
+  end
+end

data/lib/glark/output/glark_count.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+require 'glark/output/count'
+
+module Glark
+  class Count < ::Count
+    def initialize fname, spec
+      super
+      @fname_highlighter = spec.highlight && spec.file_highlight
+    end
+
+    def print_file_name
+      file_header = FileHeader.new displayed_name, @fname_highlighter
+      file_header.print @out
+    end
+
+    def print_count ct
+      @out.puts "    " + ct.to_s
+    end
+  end
+end

data/lib/glark/output/glark_format.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+require 'glark/output/file_header'
+require 'glark/util/highlight'
+
+module Glark; end
+
+module Glark
+  module Format
+    include Loggable, Highlight
+    
+    def initialize file, spec
+      @file_header = nil        # not nil after file header written
+      @fname_highlighter = spec.highlight && spec.file_highlight
+      @lnum_highlighter = spec.line_number_highlight
+
+      super
+    end
+
+    def show_file_header
+      if @show_file_name && @file_header.nil?
+        @file_header = FileHeader.new displayed_name, @fname_highlighter
+        @file_header.print @out
+      end
+    end
+
+    def print_line_number lnum 
+      if @lnum_highlighter
+        lnumstr = (lnum + 1).to_s
+        pad = " " * ([4 - lnumstr.length, 0].max)
+        @out.print pad + " " + adorn(@lnum_highlighter, lnumstr) + " "
+      else
+        super
+      end
+    end
+
+    def println ln, ch 
+      if @show_line_numbers
+        print_line_number ln 
+      end
+      
+      if ch && @print_context
+        @out.printf "%s ", ch
+      end
+
+      line = get_line_to_print ln 
+      @out.puts line
+    end
+
+    # prints the line, and adjusts for the fact that in our world, lines are
+    # 0-indexed, whereas they are displayed as if 1-indexed.
+    def print_line lnum, ch = nil 
+      lnums = @file.get_region lnum 
+      return unless lnums
+      lnums.each do |ln|
+        println ln, ch 
+      end
+    end
+  end
+end

data/lib/glark/output/glark_lines.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+require 'glark/output/lines'
+require 'glark/output/glark_format'
+
+# -------------------------------------------------------
+# Glark output format
+# -------------------------------------------------------
+
+module Glark
+  class Lines < ::Lines
+    include Format
+
+    def initialize file, spec
+      super
+      @print_context = @after != 0 || @before != 0
+    end
+
+    def write_matching from, to
+      show_file_header
+      super
+    end
+
+    def write_nonmatching from, to
+      show_file_header
+      super
+    end
+
+    def add_match startline, endline
+      super
+      set_status startline, endline
+    end
+  end
+end

data/lib/glark/output/grep_count.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+require 'glark/output/count'
+
+module Grep
+  class Count < ::Count
+    def print_file_name
+      fname = displayed_name
+      @out.print fname, ":"
+    end
+
+    def print_count ct
+      @out.puts ct
+    end
+  end
+end

data/lib/glark/output/grep_lines.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+require 'glark/output/lines'
+
+# -------------------------------------------------------
+# Grep output format
+# -------------------------------------------------------
+
+module Grep
+  # This matches legacy grep, mostly. It is for running within emacs, thus, it
+  # does not support context or highlighting.
+  class Lines < ::Lines
+    # prints the line, and adjusts for the fact that in our world, lines are
+    # 0-indexed, whereas they are displayed as if 1-indexed.
+    def print_line lnum, ch = nil
+      ln = get_line_to_print lnum
+      return unless ln
+
+      print_file_name
+      if @show_line_numbers
+        @out.printf "%d: ", lnum + 1
+      end
+      
+      @out.print ln
+    end
+
+    def print_file_name
+      if @show_file_name
+        @out.print displayed_name, ":"
+      end
+    end
+
+    def add_match startline, endline
+      super 
+      # even with multi-line matches (--and expressions), we'll display
+      # only the first matching line, not the range between the matches.
+      set_status startline, startline
+    end
+  end
+end

data/lib/glark/output/line_status.rb

@@ -0,0 +1,46 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+module Glark
+  class LineStatus
+    WRITTEN = Object.new
+    PRE_MATCH = '-'
+    MATCH = ':'
+    POST_MATCH = '+'
+
+    def initialize 
+      @stati = Array.new
+    end
+
+    def is_written? lnum
+      @stati[lnum] == WRITTEN
+    end
+
+    def set_as_written lnum
+      @stati[lnum] = WRITTEN
+    end
+
+    def char lnum
+      @stati[lnum]
+    end
+
+    def set_status from, to, status
+      from.upto(to) do |lnum|
+        update_status lnum, status
+      end
+    end
+
+    def update_status lnum, status
+      if @stati[lnum].nil? || (status == MATCH && @stati[lnum] != WRITTEN)
+        @stati[lnum] = status
+      end
+    end
+
+    def set_match pre_match_start, match_start, match_end, post_match_end
+      start = [0, pre_match_start].max
+      set_status start,         match_start - 1,    PRE_MATCH
+      set_status match_start,   match_end,          MATCH
+      set_status match_end + 1, post_match_end,     POST_MATCH
+    end
+  end
+end

data/lib/glark/output/lines.rb

@@ -0,0 +1,100 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+# Output for displayed lines.
+
+require 'glark/io/file/file'
+require 'glark/output/line_status'
+require 'glark/output/common'
+
+class Lines < Common
+  def initialize file, spec
+    super
+
+    @print_context = false
+    
+    context = spec.context
+    @after = context && context.after
+    @before = context && context.before
+
+    @stati = Glark::LineStatus.new
+  end
+
+  def display_matches?
+    true
+  end
+
+  def at_match_limit?
+    @match_limit && @count >= @match_limit
+  end
+
+  def displayed_name
+    @label || @file.fname
+  end
+
+  # Prints the line, which is assumed to be 0-indexed, and is thus adjusted by
+  # one.
+  def print_line_number lnum 
+    @out.printf "%5d ", lnum + 1
+  end
+
+  # prints the line, and adjusts for the fact that in our world, lines are
+  # 0-indexed, whereas they are displayed as if 1-indexed.
+  def print_line lnum, ch = nil 
+    raise "error: print_line must be implemented by an output subclass"
+  end
+
+  def write_matching from, to
+    (from .. to).each do |ln|
+      next unless @stati.char(ln) && !@stati.is_written?(ln)
+
+      # this used to be conditional on show_break, but no more
+      if from > 0 && !@stati.char(ln - 1) && @print_context
+        @out.puts "  ---"
+      end
+      
+      print_line ln, @stati.char(ln)
+      @stati.set_as_written ln
+    end
+  end
+
+  def write_nonmatching from, to
+    (from .. to).each do |ln|
+      next if @stati.is_written?(ln) || @stati.char(ln) == ':'
+      print_line ln 
+      @stati.set_as_written ln
+    end
+  end
+
+  def write_matches from, to 
+    if @invert_match
+      write_nonmatching from, to
+    else
+      write_matching from, to
+    end
+  end
+
+  def process_end lnum
+    if @invert_match
+      write_nonmatching 0, lnum
+    elsif matched?
+      write_matching 0, lnum
+    end
+  end
+
+  def process_match startline, endline, fromline, toline
+    add_match startline, endline
+    
+    if display_matches?
+      write_matches fromline, toline
+    end
+    return at_match_limit?
+  end
+
+  def set_status startline, endline
+    fromline = [0, startline - @before].max
+    toline = endline + @after
+    @stati.set_match fromline, startline, endline, toline
+  end
+end