@@ -151,7 +151,7 @@ unsigned
151
151
CrystalLineParser::ParseLinePascal (unsigned dwCookie, const tchar_t *pszChars, int nLength, TEXTBLOCK * pBuf, int &nActualItems)
152
152
{
153
153
if (nLength == 0 )
154
- return dwCookie & (COOKIE_EXT_COMMENT | COOKIE_EXT_COMMENT2 | COOKIE_BLOCK_STYLE );
154
+ return dwCookie & (COOKIE_EXT_COMMENT | COOKIE_EXT_COMMENT2);
155
155
156
156
bool bRedefineBlock = true ;
157
157
bool bDecIndex = false ;
@@ -176,7 +176,7 @@ CrystalLineParser::ParseLinePascal (unsigned dwCookie, const tchar_t *pszChars,
176
176
{
177
177
DEFINE_BLOCK (nPos, COLORINDEX_COMMENT);
178
178
}
179
- else if (dwCookie & (COOKIE_CHAR | COOKIE_STRING | COOKIE_BLOCK_STYLE ))
179
+ else if (dwCookie & (COOKIE_CHAR | COOKIE_STRING))
180
180
{
181
181
DEFINE_BLOCK (nPos, COLORINDEX_STRING);
182
182
}
@@ -223,32 +223,12 @@ CrystalLineParser::ParseLinePascal (unsigned dwCookie, const tchar_t *pszChars,
223
223
}
224
224
225
225
// Char constant '..'
226
- if (dwCookie & COOKIE_CHAR || dwCookie & COOKIE_BLOCK_STYLE )
226
+ if (dwCookie & COOKIE_CHAR)
227
227
{
228
228
if (pszChars[I] == ' \' ' && (I == 0 || I == 1 && pszChars[nPrevI] != ' \\ ' || I >= 2 && (pszChars[nPrevI] != ' \\ ' || *tc::tcharprev (pszChars, pszChars + nPrevI) == ' \\ ' )))
229
229
{
230
- // Multiline string ('''...''')?
231
- if (((nLength >= I + 1 ) && (pszChars[I+1 ] == ' \' ' )) || (dwCookie & COOKIE_BLOCK_STYLE))
232
- {
233
- if (dwCookie & COOKIE_BLOCK_STYLE)
234
- {
235
- // End of multiline string
236
- dwCookie &= ~COOKIE_BLOCK_STYLE;
237
- }
238
- else
239
- {
240
- // Start of multiline string
241
- dwCookie |= COOKIE_BLOCK_STYLE;
242
- // Skip one
243
- I++;
244
- }
245
- }
246
- else
247
- {
248
- dwCookie &= ~COOKIE_CHAR;
249
-
250
- bRedefineBlock = true ;
251
- }
230
+ dwCookie &= ~COOKIE_CHAR;
231
+ bRedefineBlock = true ;
252
232
}
253
233
continue ;
254
234
}
@@ -300,7 +280,7 @@ CrystalLineParser::ParseLinePascal (unsigned dwCookie, const tchar_t *pszChars,
300
280
continue ;
301
281
}
302
282
}
303
- if (I > 0 && pszChars[I] == ' *' && pszChars[nPrevI] == ' (' ) // (*
283
+ if (I > 0 && pszChars[I] == ' *' && pszChars[nPrevI] == ' (' )
304
284
{
305
285
DEFINE_BLOCK (nPrevI, COLORINDEX_COMMENT);
306
286
dwCookie |= COOKIE_EXT_COMMENT;
@@ -341,6 +321,6 @@ CrystalLineParser::ParseLinePascal (unsigned dwCookie, const tchar_t *pszChars,
341
321
}
342
322
343
323
if (pszChars[nLength - 1 ] != ' \\ ' || IsMBSTrail (pszChars, nLength - 1 ))
344
- dwCookie &= (COOKIE_EXT_COMMENT | COOKIE_EXT_COMMENT2 | COOKIE_BLOCK_STYLE );
324
+ dwCookie &= (COOKIE_EXT_COMMENT | COOKIE_EXT_COMMENT2);
345
325
return dwCookie;
346
326
}
0 commit comments