patch 8.1.0461: quickfix code uses too many /* */ commentsv8.1.0461

Problem:    Quickfix code uses too many /* */ comments.
Solution:   Change to // comments. (Yegappan Lakshmanan)

1 files changed, 501 insertions, 585 deletions

diff --git a/src/quickfix.c b/src/quickfix.c
index 30f9bdeb2d..1b491c280a 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -27,20 +27,20 @@ struct dir_stack_T
 typedef struct qfline_S qfline_T;
 struct qfline_S
 {
-    qfline_T	*qf_next;	/* pointer to next error in the list */
-    qfline_T	*qf_prev;	/* pointer to previous error in the list */
-    linenr_T	qf_lnum;	/* line number where the error occurred */
-    int		qf_fnum;	/* file number for the line */
-    int		qf_col;		/* column where the error occurred */
-    int		qf_nr;		/* error number */
-    char_u	*qf_module;	/* module name for this error */
-    char_u	*qf_pattern;	/* search pattern for the error */
-    char_u	*qf_text;	/* description of the error */
-    char_u	qf_viscol;	/* set to TRUE if qf_col is screen column */
-    char_u	qf_cleared;	/* set to TRUE if line has been deleted */
-    char_u	qf_type;	/* type of the error (mostly 'E'); 1 for
-				   :helpgrep */
-    char_u	qf_valid;	/* valid error message detected */
+    qfline_T	*qf_next;	// pointer to next error in the list
+    qfline_T	*qf_prev;	// pointer to previous error in the list
+    linenr_T	qf_lnum;	// line number where the error occurred
+    int		qf_fnum;	// file number for the line
+    int		qf_col;		// column where the error occurred
+    int		qf_nr;		// error number
+    char_u	*qf_module;	// module name for this error
+    char_u	*qf_pattern;	// search pattern for the error
+    char_u	*qf_text;	// description of the error
+    char_u	qf_viscol;	// set to TRUE if qf_col is screen column
+    char_u	qf_cleared;	// set to TRUE if line has been deleted
+    char_u	qf_type;	// type of the error (mostly 'E'); 1 for
+				// :helpgrep
+    char_u	qf_valid;	// valid error message detected
 };
 
 /*
@@ -60,16 +60,16 @@ struct qfline_S
  */
 typedef struct qf_list_S
 {
-    int_u	qf_id;		/* Unique identifier for this list */
-    qfline_T	*qf_start;	/* pointer to the first error */
-    qfline_T	*qf_last;	/* pointer to the last error */
-    qfline_T	*qf_ptr;	/* pointer to the current error */
-    int		qf_count;	/* number of errors (0 means empty list) */
-    int		qf_index;	/* current index in the error list */
-    int		qf_nonevalid;	/* TRUE if not a single valid entry found */
-    char_u	*qf_title;	/* title derived from the command that created
-				 * the error list or set by setqflist */
-    typval_T	*qf_ctx;	/* context set by setqflist/setloclist */
+    int_u	qf_id;		// Unique identifier for this list
+    qfline_T	*qf_start;	// pointer to the first error
+    qfline_T	*qf_last;	// pointer to the last error
+    qfline_T	*qf_ptr;	// pointer to the current error
+    int		qf_count;	// number of errors (0 means empty list)
+    int		qf_index;	// current index in the error list
+    int		qf_nonevalid;	// TRUE if not a single valid entry found
+    char_u	*qf_title;	// title derived from the command that created
+				// the error list or set by setqflist
+    typval_T	*qf_ctx;	// context set by setqflist/setloclist
 
     struct dir_stack_T	*qf_dir_stack;
     char_u		*qf_directory;
@@ -87,22 +87,20 @@ typedef struct qf_list_S
  */
 struct qf_info_S
 {
-    /*
-     * Count of references to this list. Used only for location lists.
-     * When a location list window reference this list, qf_refcount
-     * will be 2. Otherwise, qf_refcount will be 1. When qf_refcount
-     * reaches 0, the list is freed.
-     */
+    // Count of references to this list. Used only for location lists.
+    // When a location list window reference this list, qf_refcount
+    // will be 2. Otherwise, qf_refcount will be 1. When qf_refcount
+    // reaches 0, the list is freed.
     int		qf_refcount;
-    int		qf_listcount;	    /* current number of lists */
-    int		qf_curlist;	    /* current error list */
+    int		qf_listcount;	    // current number of lists
+    int		qf_curlist;	    // current error list
     qf_list_T	qf_lists[LISTCOUNT];
 };
 
-static qf_info_T ql_info;	/* global quickfix list */
-static int_u last_qf_id = 0;	/* Last used quickfix list id */
+static qf_info_T ql_info;	// global quickfix list
+static int_u last_qf_id = 0;	// Last used quickfix list id
 
-#define FMT_PATTERNS 11		/* maximum number of % recognized */
+#define FMT_PATTERNS 11		// maximum number of % recognized
 
 /*
  * Structure used to hold the info of one part of 'errorformat'
@@ -110,29 +108,29 @@ static int_u last_qf_id = 0;	/* Last used quickfix list id */
 typedef struct efm_S efm_T;
 struct efm_S
 {
-    regprog_T	    *prog;	/* pre-formatted part of 'errorformat' */
-    efm_T	    *next;	/* pointer to next (NULL if last) */
-    char_u	    addr[FMT_PATTERNS]; /* indices of used % patterns */
-    char_u	    prefix;	/* prefix of this format line: */
-				/*   'D' enter directory */
-				/*   'X' leave directory */
-				/*   'A' start of multi-line message */
-				/*   'E' error message */
-				/*   'W' warning message */
-				/*   'I' informational message */
-				/*   'C' continuation line */
-				/*   'Z' end of multi-line message */
-				/*   'G' general, unspecific message */
-				/*   'P' push file (partial) message */
-				/*   'Q' pop/quit file (partial) message */
-				/*   'O' overread (partial) message */
-    char_u	    flags;	/* additional flags given in prefix */
-				/*   '-' do not include this line */
-				/*   '+' include whole line in message */
-    int		    conthere;	/* %> used */
+    regprog_T	    *prog;	// pre-formatted part of 'errorformat'
+    efm_T	    *next;	// pointer to next (NULL if last)
+    char_u	    addr[FMT_PATTERNS]; // indices of used % patterns
+    char_u	    prefix;	// prefix of this format line:
+				//   'D' enter directory
+				//   'X' leave directory
+				//   'A' start of multi-line message
+				//   'E' error message
+				//   'W' warning message
+				//   'I' informational message
+				//   'C' continuation line
+				//   'Z' end of multi-line message
+				//   'G' general, unspecific message
+				//   'P' push file (partial) message
+				//   'Q' pop/quit file (partial) message
+				//   'O' overread (partial) message
+    char_u	    flags;	// additional flags given in prefix
+				//   '-' do not include this line
+				//   '+' include whole line in message
+    int		    conthere;	// %> used
 };
 
-static efm_T	*fmt_start = NULL; /* cached across qf_parse_line() calls */
+static efm_T	*fmt_start = NULL; // cached across qf_parse_line() calls
 
 static void	qf_new_list(qf_info_T *qi, char_u *qf_title);
 static int	qf_add_entry(qf_info_T *qi, int qf_idx, char_u *dir, char_u *fname, char_u *module, int bufnum, char_u *mesg, long lnum, int col, int vis_col, char_u *pattern, int nr, int type, int valid);
@@ -153,9 +151,9 @@ static void	wipe_dummy_buffer(buf_T *buf, char_u *dirname_start);
 static void	unload_dummy_buffer(buf_T *buf, char_u *dirname_start);
 static qf_info_T *ll_get_or_alloc_list(win_T *);
 
-/* Quickfix window check helper macro */
+// Quickfix window check helper macro
 #define IS_QF_WINDOW(wp) (bt_quickfix(wp->w_buffer) && wp->w_llist_ref == NULL)
-/* Location list window check helper macro */
+// Location list window check helper macro
 #define IS_LL_WINDOW(wp) (bt_quickfix(wp->w_buffer) && wp->w_llist_ref != NULL)
 
 // Quickfix and location list stack check helper macros
@@ -189,7 +187,7 @@ static struct fmtpattern
     char	*pattern;
 } fmt_pat[FMT_PATTERNS] =
     {
-	{'f', ".\\+"},	    /* only used when at end */
+	{'f', ".\\+"},	    // only used when at end
 	{'n', "\\d\\+"},
 	{'l', "\\d\\+"},
 	{'c', "\\d\\+"},
@@ -221,7 +219,7 @@ efmpat_to_regpat(
 
     if (efminfo->addr[idx])
     {
-	/* Each errorformat pattern can occur only once */
+	// Each errorformat pattern can occur only once
 	sprintf((char *)errmsg,
 		_("E372: Too many %%%c in format string"), *efmpat);
 	EMSG(errmsg);
@@ -243,9 +241,9 @@ efmpat_to_regpat(
 #ifdef BACKSLASH_IN_FILENAME
     if (*efmpat == 'f')
     {
-	/* Also match "c:" in the file name, even when
-	 * checking for a colon next: "%f:".
-	 * "\%(\a:\)\=" */
+	// Also match "c:" in the file name, even when
+	// checking for a colon next: "%f:".
+	// "\%(\a:\)\="
 	STRCPY(regpat, "\\%(\\a:\\)\\=");
 	regpat += 10;
     }
@@ -254,18 +252,18 @@ efmpat_to_regpat(
     {
 	if (efmpat[1] != '\\' && efmpat[1] != '%')
 	{
-	    /* A file name may contain spaces, but this isn't
-	     * in "\f".  For "%f:%l:%m" there may be a ":" in
-	     * the file name.  Use ".\{-1,}x" instead (x is
-	     * the next character), the requirement that :999:
-	     * follows should work. */
+	    // A file name may contain spaces, but this isn't
+	    // in "\f".  For "%f:%l:%m" there may be a ":" in
+	    // the file name.  Use ".\{-1,}x" instead (x is
+	    // the next character), the requirement that :999:
+	    // follows should work.
 	    STRCPY(regpat, ".\\{-1,}");
 	    regpat += 7;
 	}
 	else
 	{
-	    /* File name followed by '\\' or '%': include as
-	     * many file name chars as possible. */
+	    // File name followed by '\\' or '%': include as
+	    // many file name chars as possible.
 	    STRCPY(regpat, "\\f\\+");
 	    regpat += 4;
 	}
@@ -298,16 +296,16 @@ scanf_fmt_to_regpat(
 
     if (*efmp == '[' || *efmp == '\\')
     {
-	if ((*regpat++ = *efmp) == '[')	/* %*[^a-z0-9] etc. */
+	if ((*regpat++ = *efmp) == '[')	// %*[^a-z0-9] etc.
 	{
 	    if (efmp[1] == '^')
 		*regpat++ = *++efmp;
 	    if (efmp < efm + len)
 	    {
-		*regpat++ = *++efmp;	    /* could be ']' */
+		*regpat++ = *++efmp;	    // could be ']'
 		while (efmp < efm + len
 			&& (*regpat++ = *++efmp) != ']')
-		    /* skip */;
+		    // skip ;
 		if (efmp == efm + len)
 		{
 		    EMSG(_("E374: Missing ] in format string"));
@@ -315,14 +313,14 @@ scanf_fmt_to_regpat(
 		}
 	    }
 	}
-	else if (efmp < efm + len)	/* %*\D, %*\s etc. */
+	else if (efmp < efm + len)	// %*\D, %*\s etc.
 	    *regpat++ = *++efmp;
 	*regpat++ = '\\';
 	*regpat++ = '+';
     }
     else
     {
-	/* TODO: scanf()-like: %*ud, %*3c, %*f, ... ? */
+	// TODO: scanf()-like: %*ud, %*3c, %*f, ... ?
 	sprintf((char *)errmsg,
 		_("E375: Unsupported %%%c in format string"), *efmp);
 	EMSG(errmsg);
@@ -374,9 +372,7 @@ efm_to_regpat(
     int		round;
     int		idx = 0;
 
-    /*
-     * Build a regexp pattern for a 'errorformat' option part
-     */
+    // Build a regexp pattern for a 'errorformat' option part
     ptr = regpat;
     *ptr++ = '^';
     round = 0;
@@ -404,17 +400,15 @@ efm_to_regpat(
 		    return FAIL;
 	    }
 	    else if (vim_strchr((char_u *)"%\\.^$~[", *efmp) != NULL)
-		*ptr++ = *efmp;		/* regexp magic characters */
+		*ptr++ = *efmp;		// regexp magic characters
 	    else if (*efmp == '#')
 		*ptr++ = '*';
 	    else if (*efmp == '>')
 		fmt_ptr->conthere = TRUE;
-	    else if (efmp == efm + 1)		/* analyse prefix */
+	    else if (efmp == efm + 1)		// analyse prefix
 	    {
-		/*
-		 * prefix is allowed only at the beginning of the errorformat
-		 * option part
-		 */
+		// prefix is allowed only at the beginning of the errorformat
+		// option part
 		efmp = efm_analyze_prefix(efmp, fmt_ptr, errmsg);
 		if (efmp == NULL)
 		    return FAIL;
@@ -427,12 +421,12 @@ efm_to_regpat(
 		return FAIL;
 	    }
 	}
-	else			/* copy normal character */
+	else			// copy normal character
 	{
 	    if (*efmp == '\\' && efmp + 1 < efm + len)
 		++efmp;
 	    else if (vim_strchr((char_u *)".*^$~[", *efmp) != NULL)
-		*ptr++ = '\\';	/* escape regexp atoms */
+		*ptr++ = '\\';	// escape regexp atoms
 	    if (*efmp)
 		*ptr++ = *efmp;
 	}
@@ -474,9 +468,9 @@ efm_regpat_bufsz(char_u *efm)
     for (i = FMT_PATTERNS; i > 0; )
 	sz += (int)STRLEN(fmt_pat[--i].pattern);
 #ifdef BACKSLASH_IN_FILENAME
-    sz += 12; /* "%f" can become twelve chars longer (see efm_to_regpat) */
+    sz += 12; // "%f" can become twelve chars longer (see efm_to_regpat)
 #else
-    sz += 2; /* "%f" can become two chars longer */
+    sz += 2; // "%f" can become two chars longer
 #endif
 
     return sz;
@@ -519,48 +513,38 @@ parse_efm_option(char_u *efm)
     if (errmsg == NULL)
 	goto parse_efm_end;
 
-    /*
-     * Each part of the format string is copied and modified from errorformat
-     * to regex prog.  Only a few % characters are allowed.
-     */
+    // Each part of the format string is copied and modified from errorformat
+    // to regex prog.  Only a few % characters are allowed.
 
-    /*
-     * Get some space to modify the format string into.
-     */
+    // Get some space to modify the format string into.
     sz = efm_regpat_bufsz(efm);
     if ((fmtstr = alloc(sz)) == NULL)
 	goto parse_efm_error;
 
     while (efm[0] != NUL)
     {
-	/*
-	 * Allocate a new eformat structure and put it at the end of the list
-	 */
+	// Allocate a new eformat structure and put it at the end of the list
 	fmt_ptr = (efm_T *)alloc_clear((unsigned)sizeof(efm_T));
 	if (fmt_ptr == NULL)
 	    goto parse_efm_error;
-	if (fmt_first == NULL)	    /* first one */
+	if (fmt_first == NULL)	    // first one
 	    fmt_first = fmt_ptr;
 	else
 	    fmt_last->next = fmt_ptr;
 	fmt_last = fmt_ptr;
 
-	/*
-	 * Isolate one part in the 'errorformat' option
-	 */
+	// Isolate one part in the 'errorformat' option
 	len = efm_option_part_len(efm);
 
 	if (efm_to_regpat(efm, len, fmt_ptr, fmtstr, errmsg) == FAIL)
 	    goto parse_efm_error;
 	if ((fmt_ptr->prog = vim_regcomp(fmtstr, RE_MAGIC + RE_STRING)) == NULL)
 	    goto parse_efm_error;
-	/*
-	 * Advance to next part
-	 */
-	efm = skip_to_option_part(efm + len);	/* skip comma and spaces */
+	// Advance to next part
+	efm = skip_to_option_part(efm + len);	// skip comma and spaces
     }
 
-    if (fmt_first == NULL)	/* nothing found */
+    if (fmt_first == NULL)	// nothing found
 	EMSG(_("E378: 'errorformat' contains no pattern"));
 
     goto parse_efm_end;
@@ -611,10 +595,8 @@ qf_grow_linebuf(qfstate_T *state, int newsz)
 {
     char_u	*p;
 
-    /*
-     * If the line exceeds LINE_MAXLEN exclude the last
-     * byte since it's not a NL character.
-     */
+    // If the line exceeds LINE_MAXLEN exclude the last
+    // byte since it's not a NL character.
     state->linelen = newsz > LINE_MAXLEN ? LINE_MAXLEN - 1 : newsz;
     if (state->growbuf == NULL)
     {
@@ -639,12 +621,12 @@ qf_grow_linebuf(qfstate_T *state, int newsz)
     static int
 qf_get_next_str_line(qfstate_T *state)
 {
-    /* Get the next line from the supplied string */
+    // Get the next line from the supplied string
     char_u	*p_str = state->p_str;
     char_u	*p;
     int		len;
 
-    if (*p_str == NUL) /* Reached the end of the string */
+    if (*p_str == NUL) // Reached the end of the string
 	return QF_END_OF_INPUT;
 
     p = vim_strchr(p_str, '\n');
@@ -666,10 +648,8 @@ qf_get_next_str_line(qfstate_T *state)
     }
     vim_strncpy(state->linebuf, p_str, state->linelen);
 
-    /*
-     * Increment using len in order to discard the rest of the
-     * line if it exceeds LINE_MAXLEN.
-     */
+    // Increment using len in order to discard the rest of the
+    // line if it exceeds LINE_MAXLEN.
     p_str += len;
     state->p_str = p_str;
 
@@ -688,9 +668,9 @@ qf_get_next_list_line(qfstate_T *state)
     while (p_li != NULL
 	    && (p_li->li_tv.v_type != VAR_STRING
 		|| p_li->li_tv.vval.v_string == NULL))
-	p_li = p_li->li_next;	/* Skip non-string items */
+	p_li = p_li->li_next;	// Skip non-string items
 
-    if (p_li == NULL)		/* End of the list */
+    if (p_li == NULL)		// End of the list
     {
 	state->p_li = NULL;
 	return QF_END_OF_INPUT;
@@ -711,7 +691,7 @@ qf_get_next_list_line(qfstate_T *state)
 
     vim_strncpy(state->linebuf, p_li->li_tv.vval.v_string, state->linelen);
 
-    state->p_li = p_li->li_next;	/* next item */
+    state->p_li = p_li->li_next;	// next item
     return QF_OK;
 }
 
@@ -724,7 +704,7 @@ qf_get_next_buf_line(qfstate_T *state)
     char_u	*p_buf = NULL;
     int		len;
 
-    /* Get the next line from the supplied buffer */
+    // Get the next line from the supplied buffer
     if (state->buflnum > state->lnumlast)
 	return QF_END_OF_INPUT;
 
@@ -764,10 +744,8 @@ qf_get_next_file_line(qfstate_T *state)
     state->linelen = (int)STRLEN(IObuff);
     if (state->linelen == IOSIZE - 1 && !(IObuff[state->linelen - 1] == '\n'))
     {
-	/*
-	 * The current line exceeds IObuff, continue reading using
-	 * growbuf until EOL or LINE_MAXLEN bytes is read.
-	 */
+	// The current line exceeds IObuff, continue reading using
+	// growbuf until EOL or LINE_MAXLEN bytes is read.
 	if (state->growbuf == NULL)
 	{
 	    state->growbufsiz = 2 * (IOSIZE - 1);
@@ -776,7 +754,7 @@ qf_get_next_file_line(qfstate_T *state)
 		return QF_NOMEM;
 	}
 
-	/* Copy the read part of the line, excluding null-terminator */
+	// Copy the read part of the line, excluding null-terminator
 	memcpy(state->growbuf, IObuff, IOSIZE - 1);
 	growbuflen = state->linelen;
 
@@ -806,11 +784,9 @@ qf_get_next_file_line(qfstate_T *state)
 
 	while (discard)
 	{
-	    /*
-	     * The current line is longer than LINE_MAXLEN, continue
-	     * reading but discard everything until EOL or EOF is
-	     * reached.
-	     */
+	    // The current line is longer than LINE_MAXLEN, continue
+	    // reading but discard everything until EOL or EOF is
+	    // reached.
 	    if (fgets((char *)IObuff, IOSIZE, state->fd) == NULL
 		    || (int)STRLEN(IObuff) < IOSIZE - 1
 		    || IObuff[IOSIZE - 1] == '\n')
@@ -824,7 +800,7 @@ qf_get_next_file_line(qfstate_T *state)
 	state->linebuf = IObuff;
 
 #ifdef FEAT_MBYTE
-    /* Convert a line if it contains a non-ASCII character. */
+    // Convert a line if it contains a non-ASCII character.
     if (state->vc.vc_type != CONV_NONE && has_non_ascii(state->linebuf))
     {
 	char_u	*line;
@@ -864,24 +840,24 @@ qf_get_nextline(qfstate_T *state)
 	if (state->tv != NULL)
 	{
 	    if (state->tv->v_type == VAR_STRING)
-		/* Get the next line from the supplied string */
+		// Get the next line from the supplied string
 		status = qf_get_next_str_line(state);
 	    else if (state->tv->v_type == VAR_LIST)
-		/* Get the next line from the supplied list */
+		// Get the next line from the supplied list
 		status = qf_get_next_list_line(state);
 	}
 	else
-	    /* Get the next line from the supplied buffer */
+	    // Get the next line from the supplied buffer
 	    status = qf_get_next_buf_line(state);
     }
     else
-	/* Get the next line from the supplied file */
+	// Get the next line from the supplied file
 	status = qf_get_next_file_line(state);
 
     if (status != QF_OK)
 	return status;
 
-    /* remove newline/CR from the line */
+    // remove newline/CR from the line
     if (state->linelen > 0 && state->linebuf[state->linelen - 1] == '\n')
     {
 	state->linebuf[state->linelen - 1] = NUL;
@@ -924,16 +900,14 @@ qf_parse_fmt_f(regmatch_T *rmp, int midx, qffields_T *fields, int prefix)
     if (rmp->startp[midx] == NULL || rmp->endp[midx] == NULL)
 	return QF_FAIL;
 
-    /* Expand ~/file and $HOME/file to full path. */
+    // Expand ~/file and $HOME/file to full path.
     c = *rmp->endp[midx];
     *rmp->endp[midx] = NUL;
     expand_env(rmp->startp[midx], fields->namebuf, CMDBUFFSIZE);
     *rmp->endp[midx] = c;
 
-    /*
-     * For separate filename patterns (%O, %P and %Q), the specified file
-     * should exist.
-     */
+    // For separate filename patterns (%O, %P and %Q), the specified file
+    // should exist.
     if (vim_strchr((char_u *)"OPQ", prefix) != NULL
 	    && mch_getperm(fields->namebuf) == -1)
 	return QF_FAIL;
@@ -1004,7 +978,7 @@ qf_parse_fmt_plus(char_u *linebuf, int linelen, qffields_T *fields)
 
     if (linelen >= fields->errmsglen)
     {
-	/* linelen + null terminator */
+	// linelen + null terminator
 	if ((p = vim_realloc(fields->errmsg, linelen + 1)) == NULL)
 	    return QF_NOMEM;
 	fields->errmsg = p;
@@ -1029,7 +1003,7 @@ qf_parse_fmt_m(regmatch_T *rmp, int midx, qffields_T *fields)
     len = (int)(rmp->endp[midx] - rmp->startp[midx]);
     if (len >= fields->errmsglen)
     {
-	/* len + null terminator */
+	// len + null terminator
 	if ((p = vim_realloc(fields->errmsg, len + 1)) == NULL)
 	    return QF_NOMEM;
 	fields->errmsg = p;
@@ -1181,27 +1155,26 @@ qf_parse_match(
 	fields->type = idx;
     else
 	fields->type = 0;
-    /*
-     * Extract error message data from matched line.
-     * We check for an actual submatch, because "\[" and "\]" in
-     * the 'errorformat' may cause the wrong submatch to be used.
-     */
+
+    // Extract error message data from matched line.
+    // We check for an actual submatch, because "\[" and "\]" in
+    // the 'errorformat' may cause the wrong submatch to be used.
     for (i = 0; i < FMT_PATTERNS; i++)
     {
 	status = QF_OK;
 	midx = (int)fmt_ptr->addr[i];
-	if (i == 0 && midx > 0)				/* %f */
+	if (i == 0 && midx > 0)				// %f
 	    status = qf_parse_fmt_f(regmatch, midx, fields, idx);
 	else if (i == 5)
 	{
-	    if (fmt_ptr->flags == '+' && !qf_multiscan)	/* %+ */
+	    if (fmt_ptr->flags == '+' && !qf_multiscan)	// %+
 		status = qf_parse_fmt_plus(linebuf, linelen, fields);
-	    else if (midx > 0)				/* %m */
+	    else if (midx > 0)				// %m
 		status = qf_parse_fmt_m(regmatch, midx, fields);
 	}
-	else if (i == 6 && midx > 0)			/* %r */
+	else if (i == 6 && midx > 0)			// %r
 	    status = qf_parse_fmt_r(regmatch, midx, tail);
-	else if (midx > 0)				/* others */
+	else if (midx > 0)				// others
 	    status = (qf_parse_fmt[i])(regmatch, midx, fields);
 
 	if (status != QF_OK)
@@ -1247,7 +1220,7 @@ qf_parse_get_fields(
     fields->type = 0;
     *tail = NULL;
 
-    /* Always ignore case when looking for a matching error. */
+    // Always ignore case when looking for a matching error.
     regmatch.rm_ic = TRUE;
     regmatch.regprog = fmt_ptr->prog;
     r = vim_regexec(&regmatch, linebuf, (colnr_T)0);
@@ -1267,7 +1240,7 @@ qf_parse_get_fields(
     static int
 qf_parse_dir_pfx(int idx, qffields_T *fields, qf_list_T *qfl)
 {
-    if (idx == 'D')				/* enter directory */
+    if (idx == 'D')				// enter directory
     {
 	if (*fields->namebuf == NUL)
 	{
@@ -1279,7 +1252,7 @@ qf_parse_dir_pfx(int idx, qffields_T *fields, qf_list_T *qfl)
 	if (qfl->qf_directory == NULL)
 	    return QF_FAIL;
     }
-    else if (idx == 'X')			/* leave directory */
+    else if (idx == 'X')			// leave directory
 	qfl->qf_directory = qf_pop_dir(&qfl->qf_dir_stack);
 
     return QF_OK;
@@ -1324,18 +1297,18 @@ qf_parse_line_nomatch(char_u *linebuf, int linelen, qffields_T *fields)
 {
     char_u	*p;
 
-    fields->namebuf[0] = NUL;	/* no match found, remove file name */
-    fields->lnum = 0;			/* don't jump to this line */
+    fields->namebuf[0] = NUL;	// no match found, remove file name
+    fields->lnum = 0;		// don't jump to this line
     fields->valid = FALSE;
     if (linelen >= fields->errmsglen)
     {
-	/* linelen + null terminator */
+	// linelen + null terminator
 	if ((p = vim_realloc(fields->errmsg, linelen + 1)) == NULL)
 	    return QF_NOMEM;
 	fields->errmsg = p;
 	fields->errmsglen = linelen + 1;
     }
-    /* copy whole line to error message */
+    // copy whole line to error message
     vim_strncpy(fields->errmsg, linebuf, linelen);
 
     return QF_OK;
@@ -1376,7 +1349,7 @@ qf_parse_multiline_pfx(
 	if (qfprev->qf_nr == -1)
 	    qfprev->qf_nr = fields->enr;
 	if (vim_isprintc(fields->type) && !qfprev->qf_type)
-	    /* only printable chars allowed */
+	    // only printable chars allowed
 	    qfprev->qf_type = fields->type;
 
 	if (!qfprev->qf_lnum)
@@ -1419,20 +1392,18 @@ qf_parse_line(
     int			status;
 
 restofline:
-    /* If there was no %> item start at the first pattern */
+    // If there was no %> item start at the first pattern
     if (fmt_start == NULL)
 	fmt_ptr = fmt_first;
     else
     {
-	/* Otherwise start from the last used pattern */
+	// Otherwise start from the last used pattern
 	fmt_ptr = fmt_start;
 	fmt_start = NULL;
     }
 
-    /*
-     * Try to match each part of 'errorformat' until we find a complete
-     * match or no match.
-     */
+    // Try to match each part of 'errorformat' until we find a complete
+    // match or no match.
     fields->valid = TRUE;
     for ( ; fmt_ptr != NULL; fmt_ptr = fmt_ptr->next)
     {
@@ -1450,7 +1421,7 @@ restofline:
     {
 	if (fmt_ptr != NULL)
 	{
-	    /* 'D' and 'X' directory specifiers */
+	    // 'D' and 'X' directory specifiers
 	    status = qf_parse_dir_pfx(idx, fields, qfl);
 	    if (status != QF_OK)
 		return status;
@@ -1465,31 +1436,31 @@ restofline:
     }
     else if (fmt_ptr != NULL)
     {
-	/* honor %> item */
+	// honor %> item
 	if (fmt_ptr->conthere)
 	    fmt_start = fmt_ptr;
 
 	if (vim_strchr((char_u *)"AEWI", idx) != NULL)
 	{
-	    qfl->qf_multiline = TRUE;	/* start of a multi-line message */
-	    qfl->qf_multiignore = FALSE;/* reset continuation */
+	    qfl->qf_multiline = TRUE;	// start of a multi-line message
+	    qfl->qf_multiignore = FALSE;// reset continuation
 	}
 	else if (vim_strchr((char_u *)"CZ", idx) != NULL)
-	{				/* continuation of multi-line msg */
+	{				// continuation of multi-line msg
 	    status = qf_parse_multiline_pfx(qi, qf_idx, idx, qfl, fields);
 	    if (status != QF_OK)
 		return status;
 	}
 	else if (vim_strchr((char_u *)"OPQ", idx) != NULL)
-	{				/* global file names */
+	{				// global file names
 	    status = qf_parse_file_pfx(idx, fields, qfl, tail);
 	    if (status == QF_MULTISCAN)
 		goto restofline;
 	}
-	if (fmt_ptr->flags == '-')	/* generally exclude this line */
+	if (fmt_ptr->flags == '-')	// generally exclude this line
 	{
 	    if (qfl->qf_multiline)
-		/* also exclude continuation lines */
+		// also exclude continuation lines
 		qfl->qf_multiignore = TRUE;
 	    return QF_IGNORE_LINE;
 	}
@@ -1624,9 +1595,9 @@ qf_init_ext(
     buf_T	    *buf,
     typval_T	    *tv,
     char_u	    *errorformat,
-    int		    newlist,		/* TRUE: start a new error list */
-    linenr_T	    lnumfirst,		/* first line number to use */
-    linenr_T	    lnumlast,		/* last line number to use */
+    int		    newlist,		// TRUE: start a new error list
+    linenr_T	    lnumfirst,		// first line number to use
+    linenr_T	    lnumlast,		// last line number to use
     char_u	    *qf_title,
     char_u	    *enc)
 {
@@ -1638,10 +1609,10 @@ qf_init_ext(
     static efm_T    *fmt_first = NULL;
     char_u	    *efm;
     static char_u   *last_efm = NULL;
-    int		    retval = -1;	/* default: return error flag */
+    int		    retval = -1;	// default: return error flag
     int		    status;
 
-    /* Do not used the cached buffer, it may have been wiped out. */
+    // Do not used the cached buffer, it may have been wiped out.
     VIM_CLEAR(qf_last_bufname);
 
     vim_memset(&state, 0, sizeof(state));
@@ -1653,13 +1624,13 @@ qf_init_ext(
 
     if (newlist || qf_idx == qi->qf_listcount)
     {
-	/* make place for a new list */
+	// make place for a new list
 	qf_new_list(qi, qf_title);
 	qf_idx = qi->qf_curlist;
     }
     else
     {
-	/* Adding to existing list, use last entry. */
+	// Adding to existing list, use last entry.
 	adding = TRUE;
 	if (!qf_list_empty(qi, qf_idx))
 	    old_last = qi->qf_lists[qf_idx].qf_last;
@@ -1667,48 +1638,42 @@ qf_init_ext(
 
     qfl = &qi->qf_lists[qf_idx];
 
-    /* Use the local value of 'errorformat' if it's set. */
+    // Use the local value of 'errorformat' if it's set.
     if (errorformat == p_efm && tv == NULL && *buf->b_p_efm != NUL)
 	efm = buf->b_p_efm;
     else
 	efm = errorformat;
 
-    /*
-     * If the errorformat didn't change between calls, then reuse the
-     * previously parsed values.
-     */
+    // If the errorformat didn't change between calls, then reuse the
+    // previously parsed values.
     if (last_efm == NULL || (STRCMP(last_efm, efm) != 0))
     {
-	/* free the previously parsed data */
+	// free the previously parsed data
 	VIM_CLEAR(last_efm);
 	free_efm_list(&fmt_first);
 
-	/* parse the current 'efm' */
+	// parse the current 'efm'
 	fmt_first = parse_efm_option(efm);
 	if (fmt_first != NULL)
 	    last_efm = vim_strsave(efm);
     }
 
-    if (fmt_first == NULL)	/* nothing found */
+    if (fmt_first == NULL)	// nothing found
 	goto error2;
 
-    /*
-     * got_int is reset here, because it was probably set when killing the
-     * ":make" command, but we still want to read the errorfile then.
-     */
+    // got_int is reset here, because it was probably set when killing the
+    // ":make" command, but we still want to read the errorfile then.
     got_int = FALSE;
 
-    /*
-     * Read the lines in the error file one by one.
-     * Try to recognize one of the error formats in each line.
-     */
+    // Read the lines in the error file one by one.
+    // Try to recognize one of the error formats in each line.
     while (!got_int)
     {
-	/* Get the next line from a file/buffer/list/string */
+	// Get the next line from a file/buffer/list/string
 	status = qf_get_nextline(&state);
-	if (status == QF_NOMEM)		/* memory alloc failure */
+	if (status == QF_NOMEM)		// memory alloc failure
 	    goto qf_init_end;
-	if (status == QF_END_OF_INPUT)	/* end of input */
+	if (status == QF_END_OF_INPUT)	// end of input
 	    break;
 
 	status = qf_parse_line(qi, qf_idx, state.linebuf, state.linelen,
@@ -1744,7 +1709,7 @@ qf_init_ext(
     {
 	if (qfl->qf_index == 0)
 	{
-	    /* no valid entry found */
+	    // no valid entry found
 	    qfl->qf_ptr = qfl->qf_start;
 	    qfl->qf_index = 1;
 	    qfl->qf_nonevalid = TRUE;
@@ -1755,7 +1720,7 @@ qf_init_ext(
 	    if (qfl->qf_ptr == NULL)
 		qfl->qf_ptr = qfl->qf_start;
 	}
-	/* return number of matches */
+	// return number of matches
 	retval = qfl->qf_count;
 	goto qf_init_end;
     }
@@ -1763,7 +1728,7 @@ qf_init_ext(
 error2:
     if (!adding)
     {
-	/* Error when creating a new list. Free the new list */
+	// Error when creating a new list. Free the new list
 	qf_free(&qi->qf_lists[qi->qf_curlist]);
 	qi->qf_listcount--;
 	if (qi->qf_curlist > 0)
@@ -1787,7 +1752,7 @@ qf_init_end:
 qf_init(win_T	    *wp,
 	char_u	    *efile,
 	char_u	    *errorformat,
-	int	    newlist,		/* TRUE: start a new error list */
+	int	    newlist,		// TRUE: start a new error list
 	char_u	    *qf_title,
 	char_u	    *enc)
 {
@@ -1848,18 +1813,14 @@ qf_new_list(qf_info_T *qi, char_u *qf_title)
 {
     int		i;
 
-    /*
-     * If the current entry is not the last entry, delete entries beyond
-     * the current entry.  This makes it possible to browse in a tree-like
-     * way with ":grep'.
-     */
+    // If the current entry is not the last entry, delete entries beyond
+    // the current entry.  This makes it possible to browse in a tree-like
+    // way with ":grep'.
     while (qi->qf_listcount > qi->qf_curlist + 1)
 	qf_free(&qi->qf_lists[--qi->qf_listcount]);
 
-    /*
-     * When the stack is full, remove to oldest entry
-     * Otherwise, add a new entry.
-     */
+    // When the stack is full, remove to oldest entry
+    // Otherwise, add a new entry.
     if (qi->qf_listcount == LISTCOUNT)
     {
 	qf_free(&qi->qf_lists[0]);
@@ -1886,12 +1847,12 @@ ll_free_all(qf_info_T **pqi)
     qi = *pqi;
     if (qi == NULL)
 	return;
-    *pqi = NULL;	/* Remove reference to this list */
+    *pqi = NULL;	// Remove reference to this list
 
     qi->qf_refcount--;
     if (qi->qf_refcount < 1)
     {
-	/* No references to this location list */
+	// No references to this location list
 	for (i = 0; i < qi->qf_listcount; ++i)
 	    qf_free(&qi->qf_lists[i]);
 	vim_free(qi);
@@ -1909,12 +1870,12 @@ qf_free_all(win_T *wp)
 
     if (wp != NULL)
     {
-	/* location list */
+	// location list
 	ll_free_all(&wp->w_llist);
 	ll_free_all(&wp->w_llist_ref);
     }
     else
-	/* quickfix list */
+	// quickfix list
 	for (i = 0; i < qi->qf_listcount; ++i)
 	    qf_free(&qi->qf_lists[i]);
 }
@@ -1925,24 +1886,24 @@ qf_free_all(win_T *wp)
  */
     static int
 qf_add_entry(
-    qf_info_T	*qi,		/* quickfix list */
-    int		qf_idx,		/* list index */
-    char_u	*dir,		/* optional directory name */
-    char_u	*fname,		/* file name or NULL */
-    char_u	*module,	/* module name or NULL */
-    int		bufnum,		/* buffer number or zero */
-    char_u	*mesg,		/* message */
-    long	lnum,		/* line number */
-    int		col,		/* column */
-    int		vis_col,	/* using visual column */
-    char_u	*pattern,	/* search pattern */
-    int		nr,		/* error number */
-    int		type,		/* type character */
-    int		valid)		/* valid entry */
+    qf_info_T	*qi,		// quickfix list
+    int		qf_idx,		// list index
+    char_u	*dir,		// optional directory name
+    char_u	*fname,		// file name or NULL
+    char_u	*module,	// module name or NULL
+    int		bufnum,		// buffer number or zero
+    char_u	*mesg,		// message
+    long	lnum,		// line number
+    int		col,		// column
+    int		vis_col,	// using visual column
+    char_u	*pattern,	// search pattern
+    int		nr,		// error number
+    int		type,		// type character
+    int		valid)		// valid entry
 {
     qf_list_T	*qfl = &qi->qf_lists[qf_idx];
     qfline_T	*qfp;
-    qfline_T	**lastp;	/* pointer to qf_last or NULL */
+    qfline_T	**lastp;	// pointer to qf_last or NULL
 
     if ((qfp = (qfline_T *)alloc((unsigned)sizeof(qfline_T))) == NULL)
 	return FAIL;
@@ -1983,13 +1944,13 @@ qf_add_entry(
 	return FAIL;
     }
     qfp->qf_nr = nr;
-    if (type != 1 && !vim_isprintc(type)) /* only printable chars allowed */
+    if (type != 1 && !vim_isprintc(type)) // only printable chars allowed
 	type = 0;
     qfp->qf_type = type;
     qfp->qf_valid = valid;
 
     lastp = &qfl->qf_last;
-    if (qf_list_empty(qi, qf_idx))	/* first element in the list */
+    if (qf_list_empty(qi, qf_idx))	// first element in the list
     {
 	qfl->qf_start = qfp;
 	qfl->qf_ptr = qfp;
@@ -2005,8 +1966,7 @@ qf_add_entry(
     qfp->qf_cleared = FALSE;
     *lastp = qfp;
     ++qfl->qf_count;
-    if (qfl->qf_index == 0 && qfp->qf_valid)
-				/* first valid entry */
+    if (qfl->qf_index == 0 && qfp->qf_valid)	// first valid entry
     {
 	qfl->qf_index = qfl->qf_count;
 	qfl->qf_ptr = qfp;
@@ -2037,17 +1997,15 @@ ll_new_list(void)
 ll_get_or_alloc_list(win_T *wp)
 {
     if (IS_LL_WINDOW(wp))
-	/* For a location list window, use the referenced location list */
+	// For a location list window, use the referenced location list
 	return wp->w_llist_ref;
 
-    /*
-     * For a non-location list window, w_llist_ref should not point to a
-     * location list.
-     */
+    // For a non-location list window, w_llist_ref should not point to a
+    // location list.
     ll_free_all(&wp->w_llist_ref);
 
     if (wp->w_llist == NULL)
-	wp->w_llist = ll_new_list();	    /* new location list */
+	wp->w_llist = ll_new_list();	    // new location list
     return wp->w_llist;
 }
 
@@ -2195,7 +2153,7 @@ qf_get_fnum(qf_info_T *qi, int qf_idx, char_u *directory, char_u *fname)
     buf_T	*buf;
     char_u	*bufname;
 
-    if (fname == NULL || *fname == NUL)		/* no file name */
+    if (fname == NULL || *fname == NUL)		// no file name
 	return 0;
 
 #ifdef VMS
@@ -2209,12 +2167,10 @@ qf_get_fnum(qf_info_T *qi, int qf_idx, char_u *directory, char_u *fname)
     if (directory != NULL && !vim_isAbsName(fname)
 	    && (ptr = concat_fnames(directory, fname, TRUE)) != NULL)
     {