aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil Hodgson <nyamatongwe@gmail.com>2017-09-01 08:53:14 +1000
committerNeil Hodgson <nyamatongwe@gmail.com>2017-09-01 08:53:14 +1000
commit7b287ecd7f8527bb8f47e08090a0120ff418c730 (patch)
treea0c3341b6b256b6c58fc8703b16624dabac21f1c
parent940747df2c700f88e6c031526637d555d88d76e9 (diff)
downloadscintilla-mirror-7b287ecd7f8527bb8f47e08090a0120ff418c730.tar.gz
Use "Falls through" comments to avoid warnings from GCC 7.1.
-rw-r--r--lexers/LexCSS.cxx1
-rw-r--r--lexers/LexCaml.cxx1
-rw-r--r--lexers/LexErlang.cxx2
-rw-r--r--lexers/LexPerl.cxx1
-rw-r--r--lexers/LexTCL.cxx1
-rw-r--r--lexers/LexVisualProlog.cxx2
-rw-r--r--src/RESearch.cxx1
7 files changed, 9 insertions, 0 deletions
diff --git a/lexers/LexCSS.cxx b/lexers/LexCSS.cxx
index 19345af54..01ca78687 100644
--- a/lexers/LexCSS.cxx
+++ b/lexers/LexCSS.cxx
@@ -347,6 +347,7 @@ static void ColouriseCssDoc(Sci_PositionU startPos, Sci_Position length, int ini
case SCE_CSS_DEFAULT:
if (isLessDocument) // give priority to pseudo elements
break;
+ // Falls through.
case SCE_CSS_VALUE:
lastStateVar = sc.state;
sc.SetState(SCE_CSS_VARIABLE);
diff --git a/lexers/LexCaml.cxx b/lexers/LexCaml.cxx
index df8781541..cefc1eda2 100644
--- a/lexers/LexCaml.cxx
+++ b/lexers/LexCaml.cxx
@@ -368,6 +368,7 @@ void ColouriseCamlDoc(
break;
}/* else
// fall through for SML char literal (handle like string) */
+ // Falls through.
case SCE_CAML_STRING:
// [try to] interpret as [additional] [SML char/] string literal char
diff --git a/lexers/LexErlang.cxx b/lexers/LexErlang.cxx
index 3d3c1e89f..89ed1ae2f 100644
--- a/lexers/LexErlang.cxx
+++ b/lexers/LexErlang.cxx
@@ -116,6 +116,7 @@ static void ColouriseErlangDoc(Sci_PositionU startPos, Sci_Position length, int
}
}
// V--- Falling through!
+ // Falls through.
case COMMENT_FUNCTION : {
if (sc.ch != '%') {
to_late_to_comment = true;
@@ -128,6 +129,7 @@ static void ColouriseErlangDoc(Sci_PositionU startPos, Sci_Position length, int
}
}
// V--- Falling through!
+ // Falls through.
case COMMENT_MODULE : {
if (parse_state != COMMENT) {
// Search for comment documentation
diff --git a/lexers/LexPerl.cxx b/lexers/LexPerl.cxx
index 4d60f6e03..83475df31 100644
--- a/lexers/LexPerl.cxx
+++ b/lexers/LexPerl.cxx
@@ -1175,6 +1175,7 @@ void SCI_METHOD LexerPerl::Lex(Sci_PositionU startPos, Sci_Position length, int
break;
}
// (continued for ' delim)
+ // Falls through.
default: // non-interpolated path
sc.Forward(sLen);
}
diff --git a/lexers/LexTCL.cxx b/lexers/LexTCL.cxx
index 48af1e7fe..9377a872e 100644
--- a/lexers/LexTCL.cxx
+++ b/lexers/LexTCL.cxx
@@ -314,6 +314,7 @@ next:
break;
case '[':
expected = true;
+ // Falls through.
case ']':
case '(':
case ')':
diff --git a/lexers/LexVisualProlog.cxx b/lexers/LexVisualProlog.cxx
index dfd749b70..9b59443f8 100644
--- a/lexers/LexVisualProlog.cxx
+++ b/lexers/LexVisualProlog.cxx
@@ -366,6 +366,7 @@ void SCI_METHOD LexerVisualProlog::Lex(Sci_PositionU startPos, Sci_Position leng
case SCE_VISUALPROLOG_STRING_ESCAPE_ERROR:
// return to SCE_VISUALPROLOG_STRING and treat as such (fall-through)
sc.SetState(SCE_VISUALPROLOG_STRING);
+ // Falls through.
case SCE_VISUALPROLOG_STRING:
if (sc.atLineEnd) {
sc.SetState(SCE_VISUALPROLOG_STRING_EOL_OPEN);
@@ -385,6 +386,7 @@ void SCI_METHOD LexerVisualProlog::Lex(Sci_PositionU startPos, Sci_Position leng
case SCE_VISUALPROLOG_STRING_VERBATIM_EOL:
// return to SCE_VISUALPROLOG_STRING_VERBATIM and treat as such (fall-through)
sc.SetState(SCE_VISUALPROLOG_STRING_VERBATIM);
+ // Falls through.
case SCE_VISUALPROLOG_STRING_VERBATIM:
if (sc.atLineEnd) {
sc.SetState(SCE_VISUALPROLOG_STRING_VERBATIM_EOL);
diff --git a/src/RESearch.cxx b/src/RESearch.cxx
index 9bcea1ce9..65a732ef3 100644
--- a/src/RESearch.cxx
+++ b/src/RESearch.cxx
@@ -784,6 +784,7 @@ int RESearch::Execute(CharacterIndexer &ci, Sci::Position lp, Sci::Position endp
lp++;
if (lp >= endp) /* if EOS, fail, else fall through. */
return 0;
+ // Falls through.
default: /* regular matching all the way. */
while (lp < endp) {
ep = PMatch(ci, lp, endp, ap);