aboutsummaryrefslogtreecommitdiffhomepage
path: root/lexlib/LexAccessor.h
diff options
context:
space:
mode:
Diffstat (limited to 'lexlib/LexAccessor.h')
-rw-r--r--lexlib/LexAccessor.h20
1 files changed, 4 insertions, 16 deletions
diff --git a/lexlib/LexAccessor.h b/lexlib/LexAccessor.h
index 45a3a0a93..35e15726c 100644
--- a/lexlib/LexAccessor.h
+++ b/lexlib/LexAccessor.h
@@ -29,11 +29,8 @@ private:
int codePage;
enum EncodingType encodingType;
int lenDoc;
- int mask;
char styleBuf[bufferSize];
int validLen;
- char chFlags;
- char chWhile;
unsigned int startSeg;
int startPosStyling;
int documentVersion;
@@ -58,7 +55,7 @@ public:
codePage(pAccess->CodePage()),
encodingType(enc8bit),
lenDoc(pAccess->Length()),
- mask(127), validLen(0), chFlags(0), chWhile(0),
+ validLen(0),
startSeg(0), startPosStyling(0),
documentVersion(pAccess->Version()) {
switch (codePage) {
@@ -111,7 +108,7 @@ public:
return true;
}
char StyleAt(int position) const {
- return static_cast<char>(pAccess->StyleAt(position) & mask);
+ return static_cast<char>(pAccess->StyleAt(position));
}
int GetLine(int position) const {
return pAccess->LineFromPosition(position);
@@ -152,16 +149,10 @@ public:
return pAccess->SetLineState(line, state);
}
// Style setting
- void StartAt(unsigned int start, char chMask=31) {
- // Store the mask specified for use with StyleAt.
- mask = chMask;
- pAccess->StartStyling(start, chMask);
+ void StartAt(unsigned int start) {
+ pAccess->StartStyling(start, '\377');
startPosStyling = start;
}
- void SetFlags(char chFlags_, char chWhile_) {
- chFlags = chFlags_;
- chWhile = chWhile_;
- }
unsigned int GetStartSegment() const {
return startSeg;
}
@@ -182,9 +173,6 @@ public:
// Too big for buffer so send directly
pAccess->SetStyleFor(pos - startSeg + 1, static_cast<char>(chAttr));
} else {
- if (chAttr != chWhile)
- chFlags = 0;
- chAttr = static_cast<char>(chAttr | chFlags);
for (unsigned int i = startSeg; i <= pos; i++) {
assert((startPosStyling + validLen) < Length());
styleBuf[validLen++] = static_cast<char>(chAttr);