anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change tracking:

Browse Source 
* src/changes.h: remove Changes::Range::contained(),
	remove Changes::Range::containsOrPrecedes(),
	remove Change::set(...) methods that expect a change type parameter
	remove Change::check(...)
	simplify Change::intersects(...)
	* src/changes.C:
	* src/paragraph_pimpl.C: adjust properly


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15410 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2006-10-20 14:31:54 +00:00
parent 4ef2be0f11
commit 585e3a8730
3 changed files with 13 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/changes.C
View File

@ -56,28 +56,15 @@ bool Changes::Range::contains(Range const & r) const
}
bool Changes::Range::contained(Range const & r) const
{
return r.contains(*this);
}
bool Changes::Range::contains(pos_type const pos) const
{
return pos >= start && pos < end;
}
bool Changes::Range::containsOrPrecedes(pos_type const pos) const
{
return pos >= start && pos <= end;
}
bool Changes::Range::intersects(Range const & r) const
{
return contained(r) || contains(r)
|| contains(r.start) || contains(r.end);
return r.start < end && r.end > start; // end itself is not in the range!
}
@ -114,7 +101,8 @@ void Changes::record(Change const & change, pos_type const pos)
del(change, pos);
break;
case Change::UNCHANGED:
set(Change::UNCHANGED, pos);
// FIXME: change tracking (MG)
// set(Change::UNCHANGED, pos);
break;
}
}
@ -126,19 +114,6 @@ void Changes::set(Change const & change, pos_type const pos)
}
void Changes::set(Change::Type const type, pos_type const pos)
{
set(type, pos, pos + 1);
}
void Changes::set(Change::Type const type,
pos_type const start, pos_type const end)
{
set(Change(type), start, end);
}
void Changes::set(Change const & change,
pos_type const start, pos_type const end)
{
@ -154,7 +129,7 @@ void Changes::set(Change const & change,
// remove all sub-ranges
for (; it != table_.end();) {
if (new_range != it->range && it->range.contained(new_range)) {
if (new_range != it->range /*&& it->range.contained(new_range)*/) { // FIXME: change tracking (MG)
if (lyxerr.debugging(Debug::CHANGES)) {
lyxerr[Debug::CHANGES] << "Removing subrange "
<< it->range.start << "," << it->range.end << endl;
@ -220,7 +195,6 @@ void Changes::set(Change const & change,
}
}
check();
merge();
}
@ -251,7 +225,6 @@ void Changes::erase(pos_type const pos)
--range.end;
}
}
check();
merge();
}
@ -276,7 +249,7 @@ void Changes::del(Change const & change, ChangeTable::size_type const pos)
erase(pos);
}
break;
} else if (range.containsOrPrecedes(pos) && it + 1 == table_.end()) {
} else if (/*range.containsOrPrecedes(pos) && it + 1 == table_.end()*/ true) { // FIXME: change tracking (MG)
// this case happens when building from .lyx
set(change, pos);
break;
@ -295,7 +268,7 @@ void Changes::add(Change const & change, ChangeTable::size_type const pos)
for (; it != end; ++it) {
Range & range(it->range);
if (!found && range.containsOrPrecedes(pos)) {
if (!found /* && range.containsOrPrecedes(pos)*/) { // FIXME: change tracking (MG)
found = true;
if (lyxerr.debugging(Debug::CHANGES)) {
lyxerr[Debug::CHANGES] << "Found range of "
@ -330,7 +303,6 @@ Change const Changes::lookup(pos_type const pos) const
return it->change;
}
check();
BOOST_ASSERT(false && "missing changes for pos");
return Change(Change::UNCHANGED);
}
@ -417,38 +389,6 @@ void Changes::merge()
}
lyxerr[Debug::CHANGES] << "Merge ended" << endl;
check();
}
void Changes::check() const
{
ChangeTable::const_iterator it = table_.begin();
ChangeTable::const_iterator end = table_.end();
bool dont_assert = true;
lyxerr[Debug::CHANGES] << "Changelist:" << endl;
for (; it != end; ++it) {
if (lyxerr.debugging(Debug::CHANGES)) {
lyxerr[Debug::CHANGES] << "Range of type " << it->change.type << " is "
<< it->range.start << "," << it->range.end << " author "
<< it->change.author << " time " << it->change.changetime << endl;
}
if (it + 1 == end)
break;
Range const & range(it->range);
Range const & next((it + 1)->range);
if (range.end != next.start)
dont_assert = false;
}
if (lyxerr.debugging(Debug::CHANGES))
lyxerr[Debug::CHANGES] << "End" << endl;
BOOST_ASSERT(dont_assert);
}

21
src/changes.h
View File

@ -5,6 +5,7 @@
* Licence details can be found in the file COPYING.
*
* \author John Levon
* \author Michael Gerz
*
* Full author contact details are available in file CREDITS.
*
@ -56,15 +57,9 @@ public:
empty_type_ = type;
}
/// set the position to the given change
/// set the pos to the given change
void set(Change const & change, lyx::pos_type pos);
/// set the position to the given change
void set(Change::Type, lyx::pos_type pos);
/// set the range to the given change
void set(Change::Type, lyx::pos_type start, lyx::pos_type end);
/// set the range to the given change
void set(Change const & change, lyx::pos_type start, lyx::pos_type end);
@ -102,17 +97,11 @@ private:
// does this range contain pos ?
bool contains(lyx::pos_type pos) const;
// does this range contain pos, or can it be appended ?
bool containsOrPrecedes(lyx::pos_type pos) const;
// is this range contained within r ?
bool contained(Range const & r) const;
// do the ranges intersect ?
bool intersects(Range const & r) const;
lyx::pos_type start;
lyx::pos_type end;
lyx::pos_type end; // Caution: end is not in the range!
};
friend bool operator==(Range const & r1, Range const & r2);
@ -143,10 +132,6 @@ private:
/// merge neighbouring ranges, assuming that they are abutting
/// (as done by set())
void merge();
/// consistency check, needed before merge()
void check() const;
};
#endif // CHANGES_H

6
src/paragraph_pimpl.C
View File

@ -154,7 +154,8 @@ void Paragraph::Pimpl::acceptChange(pos_type start, pos_type end)
break;
case Change::INSERTED:
changes_->set(Change::UNCHANGED, i);
// FIXME: change tracking (MG)
changes_->set(Change(Change::UNCHANGED), i);
break;
case Change::DELETED:
@ -200,7 +201,8 @@ void Paragraph::Pimpl::rejectChange(pos_type start, pos_type end)
break;
case Change::DELETED:
changes_->set(Change::UNCHANGED, i);
// FIXME: change tracking (MG)
changes_->set(Change(Change::UNCHANGED), i);
// No real char at position size():
if (i < size() && owner_->isInset(i))
// FIXME: change tracking (MG)