bx
/
catgirl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply consecutive formatting codes at once 

Fixes the failing splits test.
weechat-hashes
Curtis McEnroe 2018-09-14 15:31:16 -04:00
parent 3cf064a531
commit b22e008d68
No known key found for this signature in database
GPG Key ID: CEA2F97ADCFCD77C
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
format.c
View File

@ -97,13 +97,16 @@ bool formatParse(struct Format *format, const wchar_t *split) {
} }
const wchar_t *init = format->str; const wchar_t *init = format->str;
switch (format->str[0]) { for (bool done = false; !done;) {
break; case IRCBold: format->str++; format->bold ^= true; switch (format->str[0]) {
break; case IRCItalic: format->str++; format->italic ^= true; break; case IRCBold: format->str++; format->bold ^= true;
break; case IRCUnderline: format->str++; format->underline ^= true; break; case IRCItalic: format->str++; format->italic ^= true;
break; case IRCReverse: format->str++; format->reverse ^= true; break; case IRCUnderline: format->str++; format->underline ^= true;
break; case IRCColor: format->str++; parseColor(format); break; case IRCReverse: format->str++; format->reverse ^= true;
break; case IRCReset: format->str++; formatReset(format); break; case IRCColor: format->str++; parseColor(format);
break; case IRCReset: format->str++; formatReset(format);
break; default: done = true;
}
} }
format->split = (split >= init && split <= format->str); format->split = (split >= init && split <= format->str);
@ -170,8 +173,10 @@ int main() {
assert(testColor(L"\00399,99a", IRCDefault, IRCDefault, 6)); assert(testColor(L"\00399,99a", IRCDefault, IRCDefault, 6));
assert(testSplits(L"ab")); assert(testSplits(L"ab"));
assert(testSplits(L"\002"));
assert(testSplits(L"\002ab")); assert(testSplits(L"\002ab"));
assert(testSplits(L"a\002b")); assert(testSplits(L"a\002b"));
assert(testSplits(L"\002\003"));
assert(testSplits(L"a\002\003b")); assert(testSplits(L"a\002\003b"));
assert(testSplits(L"a\0031b")); assert(testSplits(L"a\0031b"));
assert(testSplits(L"a\00312b")); assert(testSplits(L"a\00312b"));