diff options
| -rw-r--r-- | src/misc1.c | 9 | ||||
| -rw-r--r-- | src/testdir/test3.in | 27 | ||||
| -rw-r--r-- | src/testdir/test3.ok | 27 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 64 insertions, 1 deletions
diff --git a/src/misc1.c b/src/misc1.c index 60e814694..aacf610ad 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -6555,7 +6555,7 @@ cin_is_cpp_baseclass(cached) pos->lnum = lnum; line = ml_get(lnum); - s = cin_skipcomment(line); + s = line; for (;;) { if (*s == NUL) @@ -6564,6 +6564,13 @@ cin_is_cpp_baseclass(cached) break; /* Continue in the cursor line. */ line = ml_get(++lnum); + s = line; + } + if (s == line) + { + /* don't recognize "case (foo):" as a baseclass */ + if (cin_iscase(s, FALSE)) + break; s = cin_skipcomment(line); if (*s == NUL) continue; diff --git a/src/testdir/test3.in b/src/testdir/test3.in index 4fc73a978..f3d4f182f 100644 --- a/src/testdir/test3.in +++ b/src/testdir/test3.in @@ -932,6 +932,33 @@ if (1) a = 1; } +void func() +{ +switch (foo) +{ +case (bar): +if (baz()) +quux(); +break; +case (shmoo): +if (!bar) +{ +} +case (foo1): +switch (bar) +{ +case baz: +baz_f(); +break; +} +break; +default: +baz(); +baz(); +break; +} +} + /* end of AUTO */ STARTTEST diff --git a/src/testdir/test3.ok b/src/testdir/test3.ok index 8fa9caac2..477aacc1c 100644 --- a/src/testdir/test3.ok +++ b/src/testdir/test3.ok @@ -920,6 +920,33 @@ void getstring() { a = 1; } +void func() +{ + switch (foo) + { + case (bar): + if (baz()) + quux(); + break; + case (shmoo): + if (!bar) + { + } + case (foo1): + switch (bar) + { + case baz: + baz_f(); + break; + } + break; + default: + baz(); + baz(); + break; + } +} + /* end of AUTO */ diff --git a/src/version.c b/src/version.c index 3722b5aee..3c8a9382a 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 893, +/**/ 892, /**/ 891, |