# HG changeset patch # User Bram Moolenaar # Date 1549309506 -3600 # Node ID d2f0154a44f5be9370805e8379a76dcf14c096dd # Parent 38453306ed052b22f933c7dfeb45d8255123cd8c patch 8.1.0874: using old style comments in new file commit https://github.com/vim/vim/commit/9c46efd7dc57c1a8eae5137d05c7e67c4f82c3d7 Author: Bram Moolenaar Date: Mon Feb 4 20:30:18 2019 +0100 patch 8.1.0874: using old style comments in new file Problem: Using old style comments in new file. Solution: Convert to // comments in new file. (Yegappan Lakshmanan) diff --git a/src/indent.c b/src/indent.c --- a/src/indent.c +++ b/src/indent.c @@ -59,13 +59,13 @@ static pos_T *find_start_rawstring(int i * Return NULL when not inside a comment. */ static pos_T * -ind_find_start_comment(void) /* XXX */ +ind_find_start_comment(void) // XXX { return find_start_comment(curbuf->b_ind_maxcomment); } pos_T * -find_start_comment(int ind_maxcomment) /* XXX */ +find_start_comment(int ind_maxcomment) // XXX { pos_T *pos; char_u *line; @@ -78,10 +78,8 @@ find_start_comment(int ind_maxcomment) / if (pos == NULL) break; - /* - * Check if the comment start we found is inside a string. - * If it is then restrict the search to below this line and try again. - */ + // Check if the comment start we found is inside a string. + // If it is then restrict the search to below this line and try again. line = ml_get(pos->lnum); for (p = line; *p && (colnr_T)(p - line) < pos->col; ++p) p = skip_string(p); @@ -106,7 +104,7 @@ find_start_comment(int ind_maxcomment) / * "CORS" -> Comment Or Raw String */ static pos_T * -ind_find_start_CORS(linenr_T *is_raw) /* XXX */ +ind_find_start_CORS(linenr_T *is_raw) // XXX { static pos_T comment_pos_copy; pos_T *comment_pos; @@ -115,15 +113,15 @@ ind_find_start_CORS(linenr_T *is_raw) comment_pos = find_start_comment(curbuf->b_ind_maxcomment); if (comment_pos != NULL) { - /* Need to make a copy of the static pos in findmatchlimit(), - * calling find_start_rawstring() may change it. */ + // Need to make a copy of the static pos in findmatchlimit(), + // calling find_start_rawstring() may change it. comment_pos_copy = *comment_pos; comment_pos = &comment_pos_copy; } rs_pos = find_start_rawstring(curbuf->b_ind_maxcomment); - /* If comment_pos is before rs_pos the raw string is inside the comment. - * If rs_pos is before comment_pos the comment is inside the raw string. */ + // If comment_pos is before rs_pos the raw string is inside the comment. + // If rs_pos is before comment_pos the comment is inside the raw string. if (comment_pos == NULL || (rs_pos != NULL && LT_POS(*rs_pos, *comment_pos))) { @@ -140,7 +138,7 @@ ind_find_start_CORS(linenr_T *is_raw) * Return NULL when not inside a raw string. */ static pos_T * -find_start_rawstring(int ind_maxcomment) /* XXX */ +find_start_rawstring(int ind_maxcomment) // XXX { pos_T *pos; char_u *line; @@ -153,10 +151,8 @@ find_start_rawstring(int ind_maxcomment) if (pos == NULL) break; - /* - * Check if the raw string start we found is inside a string. - * If it is then restrict the search to below this line and try again. - */ + // Check if the raw string start we found is inside a string. + // If it is then restrict the search to below this line and try again. line = ml_get(pos->lnum); for (p = line; *p && (colnr_T)(p - line) < pos->col; ++p) p = skip_string(p); @@ -181,43 +177,41 @@ skip_string(char_u *p) { int i; - /* - * We loop, because strings may be concatenated: "date""time". - */ + // We loop, because strings may be concatenated: "date""time". for ( ; ; ++p) { - if (p[0] == '\'') /* 'c' or '\n' or '\000' */ + if (p[0] == '\'') // 'c' or '\n' or '\000' { - if (!p[1]) /* ' at end of line */ + if (!p[1]) // ' at end of line break; i = 2; - if (p[1] == '\\') /* '\n' or '\000' */ + if (p[1] == '\\') // '\n' or '\000' { ++i; - while (vim_isdigit(p[i - 1])) /* '\000' */ + while (vim_isdigit(p[i - 1])) // '\000' ++i; } - if (p[i] == '\'') /* check for trailing ' */ + if (p[i] == '\'') // check for trailing ' { p += i; continue; } } - else if (p[0] == '"') /* start of string */ + else if (p[0] == '"') // start of string { for (++p; p[0]; ++p) { if (p[0] == '\\' && p[1] != NUL) ++p; - else if (p[0] == '"') /* end of string */ + else if (p[0] == '"') // end of string break; } if (p[0] == '"') - continue; /* continue for another string */ + continue; // continue for another string } else if (p[0] == 'R' && p[1] == '"') { - /* Raw string: R"[delim](...)[delim]" */ + // Raw string: R"[delim](...)[delim]" char_u *delim = p + 2; char_u *paren = vim_strchr(delim, '('); @@ -233,16 +227,16 @@ skip_string(char_u *p) break; } if (p[0] == '"') - continue; /* continue for another string */ + continue; // continue for another string } } - break; /* no string found */ + break; // no string found } if (!*p) - --p; /* backup from NUL */ + --p; // backup from NUL return p; } -#endif /* FEAT_CINDENT || FEAT_SYN_HL */ +#endif // FEAT_CINDENT || FEAT_SYN_HL #if defined(FEAT_CINDENT) || defined(PROTO) @@ -259,7 +253,7 @@ cindent_on(void) )); } -/* Find result cache for cpp_baseclass */ +// Find result cache for cpp_baseclass typedef struct { int found; lpos_T lpos; @@ -299,8 +293,8 @@ cin_skipcomment(char_u *s) s = skipwhite(s); - /* Perl/shell # comment comment continues until eol. Require a space - * before # to avoid recognizing $#array. */ + // Perl/shell # comment comment continues until eol. Require a space + // before # to avoid recognizing $#array. if (curbuf->b_ind_hash_comment != 0 && s != prev_s && *s == '#') { s += STRLEN(s); @@ -309,14 +303,14 @@ cin_skipcomment(char_u *s) if (*s != '/') break; ++s; - if (*s == '/') /* slash-slash comment continues till eol */ + if (*s == '/') // slash-slash comment continues till eol { s += STRLEN(s); break; } if (*s != '*') break; - for (++s; *s; ++s) /* skip slash-star comment */ + for (++s; *s; ++s) // skip slash-star comment if (s[0] == '*' && s[1] == '/') { s += 2; @@ -340,7 +334,7 @@ cin_nocode(char_u *s) * Check previous lines for a "//" line comment, skipping over blank lines. */ static pos_T * -find_line_comment(void) /* XXX */ +find_line_comment(void) // XXX { static pos_T pos; char_u *line; @@ -373,11 +367,11 @@ cin_has_js_key(char_u *text) if (*s == '\'' || *s == '"') { - /* can be 'key': or "key": */ + // can be 'key': or "key": quote = *s; ++s; } - if (!vim_isIDc(*s)) /* need at least one ID character */ + if (!vim_isIDc(*s)) // need at least one ID character return FALSE; while (vim_isIDc(*s)) @@ -387,7 +381,7 @@ cin_has_js_key(char_u *text) s = cin_skipcomment(s); - /* "::" is not a label, it's C++ */ + // "::" is not a label, it's C++ return (*s == ':' && s[1] != ':'); } @@ -398,7 +392,7 @@ cin_has_js_key(char_u *text) static int cin_islabel_skip(char_u **s) { - if (!vim_isIDc(**s)) /* need at least one ID character */ + if (!vim_isIDc(**s)) // need at least one ID character return FALSE; while (vim_isIDc(**s)) @@ -406,7 +400,7 @@ cin_islabel_skip(char_u **s) *s = cin_skipcomment(*s); - /* "::" is not a label, it's C++ */ + // "::" is not a label, it's C++ return (**s == ':' && *++*s != ':'); } @@ -415,16 +409,14 @@ cin_islabel_skip(char_u **s) * Note: curwin->w_cursor must be where we are looking for the label. */ int -cin_islabel(void) /* XXX */ +cin_islabel(void) // XXX { char_u *s; s = cin_skipcomment(ml_get_curline()); - /* - * Exclude "default" from labels, since it should be indented - * like a switch label. Same for C++ scope declarations. - */ + // Exclude "default" from labels, since it should be indented + // like a switch label. Same for C++ scope declarations. if (cin_isdefault(s)) return FALSE; if (cin_isscopedecl(s)) @@ -432,10 +424,8 @@ cin_islabel(void) /* XXX */ if (cin_islabel_skip(&s)) { - /* - * Only accept a label if the previous line is terminated or is a case - * label. - */ + // Only accept a label if the previous line is terminated or is a case + // label. pos_T cursor_save; pos_T *trypos; char_u *line; @@ -445,16 +435,14 @@ cin_islabel(void) /* XXX */ { --curwin->w_cursor.lnum; - /* - * If we're in a comment or raw string now, skip to the start of - * it. - */ + // If we're in a comment or raw string now, skip to the start of + // it. curwin->w_cursor.col = 0; - if ((trypos = ind_find_start_CORS(NULL)) != NULL) /* XXX */ + if ((trypos = ind_find_start_CORS(NULL)) != NULL) // XXX curwin->w_cursor = *trypos; line = ml_get_curline(); - if (cin_ispreproc(line)) /* ignore #defines, #if, etc. */ + if (cin_ispreproc(line)) // ignore #defines, #if, etc. continue; if (*(line = cin_skipcomment(line)) == NUL) continue; @@ -468,7 +456,7 @@ cin_islabel(void) /* XXX */ return FALSE; } curwin->w_cursor = cursor_save; - return TRUE; /* label at start of file??? */ + return TRUE; // label at start of file??? } return FALSE; } @@ -522,7 +510,7 @@ cin_isinit(void) int cin_iscase( char_u *s, - int strict) /* Allow relaxed check of case statement for JS */ + int strict) // Allow relaxed check of case statement for JS { s = cin_skipcomment(s); if (cin_starts_with(s, "case")) @@ -532,20 +520,20 @@ cin_iscase( s = cin_skipcomment(s); if (*s == ':') { - if (s[1] == ':') /* skip over "::" for C++ */ + if (s[1] == ':') // skip over "::" for C++ ++s; else return TRUE; } if (*s == '\'' && s[1] && s[2] == '\'') - s += 2; /* skip over ':' */ + s += 2; // skip over ':' else if (*s == '/' && (s[1] == '*' || s[1] == '/')) - return FALSE; /* stop at comment */ + return FALSE; // stop at comment else if (*s == '"') { - /* JS etc. */ + // JS etc. if (strict) - return FALSE; /* stop at string */ + return FALSE; // stop at string else return TRUE; } @@ -589,7 +577,7 @@ cin_isscopedecl(char_u *s) return (*(s = cin_skipcomment(s + i)) == ':' && s[1] != ':'); } -/* Maximum number of lines to search back for a "namespace" line. */ +// Maximum number of lines to search back for a "namespace" line. #define FIND_NAMESPACE_LIM 20 /* @@ -610,7 +598,7 @@ cin_is_cpp_namespace(char_u *s) { if (VIM_ISWHITE(*p)) { - has_name = TRUE; /* found end of a name */ + has_name = TRUE; // found end of a name p = cin_skipcomment(skipwhite(p)); } else if (*p == '{') @@ -621,14 +609,14 @@ cin_is_cpp_namespace(char_u *s) { has_name_start = TRUE; if (has_name) - return FALSE; /* word character after skipping past name */ + return FALSE; // word character after skipping past name ++p; } else if (p[0] == ':' && p[1] == ':' && vim_iswordc(p[2])) { if (!has_name_start || has_name) return FALSE; - /* C++ 17 nested namespace */ + // C++ 17 nested namespace p += 3; } else @@ -702,13 +690,13 @@ after_label(char_u *l) { if (*l == ':') { - if (l[1] == ':') /* skip over "::" for C++ */ + if (l[1] == ':') // skip over "::" for C++ ++l; else if (!cin_iscase(l + 1, FALSE)) break; } else if (*l == '\'' && l[1] && l[2] == '\'') - l += 2; /* skip over 'x' */ + l += 2; // skip over 'x' } if (*l == NUL) return NULL; @@ -723,7 +711,7 @@ after_label(char_u *l) * Return 0 if there is nothing after the label. */ static int -get_indent_nolabel (linenr_T lnum) /* XXX */ +get_indent_nolabel (linenr_T lnum) // XXX { char_u *l; pos_T fp; @@ -757,12 +745,12 @@ skip_label(linenr_T lnum, char_u **pp) cursor_save = curwin->w_cursor; curwin->w_cursor.lnum = lnum; l = ml_get_curline(); - /* XXX */ + // XXX if (cin_iscase(l, FALSE) || cin_isscopedecl(l) || cin_islabel()) { amount = get_indent_nolabel(lnum); l = after_label(ml_get_curline()); - if (l == NULL) /* just in case */ + if (l == NULL) // just in case l = ml_get_curline(); } else @@ -852,7 +840,7 @@ cin_get_equal_amount(linenr_T lnum) line = s = ml_get(lnum); while (*s != NUL && vim_strchr((char_u *)"=;{}\"'", *s) == NULL) { - if (cin_iscomment(s)) /* ignore comments */ + if (cin_iscomment(s)) // ignore comments s = cin_skipcomment(s); else ++s; @@ -864,7 +852,7 @@ cin_get_equal_amount(linenr_T lnum) if (cin_nocode(s)) return 0; - if (*s == '"') /* nice alignment for continued strings */ + if (*s == '"') // nice alignment for continued strings ++s; fp.lnum = lnum; @@ -953,8 +941,8 @@ cin_islinecomment(char_u *p) static int cin_isterminated( char_u *s, - int incl_open, /* include '{' at the end as terminator */ - int incl_comma) /* recognize a trailing comma */ + int incl_open, // include '{' at the end as terminator + int incl_comma) // recognize a trailing comma { char_u found_start = 0; unsigned n_open = 0; @@ -970,7 +958,7 @@ cin_isterminated( while (*s) { - /* skip over comments, "" strings and 'c'haracters */ + // skip over comments, "" strings and 'c'haracters s = skip_string(cin_skipcomment(s)); if (*s == '}' && n_open > 0) --n_open; @@ -1035,38 +1023,38 @@ cin_isfuncdecl( } curwin->w_cursor.lnum = save_lnum; - /* Ignore line starting with #. */ + // Ignore line starting with #. if (cin_ispreproc(s)) return FALSE; while (*s && *s != '(' && *s != ';' && *s != '\'' && *s != '"') { - if (cin_iscomment(s)) /* ignore comments */ + if (cin_iscomment(s)) // ignore comments s = cin_skipcomment(s); else if (*s == ':') { if (*(s + 1) == ':') s += 2; else - /* To avoid a mistake in the following situation: - * A::A(int a, int b) - * : a(0) // <--not a function decl - * , b(0) - * {... - */ + // To avoid a mistake in the following situation: + // A::A(int a, int b) + // : a(0) // <--not a function decl + // , b(0) + // {... return FALSE; } else ++s; } if (*s != '(') - return FALSE; /* ';', ' or " before any () or no '(' */ + return FALSE; // ';', ' or " before any () or no '(' while (*s && *s != ';' && *s != '\'' && *s != '"') { if (*s == ')' && cin_nocode(s + 1)) { - /* ')' at the end: may have found a match + /* + * ')' at the end: may have found a match * Check for he previous line not to end in a backslash: * #if defined(x) && \ * defined(y) @@ -1081,10 +1069,10 @@ cin_isfuncdecl( { int comma = (*s == ','); - /* ',' at the end: continue looking in the next line. - * At the end: check for ',' in the next line, for this style: - * func(arg1 - * , arg2) */ + // ',' at the end: continue looking in the next line. + // At the end: check for ',' in the next line, for this style: + // func(arg1 + // , arg2) for (;;) { if (lnum >= curbuf->b_ml.ml_line_count) @@ -1095,14 +1083,14 @@ cin_isfuncdecl( } if (lnum >= curbuf->b_ml.ml_line_count) break; - /* Require a comma at end of the line or a comma or ')' at the - * start of next line. */ + // Require a comma at end of the line or a comma or ')' at the + // start of next line. s = skipwhite(s); if (!just_started && (!comma && *s != ',' && *s != ')')) break; just_started = FALSE; } - else if (cin_iscomment(s)) /* ignore comments */ + else if (cin_iscomment(s)) // ignore comments s = cin_skipcomment(s); else { @@ -1128,7 +1116,7 @@ cin_isif(char_u *p) cin_iselse( char_u *p) { - if (*p == '}') /* accept "} else" */ + if (*p == '}') // accept "} else" p = cin_skipcomment(p + 1); return (STRNCMP(p, "else", 4) == 0 && !vim_isIDc(p[4])); } @@ -1145,14 +1133,14 @@ cin_isdo(char_u *p) * ')' and ';'. The condition may be spread over several lines. */ static int -cin_iswhileofdo (char_u *p, linenr_T lnum) /* XXX */ +cin_iswhileofdo (char_u *p, linenr_T lnum) // XXX { pos_T cursor_save; pos_T *trypos; int retval = FALSE; p = cin_skipcomment(p); - if (*p == '}') /* accept "} while (cond);" */ + if (*p == '}') // accept "} while (cond);" p = cin_skipcomment(p + 1); if (cin_starts_with(p, "while")) { @@ -1160,7 +1148,7 @@ cin_iswhileofdo (char_u *p, linenr_T lnu curwin->w_cursor.lnum = lnum; curwin->w_cursor.col = 0; p = ml_get_curline(); - while (*p && *p != 'w') /* skip any '}', until the 'w' of the "while" */ + while (*p && *p != 'w') // skip any '}', until the 'w' of the "while" { ++p; ++curwin->w_cursor.col; @@ -1235,7 +1223,7 @@ cin_iswhileofdo_end(int terminated) pos_T *trypos; int i; - if (terminated != ';') /* there must be a ';' at the end */ + if (terminated != ';') // there must be a ';' at the end return FALSE; p = line = ml_get_curline(); @@ -1247,15 +1235,15 @@ cin_iswhileofdo_end(int terminated) s = skipwhite(p + 1); if (*s == ';' && cin_nocode(s + 1)) { - /* Found ");" at end of the line, now check there is "while" - * before the matching '('. XXX */ + // Found ");" at end of the line, now check there is "while" + // before the matching '('. XXX i = (int)(p - line); curwin->w_cursor.col = i; trypos = find_match_paren(curbuf->b_ind_maxparen); if (trypos != NULL) { s = cin_skipcomment(ml_get(trypos->lnum)); - if (*s == '}') /* accept "} while (cond);" */ + if (*s == '}') // accept "} while (cond);" s = cin_skipcomment(s + 1); if (cin_starts_with(s, "while")) { @@ -1264,7 +1252,7 @@ cin_iswhileofdo_end(int terminated) } } - /* Searching may have made "line" invalid, get it again. */ + // Searching may have made "line" invalid, get it again. line = ml_get_curline(); p = line + i; } @@ -1296,21 +1284,21 @@ cin_isbreak(char_u *p) */ static int cin_is_cpp_baseclass( - cpp_baseclass_cache_T *cached) /* input and output */ + cpp_baseclass_cache_T *cached) // input and output { - lpos_T *pos = &cached->lpos; /* find position */ + lpos_T *pos = &cached->lpos; // find position char_u *s; int class_or_struct, lookfor_ctor_init, cpp_base_class; linenr_T lnum = curwin->w_cursor.lnum; char_u *line = ml_get_curline(); if (pos->lnum <= lnum) - return cached->found; /* Use the cached result */ + return cached->found; // Use the cached result pos->col = 0; s = skipwhite(line); - if (*s == '#') /* skip #define FOO x ? (x) : x */ + if (*s == '#') // skip #define FOO x ? (x) : x return FALSE; s = cin_skipcomment(s); if (*s == NUL) @@ -1318,19 +1306,18 @@ cin_is_cpp_baseclass( cpp_base_class = lookfor_ctor_init = class_or_struct = FALSE; - /* Search for a line starting with '#', empty, ending in ';' or containing - * '{' or '}' and start below it. This handles the following situations: - * a = cond ? - * func() : - * asdf; - * func::foo() - * : something - * {} - * Foo::Foo (int one, int two) - * : something(4), - * somethingelse(3) - * {} - */ + // Search for a line starting with '#', empty, ending in ';' or containing + // '{' or '}' and start below it. This handles the following situations: + // a = cond ? + // func() : + // asdf; + // func::foo() + // : something + // {} + // Foo::Foo (int one, int two) + // : something(4), + // somethingelse(3) + // {} while (lnum > 1) { line = ml_get(lnum - 1); @@ -1360,13 +1347,13 @@ cin_is_cpp_baseclass( { if (lnum == curwin->w_cursor.lnum) break; - /* Continue in the cursor line. */ + // Continue in the cursor line. line = ml_get(++lnum); s = line; } if (s == line) { - /* don't recognize "case (foo):" as a baseclass */ + // don't recognize "case (foo):" as a baseclass if (cin_iscase(s, FALSE)) break; s = cin_skipcomment(line); @@ -1380,15 +1367,15 @@ cin_is_cpp_baseclass( { if (s[1] == ':') { - /* skip double colon. It can't be a constructor - * initialization any more */ + // skip double colon. It can't be a constructor + // initialization any more lookfor_ctor_init = FALSE; s = cin_skipcomment(s + 2); } else if (lookfor_ctor_init || class_or_struct) { - /* we have something found, that looks like the start of - * cpp-base-class-declaration or constructor-initialization */ + // we have something found, that looks like the start of + // cpp-base-class-declaration or constructor-initialization cpp_base_class = TRUE; lookfor_ctor_init = class_or_struct = FALSE; pos->col = 0; @@ -1416,33 +1403,33 @@ cin_is_cpp_baseclass( } else if (s[0] == ')') { - /* Constructor-initialization is assumed if we come across - * something like "):" */ + // Constructor-initialization is assumed if we come across + // something like "):" class_or_struct = FALSE; lookfor_ctor_init = TRUE; } else if (s[0] == '?') { - /* Avoid seeing '() :' after '?' as constructor init. */ + // Avoid seeing '() :' after '?' as constructor init. return FALSE; } else if (!vim_isIDc(s[0])) { - /* if it is not an identifier, we are wrong */ + // if it is not an identifier, we are wrong class_or_struct = FALSE; lookfor_ctor_init = FALSE; } else if (pos->col == 0) { - /* it can't be a constructor-initialization any more */ + // it can't be a constructor-initialization any more lookfor_ctor_init = FALSE; - /* the first statement starts here: lineup with this one... */ + // the first statement starts here: lineup with this one... if (cpp_base_class) pos->col = (colnr_T)(s - line); } - /* When the line ends in a comma don't align with it. */ + // When the line ends in a comma don't align with it. if (lnum == curwin->w_cursor.lnum && *s == ',' && cin_nocode(s + 1)) pos->col = 0; @@ -1468,7 +1455,7 @@ get_baseclass_amount(int col) amount = get_indent(); if (find_last_paren(ml_get_curline(), '(', ')') && (trypos = find_match_paren(curbuf->b_ind_maxparen)) != NULL) - amount = get_indent_lnum(trypos->lnum); /* XXX */ + amount = get_indent_lnum(trypos->lnum); // XXX if (!cin_ends_in(ml_get_curline(), (char_u *)",", NULL)) amount += curbuf->b_ind_cpp_baseclass; } @@ -1555,13 +1542,14 @@ cin_skip2pos(pos_T *trypos) * Find the '{' at the start of the block we are in. * Return NULL if no match found. * Ignore a '{' that is in a comment, makes indenting the next three lines - * work. */ + * work. + */ /* foo() */ /* { */ /* } */ static pos_T * -find_start_brace(void) /* XXX */ +find_start_brace(void) // XXX { pos_T cursor_save; pos_T *trypos; @@ -1571,13 +1559,13 @@ find_start_brace(void) /* XXX */ cursor_save = curwin->w_cursor; while ((trypos = findmatchlimit(NULL, '{', FM_BLOCKSTOP, 0)) != NULL) { - pos_copy = *trypos; /* copy pos_T, next findmatch will change it */ + pos_copy = *trypos; // copy pos_T, next findmatch will change it trypos = &pos_copy; curwin->w_cursor = *trypos; pos = NULL; - /* ignore the { if it's in a // or / * * / comment */ + // ignore the { if it's in a // or / * * / comment if ((colnr_T)cin_skip2pos(trypos) == trypos->col - && (pos = ind_find_start_CORS(NULL)) == NULL) /* XXX */ + && (pos = ind_find_start_CORS(NULL)) == NULL) // XXX break; if (pos != NULL) curwin->w_cursor.lnum = pos->lnum; @@ -1591,13 +1579,13 @@ find_start_brace(void) /* XXX */ * Return NULL if no match found. */ static pos_T * -find_match_paren(int ind_maxparen) /* XXX */ +find_match_paren(int ind_maxparen) // XXX { return find_match_char('(', ind_maxparen); } static pos_T * -find_match_char(int c, int ind_maxparen) /* XXX */ +find_match_char(int c, int ind_maxparen) // XXX { pos_T cursor_save; pos_T *trypos; @@ -1609,14 +1597,14 @@ find_match_char(int c, int ind_maxparen) retry: if ((trypos = findmatchlimit(NULL, c, 0, ind_maxp_wk)) != NULL) { - /* check if the ( is in a // comment */ + // check if the ( is in a // comment if ((colnr_T)cin_skip2pos(trypos) > trypos->col) { ind_maxp_wk = ind_maxparen - (int)(cursor_save.lnum - trypos->lnum); if (ind_maxp_wk > 0) { curwin->w_cursor = *trypos; - curwin->w_cursor.col = 0; /* XXX */ + curwin->w_cursor.col = 0; // XXX goto retry; } trypos = NULL; @@ -1625,10 +1613,10 @@ retry: { pos_T *trypos_wk; - pos_copy = *trypos; /* copy trypos, findmatch will change it */ + pos_copy = *trypos; // copy trypos, findmatch will change it trypos = &pos_copy; curwin->w_cursor = *trypos; - if ((trypos_wk = ind_find_start_CORS(NULL)) != NULL) /* XXX */ + if ((trypos_wk = ind_find_start_CORS(NULL)) != NULL) // XXX { ind_maxp_wk = ind_maxparen - (int)(cursor_save.lnum - trypos_wk->lnum); @@ -1651,7 +1639,7 @@ retry: * Return NULL if no match found. */ static pos_T * -find_match_paren_after_brace (int ind_maxparen) /* XXX */ +find_match_paren_after_brace (int ind_maxparen) // XXX { pos_T *trypos = find_match_paren(ind_maxparen); @@ -1659,8 +1647,8 @@ find_match_paren_after_brace (int ind_ma { pos_T *tryposBrace = find_start_brace(); - /* If both an unmatched '(' and '{' is found. Ignore the '(' - * position if the '{' is further down. */ + // If both an unmatched '(' and '{' is found. Ignore the '(' + // position if the '{' is further down. if (tryposBrace != NULL && (trypos->lnum != tryposBrace->lnum ? trypos->lnum < tryposBrace->lnum @@ -1697,12 +1685,12 @@ find_last_paren(char_u *l, int start, in int retval = FALSE; int open_count = 0; - curwin->w_cursor.col = 0; /* default is start of line */ + curwin->w_cursor.col = 0; // default is start of line for (i = 0; l[i] != NUL; i++) { - i = (int)(cin_skipcomment(l + i) - l); /* ignore parens in comments */ - i = (int)(skip_string(l + i) - l); /* ignore parens in quotes */ + i = (int)(cin_skipcomment(l + i) - l); // ignore parens in comments + i = (int)(skip_string(l + i) - l); // ignore parens in quotes if (l[i] == start) ++open_count; else if (l[i] == end) @@ -1734,134 +1722,133 @@ parse_cino(buf_T *buf) int fraction = 0; int sw = (int)get_sw_value(buf); - /* - * Set the default values. - */ - /* Spaces from a block's opening brace the prevailing indent for that - * block should be. */ + // Set the default values. + + // Spaces from a block's opening brace the prevailing indent for that + // block should be. buf->b_ind_level = sw; - /* Spaces from the edge of the line an open brace that's at the end of a - * line is imagined to be. */ + // Spaces from the edge of the line an open brace that's at the end of a + // line is imagined to be. buf->b_ind_open_imag = 0; - /* Spaces from the prevailing indent for a line that is not preceded by - * an opening brace. */ + // Spaces from the prevailing indent for a line that is not preceded by + // an opening brace. buf->b_ind_no_brace = 0; - /* Column where the first { of a function should be located }. */ + // Column where the first { of a function should be located }. buf->b_ind_first_open = 0; - /* Spaces from the prevailing indent a leftmost open brace should be - * located. */ + // Spaces from the prevailing indent a leftmost open brace should be + // located. buf->b_ind_open_extra = 0; - /* Spaces from the matching open brace (real location for one at the left - * edge; imaginary location from one that ends a line) the matching close - * brace should be located. */ + // Spaces from the matching open brace (real location for one at the left + // edge; imaginary location from one that ends a line) the matching close + // brace should be located. buf->b_ind_close_extra = 0; - /* Spaces from the edge of the line an open brace sitting in the leftmost - * column is imagined to be. */ + // Spaces from the edge of the line an open brace sitting in the leftmost + // column is imagined to be. buf->b_ind_open_left_imag = 0; - /* Spaces jump labels should be shifted to the left if N is non-negative, - * otherwise the jump label will be put to column 1. */ + // Spaces jump labels should be shifted to the left if N is non-negative, + // otherwise the jump label will be put to column 1. buf->b_ind_jump_label = -1; - /* Spaces from the switch() indent a "case xx" label should be located. */ + // Spaces from the switch() indent a "case xx" label should be located. buf->b_ind_case = sw; - /* Spaces from the "case xx:" code after a switch() should be located. */ + // Spaces from the "case xx:" code after a switch() should be located. buf->b_ind_case_code = sw; - /* Lineup break at end of case in switch() with case label. */ + // Lineup break at end of case in switch() with case label. buf->b_ind_case_break = 0; - /* Spaces from the class declaration indent a scope declaration label - * should be located. */ + // Spaces from the class declaration indent a scope declaration label + // should be located. buf->b_ind_scopedecl = sw; - /* Spaces from the scope declaration label code should be located. */ + // Spaces from the scope declaration label code should be located. buf->b_ind_scopedecl_code = sw; - /* Amount K&R-style parameters should be indented. */ + // Amount K&R-style parameters should be indented. buf->b_ind_param = sw; - /* Amount a function type spec should be indented. */ + // Amount a function type spec should be indented. buf->b_ind_func_type = sw; - /* Amount a cpp base class declaration or constructor initialization - * should be indented. */ + // Amount a cpp base class declaration or constructor initialization + // should be indented. buf->b_ind_cpp_baseclass = sw; - /* additional spaces beyond the prevailing indent a continuation line - * should be located. */ + // additional spaces beyond the prevailing indent a continuation line + // should be located. buf->b_ind_continuation = sw; - /* Spaces from the indent of the line with an unclosed parentheses. */ + // Spaces from the indent of the line with an unclosed parentheses. buf->b_ind_unclosed = sw * 2; - /* Spaces from the indent of the line with an unclosed parentheses, which - * itself is also unclosed. */ + // Spaces from the indent of the line with an unclosed parentheses, which + // itself is also unclosed. buf->b_ind_unclosed2 = sw; - /* Suppress ignoring spaces from the indent of a line starting with an - * unclosed parentheses. */ + // Suppress ignoring spaces from the indent of a line starting with an + // unclosed parentheses. buf->b_ind_unclosed_noignore = 0; - /* If the opening paren is the last nonwhite character on the line, and - * b_ind_unclosed_wrapped is nonzero, use this indent relative to the outer - * context (for very long lines). */ + // If the opening paren is the last nonwhite character on the line, and + // b_ind_unclosed_wrapped is nonzero, use this indent relative to the outer + // context (for very long lines). buf->b_ind_unclosed_wrapped = 0; - /* Suppress ignoring white space when lining up with the character after - * an unclosed parentheses. */ + // Suppress ignoring white space when lining up with the character after + // an unclosed parentheses. buf->b_ind_unclosed_whiteok = 0; - /* Indent a closing parentheses under the line start of the matching - * opening parentheses. */ + // Indent a closing parentheses under the line start of the matching + // opening parentheses. buf->b_ind_matching_paren = 0; - /* Indent a closing parentheses under the previous line. */ + // Indent a closing parentheses under the previous line. buf->b_ind_paren_prev = 0; - /* Extra indent for comments. */ + // Extra indent for comments. buf->b_ind_comment = 0; - /* Spaces from the comment opener when there is nothing after it. */ + // Spaces from the comment opener when there is nothing after it. buf->b_ind_in_comment = 3; - /* Boolean: if non-zero, use b_ind_in_comment even if there is something - * after the comment opener. */ + // Boolean: if non-zero, use b_ind_in_comment even if there is something + // after the comment opener. buf->b_ind_in_comment2 = 0; - /* Max lines to search for an open paren. */ + // Max lines to search for an open paren. buf->b_ind_maxparen = 20; - /* Max lines to search for an open comment. */ + // Max lines to search for an open comment. buf->b_ind_maxcomment = 70; - /* Handle braces for java code. */ + // Handle braces for java code. buf->b_ind_java = 0; - /* Not to confuse JS object properties with labels. */ + // Not to confuse JS object properties with labels. buf->b_ind_js = 0; - /* Handle blocked cases correctly. */ + // Handle blocked cases correctly. buf->b_ind_keep_case_label = 0; - /* Handle C++ namespace. */ + // Handle C++ namespace. buf->b_ind_cpp_namespace = 0; - /* Handle continuation lines containing conditions of if(), for() and - * while(). */ + // Handle continuation lines containing conditions of if(), for() and + // while(). buf->b_ind_if_for_while = 0; - /* indentation for # comments */ + // indentation for # comments buf->b_ind_hash_comment = 0; - /* Handle C++ extern "C" or "C++" */ + // Handle C++ extern "C" or "C++" buf->b_ind_cpp_extern_c = 0; for (p = buf->b_p_cino; *p; ) @@ -1869,10 +1856,10 @@ parse_cino(buf_T *buf) l = p++; if (*p == '-') ++p; - digits = p; /* remember where the digits start */ + digits = p; // remember where the digits start n = getdigits(&p); divider = 0; - if (*p == '.') /* ".5s" means a fraction */ + if (*p == '.') // ".5s" means a fraction { fraction = atol((char *)++p); while (VIM_ISDIGIT(*p)) @@ -1884,10 +1871,10 @@ parse_cino(buf_T *buf) divider = 10; } } - if (*p == 's') /* "2s" means two times 'shiftwidth' */ + if (*p == 's') // "2s" means two times 'shiftwidth' { if (p == digits) - n = sw; /* just "s" is one 'shiftwidth' */ + n = sw; // just "s" is one 'shiftwidth' else { n *= sw; @@ -1899,8 +1886,8 @@ parse_cino(buf_T *buf) if (l[1] == '-') n = -n; - /* When adding an entry here, also update the default 'cinoptions' in - * doc/indent.txt, and add explanation for it! */ + // When adding an entry here, also update the default 'cinoptions' in + // doc/indent.txt, and add explanation for it! switch (*l) { case '>': buf->b_ind_level = n; break; @@ -1966,9 +1953,9 @@ get_c_indent(void) pos_T our_paren_pos; char_u *start; int start_brace; -#define BRACE_IN_COL0 1 /* '{' is in column 0 */ -#define BRACE_AT_START 2 /* '{' is at start of line */ -#define BRACE_AT_END 3 /* '{' is at end of line */ +#define BRACE_IN_COL0 1 // '{' is in column 0 +#define BRACE_AT_START 2 // '{' is at start of line +#define BRACE_AT_END 3 // '{' is at end of line linenr_T ourscope; char_u *l; char_u *look; @@ -1994,37 +1981,35 @@ get_c_indent(void) int iscase; 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 added_to_amount = 0; int js_cur_has_key = 0; linenr_T raw_string_start = 0; cpp_baseclass_cache_T cache_cpp_baseclass = { FALSE, { MAXLNUM, 0 } }; - /* make a copy, value is changed below */ + // make a copy, value is changed below int ind_continuation = curbuf->b_ind_continuation; - /* remember where the cursor was when we started */ + // remember where the cursor was when we started cur_curpos = curwin->w_cursor; - /* if we are at line 1 zero indent is fine, right? */ + // if we are at line 1 zero indent is fine, right? if (cur_curpos.lnum == 1) return 0; - /* Get a copy of the current contents of the line. - * This is required, because only the most recent line obtained with - * ml_get is valid! */ + // Get a copy of the current contents of the line. + // This is required, because only the most recent line obtained with + // ml_get is valid! linecopy = vim_strsave(ml_get(cur_curpos.lnum)); if (linecopy == NULL) return 0; - /* - * In insert mode and the cursor is on a ')' truncate the line at the - * cursor position. We don't want to line up with the matching '(' when - * inserting new stuff. - * For unknown reasons the cursor might be past the end of the line, thus - * check for that. - */ + // In insert mode and the cursor is on a ')' truncate the line at the + // cursor position. We don't want to line up with the matching '(' when + // inserting new stuff. + // For unknown reasons the cursor might be past the end of the line, thus + // check for that. if ((State & INSERT) && curwin->w_cursor.col < (colnr_T)STRLEN(linecopy) && linecopy[curwin->w_cursor.col] == ')') @@ -2032,20 +2017,18 @@ get_c_indent(void) theline = skipwhite(linecopy); - /* move the cursor to the start of the line */ + // move the cursor to the start of the line curwin->w_cursor.col = 0; - original_line_islabel = cin_islabel(); /* XXX */ - - /* - * If we are inside a raw string don't change the indent. - * Ignore a raw string inside a comment. - */ + original_line_islabel = cin_islabel(); // XXX + + // If we are inside a raw string don't change the indent. + // Ignore a raw string inside a comment. comment_pos = ind_find_start_comment(); if (comment_pos != NULL) { - /* findmatchlimit() static pos is overwritten, make a copy */ + // findmatchlimit() static pos is overwritten, make a copy tryposCopy = *comment_pos; comment_pos = &tryposCopy; } @@ -2057,20 +2040,16 @@ get_c_indent(void) goto laterend; } - /* - * #defines and so on always go at the left when included in 'cinkeys'. - */ + // #defines and so on always go at the left when included in 'cinkeys'. if (*theline == '#' && (*linecopy == '#' || in_cinkeys('#', ' ', TRUE))) { amount = curbuf->b_ind_hash_comment; goto theend; } - /* - * Is it a non-case label? Then that goes at the left margin too unless: - * - JS flag is set. - * - 'L' item has a positive value. - */ + // Is it a non-case label? Then that goes at the left margin too unless: + // - JS flag is set. + // - 'L' item has a positive value. if (original_line_islabel && !curbuf->b_ind_js && curbuf->b_ind_jump_label < 0) { @@ -2078,36 +2057,32 @@ get_c_indent(void) goto theend; } - /* - * If we're inside a "//" comment and there is a "//" comment in a - * previous line, lineup with that one. - */ + // If we're inside a "//" comment and there is a "//" comment in a + // previous line, lineup with that one. if (cin_islinecomment(theline) - && (trypos = find_line_comment()) != NULL) /* XXX */ + && (trypos = find_line_comment()) != NULL) // XXX { - /* find how indented the line beginning the comment is */ + // find how indented the line beginning the comment is getvcol(curwin, trypos, &col, NULL, NULL); amount = col; goto theend; } - /* - * If we're inside a comment and not looking at the start of the - * comment, try using the 'comments' option. - */ - if (!cin_iscomment(theline) && comment_pos != NULL) /* XXX */ + // If we're inside a comment and not looking at the start of the + // comment, try using the 'comments' option. + if (!cin_iscomment(theline) && comment_pos != NULL) // XXX { int lead_start_len = 2; int lead_middle_len = 1; - char_u lead_start[COM_MAX_LEN]; /* start-comment string */ - char_u lead_middle[COM_MAX_LEN]; /* middle-comment string */ - char_u lead_end[COM_MAX_LEN]; /* end-comment string */ + char_u lead_start[COM_MAX_LEN]; // start-comment string + char_u lead_middle[COM_MAX_LEN]; // middle-comment string + char_u lead_end[COM_MAX_LEN]; // end-comment string char_u *p; int start_align = 0; int start_off = 0; int done = FALSE; - /* find how indented the line beginning the comment is */ + // find how indented the line beginning the comment is getvcol(curwin, comment_pos, &col, NULL, NULL); amount = col; *lead_start = NUL; @@ -2149,18 +2124,18 @@ get_c_indent(void) } else if (what == COM_END) { - /* If our line starts with the middle comment string, line it - * up with the comment opener per the 'comments' option. */ + // If our line starts with the middle comment string, line it + // up with the comment opener per the 'comments' option. if (STRNCMP(theline, lead_middle, lead_middle_len) == 0 && STRNCMP(theline, lead_end, STRLEN(lead_end)) != 0) { done = TRUE; if (curwin->w_cursor.lnum > 1) { - /* If the start comment string matches in the previous - * line, use the indent of that line plus offset. If - * the middle comment string matches in the previous - * line, use the indent of that line. XXX */ + // If the start comment string matches in the previous + // line, use the indent of that line plus offset. If + // the middle comment string matches in the previous + // line, use the indent of that line. XXX look = skipwhite(ml_get(curwin->w_cursor.lnum - 1)); if (STRNCMP(look, lead_start, lead_start_len) == 0) amount = get_indent_lnum(curwin->w_cursor.lnum - 1); @@ -2170,8 +2145,8 @@ get_c_indent(void) amount = get_indent_lnum(curwin->w_cursor.lnum - 1); break; } - /* If the start comment string doesn't match with the - * start of the comment, skip this entry. XXX */ + // If the start comment string doesn't match with the + // start of the comment, skip this entry. XXX else if (STRNCMP(ml_get(comment_pos->lnum) + comment_pos->col, lead_start, lead_start_len) != 0) continue; @@ -2184,13 +2159,13 @@ get_c_indent(void) break; } - /* If our line starts with the end comment string, line it up - * with the middle comment */ + // If our line starts with the end comment string, line it up + // with the middle comment if (STRNCMP(theline, lead_middle, lead_middle_len) != 0 && STRNCMP(theline, lead_end, STRLEN(lead_end)) == 0) { amount = get_indent_lnum(curwin->w_cursor.lnum - 1); - /* XXX */ + // XXX if (off != 0) amount += off; else if (align == COM_RIGHT) @@ -2202,38 +2177,35 @@ get_c_indent(void) } } - /* If our line starts with an asterisk, line up with the - * asterisk in the comment opener; otherwise, line up - * with the first character of the comment text. - */ + // If our line starts with an asterisk, line up with the + // asterisk in the comment opener; otherwise, line up + // with the first character of the comment text. if (done) ; else if (theline[0] == '*') amount += 1; else { - /* - * If we are more than one line away from the comment opener, take - * the indent of the previous non-empty line. If 'cino' has "CO" - * and we are just below the comment opener and there are any - * white characters after it line up with the text after it; - * otherwise, add the amount specified by "c" in 'cino' - */ + // If we are more than one line away from the comment opener, take + // the indent of the previous non-empty line. If 'cino' has "CO" + // and we are just below the comment opener and there are any + // white characters after it line up with the text after it; + // otherwise, add the amount specified by "c" in 'cino' amount = -1; for (lnum = cur_curpos.lnum - 1; lnum > comment_pos->lnum; --lnum) { - if (linewhite(lnum)) /* skip blank lines */ + if (linewhite(lnum)) // skip blank lines continue; - amount = get_indent_lnum(lnum); /* XXX */ + amount = get_indent_lnum(lnum); // XXX break; } - if (amount == -1) /* use the comment opener */ + if (amount == -1) // use the comment opener { if (!curbuf->b_ind_in_comment2) { start = ml_get(comment_pos->lnum); - look = start + comment_pos->col + 2; /* skip / and * */ - if (*look != NUL) /* if something after it */ + look = start + comment_pos->col + 2; // skip / and * + if (*look != NUL) // if something after it comment_pos->col = (colnr_T)(skipwhite(look) - start); } getvcol(curwin, comment_pos, &col, NULL, NULL); @@ -2245,20 +2217,16 @@ get_c_indent(void) goto theend; } - /* - * Are we looking at a ']' that has a match? - */ + // Are we looking at a ']' that has a match? if (*skipwhite(theline) == ']' && (trypos = find_match_char('[', curbuf->b_ind_maxparen)) != NULL) { - /* align with the line containing the '['. */ + // align with the line containing the '['. amount = get_indent_lnum(trypos->lnum); goto theend; } - /* - * Are we inside parentheses or braces? - */ /* XXX */ + // Are we inside parentheses or braces? XXX if (((trypos = find_match_paren(curbuf->b_ind_maxparen)) != NULL && curbuf->b_ind_java == 0) || (tryposBrace = find_start_brace()) != NULL @@ -2266,8 +2234,8 @@ get_c_indent(void) { if (trypos != NULL && tryposBrace != NULL) { - /* Both an unmatched '(' and '{' is found. Use the one which is - * closer to the current cursor position, set the other to NULL. */ + // Both an unmatched '(' and '{' is found. Use the one which is + // closer to the current cursor position, set the other to NULL. if (trypos->lnum != tryposBrace->lnum ? trypos->lnum < tryposBrace->lnum : trypos->col < tryposBrace->col) @@ -2278,14 +2246,12 @@ get_c_indent(void) if (trypos != NULL) { - /* - * If the matching paren is more than one line away, use the indent of - * a previous non-empty line that matches the same paren. - */ + // If the matching paren is more than one line away, use the indent of + // a previous non-empty line that matches the same paren. if (theline[0] == ')' && curbuf->b_ind_paren_prev) { - /* Line up with the start of the matching paren line. */ - amount = get_indent_lnum(curwin->w_cursor.lnum - 1); /* XXX */ + // Line up with the start of the matching paren line. + amount = get_indent_lnum(curwin->w_cursor.lnum - 1); // XXX } else { @@ -2294,26 +2260,26 @@ get_c_indent(void) for (lnum = cur_curpos.lnum - 1; lnum > our_paren_pos.lnum; --lnum) { l = skipwhite(ml_get(lnum)); - if (cin_nocode(l)) /* skip comment lines */ + if (cin_nocode(l)) // skip comment lines continue; if (cin_ispreproc_cont(&l, &lnum, &amount)) - continue; /* ignore #define, #if, etc. */ + continue; // ignore #define, #if, etc. curwin->w_cursor.lnum = lnum; - /* Skip a comment or raw string. XXX */ + // Skip a comment or raw string. XXX if ((trypos = ind_find_start_CORS(NULL)) != NULL) { lnum = trypos->lnum + 1; continue; } - /* XXX */ + // XXX if ((trypos = find_match_paren( corr_ind_maxparen(&cur_curpos))) != NULL && trypos->lnum == our_paren_pos.lnum && trypos->col == our_paren_pos.col) { - amount = get_indent_lnum(lnum); /* XXX */ + amount = get_indent_lnum(lnum); // XXX if (theline[0] == ')') { @@ -2327,11 +2293,9 @@ get_c_indent(void) } } - /* - * Line up with line where the matching paren is. XXX - * If the line starts with a '(' or the indent for unclosed - * parentheses is zero, line up with the unclosed parentheses. - */ + // Line up with line where the matching paren is. XXX + // If the line starts with a '(' or the indent for unclosed + // parentheses is zero, line up with the unclosed parentheses. if (amount == -1) { int ignore_paren_col = 0; @@ -2339,8 +2303,8 @@ get_c_indent(void) if (curbuf->b_ind_if_for_while) { - /* Look for the outermost opening parenthesis on this line - * and check whether it belongs to an "if", "for" or "while". */ + // Look for the outermost opening parenthesis on this line + // and check whether it belongs to an "if", "for" or "while". pos_T cursor_save = curwin->w_cursor; pos_T outermost; @@ -2371,8 +2335,8 @@ get_c_indent(void) char_u *line; int look_col; - /* Ignore a '(' in front of the line that has a match before - * our matching '('. */ + // Ignore a '(' in front of the line that has a match before + // our matching '('. curwin->w_cursor.lnum = our_paren_pos.lnum; line = ml_get_curline(); look_col = (int)(look - line); @@ -2392,15 +2356,13 @@ get_c_indent(void) || (!curbuf->b_ind_unclosed_noignore && *look == '(' && ignore_paren_col == 0)) { - /* - * If we're looking at a close paren, line up right there; - * otherwise, line up with the next (non-white) character. - * When b_ind_unclosed_wrapped is set and the matching paren is - * the last nonwhite character of the line, use either the - * indent of the current line or the indentation of the next - * outer paren and add b_ind_unclosed_wrapped (for very long - * lines). - */ + // If we're looking at a close paren, line up right there; + // otherwise, line up with the next (non-white) character. + // When b_ind_unclosed_wrapped is set and the matching paren is + // the last nonwhite character of the line, use either the + // indent of the current line or the indentation of the next + // outer paren and add b_ind_unclosed_wrapped (for very long + // lines). if (theline[0] != ')') { cur_amount = MAXCOL; @@ -2408,8 +2370,8 @@ get_c_indent(void) if (curbuf->b_ind_unclosed_wrapped && cin_ends_in(l, (char_u *)"(", NULL)) { - /* look for opening unmatched paren, indent one level - * for each additional level */ + // look for opening unmatched paren, indent one level + // for each additional level n = 1; for (col = 0; col < our_paren_pos.col; ++col) { @@ -2436,17 +2398,15 @@ get_c_indent(void) col = our_paren_pos.col + 1; while (VIM_ISWHITE(l[col])) col++; - if (l[col] != NUL) /* In case of trailing space */ + if (l[col] != NUL) // In case of trailing space our_paren_pos.col = col; else our_paren_pos.col++; } } - /* - * Find how indented the paren is, or the character after it - * if we did the above "if". - */ + // Find how indented the paren is, or the character after it + // if we did the above "if". if (our_paren_pos.col > 0) { getvcol(curwin, &our_paren_pos, &col, NULL, NULL); @@ -2457,7 +2417,7 @@ get_c_indent(void) if (theline[0] == ')' && curbuf->b_ind_matching_paren) { - /* Line up with the start of the matching paren line. */ + // Line up with the start of the matching paren line. } else if ((curbuf->b_ind_unclosed == 0 && is_if_for_while == 0) || (!curbuf->b_ind_unclosed_noignore @@ -2468,8 +2428,8 @@ get_c_indent(void) } else { - /* Add b_ind_unclosed2 for each '(' before our matching one, - * but ignore (void) before the line (ignore_paren_col). */ + // Add b_ind_unclosed2 for each '(' before our matching one, + // but ignore (void) before the line (ignore_paren_col). col = our_paren_pos.col; while ((int)our_paren_pos.col > ignore_paren_col) { @@ -2485,8 +2445,8 @@ get_c_indent(void) } } - /* Use b_ind_unclosed once, when the first '(' is not inside - * braces */ + // Use b_ind_unclosed once, when the first '(' is not inside + // braces if (col == MAXCOL) amount += curbuf->b_ind_unclosed; else @@ -2504,43 +2464,37 @@ get_c_indent(void) amount += curbuf->b_ind_unclosed; } } - /* - * For a line starting with ')' use the minimum of the two - * positions, to avoid giving it more indent than the previous - * lines: - * func_long_name( if (x - * arg && yy - * ) ^ not here ) ^ not here - */ + // For a line starting with ')' use the minimum of the two + // positions, to avoid giving it more indent than the previous + // lines: + // func_long_name( if (x + // arg && yy + // ) ^ not here ) ^ not here if (cur_amount < amount) amount = cur_amount; } } - /* add extra indent for a comment */ + // add extra indent for a comment if (cin_iscomment(theline)) amount += curbuf->b_ind_comment; } else { - /* - * We are inside braces, there is a { before this line at the position - * stored in tryposBrace. - * Make a copy of tryposBrace, it may point to pos_copy inside - * find_start_brace(), which may be changed somewhere. - */ + // We are inside braces, there is a { before this line at the position + // stored in tryposBrace. + // Make a copy of tryposBrace, it may point to pos_copy inside + // find_start_brace(), which may be changed somewhere. tryposCopy = *tryposBrace; tryposBrace = &tryposCopy; trypos = tryposBrace; ourscope = trypos->lnum; start = ml_get(ourscope); - /* - * Now figure out how indented the line is in general. - * If the brace was at the start of the line, we use that; - * otherwise, check out the indentation of the line as - * a whole and then add the "imaginary indent" to that. - */ + // Now figure out how indented the line is in general. + // If the brace was at the start of the line, we use that; + // otherwise, check out the indentation of the line as + // a whole and then add the "imaginary indent" to that. look = skipwhite(start); if (*look == '{') { @@ -2553,23 +2507,22 @@ get_c_indent(void) } else { - /* That opening brace might have been on a continuation - * line. if so, find the start of the line. */ + // That opening brace might have been on a continuation + // line. if so, find the start of the line. curwin->w_cursor.lnum = ourscope; - /* Position the cursor over the rightmost paren, so that - * matching it will take us back to the start of the line. */ + // Position the cursor over the rightmost paren, so that + // matching it will take us back to the start of the line. lnum = ourscope; if (find_last_paren(start, '(', ')') && (trypos = find_match_paren(curbuf->b_ind_maxparen)) != NULL) lnum = trypos->lnum; - /* It could have been something like - * case 1: if (asdf && - * ldfd) { - * } - */ + // It could have been something like + // case 1: if (asdf && + // ldfd) { + // } if ((curbuf->b_ind_js || curbuf->b_ind_keep_case_label) && cin_iscase(skipwhite(ml_get_curline()), FALSE)) amount = get_indent(); @@ -2581,73 +2534,63 @@ get_c_indent(void) start_brace = BRACE_AT_END; } - /* For Javascript check if the line starts with "key:". */ + // For Javascript check if the line starts with "key:". if (curbuf->b_ind_js) js_cur_has_key = cin_has_js_key(theline); - /* - * If we're looking at a closing brace, that's where - * we want to be. otherwise, add the amount of room - * that an indent is supposed to be. - */ + // If we're looking at a closing brace, that's where + // we want to be. otherwise, add the amount of room + // that an indent is supposed to be. if (theline[0] == '}') { - /* - * they may want closing braces to line up with something - * other than the open brace. indulge them, if so. - */ + // they may want closing braces to line up with something + // other than the open brace. indulge them, if so. amount += curbuf->b_ind_close_extra; } else { - /* - * If we're looking at an "else", try to find an "if" - * to match it with. - * If we're looking at a "while", try to find a "do" - * to match it with. - */ + // If we're looking at an "else", try to find an "if" + // to match it with. + // If we're looking at a "while", try to find a "do" + // to match it with. lookfor = LOOKFOR_INITIAL; if (cin_iselse(theline)) lookfor = LOOKFOR_IF; - else if (cin_iswhileofdo(theline, cur_curpos.lnum)) /* XXX */ + else if (cin_iswhileofdo(theline, cur_curpos.lnum)) // XXX lookfor = LOOKFOR_DO; if (lookfor != LOOKFOR_INITIAL) { curwin->w_cursor.lnum = cur_curpos.lnum; if (find_match(lookfor, ourscope) == OK) { - amount = get_indent(); /* XXX */ + amount = get_indent(); // XXX goto theend; } } - /* - * We get here if we are not on an "while-of-do" or "else" (or - * failed to find a matching "if"). - * Search backwards for something to line up with. - * First set amount for when we don't find anything. - */ - - /* - * if the '{' is _really_ at the left margin, use the imaginary - * location of a left-margin brace. Otherwise, correct the - * location for b_ind_open_extra. - */ - - if (start_brace == BRACE_IN_COL0) /* '{' is in column 0 */ + // We get here if we are not on an "while-of-do" or "else" (or + // failed to find a matching "if"). + // Search backwards for something to line up with. + // First set amount for when we don't find anything. + + // if the '{' is _really_ at the left margin, use the imaginary + // location of a left-margin brace. Otherwise, correct the + // location for b_ind_open_extra. + + if (start_brace == BRACE_IN_COL0) // '{' is in column 0 { amount = curbuf->b_ind_open_left_imag; lookfor_cpp_namespace = TRUE; } else if (start_brace == BRACE_AT_START && - lookfor_cpp_namespace) /* '{' is at start */ + lookfor_cpp_namespace) // '{' is at start { lookfor_cpp_namespace = TRUE; } else { - if (start_brace == BRACE_AT_END) /* '{' is at end of line */ + if (start_brace == BRACE_AT_END) // '{' is at end of line { amount += curbuf->b_ind_open_imag; @@ -2659,7 +2602,7 @@ get_c_indent(void) } else { - /* Compensate for adding b_ind_open_extra later. */ + // Compensate for adding b_ind_open_extra later. amount -= curbuf->b_ind_open_extra; if (amount < 0) amount = 0; @@ -2668,67 +2611,62 @@ get_c_indent(void) lookfor_break = FALSE; - if (cin_iscase(theline, FALSE)) /* it's a switch() label */ + if (cin_iscase(theline, FALSE)) // it's a switch() label { - lookfor = LOOKFOR_CASE; /* find a previous switch() label */ + lookfor = LOOKFOR_CASE; // find a previous switch() label amount += curbuf->b_ind_case; } - else if (cin_isscopedecl(theline)) /* private:, ... */ + else if (cin_isscopedecl(theline)) // private:, ... { - lookfor = LOOKFOR_SCOPEDECL; /* class decl is this block */ + lookfor = LOOKFOR_SCOPEDECL; // class decl is this block amount += curbuf->b_ind_scopedecl; } else { if (curbuf->b_ind_case_break && cin_isbreak(theline)) - /* break; ... */ + // break; ... lookfor_break = TRUE; lookfor = LOOKFOR_INITIAL; - /* b_ind_level from start of block */ + // b_ind_level from start of block amount += curbuf->b_ind_level; } scope_amount = amount; whilelevel = 0; - /* - * Search backwards. If we find something we recognize, line up - * with that. - * - * If we're looking at an open brace, indent - * the usual amount relative to the conditional - * that opens the block. - */ + // Search backwards. If we find something we recognize, line up + // with that. + // + // If we're looking at an open brace, indent + // the usual amount relative to the conditional + // that opens the block. curwin->w_cursor = cur_curpos; for (;;) { curwin->w_cursor.lnum--; curwin->w_cursor.col = 0; - /* - * If we went all the way back to the start of our scope, line - * up with it. - */ + // If we went all the way back to the start of our scope, line + // up with it. if (curwin->w_cursor.lnum <= ourscope) { - /* We reached end of scope: - * If looking for a enum or structure initialization - * go further back: - * If it is an initializer (enum xxx or xxx =), then - * don't add ind_continuation, otherwise it is a variable - * declaration: - * int x, - * here; <-- add ind_continuation - */ + // We reached end of scope: + // If looking for a enum or structure initialization + // go further back: + // If it is an initializer (enum xxx or xxx =), then + // don't add ind_continuation, otherwise it is a variable + // declaration: + // int x, + // here; <-- add ind_continuation if (lookfor == LOOKFOR_ENUM_OR_INIT) { if (curwin->w_cursor.lnum == 0 || curwin->w_cursor.lnum < ourscope - curbuf->b_ind_maxparen) { - /* nothing found (abuse curbuf->b_ind_maxparen as - * limit) assume terminated line (i.e. a variable - * initialization) */ + // nothing found (abuse curbuf->b_ind_maxparen as + // limit) assume terminated line (i.e. a variable + // initialization) if (cont_amount > 0) amount = cont_amount; else if (!curbuf->b_ind_js) @@ -2738,10 +2676,8 @@ get_c_indent(void) l = ml_get_curline(); - /* - * If we're in a comment or raw string now, skip to - * the start of it. - */ + // If we're in a comment or raw string now, skip to + // the start of it. trypos = ind_find_start_CORS(NULL); if (trypos != NULL) { @@ -2750,9 +2686,7 @@ get_c_indent(void) continue; } - /* - * Skip preprocessor directives and blank lines. - */ + // Skip preprocessor directives and blank lines. if (cin_ispreproc_cont(&l, &curwin->w_cursor.lnum, &amount)) continue; @@ -2762,41 +2696,37 @@ get_c_indent(void) terminated = cin_isterminated(l, FALSE, TRUE); - /* - * If we are at top level and the line looks like a - * function declaration, we are done - * (it's a variable declaration). - */ + // If we are at top level and the line looks like a + // function declaration, we are done + // (it's a variable declaration). if (start_brace != BRACE_IN_COL0 || !cin_isfuncdecl(&l, curwin->w_cursor.lnum, 0)) { - /* if the line is terminated with another ',' - * it is a continued variable initialization. - * don't add extra indent. - * TODO: does not work, if a function - * declaration is split over multiple lines: - * cin_isfuncdecl returns FALSE then. - */ + // if the line is terminated with another ',' + // it is a continued variable initialization. + // don't add extra indent. + // TODO: does not work, if a function + // declaration is split over multiple lines: + // cin_isfuncdecl returns FALSE then. if (terminated == ',') break; - /* if it es a enum declaration or an assignment, - * we are done. - */ + // if it es a enum declaration or an assignment, + // we are done. if (terminated != ';' && cin_isinit()) break; - /* nothing useful found */ + // nothing useful found if (terminated == 0 || terminated == '{') continue; } if (terminated != ';') { - /* Skip parens and braces. Position the cursor - * over the rightmost paren, so that matching it - * will take us back to the start of the line. - */ /* XXX */ + // Skip parens and braces. Position the cursor + // over the rightmost paren, so that matching it + // will take us back to the start of the line. + // XXX trypos = NULL; if (find_last_paren(l, '(', ')')) trypos = find_match_paren( @@ -2813,11 +2743,10 @@ get_c_indent(void) } } - /* it's a variable declaration, add indentation - * like in - * int a, - * b; - */ + // it's a variable declaration, add indentation + // like in + // int a, + // b; if (cont_amount > 0) amount = cont_amount; else @@ -2846,10 +2775,8 @@ get_c_indent(void) if (lookfor_cpp_namespace) { - /* - * Looking for C++ namespace, need to look further - * back. - */ + // Looking for C++ namespace, need to look further + // back. if (curwin->w_cursor.lnum == ourscope) continue; @@ -2860,8 +2787,8 @@ get_c_indent(void) l = ml_get_curline(); - /* If we're in a comment or raw string now, skip - * to the start of it. */ + // If we're in a comment or raw string now, skip + // to the start of it. trypos = ind_find_start_CORS(NULL); if (trypos != NULL) { @@ -2870,12 +2797,12 @@ get_c_indent(void) continue; } - /* Skip preprocessor directives and blank lines. */ + // Skip preprocessor directives and blank lines. if (cin_ispreproc_cont(&l, &curwin->w_cursor.lnum, &amount)) continue; - /* Finally the actual check for "namespace". */ + // Finally the actual check for "namespace". if (cin_is_cpp_namespace(l)) { amount += curbuf->b_ind_cpp_namespace @@ -2896,10 +2823,8 @@ get_c_indent(void) break; } - /* - * If we're in a comment or raw string now, skip to the start - * of it. - */ /* XXX */ + // If we're in a comment or raw string now, skip to the start + // of it. XXX if ((trypos = ind_find_start_CORS(&raw_string_start)) != NULL) { curwin->w_cursor.lnum = trypos->lnum + 1; @@ -2909,28 +2834,24 @@ get_c_indent(void) l = ml_get_curline(); - /* - * If this is a switch() label, may line up relative to that. - * If this is a C++ scope declaration, do the same. - */ + // If this is a switch() label, may line up relative to that. + // If this is a C++ scope declaration, do the same. iscase = cin_iscase(l, FALSE); if (iscase || cin_isscopedecl(l)) { - /* we are only looking for cpp base class - * declaration/initialization any longer */ + // we are only looking for cpp base class + // declaration/initialization any longer if (lookfor == LOOKFOR_CPP_BASECLASS) break; - /* When looking for a "do" we are not interested in - * labels. */ + // When looking for a "do" we are not interested in + // labels. if (whilelevel > 0) continue; - /* - * case xx: - * c = 99 + <- this indent plus continuation - *-> here; - */ + // case xx: + // c = 99 + <- this indent plus continuation + //-> here; if (lookfor == LOOKFOR_UNTERM || lookfor == LOOKFOR_ENUM_OR_INIT) { @@ -2941,40 +2862,34 @@ get_c_indent(void) break; } - /* - * case xx: <- line up with this case - * x = 333; - * case yy: - */ + // case xx: <- line up with this case + // x = 333; + // case yy: if ( (iscase && lookfor == LOOKFOR_CASE) || (iscase && lookfor_break) || (!iscase && lookfor == LOOKFOR_SCOPEDECL)) { - /* - * Check that this case label is not for another - * switch() - */ /* XXX */ + // Check that this case label is not for another + // switch() XXX if ((trypos = find_start_brace()) == NULL || trypos->lnum == ourscope) { - amount = get_indent(); /* XXX */ + amount = get_indent(); // XXX break; } continue; } - n = get_indent_nolabel(curwin->w_cursor.lnum); /* XXX */ - - /* - * case xx: if (cond) <- line up with this if - * y = y + 1; - * -> s = 99; - * - * case xx: - * if (cond) <- line up with this line - * y = y + 1; - * -> s = 99; - */ + n = get_indent_nolabel(curwin->w_cursor.lnum); // XXX + + // case xx: if (cond) <- line up with this if + // y = y + 1; + // -> s = 99; + // + // case xx: + // if (cond) <- line up with this line + // y = y + 1; + // -> s = 99; if (lookfor == LOOKFOR_TERM) { if (n) @@ -2984,13 +2899,11 @@ get_c_indent(void) break; } - /* - * case xx: x = x + 1; <- line up with this x - * -> y = y + 1; - * - * case xx: if (cond) <- line up with this if - * -> y = y + 1; - */ + // case xx: x = x + 1; <- line up with this x + // -> y = y + 1; + // + // case xx: if (cond) <- line up with this if + // -> y = y + 1; if (n) { amount = n; @@ -3006,15 +2919,13 @@ get_c_indent(void) break; } - /* - * Try to get the indent of a statement before the switch - * label. If nothing is found, line up relative to the - * switch label. - * break; <- may line up with this line - * case xx: - * -> y = 1; - */ - scope_amount = get_indent() + (iscase /* XXX */ + // Try to get the indent of a statement before the switch + // label. If nothing is found, line up relative to the + // switch label. + // break; <- may line up with this line + // case xx: + // -> y = 1; + scope_amount = get_indent() + (iscase // XXX ? curbuf->b_ind_case_code : curbuf->b_ind_scopedecl_code); lookfor = curbuf->b_ind_case_break @@ -3022,10 +2933,8 @@ get_c_indent(void) continue; } - /* - * Looking for a switch() label or C++ scope declaration, - * ignore other lines, skip {}-blocks. - */ + // Looking for a switch() label or C++ scope declaration, + // ignore other lines, skip {}-blocks. if (lookfor == LOOKFOR_CASE || lookfor == LOOKFOR_SCOPEDECL) { if (find_last_paren(l, '{', '}') @@ -3037,9 +2946,7 @@ get_c_indent(void) continue; } - /* - * Ignore jump labels with nothing after them. - */ + // Ignore jump labels with nothing after them. if (!curbuf->b_ind_js && cin_islabel()) { l = after_label(ml_get_curline()); @@ -3047,21 +2954,17 @@ get_c_indent(void) continue; } - /* - * Ignore #defines, #if, etc. - * Ignore comment and empty lines. - * (need to get the line again, cin_islabel() may have - * unlocked it) - */ + // Ignore #defines, #if, etc. + // Ignore comment and empty lines. + // (need to get the line again, cin_islabel() may have + // unlocked it) l = ml_get_curline(); if (cin_ispreproc_cont(&l, &curwin->w_cursor.lnum, &amount) || cin_nocode(l)) continue; - /* - * Are we at the start of a cpp base class declaration or - * constructor initialization? - */ /* XXX */ + // Are we at the start of a cpp base class declaration or + // constructor initialization? XXX n = FALSE; if (lookfor != LOOKFOR_TERM && curbuf->b_ind_cpp_baseclass > 0) { @@ -3079,54 +2982,50 @@ get_c_indent(void) } else if (theline[0] == '{') { - /* Need to find start of the declaration. */ + // Need to find start of the declaration. lookfor = LOOKFOR_UNTERM; ind_continuation = 0; continue; } else - /* XXX */ + // XXX amount = get_baseclass_amount( cache_cpp_baseclass.lpos.col); break; } else if (lookfor == LOOKFOR_CPP_BASECLASS) { - /* only look, whether there is a cpp base class - * declaration or initialization before the opening brace. - */ + // only look, whether there is a cpp base class + // declaration or initialization before the opening brace. if (cin_isterminated(l, TRUE, FALSE)) break; else continue; } - /* - * What happens next depends on the line being terminated. - * If terminated with a ',' only consider it terminating if - * there is another unterminated statement behind, eg: - * 123, - * sizeof - * here - * Otherwise check whether it is a enumeration or structure - * initialisation (not indented) or a variable declaration - * (indented). - */ + // What happens next depends on the line being terminated. + // If terminated with a ',' only consider it terminating if + // there is another unterminated statement behind, eg: + // 123, + // sizeof + // here + // Otherwise check whether it is a enumeration or structure + // initialisation (not indented) or a variable declaration + // (indented). terminated = cin_isterminated(l, FALSE, TRUE); if (js_cur_has_key) { - js_cur_has_key = 0; /* only check the first line */ + js_cur_has_key = 0; // only check the first line if (curbuf->b_ind_js && terminated == ',') { - /* For Javascript we might be inside an object: - * key: something, <- align with this - * key: something - * or: - * key: something + <- align with this - * something, - * key: something - */ + // For Javascript we might be inside an object: + // key: something, <- align with this + // key: something + // or: + // key: something + <- align with this + // something, + // key: something lookfor = LOOKFOR_JS_KEY; } } @@ -3141,16 +3040,16 @@ get_c_indent(void) >= curwin->w_cursor.lnum) break; if (terminated == ',') - /* line below current line is the one that starts a - * (possibly broken) line ending in a comma. */ + // line below current line is the one that starts a + // (possibly broken) line ending in a comma. break; else { amount = get_indent(); if (curwin->w_cursor.lnum - 1 == ourscope) - /* line above is start of the scope, thus current - * line is the one that stars a (possibly broken) - * line ending in a comma. */ + // line above is start of the scope, thus current + // line is the one that stars a (possibly broken) + // line ending in a comma. break; } } @@ -3161,18 +3060,15 @@ get_c_indent(void) if (lookfor != LOOKFOR_ENUM_OR_INIT && (*skipwhite(l) == '[' || l[STRLEN(l) - 1] == '[')) amount += ind_continuation; - /* - * if we're in the middle of a paren thing, - * go back to the line that starts it so - * we can get the right prevailing indent - * if ( foo && - * bar ) - */ - /* - * Position the cursor over the rightmost paren, so that - * matching it will take us back to the start of the line. - * Ignore a match before the start of the block. - */ + // if we're in the middle of a paren thing, + // go back to the line that starts it so + // we can get the right prevailing indent + // if ( foo && + // bar ) + + // Position the cursor over the rightmost paren, so that + // matching it will take us back to the start of the line. + // Ignore a match before the start of the block. (void)find_last_paren(l, '(', ')'); trypos = find_match_paren(corr_ind_maxparen(&cur_curpos)); if (trypos != NULL && (trypos->lnum < tryposBrace->lnum @@ -3180,22 +3076,18 @@ get_c_indent(void) && trypos->col < tryposBrace->col))) trypos = NULL; - /* - * If we are looking for ',', we also look for matching - * braces. - */ + // If we are looking for ',', we also look for matching + // braces. if (trypos == NULL && terminated == ',' && find_last_paren(l, '{', '}')) trypos = find_start_brace(); if (trypos != NULL) { - /* - * Check if we are on a case label now. This is - * handled above. - * case xx: if ( asdf && - * asdf) - */ + // Check if we are on a case label now. This is + // handled above. + // case xx: if ( asdf && + // asdf) curwin->w_cursor = *trypos; l = ml_get_curline(); if (cin_iscase(l, FALSE) || cin_isscopedecl(l)) @@ -3225,58 +3117,48 @@ get_c_indent(void) } } - /* - * Get indent and pointer to text for current line, - * ignoring any jump label. XXX - */ + // Get indent and pointer to text for current line, + // ignoring any jump label. XXX if (curbuf->b_ind_js) cur_amount = get_indent(); else cur_amount = skip_label(curwin->w_cursor.lnum, &l); - /* - * If this is just above the line we are indenting, and it - * starts with a '{', line it up with this line. - * while (not) - * -> { - * } - */ + // If this is just above the line we are indenting, and it + // starts with a '{', line it up with this line. + // while (not) + // -> { + // } if (terminated != ',' && lookfor != LOOKFOR_TERM && theline[0] == '{') { amount = cur_amount; - /* - * Only add b_ind_open_extra when the current line - * doesn't start with a '{', which must have a match - * in the same line (scope is the same). Probably: - * { 1, 2 }, - * -> { 3, 4 } - */ + // Only add b_ind_open_extra when the current line + // doesn't start with a '{', which must have a match + // in the same line (scope is the same). Probably: + // { 1, 2 }, + // -> { 3, 4 } if (*skipwhite(l) != '{') amount += curbuf->b_ind_open_extra; if (curbuf->b_ind_cpp_baseclass && !curbuf->b_ind_js) { - /* have to look back, whether it is a cpp base - * class declaration or initialization */ + // have to look back, whether it is a cpp base + // class declaration or initialization lookfor = LOOKFOR_CPP_BASECLASS; continue; } break; } - /* - * Check if we are after an "if", "while", etc. - * Also allow " } else". - */ + // Check if we are after an "if", "while", etc. + // Also allow " } else". if (cin_is_cinword(l) || cin_iselse(skipwhite(l))) { - /* - * Found an unterminated line after an if (), line up - * with the last one. - * if (cond) - * 100 + - * -> here; - */ + // Found an unterminated line after an if (), line up + // with the last one. + // if (cond) + // 100 + + // -> here; if (lookfor == LOOKFOR_UNTERM || lookfor == LOOKFOR_ENUM_OR_INIT) { @@ -3287,19 +3169,17 @@ get_c_indent(void) break; } - /* - * If this is just above the line we are indenting, we - * are finished. - * while (not) - * -> here; - * Otherwise this indent can be used when the line - * before this is terminated. - * yyy; - * if (stat) - * while (not) - * xxx; - * -> here; - */ + // If this is just above the line we are indenting, we + // are finished. + // while (not) + // -> here; + // Otherwise this indent can be used when the line + // before this is terminated. + // yyy; + // if (stat) + // while (not) + // xxx; + // -> here; amount = cur_amount; if (theline[0] == '{') amount += curbuf->b_ind_open_extra; @@ -3310,13 +3190,11 @@ get_c_indent(void) break; } - /* - * Special trick: when expecting the while () after a - * do, line up with the while() - * do - * x = 1; - * -> here - */ + // Special trick: when expecting the while () after a + // do, line up with the while() + // do + // x = 1; + // -> here l = skipwhite(ml_get_curline()); if (cin_isdo(l)) { @@ -3325,17 +3203,15 @@ get_c_indent(void) --whilelevel; } - /* - * When searching for a terminated line, don't use the - * one between the "if" and the matching "else". - * Need to use the scope of this "else". XXX - * If whilelevel != 0 continue looking for a "do {". - */ + // When searching for a terminated line, don't use the + // one between the "if" and the matching "else". + // Need to use the scope of this "else". XXX + // If whilelevel != 0 continue looking for a "do {". if (cin_iselse(l) && whilelevel == 0) { - /* If we're looking at "} else", let's make sure we - * find the opening brace of the enclosing scope, - * not the one from "if () {". */ + // If we're looking at "} else", let's make sure we + // find the opening brace of the enclosing scope, + // not the one from "if () {". if (*l == '}') curwin->w_cursor.col = (colnr_T)(l - ml_get_curline()) + 1; @@ -3347,24 +3223,20 @@ get_c_indent(void) } } - /* - * If we're below an unterminated line that is not an - * "if" or something, we may line up with this line or - * add something for a continuation line, depending on - * the line before this one. - */ + // If we're below an unterminated line that is not an + // "if" or something, we may line up with this line or + // add something for a continuation line, depending on + // the line before this one. else { - /* - * Found two unterminated lines on a row, line up with - * the last one. - * c = 99 + - * 100 + - * -> here; - */ + // Found two unterminated lines on a row, line up with + // the last one. + // c = 99 + + // 100 + + // -> here; if (lookfor == LOOKFOR_UNTERM) { - /* When line ends in a comma add extra indent */ + // When line ends in a comma add extra indent if (terminated == ',') amount += ind_continuation; break; @@ -3372,11 +3244,11 @@ get_c_indent(void) if (lookfor == LOOKFOR_ENUM_OR_INIT) { - /* Found two lines ending in ',', lineup with the - * lowest one, but check for cpp base class - * declaration/initialization, if it is an - * opening brace or we are looking just for - * enumerations/initializations. */ + // Found two lines ending in ',', lineup with the + // lowest one, but check for cpp base class + // declaration/initialization, if it is an + // opening brace or we are looking just for + // enumerations/initializations. if (terminated == ',') { if (curbuf->b_ind_cpp_baseclass == 0) @@ -3386,19 +3258,17 @@ get_c_indent(void) continue; } - /* Ignore unterminated lines in between, but - * reduce indent. */ + // Ignore unterminated lines in between, but + // reduce indent. if (amount > cur_amount) amount = cur_amount; } else { - /* - * Found first unterminated line on a row, may - * line up with this line, remember its indent - * 100 + - * -> here; - */ + // Found first unterminated line on a row, may + // line up with this line, remember its indent + // 100 + + // -> here; l = ml_get_curline(); amount = cur_amount; @@ -3407,33 +3277,30 @@ get_c_indent(void) || (n >=2 && l[n - 2] == ']'))) break; - /* - * If previous line ends in ',', check whether we - * are in an initialization or enum - * struct xxx = - * { - * sizeof a, - * 124 }; - * or a normal possible continuation line. - * but only, of no other statement has been found - * yet. - */ + // If previous line ends in ',', check whether we + // are in an initialization or enum + // struct xxx = + // { + // sizeof a, + // 124 }; + // or a normal possible continuation line. + // but only, of no other statement has been found + // yet. if (lookfor == LOOKFOR_INITIAL && terminated == ',') { if (curbuf->b_ind_js) { - /* Search for a line ending in a comma - * and line up with the line below it - * (could be the current line). - * some = [ - * 1, <- line up here - * 2, - * some = [ - * 3 + <- line up here - * 4 * - * 5, - * 6, - */ + // Search for a line ending in a comma + // and line up with the line below it + // (could be the current line). + // some = [ + // 1, <- line up here + // 2, + // some = [ + // 3 + <- line up here + // 4 * + // 5, + // 6, if (cin_iscomment(skipwhite(l))) break; lookfor = LOOKFOR_COMMA; @@ -3444,8 +3311,8 @@ get_c_indent(void) if (trypos->lnum == curwin->w_cursor.lnum - 1) { - /* Current line is first inside - * [], line up with it. */ + // Current line is first inside + // [], line up with it. break; } ourscope = trypos->lnum; @@ -3462,7 +3329,7 @@ get_c_indent(void) if (lookfor == LOOKFOR_INITIAL && *l != NUL && l[STRLEN(l) - 1] == '\\') - /* XXX */ + // XXX cont_amount = cin_get_equal_amount( curwin->w_cursor.lnum); if (lookfor != LOOKFOR_TERM @@ -3475,19 +3342,15 @@ get_c_indent(void) } } - /* - * Check if we are after a while (cond); - * If so: Ignore until the matching "do". - */ - else if (cin_iswhileofdo_end(terminated)) /* XXX */ + // Check if we are after a while (cond); + // If so: Ignore until the matching "do". + else if (cin_iswhileofdo_end(terminated)) // XXX { - /* - * Found an unterminated line after a while ();, line up - * with the last one. - * while (cond); - * 100 + <- line up with this one - * -> here; - */ + // Found an unterminated line after a while ();, line up + // with the last one. + // while (cond); + // 100 + <- line up with this one + // -> here; if (lookfor == LOOKFOR_UNTERM || lookfor == LOOKFOR_ENUM_OR_INIT) { @@ -3501,26 +3364,22 @@ get_c_indent(void) if (whilelevel == 0) { lookfor = LOOKFOR_TERM; - amount = get_indent(); /* XXX */ + amount = get_indent(); // XXX if (theline[0] == '{') amount += curbuf->b_ind_open_extra; } ++whilelevel; } - /* - * We are after a "normal" statement. - * If we had another statement we can stop now and use the - * indent of that other statement. - * Otherwise the indent of the current statement may be used, - * search backwards for the next "normal" statement. - */ + // We are after a "normal" statement. + // If we had another statement we can stop now and use the + // indent of that other statement. + // Otherwise the indent of the current statement may be used, + // search backwards for the next "normal" statement. else { - /* - * Skip single break line, if before a switch label. It - * may be lined up with the case label. - */ + // Skip single break line, if before a switch label. It + // may be lined up with the case label. if (lookfor == LOOKFOR_NOBREAK && cin_isbreak(skipwhite(ml_get_curline()))) { @@ -3528,31 +3387,27 @@ get_c_indent(void) continue; } - /* - * Handle "do {" line. - */ + // Handle "do {" line. if (whilelevel > 0) { l = cin_skipcomment(ml_get_curline()); if (cin_isdo(l)) { - amount = get_indent(); /* XXX */ + amount = get_indent(); // XXX --whilelevel; continue; } } - /* - * Found a terminated line above an unterminated line. Add - * the amount for a continuation line. - * x = 1; - * y = foo + - * -> here; - * or - * int x = 1; - * int foo, - * -> here; - */ + // Found a terminated line above an unterminated line. Add + // the amount for a continuation line. + // x = 1; + // y = foo + + // -> here; + // or + // int x = 1; + // int foo, + // -> here; if (lookfor == LOOKFOR_UNTERM || lookfor == LOOKFOR_ENUM_OR_INIT) { @@ -3563,48 +3418,40 @@ get_c_indent(void) break; } - /* - * Found a terminated line above a terminated line or "if" - * etc. line. Use the amount of the line below us. - * x = 1; x = 1; - * if (asdf) y = 2; - * while (asdf) ->here; - * here; - * ->foo; - */ + // Found a terminated line above a terminated line or "if" + // etc. line. Use the amount of the line below us. + // x = 1; x = 1; + // if (asdf) y = 2; + // while (asdf) ->here; + // here; + // ->foo; if (lookfor == LOOKFOR_TERM) { if (!lookfor_break && whilelevel == 0) break; } - /* - * First line above the one we're indenting is terminated. - * To know what needs to be done look further backward for - * a terminated line. - */ + // First line above the one we're indenting is terminated. + // To know what needs to be done look further backward for + // a terminated line. else { - /* - * position the cursor over the rightmost paren, so - * that matching it will take us back to the start of - * the line. Helps for: - * func(asdr, - * asdfasdf); - * here; - */ + // position the cursor over the rightmost paren, so + // that matching it will take us back to the start of + // the line. Helps for: + // func(asdr, + // asdfasdf); + // here; term_again: l = ml_get_curline(); if (find_last_paren(l, '(', ')') && (trypos = find_match_paren( curbuf->b_ind_maxparen)) != NULL) { - /* - * Check if we are on a case label now. This is - * handled above. - * case xx: if ( asdf && - * asdf) - */ + // Check if we are on a case label now. This is + // handled above. + // case xx: if ( asdf && + // asdf) curwin->w_cursor = *trypos; l = ml_get_curline(); if (cin_iscase(l, FALSE) || cin_isscopedecl(l)) @@ -3615,40 +3462,35 @@ term_again: } } - /* When aligning with the case statement, don't align - * with a statement after it. - * case 1: { <-- don't use this { position - * stat; - * } - * case 2: - * stat; - * } - */ + // When aligning with the case statement, don't align + // with a statement after it. + // case 1: { <-- don't use this { position + // stat; + // } + // case 2: + // stat; + // } iscase = (curbuf->b_ind_keep_case_label && cin_iscase(l, FALSE)); - /* - * Get indent and pointer to text for current line, - * ignoring any jump label. - */ + // Get indent and pointer to text for current line, + // ignoring any jump label. amount = skip_label(curwin->w_cursor.lnum, &l); if (theline[0] == '{') amount += curbuf->b_ind_open_extra; - /* See remark above: "Only add b_ind_open_extra.." */ + // See remark above: "Only add b_ind_open_extra.." l = skipwhite(l); if (*l == '{') amount -= curbuf->b_ind_open_extra; lookfor = iscase ? LOOKFOR_ANY : LOOKFOR_TERM; - /* - * When a terminated line starts with "else" skip to - * the matching "if": - * else 3; - * indent this; - * Need to use the scope of this "else". XXX - * If whilelevel != 0 continue looking for a "do {". - */ + // When a terminated line starts with "else" skip to + // the matching "if": + // else 3; + // indent this; + // Need to use the scope of this "else". XXX + // If whilelevel != 0 continue looking for a "do {". if (lookfor == LOOKFOR_TERM && *l != '}' && cin_iselse(l) @@ -3661,17 +3503,15 @@ term_again: continue; } - /* - * If we're at the end of a block, skip to the start of - * that block. - */ + // If we're at the end of a block, skip to the start of + // that block. l = ml_get_curline(); - if (find_last_paren(l, '{', '}') /* XXX */ + if (find_last_paren(l, '{', '}') // XXX && (trypos = find_start_brace()) != NULL) { curwin->w_cursor = *trypos; - /* if not "else {" check for terminated again */ - /* but skip block for "} else {" */ + // if not "else {" check for terminated again + // but skip block for "} else {" l = cin_skipcomment(ml_get_curline()); if (*l == '}' || !cin_iselse(l)) goto term_again; @@ -3684,29 +3524,27 @@ term_again: } } - /* add extra indent for a comment */ + // add extra indent for a comment if (cin_iscomment(theline)) amount += curbuf->b_ind_comment; - /* subtract extra left-shift for jump labels */ + // subtract extra left-shift for jump labels if (curbuf->b_ind_jump_label > 0 && original_line_islabel) amount -= curbuf->b_ind_jump_label; goto theend; } - /* - * ok -- we're not inside any sort of structure at all! - * - * This means we're at the top level, and everything should - * basically just match where the previous line is, except - * for the lines immediately following a function declaration, - * which are K&R-style parameters and need to be indented. - * - * if our line starts with an open brace, forget about any - * prevailing indent and make sure it looks like the start - * of a function - */ + // ok -- we're not inside any sort of structure at all! + // + // This means we're at the top level, and everything should + // basically just match where the previous line is, except + // for the lines immediately following a function declaration, + // which are K&R-style parameters and need to be indented. + // + // if our line starts with an open brace, forget about any + // prevailing indent and make sure it looks like the start + // of a function if (theline[0] == '{') { @@ -3714,13 +3552,11 @@ term_again: goto theend; } - /* - * If the NEXT line is a function declaration, the current - * line needs to be indented as a function type spec. - * Don't do this if the current line looks like a comment or if the - * current line is terminated, ie. ends in ';', or if the current line - * contains { or }: "void f() {\n if (1)" - */ + // If the NEXT line is a function declaration, the current + // line needs to be indented as a function type spec. + // Don't do this if the current line looks like a comment or if the + // current line is terminated, ie. ends in ';', or if the current line + // contains { or }: "void f() {\n if (1)" if (cur_curpos.lnum < curbuf->b_ml.ml_line_count && !cin_nocode(theline) && vim_strchr(theline, '{') == NULL @@ -3735,7 +3571,7 @@ term_again: goto theend; } - /* search backwards until we find something we recognize */ + // search backwards until we find something we recognize amount = 0; curwin->w_cursor = cur_curpos; while (curwin->w_cursor.lnum > 1) @@ -3745,10 +3581,8 @@ term_again: l = ml_get_curline(); - /* - * If we're in a comment or raw string now, skip to the start - * of it. - */ /* XXX */ + // If we're in a comment or raw string now, skip to the start + // of it. XXX if ((trypos = ind_find_start_CORS(NULL)) != NULL) { curwin->w_cursor.lnum = trypos->lnum + 1; @@ -3756,10 +3590,8 @@ term_again: continue; } - /* - * Are we at the start of a cpp base class declaration or - * constructor initialization? - */ /* XXX */ + // Are we at the start of a cpp base class declaration or + // constructor initialization? XXX n = FALSE; if (curbuf->b_ind_cpp_baseclass != 0 && theline[0] != '{') { @@ -3768,43 +3600,40 @@ term_again: } if (n) { - /* XXX */ + // XXX amount = get_baseclass_amount(cache_cpp_baseclass.lpos.col); break; } - /* - * Skip preprocessor directives and blank lines. - */ + // Skip preprocessor directives and blank lines. if (cin_ispreproc_cont(&l, &curwin->w_cursor.lnum, &amount)) continue; if (cin_nocode(l)) continue; - /* - * If the previous line ends in ',', use one level of - * indentation: - * int foo, - * bar; - * do this before checking for '}' in case of eg. - * enum foobar - * { - * ... - * } foo, - * bar; - */ + // If the previous line ends in ',', use one level of + // indentation: + // int foo, + // bar; + // do this before checking for '}' in case of eg. + // enum foobar + // { + // ... + // } foo, + // bar; n = 0; if (cin_ends_in(l, (char_u *)",", NULL) || (*l != NUL && (n = l[STRLEN(l) - 1]) == '\\')) { - /* take us back to opening paren */ + // take us back to opening paren if (find_last_paren(l, '(', ')') && (trypos = find_match_paren( curbuf->b_ind_maxparen)) != NULL) curwin->w_cursor = *trypos; - /* For a line ending in ',' that is a continuation line go + /* + * For a line ending in ',' that is a continuation line go * back to the first line with a backslash: * char *foo = "bla\ * bla", @@ -3819,7 +3648,7 @@ term_again: curwin->w_cursor.col = 0; } - amount = get_indent(); /* XXX */ + amount = get_indent(); // XXX if (amount == 0) amount = cin_first_id_amount(); @@ -3828,47 +3657,38 @@ term_again: break; } - /* - * If the line looks like a function declaration, and we're - * not in a comment, put it the left margin. - */ - if (cin_isfuncdecl(NULL, cur_curpos.lnum, 0)) /* XXX */ + // If the line looks like a function declaration, and we're + // not in a comment, put it the left margin. + if (cin_isfuncdecl(NULL, cur_curpos.lnum, 0)) // XXX break; l = ml_get_curline(); - /* - * Finding the closing '}' of a previous function. Put - * current line at the left margin. For when 'cino' has "fs". - */ + // Finding the closing '}' of a previous function. Put + // current line at the left margin. For when 'cino' has "fs". if (*skipwhite(l) == '}') break; - /* (matching {) - * If the previous line ends on '};' (maybe followed by - * comments) align at column 0. For example: - * char *string_array[] = { "foo", - * / * x * / "b};ar" }; / * foobar * / - */ + // (matching {) + // If the previous line ends on '};' (maybe followed by + // comments) align at column 0. For example: + // char *string_array[] = { "foo", + // / * x * / "b};ar" }; / * foobar * / if (cin_ends_in(l, (char_u *)"};", NULL)) break; - /* - * If the previous line ends on '[' we are probably in an - * array constant: - * something = [ - * 234, <- extra indent - */ + // If the previous line ends on '[' we are probably in an + // array constant: + // something = [ + // 234, <- extra indent if (cin_ends_in(l, (char_u *)"[", NULL)) { amount = get_indent() + ind_continuation; break; } - /* - * Find a line only has a semicolon that belongs to a previous - * line ending in '}', e.g. before an #endif. Don't increase - * indent then. - */ + // Find a line only has a semicolon that belongs to a previous + // line ending in '}', e.g. before an #endif. Don't increase + // indent then. if (*(look = skipwhite(l)) == ';' && cin_nocode(look + 1)) { pos_T curpos_save = curwin->w_cursor; @@ -3887,24 +3707,20 @@ term_again: curwin->w_cursor = curpos_save; } - /* - * If the PREVIOUS line is a function declaration, the current - * line (and the ones that follow) needs to be indented as - * parameters. - */ + // If the PREVIOUS line is a function declaration, the current + // line (and the ones that follow) needs to be indented as + // parameters. if (cin_isfuncdecl(&l, curwin->w_cursor.lnum, 0)) { amount = curbuf->b_ind_param; break; } - /* - * If the previous line ends in ';' and the line before the - * previous line ends in ',' or '\', ident to column zero: - * int foo, - * bar; - * indent_to_0 here; - */ + // If the previous line ends in ';' and the line before the + // previous line ends in ',' or '\', ident to column zero: + // int foo, + // bar; + // indent_to_0 here; if (cin_ends_in(l, (char_u *)";", NULL)) { l = ml_get(curwin->w_cursor.lnum - 1); @@ -3914,26 +3730,25 @@ term_again: l = ml_get_curline(); } - /* - * Doesn't look like anything interesting -- so just - * use the indent of this line. - * - * Position the cursor over the rightmost paren, so that - * matching it will take us back to the start of the line. - */ + // Doesn't look like anything interesting -- so just + // use the indent of this line. + // + // Position the cursor over the rightmost paren, so that + // matching it will take us back to the start of the line. find_last_paren(l, '(', ')'); if ((trypos = find_match_paren(curbuf->b_ind_maxparen)) != NULL) curwin->w_cursor = *trypos; - amount = get_indent(); /* XXX */ + amount = get_indent(); // XXX break; } - /* add extra indent for a comment */ + // add extra indent for a comment if (cin_iscomment(theline)) amount += curbuf->b_ind_comment; - /* add extra indent if the previous line ended in a backslash: + /* + * add extra indent if the previous line ended in a backslash: * "asdfasdf\ * here"; * char *foo = "asdf\ @@ -3957,7 +3772,7 @@ theend: amount = 0; laterend: - /* put the cursor back where it belongs */ + // put the cursor back where it belongs curwin->w_cursor = cur_curpos; vim_free(linecopy); @@ -3995,38 +3810,30 @@ find_match(int lookfor, linenr_T ourscop look = cin_skipcomment(ml_get_curline()); if (cin_iselse(look) || cin_isif(look) - || cin_isdo(look) /* XXX */ + || cin_isdo(look) // XXX || cin_iswhileofdo(look, curwin->w_cursor.lnum)) { - /* - * if we've gone outside the braces entirely, - * we must be out of scope... - */ - theirscope = find_start_brace(); /* XXX */ + // if we've gone outside the braces entirely, + // we must be out of scope... + theirscope = find_start_brace(); // XXX if (theirscope == NULL) break; - /* - * and if the brace enclosing this is further - * back than the one enclosing the else, we're - * out of luck too. - */ + // and if the brace enclosing this is further + // back than the one enclosing the else, we're + // out of luck too. if (theirscope->lnum < ourscope) break; - /* - * and if they're enclosed in a *deeper* brace, - * then we can ignore it because it's in a - * different scope... - */ + // and if they're enclosed in a *deeper* brace, + // then we can ignore it because it's in a + // different scope... if (theirscope->lnum > ourscope) continue; - /* - * if it was an "else" (that's not an "else if") - * then we need to go back to another if, so - * increment elselevel - */ + // if it was an "else" (that's not an "else if") + // then we need to go back to another if, so + // increment elselevel look = cin_skipcomment(ml_get_curline()); if (cin_iselse(look)) { @@ -4036,38 +3843,32 @@ find_match(int lookfor, linenr_T ourscop continue; } - /* - * if it was a "while" then we need to go back to - * another "do", so increment whilelevel. XXX - */ + // if it was a "while" then we need to go back to + // another "do", so increment whilelevel. XXX if (cin_iswhileofdo(look, curwin->w_cursor.lnum)) { ++whilelevel; continue; } - /* If it's an "if" decrement elselevel */ + // If it's an "if" decrement elselevel look = cin_skipcomment(ml_get_curline()); if (cin_isif(look)) { elselevel--; - /* - * When looking for an "if" ignore "while"s that - * get in the way. - */ + // When looking for an "if" ignore "while"s that + // get in the way. if (elselevel == 0 && lookfor == LOOKFOR_IF) whilelevel = 0; } - /* If it's a "do" decrement whilelevel */ + // If it's a "do" decrement whilelevel if (cin_isdo(look)) whilelevel--; - /* - * if we've used up all the elses, then - * this must be the if that we want! - * match the indent level of that if. - */ + // if we've used up all the elses, then + // this must be the if that we want! + // match the indent level of that if. if (elselevel <= 0 && whilelevel <= 0) { return OK; @@ -4093,8 +3894,8 @@ get_expr_indent(void) int use_sandbox = was_set_insecurely((char_u *)"indentexpr", OPT_LOCAL); - /* Save and restore cursor position and curswant, in case it was changed - * via :normal commands */ + // Save and restore cursor position and curswant, in case it was changed + // via :normal commands save_pos = curwin->w_cursor; save_curswant = curwin->w_curswant; save_set_curswant = curwin->w_set_curswant; @@ -4103,8 +3904,8 @@ get_expr_indent(void) ++sandbox; ++textlock; - /* Need to make a copy, the 'indentexpr' option could be changed while - * evaluating it. */ + // Need to make a copy, the 'indentexpr' option could be changed while + // evaluating it. inde_copy = vim_strsave(curbuf->b_p_inde); if (inde_copy != NULL) { @@ -4116,9 +3917,9 @@ get_expr_indent(void) --sandbox; --textlock; - /* Restore the cursor position so that 'indentexpr' doesn't need to. - * Pretend to be in Insert mode, allow cursor past end of line for "o" - * command. */ + // Restore the cursor position so that 'indentexpr' doesn't need to. + // Pretend to be in Insert mode, allow cursor past end of line for "o" + // command. save_State = State; State = INSERT; curwin->w_cursor = save_pos; @@ -4127,7 +3928,7 @@ get_expr_indent(void) check_cursor(); State = save_State; - /* If there is an error, just keep the current indent. */ + // If there is an error, just keep the current indent. if (indent < 0) indent = get_indent(); @@ -4163,21 +3964,19 @@ in_cinkeys( int i; if (keytyped == NUL) - /* Can happen with CTRL-Y and CTRL-E on a short line. */ + // Can happen with CTRL-Y and CTRL-E on a short line. return FALSE; #ifdef FEAT_EVAL if (*curbuf->b_p_inde != NUL) - look = curbuf->b_p_indk; /* 'indentexpr' set: use 'indentkeys' */ + look = curbuf->b_p_indk; // 'indentexpr' set: use 'indentkeys' else #endif - look = curbuf->b_p_cink; /* 'indentexpr' empty: use 'cinkeys' */ + look = curbuf->b_p_cink; // 'indentexpr' empty: use 'cinkeys' while (*look) { - /* - * Find out if we want to try a match with this key, depending on - * 'when' and a '*' or '!' before the key. - */ + // Find out if we want to try a match with this key, depending on + // 'when' and a '*' or '!' before the key. switch (when) { case '*': try_match = (*look == '*'); break; @@ -4187,10 +3986,8 @@ in_cinkeys( if (*look == '*' || *look == '!') ++look; - /* - * If there is a '0', only accept a match if the line is empty. - * But may still match when typing last char of a word. - */ + // If there is a '0', only accept a match if the line is empty. + // But may still match when typing last char of a word. if (*look == '0') { try_match_word = try_match; @@ -4201,9 +3998,7 @@ in_cinkeys( else try_match_word = FALSE; - /* - * does it look like a control character? - */ + // does it look like a control character? if (*look == '^' #ifdef EBCDIC && (Ctrl_chr(look[1]) != 0) @@ -4216,10 +4011,8 @@ in_cinkeys( return TRUE; look += 2; } - /* - * 'o' means "o" command, open forward. - * 'O' means "O" command, open backward. - */ + // 'o' means "o" command, open forward. + // 'O' means "O" command, open backward. else if (*look == 'o') { if (try_match && keytyped == KEY_OPEN_FORW) @@ -4233,10 +4026,8 @@ in_cinkeys( ++look; } - /* - * 'e' means to check for "else" at start of line and just before the - * cursor. - */ + // 'e' means to check for "else" at start of line and just before the + // cursor. else if (*look == 'e') { if (try_match && keytyped == 'e' && curwin->w_cursor.col >= 4) @@ -4249,11 +4040,9 @@ in_cinkeys( ++look; } - /* - * ':' only causes an indent if it is at the end of a label or case - * statement, or when it was before typing the ':' (to fix - * class::method for C++). - */ + // ':' only causes an indent if it is at the end of a label or case + // statement, or when it was before typing the ':' (to fix + // class::method for C++). else if (*look == ':') { if (try_match && keytyped == ':') @@ -4261,7 +4050,7 @@ in_cinkeys( p = ml_get_curline(); if (cin_iscase(p, FALSE) || cin_isscopedecl(p) || cin_islabel()) return TRUE; - /* Need to get the line again after cin_islabel(). */ + // Need to get the line again after cin_islabel(). p = ml_get_curline(); if (curwin->w_cursor.col > 2 && p[curwin->w_cursor.col - 1] == ':' @@ -4280,18 +4069,14 @@ in_cinkeys( } - /* - * Is it a key in <>, maybe? - */ + // Is it a key in <>, maybe? else if (*look == '<') { if (try_match) { - /* - * make up some named keys , , , <0>, <>>, <<>, <*>, - * <:> and so that people can re-indent on o, O, e, 0, <, - * >, *, : and ! keys if they really really want to. - */ + // make up some named keys , , , <0>, <>>, <<>, <*>, + // <:> and so that people can re-indent on o, O, e, 0, <, + // >, *, : and ! keys if they really really want to. if (vim_strchr((char_u *)"<>!*oOe0:", look[1]) != NULL && keytyped == look[1]) return TRUE; @@ -4305,9 +4090,7 @@ in_cinkeys( look++; } - /* - * Is it a word: "=word"? - */ + // Is it a word: "=word"? else if (*look == '=' && look[1] != ',' && look[1] != NUL) { ++look; @@ -4331,8 +4114,8 @@ in_cinkeys( { char_u *s; - /* Just completed a word, check if it starts with "look". - * search back for the start of a word. */ + // Just completed a word, check if it starts with "look". + // search back for the start of a word. line = ml_get_curline(); if (has_mbyte) { @@ -4357,7 +4140,7 @@ in_cinkeys( } else #endif - /* TODO: multi-byte */ + // TODO: multi-byte if (keytyped == (int)p[-1] || (icase && keytyped < 256 && TOLOWER_LOC(keytyped) == TOLOWER_LOC((int)p[-1]))) { @@ -4372,8 +4155,8 @@ in_cinkeys( } if (match && try_match_word && !try_match) { - /* "0=word": Check if there are only blanks before the - * word. */ + // "0=word": Check if there are only blanks before the + // word. if (getwhitecols_curline() != (int)(curwin->w_cursor.col - (p - look))) match = FALSE; @@ -4384,9 +4167,7 @@ in_cinkeys( look = p; } - /* - * ok, it's a boring generic character. - */ + // ok, it's a boring generic character. else { if (try_match && *look == keytyped) @@ -4395,14 +4176,12 @@ in_cinkeys( ++look; } - /* - * Skip over ", ". - */ + // Skip over ", ". look = skip_to_option_part(look); } return FALSE; } -#endif /* FEAT_CINDENT */ +#endif // FEAT_CINDENT #if defined(FEAT_LISP) || defined(PROTO) @@ -4450,7 +4229,7 @@ get_lisp_indent(void) int parencount, quotecount; int vi_lisp; - /* Set vi_lisp to use the vi-compatible method */ + // Set vi_lisp to use the vi-compatible method vi_lisp = (vim_strchr(p_cpo, CPO_LISP) != NULL); realpos = curwin->w_cursor; @@ -4467,8 +4246,8 @@ get_lisp_indent(void) } if (pos != NULL) { - /* Extra trick: Take the indent of the first previous non-white - * line that is at the same () level. */ + // Extra trick: Take the indent of the first previous non-white + // line that is at the same () level. amount = -1; parencount = 0; @@ -4494,7 +4273,7 @@ get_lisp_indent(void) { while (*++that && *that != '"') { - /* skipping escaped characters in the string */ + // skipping escaped characters in the string if (*that == '\\') { if (*++that == NUL) @@ -4540,13 +4319,11 @@ get_lisp_indent(void) col--; } - /* - * Some keywords require "body" indenting rules (the - * non-standard-lisp ones are Scheme special forms): - * - * (let ((a 1)) instead (let ((a 1)) - * (...)) of (...)) - */ + // Some keywords require "body" indenting rules (the + // non-standard-lisp ones are Scheme special forms): + // + // (let ((a 1)) instead (let ((a 1)) + // (...)) of (...)) if (!vi_lisp && (*that == '(' || *that == '[') && lisp_match(that + 1)) @@ -4563,10 +4340,10 @@ get_lisp_indent(void) ++that; } - if (*that && *that != ';') /* not a comment line */ + if (*that && *that != ';') // not a comment line { - /* test *that != '(' to accommodate first let/do - * argument if it is more than one line */ + // test *that != '(' to accommodate first let/do + // argument if it is more than one line if (!vi_lisp && *that != '(' && *that != '[') firsttry++; @@ -4617,13 +4394,13 @@ get_lisp_indent(void) } } else - amount = 0; /* no matching '(' or '[' found, use zero indent */ + amount = 0; // no matching '(' or '[' found, use zero indent curwin->w_cursor = realpos; return amount; } -#endif /* FEAT_LISP */ +#endif // FEAT_LISP #if defined(FEAT_CINDENT) || defined(PROTO) /* @@ -4658,7 +4435,7 @@ fixthisline(int (*get_the_indent)(void)) { change_indent(INDENT_SET, amount, FALSE, 0, TRUE); if (linewhite(curwin->w_cursor.lnum)) - did_ai = TRUE; /* delete the indent if the line stays empty */ + did_ai = TRUE; // delete the indent if the line stays empty } } diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -784,6 +784,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 874, +/**/ 873, /**/ 872,