hg/stx-libtool: comparison Diff2.st

equal deleted inserted replaced

-:2be01fe4903c
+:6cc4674bfd18
 			ifAbsentPut: [ OrderedCollection new ]) add: index ].
 	^ result
 !
 findCandidateFrom: candidates forLine: file2index startingAt: lowIndex
-	"Find the index k in the given subrange of candidates where file2index falls strictly between the file2indexes of the kth and k+1th candidates. If no such k exists, return 0."
+"Find the index k in the given subrange of candidates where file2index falls strictly between the file2indexes of the kth and k+1th candidates. If no such k exists, return 0."
-	(lowIndex to: candidates size) do: [ :k |
+lowIndex to: candidates size do: [ :k |
-		(candidates at: k) file2index >= file2index ifTrue: [^ 0].
+(candidates at: k) file2index >= file2index ifTrue: [^ 0].
-		(k = candidates size or: [ (candidates at: k + 1) file2index > file2index ])
+(k = candidates size or: [ (candidates at: k + 1) file2index > file2index ])
-			ifTrue: [^ k] ].
+ifTrue: [^ k] ].
-	^ 0
+^ 0
 !
 mergeCandidates: candidates file1index: file1index file2indices: file2indices
 | r c s newCandidate |
 r := 1.
 ! !
 !Diff2 class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/Diff2.st,v 1.3 2014-02-25 07:00:18 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Diff2.st,v 1.4 2014-11-18 18:12:59 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libtool/Diff2.st,v 1.3 2014-02-25 07:00:18 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Diff2.st,v 1.4 2014-11-18 18:12:59 cg Exp $'
 ! !