|
Class: Chunk (private in Diff3
This class is only visible from within
Diff3.
Object
|
+--Diff3::Chunk
- Package:
- stx:libtool
- Category:
- Collections-Sequenceable-Diff
- Owner:
- Diff3
- Author:
- Tony Garnock-Jones <tonyg@lshift.com>
A Diff3Chunk is a subclass of DiffChunk that also knows which side of a three-way merge it represents.
Instance Variables
side: <Symbol> One of #left, #original or #right
[instance variables:]
[class variables:]
as yet unclassified
-
negativeSize: s
-
Returns a pseudo-chunk with *negative* length, useful as a kind of zero for destructiveMergeWith: operations intended to build up coverage over some set of chunks.
-
offset: o length: l
-
-
side: aSelector chunk: aChunk
-
accessing
-
correctForSkewFrom: smallerChunk to: biggerChunk
-
Given a biggerChunk that definitely contains smallerChunk but might have an extra head or tail, updates the receiver to include such an extra head or tail.
-
destructiveMergeWith: aChunk
-
-
lastIndex
-
Returns the rightmost index contained in my range. (Offset is the leftmost index.) If my length is zero, will return an index lower than my offset.
-
length
-
-
length: anObject
-
-
offset
-
-
offset: anObject
-
-
side
-
-
side: anObject
-
as yet unclassified
-
= otherChunk
-
(comment from inherited method)
return true if the receiver and the arg have the same structure.
Notice:
This method is partially open coded (inlined) by the compiler(s)
identical objects are always considered equal.
redefining it may not work as expected.
-
accept: aVisitor
-
-
extractFrom: aCollection
-
Extracts a subcollection from aCollection corresponding to my offset and length.
-
extractFrom: aCollection offset: lineOffset
-
Given a text and lineOffset withing a chunk, return the line
-
extractFromDiff: diff
-
-
extractResolution
-
-
printOn: aStream
-
(comment from inherited method)
append a user printed representation of the receiver to aStream.
The format is suitable for a human - not meant to be read back.
The default here is to output the receiver's class name.
BUT: this method is heavily redefined for objects which
can print prettier.
comparing
-
< aDiffChunk
-
Used to sort changed chunks during three-way merge; see Diff3
testing
-
isChunk
-
-
isConflict
-
|