aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.202

Browse Source 
Problem:    Cannot influence the indent inside a namespace.
Solution:   Add the "N" 'cino' parameter. (Konstantin Lepa)
This commit is contained in:
Bram Moolenaar 2011-05-25 15:16:18 +02:00
parent 334adf0ae5
commit ed38b0ac41
5 changed files with 426 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
runtime/doc/indent.txt
View File

@ -128,13 +128,20 @@ have changed the indent by typing <BS>, <Tab>, or <Space> in the indent or
used CTRL-T or CTRL-D. used CTRL-T or CTRL-D.
*cinoptions-values* *cinoptions-values*
The 'cinoptions' option sets how Vim performs indentation. In the list below, The 'cinoptions' option sets how Vim performs indentation. The value after
the option character can be one of these (N is any number):
N indent N spaces
-N indent N spaces to the left
Ns N times 'shiftwidth spaces
-Ns N times 'shiftwidth spaces to the left
In the list below,
"N" represents a number of your choice (the number can be negative). When "N" represents a number of your choice (the number can be negative). When
there is an 's' after the number, Vim multiplies the number by 'shiftwidth': there is an 's' after the number, Vim multiplies the number by 'shiftwidth':
"1s" is 'shiftwidth', "2s" is two times 'shiftwidth', etc. You can use a "1s" is 'shiftwidth', "2s" is two times 'shiftwidth', etc. You can use a
decimal point, too: "-0.5s" is minus half a 'shiftwidth'. The examples below decimal point, too: "-0.5s" is minus half a 'shiftwidth'.
assume a 'shiftwidth' of 4. The examples below assume a 'shiftwidth' of 4.
*cino->*
>N Amount added for "normal" indent. Used after a line that should >N Amount added for "normal" indent. Used after a line that should
increase the indent (lines starting with "if", an opening brace, increase the indent (lines starting with "if", an opening brace,
etc.). (default 'shiftwidth'). etc.). (default 'shiftwidth').
@ -145,6 +152,7 @@ assume a 'shiftwidth' of 4.
foo; foo; foo; foo; foo; foo;
} } } } } }
< <
*cino-e*
eN Add N to the prevailing indent inside a set of braces if the eN Add N to the prevailing indent inside a set of braces if the
opening brace at the End of the line (more precise: is not the opening brace at the End of the line (more precise: is not the
first character in a line). This is useful if you want a first character in a line). This is useful if you want a
@ -160,6 +168,7 @@ assume a 'shiftwidth' of 4.
bar; bar; bar; bar; bar; bar;
} } } } } }
< <
*cino-n*
nN Add N to the prevailing indent for a statement after an "if", nN Add N to the prevailing indent for a statement after an "if",
"while", etc., if it is NOT inside a set of braces. This is "while", etc., if it is NOT inside a set of braces. This is
useful if you want a different indent when there is no '{' useful if you want a different indent when there is no '{'
@ -174,6 +183,7 @@ assume a 'shiftwidth' of 4.
bar; bar; bar; bar; bar; bar;
} } } } } }
< <
*cino-f*
fN Place the first opening brace of a function or other block in fN Place the first opening brace of a function or other block in
column N. This applies only for an opening brace that is not column N. This applies only for an opening brace that is not
inside other braces and is at the start of the line. What comes inside other braces and is at the start of the line. What comes
@ -184,6 +194,7 @@ assume a 'shiftwidth' of 4.
{ { { { { {
int foo; int foo; int foo; int foo; int foo; int foo;
< <
*cino-{*
{N Place opening braces N characters from the prevailing indent. {N Place opening braces N characters from the prevailing indent.
This applies only for opening braces that are inside other This applies only for opening braces that are inside other
braces. (default 0). braces. (default 0).
@ -193,6 +204,7 @@ assume a 'shiftwidth' of 4.
{ { { { { {
foo; foo; foo; foo; foo; foo;
< <
*cino-}*
}N Place closing braces N characters from the matching opening }N Place closing braces N characters from the matching opening
brace. (default 0). brace. (default 0).
@ -202,6 +214,7 @@ assume a 'shiftwidth' of 4.
foo; foo; foo; foo; foo; foo;
} } } } } }
< <
*cino-^*
^N Add N to the prevailing indent inside a set of braces if the ^N Add N to the prevailing indent inside a set of braces if the
opening brace is in column 0. This can specify a different opening brace is in column 0. This can specify a different
indent for whole of a function (some may like to set it to a indent for whole of a function (some may like to set it to a
@ -216,6 +229,7 @@ assume a 'shiftwidth' of 4.
} } } } } }
} } } } } }
< <
*cino-L*
LN Controls placement of jump labels. If N is negative, the label LN Controls placement of jump labels. If N is negative, the label
will be placed at column 1. If N is non-negative, the indent of will be placed at column 1. If N is non-negative, the indent of
the label will be the prevailing indent minus N. (default -1). the label will be the prevailing indent minus N. (default -1).
@ -229,6 +243,7 @@ assume a 'shiftwidth' of 4.
} } } } } }
} } } } } }
< <
*cino-:*
:N Place case labels N characters from the indent of the switch(). :N Place case labels N characters from the indent of the switch().
(default 'shiftwidth'). (default 'shiftwidth').
@ -240,6 +255,7 @@ assume a 'shiftwidth' of 4.
default: default: default: default:
} } } }
< <
*cino-=*
=N Place statements occurring after a case label N characters from =N Place statements occurring after a case label N characters from
the indent of the label. (default 'shiftwidth'). the indent of the label. (default 'shiftwidth').
@ -247,6 +263,7 @@ assume a 'shiftwidth' of 4.
case 11: case 11: a = a + 1; case 11: case 11: a = a + 1;
a = a + 1; b = b + 1; a = a + 1; b = b + 1;
< <
*cino-l*
lN If N != 0 Vim will align with a case label instead of the lN If N != 0 Vim will align with a case label instead of the
statement after it in the same line. statement after it in the same line.
@ -256,6 +273,7 @@ assume a 'shiftwidth' of 4.
break; break; break; break;
} } } }
< <
*cino-b*
bN If N != 0 Vim will align a final "break" with the case label, bN If N != 0 Vim will align a final "break" with the case label,
so that case..break looks like a sort of block. (default: 0). so that case..break looks like a sort of block. (default: 0).
When using 1, consider adding "0=break" to 'cinkeys'. When using 1, consider adding "0=break" to 'cinkeys'.
@ -272,6 +290,7 @@ assume a 'shiftwidth' of 4.
break; break; break; break;
} } } }
< <
*cino-g*
gN Place C++ scope declarations N characters from the indent of the gN Place C++ scope declarations N characters from the indent of the
block they are in. (default 'shiftwidth'). A scope declaration block they are in. (default 'shiftwidth'). A scope declaration
can be "public:", "protected:" or "private:". can be "public:", "protected:" or "private:".
@ -283,6 +302,7 @@ assume a 'shiftwidth' of 4.
private: private: private: private:
} } } }
< <
*cino-h*
hN Place statements occurring after a C++ scope declaration N hN Place statements occurring after a C++ scope declaration N
characters from the indent of the label. (default characters from the indent of the label. (default
'shiftwidth'). 'shiftwidth').
@ -291,6 +311,21 @@ assume a 'shiftwidth' of 4.
public: public: a = a + 1; public: public: a = a + 1;
a = a + 1; b = b + 1; a = a + 1; b = b + 1;
< <
*cino-N*
NN Indent inside C++ namespace N characters extra compared to a
normal block. (default 0).
cino= cino=N-s >
namespace { namespace {
void function(); void function();
} }
namespace my namespace my
{ {
void function(); void function();
} }
<
*cino-p*
pN Parameter declarations for K&R-style function declarations will pN Parameter declarations for K&R-style function declarations will
be indented N characters from the margin. (default be indented N characters from the margin. (default
'shiftwidth'). 'shiftwidth').
@ -300,6 +335,7 @@ assume a 'shiftwidth' of 4.
int a; int a; int a; int a; int a; int a;
char b; char b; char b; char b; char b; char b;
< <
*cino-t*
tN Indent a function return type declaration N characters from the tN Indent a function return type declaration N characters from the
margin. (default 'shiftwidth'). margin. (default 'shiftwidth').
@ -307,6 +343,7 @@ assume a 'shiftwidth' of 4.
int int int int int int
func() func() func() func() func() func()
< <
*cino-i*
iN Indent C++ base class declarations and constructor iN Indent C++ base class declarations and constructor
initializations, if they start in a new line (otherwise they initializations, if they start in a new line (otherwise they
are aligned at the right side of the ':'). are aligned at the right side of the ':').
@ -320,6 +357,7 @@ assume a 'shiftwidth' of 4.
BaseClass(3) BaseClass(3) BaseClass(3) BaseClass(3)
{} {} {} {}
< <
*cino-+*
+N Indent a continuation line (a line that spills onto the next) +N Indent a continuation line (a line that spills onto the next)
inside a function N additional characters. (default inside a function N additional characters. (default
'shiftwidth'). 'shiftwidth').
@ -330,6 +368,7 @@ assume a 'shiftwidth' of 4.
a = b + 9 * a = b + 9 * a = b + 9 * a = b + 9 *
c; c; c; c;
< <
*cino-c*
cN Indent comment lines after the comment opener, when there is no cN Indent comment lines after the comment opener, when there is no
other text with which to align, N characters from the comment other text with which to align, N characters from the comment
opener. (default 3). See also |format-comments|. opener. (default 3). See also |format-comments|.
@ -339,6 +378,7 @@ assume a 'shiftwidth' of 4.
text. text. text. text.
*/ */ */ */
< <
*cino-C*
CN When N is non-zero, indent comment lines by the amount specified CN When N is non-zero, indent comment lines by the amount specified
with the c flag above even if there is other text behind the with the c flag above even if there is other text behind the
comment opener. (default 0). comment opener. (default 0).
@ -349,12 +389,14 @@ assume a 'shiftwidth' of 4.
********/ ********/ ********/ ********/
< (Example uses ":set comments& comments-=s1:/* comments^=s0:/*") < (Example uses ":set comments& comments-=s1:/* comments^=s0:/*")
*cino-/*
/N Indent comment lines N characters extra. (default 0). /N Indent comment lines N characters extra. (default 0).
cino= cino=/4 > cino= cino=/4 >
a = b; a = b; a = b; a = b;
/* comment */ /* comment */ /* comment */ /* comment */
c = d; c = d; c = d; c = d;
< <
*cino-(*
(N When in unclosed parentheses, indent N characters from the line (N When in unclosed parentheses, indent N characters from the line
with the unclosed parentheses. Add a 'shiftwidth' for every with the unclosed parentheses. Add a 'shiftwidth' for every
unclosed parentheses. When N is 0 or the unclosed parentheses unclosed parentheses. When N is 0 or the unclosed parentheses
@ -370,6 +412,7 @@ assume a 'shiftwidth' of 4.
(c2 || c3)) (c2 || c3)) (c2 || c3)) (c2 || c3))
{ { { {
< <
*cino-u*
uN Same as (N, but for one level deeper. (default 'shiftwidth'). uN Same as (N, but for one level deeper. (default 'shiftwidth').
cino= cino=u2 > cino= cino=u2 >
@ -377,6 +420,7 @@ assume a 'shiftwidth' of 4.
&& (c22345 && (c22345 && (c22345 && (c22345
|| c3)) || c3)) || c3)) || c3))
< <
*cino-U*
UN When N is non-zero, do not ignore the indenting specified by UN When N is non-zero, do not ignore the indenting specified by
( or u in case that the unclosed parentheses is the first ( or u in case that the unclosed parentheses is the first
non-white character in its line. (default 0). non-white character in its line. (default 0).
@ -388,6 +432,7 @@ assume a 'shiftwidth' of 4.
c3 c3 c3 c3
) && c4; ) && c4; ) && c4; ) && c4;
< <
*cino-2*
wN When in unclosed parentheses and N is non-zero and either wN When in unclosed parentheses and N is non-zero and either
using "(0" or "u0", respectively, or using "U0" and the unclosed using "(0" or "u0", respectively, or using "U0" and the unclosed
parentheses is the first non-white character in its line, line parentheses is the first non-white character in its line, line
@ -400,6 +445,7 @@ assume a 'shiftwidth' of 4.
|| c3)) || c3)) || c3)) || c3))
foo; foo; foo; foo;
< <
*cino-W*
WN When in unclosed parentheses and N is non-zero and either WN When in unclosed parentheses and N is non-zero and either
using "(0" or "u0", respectively and the unclosed parentheses is using "(0" or "u0", respectively and the unclosed parentheses is
the last non-white character in its line and it is not the the last non-white character in its line and it is not the
@ -414,6 +460,7 @@ assume a 'shiftwidth' of 4.
a_short_line(argument, a_short_line(argument, a_short_line(argument, a_short_line(argument,
argument); argument); argument); argument);
< <
*cino-m*
mN When N is non-zero, line up a line starting with a closing mN When N is non-zero, line up a line starting with a closing
parentheses with the first character of the line with the parentheses with the first character of the line with the
matching opening parentheses. (default 0). matching opening parentheses. (default 0).
@ -428,6 +475,7 @@ assume a 'shiftwidth' of 4.
) ) ) )
foo; foo; foo; foo;
< <
*cino-M*
MN When N is non-zero, line up a line starting with a closing MN When N is non-zero, line up a line starting with a closing
parentheses with the first character of the previous line. parentheses with the first character of the previous line.
(default 0). (default 0).
@ -437,7 +485,7 @@ assume a 'shiftwidth' of 4.
cond2 cond2 cond2 cond2
) ) ) )
< <
*java-cinoptions* *java-indenting* *java-cinoptions* *java-indenting* *cino-j*
jN Indent java anonymous classes correctly. The value 'N' is jN Indent java anonymous classes correctly. The value 'N' is
currently unused but must be non-zero (e.g. 'j1'). 'j1' will currently unused but must be non-zero (e.g. 'j1'). 'j1' will
indent for example the following code snippet correctly: > indent for example the following code snippet correctly: >
@ -448,7 +496,7 @@ assume a 'shiftwidth' of 4.
} }
}); });
< <
*javascript-cinoptions* *javascript-indenting* *javascript-cinoptions* *javascript-indenting* *cino-J*
JN Indent JavaScript object declarations correctly by not confusing JN Indent JavaScript object declarations correctly by not confusing
them with labels. The value 'N' is currently unused but must be them with labels. The value 'N' is currently unused but must be
non-zero (e.g. 'J1'). > non-zero (e.g. 'J1'). >
@ -466,16 +514,19 @@ assume a 'shiftwidth' of 4.
} }
} }
< <
*cino-)*
)N Vim searches for unclosed parentheses at most N lines away. )N Vim searches for unclosed parentheses at most N lines away.
This limits the time needed to search for parentheses. (default This limits the time needed to search for parentheses. (default
20 lines). 20 lines).
*cino-star*
*N Vim searches for unclosed comments at most N lines away. This *N Vim searches for unclosed comments at most N lines away. This
limits the time needed to search for the start of a comment. limits the time needed to search for the start of a comment.
If your /* */ comments stop indenting afer N lines this is the If your /* */ comments stop indenting afer N lines this is the
value you will want to change. value you will want to change.
(default 70 lines). (default 70 lines).
*cino-#*
#N When N is non-zero recognize shell/Perl comments, starting with #N When N is non-zero recognize shell/Perl comments, starting with
'#'. Default N is zero: don't recognizes '#' comments. Note '#'. Default N is zero: don't recognizes '#' comments. Note
that lines starting with # will still be seen as preprocessor that lines starting with # will still be seen as preprocessor
@ -483,7 +534,7 @@ assume a 'shiftwidth' of 4.
The defaults, spelled out in full, are: The defaults, spelled out in full, are:
cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,ps,ts,is,+s, cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,N0,ps,ts,is,+s,
c3,C0,/0,(2s,us,U0,w0,W0,m0,j0,J0,)20,*70,#0 c3,C0,/0,(2s,us,U0,w0,W0,m0,j0,J0,)20,*70,#0
Vim puts a line in column 1 if: Vim puts a line in column 1 if:

