diff options
| author | nyamatongwe <unknown> | 2011-02-10 14:59:17 +1100 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2011-02-10 14:59:17 +1100 |
| commit | e4e7a926111f9644542cec4549a65fd349a879de (patch) | |
| tree | 16463461ca6a60d4a168be44e5b8cc707d3251a4 /lexers/LexCPP.cxx | |
| parent | b415a7b3f8adfd91f4b377892433a24f78cb88ec (diff) | |
| download | scintilla-mirror-e4e7a926111f9644542cec4549a65fd349a879de.tar.gz | |
Handling unicode and wide character literals.
Diffstat (limited to 'lexers/LexCPP.cxx')
| -rw-r--r-- | lexers/LexCPP.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx index 5fc769f51..92248f7f0 100644 --- a/lexers/LexCPP.cxx +++ b/lexers/LexCPP.cxx @@ -586,18 +586,21 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, } else if (keywords4.InList(s)) { sc.ChangeState(SCE_C_GLOBALCLASS|activitySet); } - if (sc.ch == '\"') { - // Should check all s in "L|u|U|u8" "R" - const bool raw = sc.chPrev == 'R'; + const bool literalString = sc.ch == '\"'; + if (literalString || sc.ch == '\'') { size_t lenS = strlen(s); + const bool raw = literalString && sc.chPrev == 'R'; if (raw) s[lenS--] = '\0'; bool valid = (lenS == 0) || ((lenS == 1) && ((s[0] == 'L') || (s[0] == 'u') || (s[0] == 'U'))) || - ((lenS == 2) && (s[0] == 'u') && (s[1] == '8')); + ((lenS == 2) && literalString && (s[0] == 'u') && (s[1] == '8')); if (valid) { - sc.ChangeState((raw ? SCE_C_STRINGRAW : SCE_C_STRING)|activitySet); + if (literalString) + sc.ChangeState((raw ? SCE_C_STRINGRAW : SCE_C_STRING)|activitySet); + else + sc.ChangeState(SCE_C_CHARACTER|activitySet); } } sc.SetState(SCE_C_DEFAULT|activitySet); |