--- a/Diff2.st Tue Feb 25 08:00:16 2014 +0100
+++ b/Diff2.st Tue Feb 25 08:00:18 2014 +0100
@@ -33,7 +33,7 @@
instanceVariableNames:'file1 file2'
classVariableNames:''
poolDictionaries:''
- category:'Collections-Sequenceable-Diff2'
+ category:'Collections-Sequenceable-Diff'
!
Object subclass:#Chunk
@@ -121,9 +121,9 @@
documentation
"
-Generic diff/comm utilities. Agnostic as to the longestCommonSubsequence algorithm used.
+ Generic diff/comm utilities. Agnostic as to the longestCommonSubsequence algorithm used.
-Instance Variables
+ Instance Variables
file1: <SequenceableCollection> One of the two files to compare.
file2: <SequenceableCollection> The other of the files to compare.
@@ -319,9 +319,9 @@
documentation
"
-A DiffChunk represents a span of items within a collection (e.g. a collection of lines representing a text file).
+ A DiffChunk represents a span of items within a collection (e.g. a collection of lines representing a text file).
-Instance Variables
+ Instance Variables
length: <Integer> Count of lines within the chunk; 0 is permitted
offset: <Integer> Index of first line within the chunk; 1-based
@@ -458,12 +458,12 @@
documentation
"
-A HuntMcilroyDiff provides a longestCommonSubsequence algorithm following Hunt and McIlroy 1976 for use by the methods on GenericDiff.
+ A HuntMcilroyDiff provides a longestCommonSubsequence algorithm following Hunt and McIlroy 1976 for use by the methods on GenericDiff.
-J. W. Hunt and M. D. McIlroy, An algorithm for differential file comparison, Bell Telephone Laboratories CSTR #41 (1976).
-http://www.cs.dartmouth.edu/~doug/
+ J. W. Hunt and M. D. McIlroy, An algorithm for differential file comparison, Bell Telephone Laboratories CSTR #41 (1976).
+ http://www.cs.dartmouth.edu/~doug/
-Instance Variables
+ Instance Variables
lcs: cached longest common subsequence
[author:]
@@ -604,7 +604,7 @@
documentation
"
-HuntMcilroyDiffCandidate is used internally by HuntMcilroyDiff.
+ HuntMcilroyDiffCandidate is used internally by HuntMcilroyDiff.
[author:]
Tony Garnock-Jones <tonyg@kcbbs.gen.nz>
@@ -679,7 +679,9 @@
documentation
"
-I implement a modified version of Myers' greedy lcs algorithm described in http://xmailserver.org/diff2.pdf. A similar version written in C can be found here http://research.janelia.org/myers/Papers/file.comparison.pdf. Ukkonen's version can be found here http://www.cs.helsinki.fi/u/ukkonen/InfCont85.PDF.
+ I implement a modified version of Myers' greedy lcs algorithm described in http://xmailserver.org/diff2.pdf.
+ A similar version written in C can be found here http://research.janelia.org/myers/Papers/file.comparison.pdf.
+ Ukkonen's version can be found here http://www.cs.helsinki.fi/u/ukkonen/InfCont85.PDF.
[author:]
Tony Garnock-Jones <tonyg@lshift.com>
@@ -836,10 +838,10 @@
!Diff2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Diff2.st,v 1.2 2014-02-05 19:13:29 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Diff2.st,v 1.3 2014-02-25 07:00:18 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Diff2.st,v 1.2 2014-02-05 19:13:29 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Diff2.st,v 1.3 2014-02-25 07:00:18 cg Exp $'
! !