105
src/misc1.c
View File

@ -4959,6 +4959,7 @@ static pos_T *find_match_paren __ARGS((int, int));
static int corr_ind_maxparen __ARGS((int ind_maxparen, pos_T *startpos)); static int corr_ind_maxparen __ARGS((int ind_maxparen, pos_T *startpos));
static int find_last_paren __ARGS((char_u *l, int start, int end)); static int find_last_paren __ARGS((char_u *l, int start, int end));
static int find_match __ARGS((int lookfor, linenr_T ourscope, int ind_maxparen, int ind_maxcomment)); static int find_match __ARGS((int lookfor, linenr_T ourscope, int ind_maxparen, int ind_maxcomment));
static int cin_is_cpp_namespace __ARGS((char_u *));
static int ind_hash_comment = 0; /* # starts a comment */ static int ind_hash_comment = 0; /* # starts a comment */
@ -5221,6 +5222,50 @@ cin_isscopedecl(s)
return (*(s = cin_skipcomment(s + i)) == ':' && s[1] != ':'); return (*(s = cin_skipcomment(s + i)) == ':' && s[1] != ':');
} }
/* Maximum number of lines to search back for a "namespace" line. */
#define FIND_NAMESPACE_LIM 20
/*
* Recognize a "namespace" scope declaration.
*/
static int
cin_is_cpp_namespace(s)
char_u *s;
{
char_u *p;
int has_name = FALSE;
s = cin_skipcomment(s);
if (STRNCMP(s, "namespace", 9) == 0 && (s[9] == NUL || !vim_iswordc(s[9])))
{
p = cin_skipcomment(skipwhite(s + 9));
while (*p != NUL)
{
if (vim_iswhite(*p))
{
has_name = TRUE; /* found end of a name */
p = cin_skipcomment(skipwhite(p));
}
else if (*p == '{')
{
break;
}
else if (vim_iswordc(*p))
{
if (has_name)
return FALSE; /* word character after skipping past name */
++p;
}
else
{
return FALSE;
}
}
return TRUE;
}
return FALSE;
}
/* /*
* Return a pointer to the first non-empty non-comment character after a ':'. * Return a pointer to the first non-empty non-comment character after a ':'.
* Return NULL if not found. * Return NULL if not found.
@ -6296,6 +6341,11 @@ get_c_indent()
*/ */
int ind_keep_case_label = 0; int ind_keep_case_label = 0;
/*
* handle C++ namespace
*/
int ind_cpp_namespace = 0;
pos_T cur_curpos; pos_T cur_curpos;
int amount; int amount;
int scope_amount; int scope_amount;
@ -6336,6 +6386,7 @@ get_c_indent()
int n; int n;
int iscase; int iscase;
int lookfor_break; int lookfor_break;
int lookfor_cpp_namespace = FALSE;
int cont_amount = 0; /* amount for continuation line */ int cont_amount = 0; /* amount for continuation line */
int original_line_islabel; int original_line_islabel;
@ -6409,6 +6460,7 @@ get_c_indent()
case 'J': ind_js = n; break; case 'J': ind_js = n; break;
case 'l': ind_keep_case_label = n; break; case 'l': ind_keep_case_label = n; break;
case '#': ind_hash_comment = n; break; case '#': ind_hash_comment = n; break;
case 'N': ind_cpp_namespace = n; break;
} }
if (*options == ',') if (*options == ',')
++options; ++options;
@ -6976,11 +7028,24 @@ get_c_indent()
if (start_brace == BRACE_IN_COL0) /* '{' is in column 0 */ if (start_brace == BRACE_IN_COL0) /* '{' is in column 0 */
{ {
amount = ind_open_left_imag; amount = ind_open_left_imag;
lookfor_cpp_namespace = TRUE;
}
else if (start_brace == BRACE_AT_START &&
lookfor_cpp_namespace) /* '{' is at start */
{
lookfor_cpp_namespace = TRUE;
} }
else else
{ {
if (start_brace == BRACE_AT_END) /* '{' is at end of line */ if (start_brace == BRACE_AT_END) /* '{' is at end of line */
{
amount += ind_open_imag; amount += ind_open_imag;
l = skipwhite(ml_get_curline());
if (cin_is_cpp_namespace(l))
amount += ind_cpp_namespace;
}
else else
{ {
/* Compensate for adding ind_open_extra later. */ /* Compensate for adding ind_open_extra later. */
@ -7151,6 +7216,46 @@ get_c_indent()
else else
amount += ind_continuation; amount += ind_continuation;
} }
else if (lookfor_cpp_namespace)
{
if (curwin->w_cursor.lnum == ourscope)
continue;
if (curwin->w_cursor.lnum == 0
|| curwin->w_cursor.lnum
< ourscope - FIND_NAMESPACE_LIM)
break;
l = ml_get_curline();
/*
* If we're in a comment now, skip to the start of the
* comment.
*/
trypos = find_start_comment(ind_maxcomment);
if (trypos != NULL)
{
curwin->w_cursor.lnum = trypos->lnum + 1;
curwin->w_cursor.col = 0;
continue;
}
/*
* Skip preprocessor directives and blank lines.
*/
if (cin_ispreproc_cont(&l, &curwin->w_cursor.lnum))
continue;
if (cin_is_cpp_namespace(l))
{
amount += ind_cpp_namespace;
break;
}
if (cin_nocode(l))
continue;
}
else if (lookfor != LOOKFOR_TERM else if (lookfor != LOOKFOR_TERM
&& lookfor != LOOKFOR_CPP_BASECLASS) && lookfor != LOOKFOR_CPP_BASECLASS)
{ {

133
src/testdir/test3.in
View File

@ -799,6 +799,69 @@ main()
df */ df */
hello hello
} }
/* valid namespaces with normal indent */
namespace
{
{
111111111111;
}
}
namespace /* test */
{
11111111111111111;
}
namespace // test
{
111111111111111111;
}
namespace
{
111111111111111111;
}
namespace test
{
111111111111111111;
}
namespace{
111111111111111111;
}
namespace test{
111111111111111111;
}
namespace {
111111111111111111;
}
namespace test {
111111111111111111;
namespace test2 {
22222222222222222;
}
}
/* invalid namespaces use block indent */
namespace test test2 {
111111111111111111111;
}
namespace11111111111 {
111111111111;
}
namespace() {
1111111111111;
}
namespace()
{
111111111111111111;
}
namespace test test2
{
1111111111111111111;
}
namespace111111111
{
111111111111111111;
}
/* end of AUTO */ /* end of AUTO */
STARTTEST STARTTEST
@ -1427,6 +1490,76 @@ void func(void)
baz(); baz();
} }
STARTTEST
:set cino=N-s
/namespaces
=/^NAMESPACEEND
ENDTEST
/* valid namespaces with normal indent */
namespace
{
{
111111111111;
}
}
namespace /* test */
{
11111111111111111;
}
namespace // test
{
111111111111111111;
}
namespace
{
111111111111111111;
}
namespace test
{
111111111111111111;
}
namespace{
111111111111111111;
}
namespace test{
111111111111111111;
}
namespace {
111111111111111111;
}
namespace test {
111111111111111111;
namespace test2 {
22222222222222222;
}
}
/* invalid namespaces use block indent */
namespace test test2 {
111111111111111111111;
}
namespace11111111111 {
111111111111;
}
namespace() {
1111111111111;
}
namespace()
{
111111111111111111;
}
namespace test test2
{
1111111111111111111;
}
namespace111111111
{
111111111111111111;
}
NAMESPACEEND
STARTTEST STARTTEST
:g/^STARTTEST/.,/^ENDTEST/d :g/^STARTTEST/.,/^ENDTEST/d
:1;/start of AUTO/,$wq! test.out :1;/start of AUTO/,$wq! test.out

