diff options
| author | Neil <nyamatongwe@gmail.com> | 2013-10-09 21:42:10 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2013-10-09 21:42:10 +1100 |
| commit | 5cd7a1a1597028eef348c3d3d5625af481e51283 (patch) | |
| tree | 9a8346807c8e9ea69c119c6d5ae518363dcc0bac /lexers/LexPerl.cxx | |
| parent | ff66eec855d336ec00766a2fa3552a9e67da6f7d (diff) | |
| download | scintilla-mirror-5cd7a1a1597028eef348c3d3d5625af481e51283.tar.gz | |
Bug [#1528]. Perl: multibyte character problems.
From Colomban Wendling and Kein-Hong Man.
Diffstat (limited to 'lexers/LexPerl.cxx')
| -rw-r--r-- | lexers/LexPerl.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lexers/LexPerl.cxx b/lexers/LexPerl.cxx index f694426ef..fe169f071 100644 --- a/lexers/LexPerl.cxx +++ b/lexers/LexPerl.cxx @@ -861,10 +861,14 @@ void SCI_METHOD LexerPerl::Lex(unsigned int startPos, int length, int initStyle, sc.Forward(); } if (sc.ch != '\r') { // skip CR if CRLF - HereDoc.Append(sc.ch); + int i = 0; // else append char, possibly an extended char + while (i < sc.width) { + HereDoc.Append(static_cast<unsigned char>(styler.SafeGetCharAt(sc.currentPos + i))); + i++; + } } } - } else { // an unquoted here-doc delimiter + } else { // an unquoted here-doc delimiter, no extended charsets if (setHereDocDelim.Contains(sc.ch)) { HereDoc.Append(sc.ch); } else { @@ -885,7 +889,7 @@ void SCI_METHOD LexerPerl::Lex(unsigned int startPos, int length, int initStyle, if (HereDoc.DelimiterLength == 0 || sc.Match(HereDoc.Delimiter)) { int c = sc.GetRelative(HereDoc.DelimiterLength); if (c == '\r' || c == '\n') { // peek first, do not consume match - sc.Forward(HereDoc.DelimiterLength); + sc.ForwardBytes(HereDoc.DelimiterLength); sc.SetState(SCE_PL_DEFAULT); backFlag = BACK_NONE; HereDoc.State = 0; @@ -1021,7 +1025,7 @@ void SCI_METHOD LexerPerl::Lex(unsigned int startPos, int length, int initStyle, // For '#', if no whitespace in between, it's a delimiter. if (IsASpace(c)) { // Keep going - } else if (c == '#' && IsASpaceOrTab(sc.GetRelative(sLen - 1))) { + } else if (c == '#' && IsASpaceOrTab(sc.GetRelativeCharacter(sLen - 1))) { endType = 3; } else Quote.Open(c); @@ -1109,7 +1113,7 @@ void SCI_METHOD LexerPerl::Lex(unsigned int startPos, int length, int initStyle, while (setSubPrototype.Contains(sc.GetRelative(i))) i++; if (sc.GetRelative(i) == ')') { // valid sub prototype - sc.Forward(i); + sc.ForwardBytes(i); sc.ForwardSetState(SCE_PL_DEFAULT); } else { // abandon prototype, restart from '(' @@ -1322,7 +1326,7 @@ void SCI_METHOD LexerPerl::Lex(unsigned int startPos, int length, int initStyle, if (setArray.Contains(sc.chNext)) { // no special treatment } else if (sc.chNext == ':' && sc.GetRelative(2) == ':') { - sc.Forward(2); + sc.ForwardBytes(2); } else if (sc.chNext == '{' || sc.chNext == '[') { sc.ForwardSetState(SCE_PL_OPERATOR); } else { @@ -1445,7 +1449,7 @@ void SCI_METHOD LexerPerl::Lex(unsigned int startPos, int length, int initStyle, if (preferRE) { sc.SetState(SCE_PL_SYMBOLTABLE); if (sc.chNext == ':' && sc.GetRelative(2) == ':') { - sc.Forward(2); + sc.ForwardBytes(2); } else if (sc.chNext == '{') { sc.ForwardSetState(SCE_PL_OPERATOR); } else { @@ -1462,7 +1466,7 @@ void SCI_METHOD LexerPerl::Lex(unsigned int startPos, int length, int initStyle, if (setHash.Contains(sc.chNext)) { sc.Forward(); } else if (sc.chNext == ':' && sc.GetRelative(2) == ':') { - sc.Forward(2); + sc.ForwardBytes(2); } else if (sc.chNext == '{') { sc.ForwardSetState(SCE_PL_OPERATOR); } else { |