Am 14.09.2010 um 15:46 schrieb Abdelrazak Younes:
> On 09/14/2010 02:48 PM, [email protected] wrote:
>> Author: switt
>> Date: Tue Sep 14 14:48:03 2010
>> New Revision: 35369
>> URL:
>> http://www.lyx.org/trac/changeset/35369
>>
>>
>> Log:
>> reduce nesting levels in markMisspelledWords; simplify range check of
>> fontspan
>
> I have a compile error:
>
> /home/younes/devel/lyx/trunk/src/Paragraph.cpp: In member function ‘void
> lyx::Paragraph::Private::markMisspelledWords(const lyx::pos_type&, const
> lyx::pos_type&, lyx::SpellChecker::Result, const lyx::docstring&, const
> std::vector<long int, std::allocator<long int> >&)’:
> /home/younes/devel/lyx/trunk/src/Paragraph.cpp:3538: error: no matching
> function for call to
> ‘lyx::Paragraph::Private::countSoftbreaks(__gnu_cxx::__normal_iterator<const
> long int*, std::vector<long int, std::allocator<long int> > >&,
> __gnu_cxx::__normal_iterator<const long int*, std::vector<long int,
> std::allocator<long int> > >&, int&)’
> /home/younes/devel/lyx/trunk/src/Paragraph.cpp:366: note: candidates are: int
> lyx::Paragraph::Private::countSoftbreaks(__gnu_cxx::__normal_iterator<const
> long int*, std::vector<long int, std::allocator<long int> > >&,
> __gnu_cxx::__normal_iterator<const long int*, std::vector<long int,
> std::allocator<long int> > >, lyx::pos_type&) const
> make[2]: ***
> [src/CMakeFiles/lyx2.0.dir/home/younes/devel/lyx/trunk/src/Paragraph.cpp.o]
> Error 1
>
> Abdel.
Of course the function Paragraph::Private::countSoftbreaks() should have int
argument,
but why did it compile here with gcc 4.2.1 on Mac and gcc 4.4 on Linux?
What's your environment?
Another question:
I want to replace the map of the speller state by a vector to make it more
similar to the FontList.
The patch is attached. Is it ok?
Stephan
Index: src/Paragraph.cpp
===================================================================
--- src/Paragraph.cpp (Revision 35413)
+++ src/Paragraph.cpp (Arbeitskopie)
@@ -73,9 +73,54 @@
char_type const META_INSET = 0x200001;
};
-
/////////////////////////////////////////////////////////////////////
//
+// SpellResultRange
+//
+/////////////////////////////////////////////////////////////////////
+class SpellResultRange {
+public:
+ SpellResultRange(FontSpan range, SpellChecker::Result result)
+ : range_(range), result_(result)
+ {}
+ ///
+ FontSpan range() const { return range_; }
+ ///
+ void range(FontSpan r) { range_ = r; }
+ ///
+ SpellChecker::Result result() const { return result_; }
+ ///
+ void result(SpellChecker::Result r) { result_ = r; }
+ ///
+ bool inside(pos_type pos) const { return range_.inside(pos); }
+ ///
+ bool covered(FontSpan r) const
+ {
+ // 1. first of new range inside current range or
+ // 2. last of new range inside current range or
+ // 3. first of current range inside new range or
+ // 4. last of current range inside new range
+ return range_.inside(r.first) || range_.inside(r.last) ||
+ r.inside(range_.first) || r.inside(range_.last);
+ }
+ ///
+ void shift(pos_type pos, int offset)
+ {
+ if (range_.first > pos) {
+ range_.first += offset;
+ range_.last += offset;
+ } else if (range_.last > pos) {
+ range_.last += offset;
+ }
+ }
+private:
+ FontSpan range_ ;
+ SpellChecker::Result result_ ;
+};
+
+
+/////////////////////////////////////////////////////////////////////
+//
// SpellCheckerState
//
/////////////////////////////////////////////////////////////////////
@@ -91,7 +136,7 @@
{
eraseCoveredRanges(fp);
if (state != SpellChecker::WORD_OK)
- ranges_[fp] = state;
+ ranges_.push_back(SpellResultRange(fp, state));
}
void increasePosAfterPos(pos_type pos)
@@ -112,10 +157,8 @@
RangesIterator et = ranges_.end();
RangesIterator it = ranges_.begin();
for (; it != et; ++it) {
- FontSpan fc = it->first;
- if(fc.first <= pos && pos <= fc.last) {
- result = it->second;
- break;
+ if(it->inside(pos)) {
+ return it->result();
}
}
return result;
@@ -155,52 +198,35 @@
}
private:
- /// store the ranges as map of FontSpan and spell result pairs
- typedef map<FontSpan, SpellChecker::Result> Ranges;
+ typedef vector<SpellResultRange> Ranges;
typedef Ranges::const_iterator RangesIterator;
Ranges ranges_;
- ///
+ /// the area of the paragraph with pending spell check
FontSpan refresh_;
bool needs_refresh_;
+ /// spell state cache version number
SpellChecker::ChangeNumber current_change_number_;
+
void eraseCoveredRanges(FontSpan const fp)
{
Ranges result;
RangesIterator et = ranges_.end();
RangesIterator it = ranges_.begin();
for (; it != et; ++it) {
- FontSpan fc = it->first;
- // 1. first of new range inside current range or
- // 2. last of new range inside current range or
- // 3. first of current range inside new range or
- // 4. last of current range inside new range
- if (fc.inside(fp.first) || fc.inside(fp.last) ||
- fp.inside(fc.first) || fp.inside(fc.last))
- {
- continue;
- }
- result[fc] = it->second;
+ if (!it->covered(fp))
+ result.push_back(SpellResultRange(it->range(),
it->result()));
}
ranges_ = result;
}
void correctRangesAfterPos(pos_type pos, int offset)
{
- Ranges result;
RangesIterator et = ranges_.end();
- RangesIterator it = ranges_.begin();
+ Ranges::iterator it = ranges_.begin();
for (; it != et; ++it) {
- FontSpan m = it->first;
- if (m.first > pos) {
- m.first += offset;
- m.last += offset;
- } else if (m.last > pos) {
- m.last += offset;
- }
- result[m] = it->second;
+ it->shift(pos, offset);
}
- ranges_ = result;
}
};
@@ -3564,6 +3590,11 @@
pos_type start;
pos_type endpos;
d->rangeOfSpellCheck(start, endpos);
+ if (endpos > size()) {
+ LYXERR(Debug::GUI, "should not happen: \"" <<
+ endpos << ">" << size());
+ endpos = size();
+ }
if (speller->canCheckParagraph()) {
// loop until we leave the range
for (pos_type first = start; first < endpos; ) {
