anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 11:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unify traverse_snake_back and traverse_snake_forw and make it more general for future purposes.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32922 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-01-09 21:17:10 +00:00
parent e4e43f63d2
commit 68edfdafc3
1 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/Compare.cpp
View File

@ -123,12 +123,25 @@ public:
: o(o_), n(n_)
{}
bool operator!=(DocPair const & rhs) {
// this might not be intuitive but correct for our purpose
return o != rhs.o && n != rhs.n;
}
DocPair & operator++()
{
step_forward(o);
step_forward(n);
return *this;
}
DocPair & operator--()
{
step_backward(o);
step_backward(n);
return *this;
}
///
DocIterator o;
///
@ -373,39 +386,25 @@ bool equal(DocIterator & o, DocIterator & n) {
}
void traverse_snake_back(DocRangePair & rp)
bool traverse_snake(DocPair & p, DocRangePair const & rp, bool forward)
{
while (true) {
// Traverse snake
if (!step_backward(rp.o.to, rp.o.from))
break;
if (!step_backward(rp.n.to, rp.n.from)) {
step_forward(rp.o.to);
break;
bool ret = false;
DocPair const & p_end = forward ? rp.to() : rp.from();
while (p != p_end) {
if (!forward)
--p;
if (!equal(p.o, p.n)) {
if (!forward)
++p;
return ret;
}
if (forward)
++p;
ret = true;
}
return ret;
}
if (!equal(rp.o.to, rp.n.to)) {
step_forward(rp.o.to);
step_forward(rp.n.to);
break;
}
}
}
void traverse_snake_forw(DocRangePair & rp)
{
while (equal(rp.o.from, rp.n.from)) {
if (!step_forward(rp.o.from, rp.o.to))
break;
if (!step_forward(rp.n.from, rp.n.to)) {
step_backward(rp.o.from);
break;
}
}
}
/////////////////////////////////////////////////////////////////////
//
@ -440,8 +439,8 @@ bool Compare::Impl::diff(Buffer const * new_buf, Buffer const * old_buf,
DocRangePair rp(old_buf_, new_buf_);
DocPair from = rp.from();
traverse_snake_forw(rp);
DocRangePair const snake(from, rp.from());
traverse_snake(from, rp, true);
DocRangePair const snake(rp.from(), from);
process_snake(snake);
// Start the recursive algorithm
@ -484,11 +483,13 @@ void Compare::Impl::diff_i(DocRangePair const & rp)
} else {
// Retrieve the complete snake
DocRangePair first_part(rp.from(), middle_snake);
traverse_snake_back(first_part);
DocPair first_part_end = middle_snake;
traverse_snake(first_part_end, rp, false);
DocRangePair first_part(rp.from(), first_part_end);
DocRangePair second_part(middle_snake, rp.to());
traverse_snake_forw(second_part);
DocPair second_part_begin = middle_snake;
traverse_snake(second_part_begin, rp, true);
DocRangePair second_part(second_part_begin, rp.to());
// Split the string in three parts:
// 1. in front of the snake