Guitar
|
#include <Diff3.hpp>
Public Member Functions | |
Diff3 () | |
Diff3 (const sequence &a, const sequence &b, const sequence &c) | |
~Diff3 () | |
bool | isConflict () const |
sequence | getMergedSequence () const |
bool | merge () |
void | compose () |
Private Member Functions | |
dtl_typedefs (elem, sequence) sequence A | |
sequence | merge_ () |
void | joinElemVec (elemVec &s1, elemVec &s2) const |
template<typename T_iter > | |
bool | isEnd (const T_iter &end, const T_iter &it) const |
template<typename T_iter > | |
void | forwardUntilEnd (const T_iter &end, T_iter &it) const |
void | addDecentSequence (const sesElemVec_iter &end, sesElemVec_iter &it, elemVec &seq) const |
Private Attributes | |
sequence | B |
sequence | C |
sequence | S |
Diff< elem, sequence, comparator > | diff_ba |
Diff< elem, sequence, comparator > | diff_bc |
bool | conflict |
elem | csepabegin |
elem | csepa |
elem | csepaend |
diff3 class template sequence must support random_access_iterator.
|
inline |
|
inline |
|
inline |
|
inlineprivate |
add elements whose SES's type is ADD
|
inline |
compose differences
|
private |
|
inlineprivate |
increment iterator until iterator is at end
|
inline |
|
inline |
|
inlineprivate |
check if sequence is at end
|
inlineprivate |
join elem vectors
|
inline |
merge changes B and C into A
|
inlineprivate |
merge implementation
|
private |
|
private |
|
private |
|
private |
|
private |
|
private |
|
private |
|
private |
|
private |