128
src/testdir/test3.ok
View File

@ -787,6 +787,69 @@ main()
df */ df */
hello hello
} }
/* valid namespaces with normal indent */
namespace
{
{
111111111111;
}
}
namespace /* test */
{
11111111111111111;
}
namespace // test
{
111111111111111111;
}
namespace
{
111111111111111111;
}
namespace test
{
111111111111111111;
}
namespace{
111111111111111111;
}
namespace test{
111111111111111111;
}
namespace {
111111111111111111;
}
namespace test {
111111111111111111;
namespace test2 {
22222222222222222;
}
}
/* invalid namespaces use block indent */
namespace test test2 {
111111111111111111111;
}
namespace11111111111 {
111111111111;
}
namespace() {
1111111111111;
}
namespace()
{
111111111111111111;
}
namespace test test2
{
1111111111111111111;
}
namespace111111111
{
111111111111111111;
}
/* end of AUTO */ /* end of AUTO */
@ -1273,3 +1336,68 @@ void func(void)
baz(); baz();
} }
/* valid namespaces with normal indent */
namespace
{
{
111111111111;
}
}
namespace /* test */
{
11111111111111111;
}
namespace // test
{
111111111111111111;
}
namespace
{
111111111111111111;
}
namespace test
{
111111111111111111;
}
namespace{
111111111111111111;
}
namespace test{
111111111111111111;
}
namespace {
111111111111111111;
}
namespace test {
111111111111111111;
namespace test2 {
22222222222222222;
}
}
/* invalid namespaces use block indent */
namespace test test2 {
111111111111111111111;
}
namespace11111111111 {
111111111111;
}
namespace() {
1111111111111;
}
namespace()
{
111111111111111111;
}
namespace test test2
{
1111111111111111111;
}
namespace111111111
{
111111111111111111;
}
NAMESPACEEND

2
src/version.c
View File

@ -709,6 +709,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
202,
/**/ /**/
201, 201,
/**/ /**/