diff.rb
282 lines
| 6.1 KiB
| text/x-ruby
|
RubyLexer
/ lib / diff.rb
Eric Davis
|
r2735 | module RedmineDiff | ||
| class Diff | ||||
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | VERSION = 0.3 | ||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | def Diff.lcs(a, b) | ||
| astart = 0 | ||||
| bstart = 0 | ||||
| afinish = a.length-1 | ||||
| bfinish = b.length-1 | ||||
| mvector = [] | ||||
Toshi MARUYAMA
|
r6349 | |||
|
Eric Davis
|
r2735 | # First we prune off any common elements at the beginning | ||
| while (astart <= afinish && bstart <= afinish && a[astart] == b[bstart]) | ||||
| mvector[astart] = bstart | ||||
| astart += 1 | ||||
| bstart += 1 | ||||
| end | ||||
|
Toshi MARUYAMA
|
r6349 | |||
|
Eric Davis
|
r2735 | # now the end | ||
| while (astart <= afinish && bstart <= bfinish && a[afinish] == b[bfinish]) | ||||
| mvector[afinish] = bfinish | ||||
| afinish -= 1 | ||||
| bfinish -= 1 | ||||
| end | ||||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | bmatches = b.reverse_hash(bstart..bfinish) | ||
| thresh = [] | ||||
| links = [] | ||||
|
Toshi MARUYAMA
|
r6349 | |||
|
Eric Davis
|
r2735 | (astart..afinish).each { |aindex| | ||
| aelem = a[aindex] | ||||
| next unless bmatches.has_key? aelem | ||||
| k = nil | ||||
| bmatches[aelem].reverse.each { |bindex| | ||||
|
Toshi MARUYAMA
|
r9183 | if k && (thresh[k] > bindex) && (thresh[k-1] < bindex) | ||
| thresh[k] = bindex | ||||
| else | ||||
| k = thresh.replacenextlarger(bindex, k) | ||||
| end | ||||
| links[k] = [ (k==0) ? nil : links[k-1], aindex, bindex ] if k | ||||
|
Eric Davis
|
r2735 | } | ||
|
Jean-Philippe Lang
|
r580 | } | ||
|
Eric Davis
|
r2735 | if !thresh.empty? | ||
| link = links[thresh.length-1] | ||||
| while link | ||||
|
Toshi MARUYAMA
|
r9183 | mvector[link[1]] = link[2] | ||
| link = link[0] | ||||
|
Eric Davis
|
r2735 | end | ||
|
Jean-Philippe Lang
|
r580 | end | ||
|
Eric Davis
|
r2735 | return mvector | ||
|
Jean-Philippe Lang
|
r580 | end | ||
|
Eric Davis
|
r2735 | |||
| def makediff(a, b) | ||||
| mvector = Diff.lcs(a, b) | ||||
| ai = bi = 0 | ||||
| while ai < mvector.length | ||||
| bline = mvector[ai] | ||||
| if bline | ||||
|
Toshi MARUYAMA
|
r9183 | while bi < bline | ||
| discardb(bi, b[bi]) | ||||
| bi += 1 | ||||
| end | ||||
| match(ai, bi) | ||||
| bi += 1 | ||||
|
Eric Davis
|
r2735 | else | ||
|
Toshi MARUYAMA
|
r9183 | discarda(ai, a[ai]) | ||
|
Eric Davis
|
r2735 | end | ||
| ai += 1 | ||||
|
Jean-Philippe Lang
|
r580 | end | ||
|
Eric Davis
|
r2735 | while ai < a.length | ||
| discarda(ai, a[ai]) | ||||
| ai += 1 | ||||
| end | ||||
| while bi < b.length | ||||
| discardb(bi, b[bi]) | ||||
| bi += 1 | ||||
| end | ||||
| match(ai, bi) | ||||
| 1 | ||||
| end | ||||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | def compactdiffs | ||
| diffs = [] | ||||
| @diffs.each { |df| | ||||
| i = 0 | ||||
| curdiff = [] | ||||
| while i < df.length | ||||
|
Toshi MARUYAMA
|
r9183 | whot = df[i][0] | ||
| s = @isstring ? df[i][2].chr : [df[i][2]] | ||||
| p = df[i][1] | ||||
| last = df[i][1] | ||||
| i += 1 | ||||
| while df[i] && df[i][0] == whot && df[i][1] == last+1 | ||||
| s << df[i][2] | ||||
| last = df[i][1] | ||||
| i += 1 | ||||
| end | ||||
| curdiff.push [whot, p, s] | ||||
|
Eric Davis
|
r2735 | end | ||
| diffs.push curdiff | ||||
| } | ||||
| return diffs | ||||
| end | ||||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | attr_reader :diffs, :difftype | ||
| def initialize(diffs_or_a, b = nil, isstring = nil) | ||||
| if b.nil? | ||||
| @diffs = diffs_or_a | ||||
| @isstring = isstring | ||||
| else | ||||
| @diffs = [] | ||||
| @curdiffs = [] | ||||
| makediff(diffs_or_a, b) | ||||
| @difftype = diffs_or_a.class | ||||
| end | ||||
| end | ||||
|
Toshi MARUYAMA
|
r6349 | |||
|
Eric Davis
|
r2735 | def match(ai, bi) | ||
| @diffs.push @curdiffs unless @curdiffs.empty? | ||||
|
Jean-Philippe Lang
|
r580 | @curdiffs = [] | ||
| end | ||||
|
Eric Davis
|
r2735 | def discarda(i, elem) | ||
| @curdiffs.push ['-', i, elem] | ||||
| end | ||||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | def discardb(i, elem) | ||
| @curdiffs.push ['+', i, elem] | ||||
| end | ||||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | def compact | ||
| return Diff.new(compactdiffs) | ||||
| end | ||||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | def compact! | ||
| @diffs = compactdiffs | ||||
| end | ||||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | def inspect | ||
| @diffs.inspect | ||||
| end | ||||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | end | ||
|
Jean-Philippe Lang
|
r580 | end | ||
| module Diffable | ||||
| def diff(b) | ||||
|
Eric Davis
|
r2735 | RedmineDiff::Diff.new(self, b) | ||
|
Jean-Philippe Lang
|
r580 | end | ||
| # Create a hash that maps elements of the array to arrays of indices | ||||
| # where the elements are found. | ||||
| def reverse_hash(range = (0...self.length)) | ||||
| revmap = {} | ||||
| range.each { |i| | ||||
| elem = self[i] | ||||
| if revmap.has_key? elem | ||||
|
Toshi MARUYAMA
|
r9183 | revmap[elem].push i | ||
|
Jean-Philippe Lang
|
r580 | else | ||
|
Toshi MARUYAMA
|
r9183 | revmap[elem] = [i] | ||
|
Jean-Philippe Lang
|
r580 | end | ||
| } | ||||
| return revmap | ||||
| end | ||||
| def replacenextlarger(value, high = nil) | ||||
| high ||= self.length | ||||
| if self.empty? || value > self[-1] | ||||
| push value | ||||
| return high | ||||
| end | ||||
| # binary search for replacement point | ||||
| low = 0 | ||||
| while low < high | ||||
| index = (high+low)/2 | ||||
| found = self[index] | ||||
| return nil if value == found | ||||
| if value > found | ||||
|
Toshi MARUYAMA
|
r9183 | low = index + 1 | ||
|
Jean-Philippe Lang
|
r580 | else | ||
|
Toshi MARUYAMA
|
r9183 | high = index | ||
|
Jean-Philippe Lang
|
r580 | end | ||
| end | ||||
| self[low] = value | ||||
| # $stderr << "replace #{value} : 0/#{low}/#{init_high} (#{steps} steps) (#{init_high-low} off )\n" | ||||
| # $stderr.puts self.inspect | ||||
| #gets | ||||
| #p length - low | ||||
| return low | ||||
| end | ||||
| def patch(diff) | ||||
| newary = nil | ||||
| if diff.difftype == String | ||||
| newary = diff.difftype.new('') | ||||
| else | ||||
| newary = diff.difftype.new | ||||
| end | ||||
| ai = 0 | ||||
| bi = 0 | ||||
| diff.diffs.each { |d| | ||||
| d.each { |mod| | ||||
|
Toshi MARUYAMA
|
r9183 | case mod[0] | ||
| when '-' | ||||
| while ai < mod[1] | ||||
| newary << self[ai] | ||||
| ai += 1 | ||||
| bi += 1 | ||||
| end | ||||
| ai += 1 | ||||
| when '+' | ||||
| while bi < mod[1] | ||||
| newary << self[ai] | ||||
| ai += 1 | ||||
| bi += 1 | ||||
| end | ||||
| newary << mod[2] | ||||
| bi += 1 | ||||
| else | ||||
| raise "Unknown diff action" | ||||
| end | ||||
|
Jean-Philippe Lang
|
r580 | } | ||
| } | ||||
| while ai < self.length | ||||
| newary << self[ai] | ||||
| ai += 1 | ||||
| bi += 1 | ||||
| end | ||||
| return newary | ||||
| end | ||||
| end | ||||
| class Array | ||||
| include Diffable | ||||
| end | ||||
| class String | ||||
| include Diffable | ||||
| end | ||||
| =begin | ||||
|
Eric Davis
|
r2735 | = Diff | ||
| (({diff.rb})) - computes the differences between two arrays or | ||||
| strings. Copyright (C) 2001 Lars Christensen | ||||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | == Synopsis | ||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | diff = Diff.new(a, b) | ||
| b = a.patch(diff) | ||||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | == Class Diff | ||
| === Class Methods | ||||
| --- Diff.new(a, b) | ||||
| --- a.diff(b) | ||||
| Creates a Diff object which represent the differences between | ||||
| ((|a|)) and ((|b|)). ((|a|)) and ((|b|)) can be either be arrays | ||||
| of any objects, strings, or object of any class that include | ||||
| module ((|Diffable|)) | ||||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | == Module Diffable | ||
| The module ((|Diffable|)) is intended to be included in any class for | ||||
| which differences are to be computed. Diffable is included into String | ||||
| and Array when (({diff.rb})) is (({require}))'d. | ||||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | Classes including Diffable should implement (({[]})) to get element at | ||
| integer indices, (({<<})) to append elements to the object and | ||||
| (({ClassName#new})) should accept 0 arguments to create a new empty | ||||
| object. | ||||
|
Jean-Philippe Lang
|
r580 | |||
|
Eric Davis
|
r2735 | === Instance Methods | ||
| --- Diffable#patch(diff) | ||||
| Applies the differences from ((|diff|)) to the object ((|obj|)) | ||||
| and return the result. ((|obj|)) is not changed. ((|obj|)) and | ||||
| can be either an array or a string, but must match the object | ||||
| from which the ((|diff|)) was created. | ||||
|
Jean-Philippe Lang
|
r580 | =end | ||