diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2017-09-25 11:18:25 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2017-09-25 11:18:25 +1000 |
| commit | b8bc4d145c209b33df8a8ef47a859bd6b899341b (patch) | |
| tree | d39d5ac16322f5cf66f65d4d384d0c2eb5cabb40 /lexers/LexPerl.cxx | |
| parent | b7fc7c238595d50bab92a0160ebd8c45b8486977 (diff) | |
| download | scintilla-mirror-b8bc4d145c209b33df8a8ef47a859bd6b899341b.tar.gz | |
Backport: Avoiding comma operator warnings from Clang in lexers.
Backport of changeset 6395:1ca06526aa8e.
Diffstat (limited to 'lexers/LexPerl.cxx')
| -rw-r--r-- | lexers/LexPerl.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lexers/LexPerl.cxx b/lexers/LexPerl.cxx index a03eccd59..3bf205f70 100644 --- a/lexers/LexPerl.cxx +++ b/lexers/LexPerl.cxx @@ -121,8 +121,8 @@ static int disambiguateBareword(LexAccessor &styler, Sci_PositionU bk, Sci_Posit // if ch isn't one of '[{(,' we can skip the test if ((ch == '{' || ch == '(' || ch == '['|| ch == ',') && fw < endPos) { - while (ch = static_cast<unsigned char>(styler.SafeGetCharAt(fw)), - IsASpaceOrTab(ch) && fw < endPos) { + while (IsASpaceOrTab(ch = static_cast<unsigned char>(styler.SafeGetCharAt(fw))) + && fw < endPos) { fw++; } if ((ch == '}' && brace) @@ -137,10 +137,12 @@ static int disambiguateBareword(LexAccessor &styler, Sci_PositionU bk, Sci_Posit static void skipWhitespaceComment(LexAccessor &styler, Sci_PositionU &p) { // when backtracking, we need to skip whitespace and comments - int style; - while ((p > 0) && (style = styler.StyleAt(p), - style == SCE_PL_DEFAULT || style == SCE_PL_COMMENTLINE)) + while (p > 0) { + const int style = styler.StyleAt(p); + if (style != SCE_PL_DEFAULT && style != SCE_PL_COMMENTLINE) + break; p--; + } } static int findPrevLexeme(LexAccessor &styler, Sci_PositionU &bk, int &style) { |