diff options
| author | nyamatongwe <unknown> | 2009-01-01 01:36:37 +0000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2009-01-01 01:36:37 +0000 |
| commit | d6571fa63db365bced55161c5d2e370b0097b4f8 (patch) | |
| tree | e3ce4c3d8bc377d3c94132e26c9a7cae538e6132 /src | |
| parent | e53adf622fb4422ff03342ece7e5a25ed4860071 (diff) | |
| download | scintilla-mirror-d6571fa63db365bced55161c5d2e370b0097b4f8.tar.gz | |
Updates to avoid warnings from GCC 4.3. Should not change behaviour.
Diffstat (limited to 'src')
| -rw-r--r-- | src/LexAU3.cxx | 3 | ||||
| -rw-r--r-- | src/LexFortran.cxx | 4 | ||||
| -rw-r--r-- | src/LexProgress.cxx | 2 | ||||
| -rw-r--r-- | src/LexTADS3.cxx | 2 | ||||
| -rw-r--r-- | src/LexVerilog.cxx | 6 |
5 files changed, 9 insertions, 8 deletions
diff --git a/src/LexAU3.cxx b/src/LexAU3.cxx index cedf261f5..cfff9279d 100644 --- a/src/LexAU3.cxx +++ b/src/LexAU3.cxx @@ -253,11 +253,12 @@ static void ColouriseAU3Doc(unsigned int startPos, //Reset at line end if (sc.atLineEnd) { ci=0; - if ((strcmp(s, "#ce")== 0 || strcmp(s, "#comments-end")== 0)) + if (strcmp(s, "#ce")== 0 || strcmp(s, "#comments-end")== 0) { if (sc.atLineEnd) sc.SetState(SCE_AU3_DEFAULT); else sc.SetState(SCE_AU3_COMMENTBLOCK); + } break; } //skip rest of line when a ; is encountered diff --git a/src/LexFortran.cxx b/src/LexFortran.cxx index e66b37ebe..0b3f2777c 100644 --- a/src/LexFortran.cxx +++ b/src/LexFortran.cxx @@ -83,7 +83,7 @@ static void ColouriseFortranDoc(unsigned int startPos, int length, int initStyle // Handle the fix format generically int toLineStart = sc.currentPos - posLineStart; if (isFixFormat && (toLineStart < 6 || toLineStart > 72)) { - if (toLineStart == 0 && (tolower(sc.ch) == 'c' || sc.ch == '*') || sc.ch == '!') { + if ((toLineStart == 0 && (tolower(sc.ch) == 'c' || sc.ch == '*')) || sc.ch == '!') { if (sc.MatchIgnoreCase("cdec$") || sc.MatchIgnoreCase("*dec$") || sc.MatchIgnoreCase("!dec$") || sc.MatchIgnoreCase("cdir$") || sc.MatchIgnoreCase("*dir$") || sc.MatchIgnoreCase("!dir$") || sc.MatchIgnoreCase("cms$") || sc.MatchIgnoreCase("*ms$") || sc.MatchIgnoreCase("!ms$") || @@ -252,7 +252,7 @@ static int classifyFoldPointFortran(const char* s, const char* prevWord, const c lev = 0; else lev = 1; - } else if (strcmp(s, "end") == 0 && chNextNonBlank != '=' + } else if ((strcmp(s, "end") == 0 && chNextNonBlank != '=') || strcmp(s, "endassociate") == 0 || strcmp(s, "endblock") == 0 || strcmp(s, "endblockdata") == 0 || strcmp(s, "endselect") == 0 || strcmp(s, "enddo") == 0 || strcmp(s, "endenum") ==0 diff --git a/src/LexProgress.cxx b/src/LexProgress.cxx index c21356960..902aa53d5 100644 --- a/src/LexProgress.cxx +++ b/src/LexProgress.cxx @@ -100,7 +100,7 @@ static void Colourise4glDoc(unsigned int startPos, int length, int initStyle, Wo if (!IsAWordChar(sc.ch) && sc.ch != '-') { char s[1000]; sc.GetCurrentLowered(s, sizeof(s)); - if (((sc.state & 0x10) == 0) && keywords2.InList(s) || keywords3.InList(s)) { + if ((((sc.state & 0x10) == 0) && keywords2.InList(s)) || keywords3.InList(s)) { sc.ChangeState(SCE_4GL_BLOCK | ResetSentenceStart); } else if (keywords1.InList(s)) { diff --git a/src/LexTADS3.cxx b/src/LexTADS3.cxx index 7cc85f1f9..ee16a0ac0 100644 --- a/src/LexTADS3.cxx +++ b/src/LexTADS3.cxx @@ -679,7 +679,7 @@ static const int T3_EXPECTINGPUNCTUATION = 1 << 14; static inline bool IsStringTransition(int s1, int s2) { return s1 != s2 && (s1 == SCE_T3_S_STRING || s1 == SCE_T3_X_STRING - || s1 == SCE_T3_D_STRING && s2 != SCE_T3_X_DEFAULT) + || (s1 == SCE_T3_D_STRING && s2 != SCE_T3_X_DEFAULT)) && s2 != SCE_T3_LIB_DIRECTIVE && s2 != SCE_T3_MSG_PARAM && s2 != SCE_T3_HTML_TAG diff --git a/src/LexVerilog.cxx b/src/LexVerilog.cxx index 52183fe8e..3fd0fc35c 100644 --- a/src/LexVerilog.cxx +++ b/src/LexVerilog.cxx @@ -248,7 +248,7 @@ static void FoldNoBoxVerilogDoc(unsigned int startPos, int length, int initStyle styler.Match(j, "generate") || styler.Match(j, "specify") || styler.Match(j, "primitive") || - styler.Match(j, "module") && foldAtModule || + (styler.Match(j, "module") && foldAtModule) || styler.Match(j, "begin")) { levelNext++; } else if (styler.Match(j, "endcase") || @@ -259,8 +259,8 @@ static void FoldNoBoxVerilogDoc(unsigned int startPos, int length, int initStyle styler.Match(j, "endtable") || styler.Match(j, "endspecify") || styler.Match(j, "endprimitive") || - styler.Match(j, "endmodule") && foldAtModule || - styler.Match(j, "end") && !IsAWordChar(styler.SafeGetCharAt(j+3))) { + (styler.Match(j, "endmodule") && foldAtModule) || + (styler.Match(j, "end") && !IsAWordChar(styler.SafeGetCharAt(j+3)))) { levelNext--; } } |