vim: src/highlight.c comparison

comparison src/highlight.c @ 17494:c8df7f8ccdf8 v8.1.1745

patch 8.1.1745: compiler warning for unused argument commit https://github.com/vim/vim/commit/1f164b19685d8ad709b11f3f1933685469251e30 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jul 24 19:00:36 2019 +0200 patch 8.1.1745: compiler warning for unused argument Problem: Compiler warning for unused argument. Solution: Add UNUSED. Change comments to new style.

author	Bram Moolenaar <Bram@vim.org>
date	Wed, 24 Jul 2019 19:15:04 +0200
parents	367ef00c6258
children	04245f071792

comparison

equal deleted inserted replaced

-:7f993d962a1d
+:c8df7f8ccdf8
 "default link QuickFixLine Search",
 CENT("Normal cterm=NONE", "Normal gui=NONE"),
 NULL
 };
-/* Default colors only used with a light background. */
+// Default colors only used with a light background.
 static char *(highlight_init_light[]) = {
 CENT("Directory term=bold ctermfg=DarkBlue",
 	 "Directory term=bold ctermfg=DarkBlue guifg=Blue"),
 CENT("LineNr term=underline ctermfg=Brown",
 	 "LineNr term=underline ctermfg=Brown guifg=Brown"),
 	 "ToolbarButton cterm=bold ctermfg=White ctermbg=DarkGrey gui=bold guifg=White guibg=Grey40"),
 #endif
 NULL
 };
-/* Default colors only used with a dark background. */
+// Default colors only used with a dark background.
 static char *(highlight_init_dark[]) = {
 CENT("Directory term=bold ctermfg=LightCyan",
 	 "Directory term=bold ctermfg=LightCyan guifg=Cyan"),
 CENT("LineNr term=underline ctermfg=Yellow",
 	 "LineNr term=underline ctermfg=Yellow guifg=Yellow"),
 char_u	*grp,
 char_u	*pat,
 int		prio,
 int		id,
 list_T	*pos_list,
-char_u      *conceal_char UNUSED) /* pointer to conceal replacement char */
+char_u      *conceal_char UNUSED) // pointer to conceal replacement char
 {
 matchitem_T	*cur;
 matchitem_T	*prev;
 matchitem_T	*m;
 int		hlg_id;
 {
 	semsg(_(e_invarg2), pat);
 	return -1;
 }
-/* Find available match ID. */
+// Find available match ID.
 while (id == -1)
 {
 	cur = wp->w_match_head;
 	while (cur != NULL && cur->id != wp->w_next_match_id)
 	    cur = cur->next;
 	if (cur == NULL)
 	    id = wp->w_next_match_id;
 	wp->w_next_match_id++;
 }
-/* Build new match. */
+// Build new match.
 m = ALLOC_CLEAR_ONE(matchitem_T);
 m->id = id;
 m->priority = prio;
 m->pattern = pat == NULL ? NULL : vim_strsave(pat);
 m->hlg_id = hlg_id;
 m->conceal_char = 0;
 if (conceal_char != NULL)
 	m->conceal_char = (*mb_ptr2char)(conceal_char);
 # endif
-/* Set up position matches */
+// Set up position matches
 if (pos_list != NULL)
 {
 	linenr_T	toplnum = 0;
 	linenr_T	botlnum = 0;
 	listitem_T	*li;
 		toplnum = lnum;
 	    if (botlnum == 0 || lnum >= botlnum)
 		botlnum = lnum + 1;
 	}
-	/* Calculate top and bottom lines for redrawing area */
+	// Calculate top and bottom lines for redrawing area
 	if (toplnum != 0)
 	{
 	    if (wp->w_buffer->b_mod_set)
 	    {
 		if (wp->w_buffer->b_mod_top > toplnum)
 	    m->pos.botlnum = botlnum;
 	    rtype = VALID;
 	}
 }
-/* Insert new match.  The match list is in ascending order with regard to
+// Insert new match.  The match list is in ascending order with regard to
-* the match priorities. */
+// the match priorities.
 cur = wp->w_match_head;
 prev = cur;
 while (cur != NULL && prio >= cur->priority)
 {
 	prev = cur;
 void
 init_search_hl(win_T *wp, match_T *search_hl)
 {
 matchitem_T *cur;
-/* Setup for match and 'hlsearch' highlighting.  Disable any previous
+// Setup for match and 'hlsearch' highlighting.  Disable any previous
-* match */
+// match
 cur = wp->w_match_head;
 while (cur != NULL)
 {
 	cur->hl.rm = cur->match;
 	if (cur->hlg_id == 0)
 	    cur->hl.attr = syn_id2attr(cur->hlg_id);
 	cur->hl.buf = wp->w_buffer;
 	cur->hl.lnum = 0;
 	cur->hl.first_lnum = 0;
 # ifdef FEAT_RELTIME
-	/* Set the time limit to 'redrawtime'. */
+	// Set the time limit to 'redrawtime'.
 	profile_setlimit(p_rdt, &(cur->hl.tm));
 # endif
 	cur = cur->next;
 }
 search_hl->buf = wp->w_buffer;
 search_hl->lnum = 0;
 search_hl->first_lnum = 0;
-/* time limit is set at the toplevel, for all windows */
+// time limit is set at the toplevel, for all windows
 }
 /*
 * If there is a match fill "shl" and return one.
 * Return zero otherwise.
 */
 static int
 next_search_hl_pos(
-match_T	    *shl,	/* points to a match */
+match_T	    *shl,	// points to a match
 linenr_T	    lnum,
-posmatch_T	    *posmatch,	/* match positions */
+posmatch_T	    *posmatch,	// match positions
-colnr_T	    mincol)	/* minimal column for a match */
+colnr_T	    mincol)	// minimal column for a match
 {
 int	    i;
 int	    found = -1;
 for (i = posmatch->cur; i < MAXPOSMATCH; i++)
 	    continue;
 	if (pos->lnum == lnum)
 	{
 	    if (found >= 0)
 	    {
-		/* if this match comes before the one at "found" then swap
+		// if this match comes before the one at "found" then swap
-		 * them */
+		// them
 		if (pos->col < posmatch->pos[found].col)
 		{
 		    llpos_T	tmp = *pos;
 		    *pos = posmatch->pos[found];
 	return;
 }
 if (shl->lnum != 0)
 {
-	/* Check for three situations:
+	// Check for three situations:
-	 * 1. If the "lnum" is below a previous match, start a new search.
+	// 1. If the "lnum" is below a previous match, start a new search.
-	 * 2. If the previous match includes "mincol", use it.
+	// 2. If the previous match includes "mincol", use it.
-	 * 3. Continue after the previous match.
+	// 3. Continue after the previous match.
-	 */
 	l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum;
 	if (lnum > l)
 	    shl->lnum = 0;
 	else if (lnum < l || shl->rm.endpos[0].col > mincol)
 	    return;
 */
 called_emsg = FALSE;
 for (;;)
 {
 # ifdef FEAT_RELTIME
-	/* Stop searching after passing the time limit. */
+	// Stop searching after passing the time limit.
 	if (profile_passed_limit(&(shl->tm)))
 	{
-	    shl->lnum = 0;		/* no match found in time */
+	    shl->lnum = 0;		// no match found in time
 	    break;
 	}
 # endif
-	/* Three situations:
+	// Three situations:
-	 * 1. No useful previous match: search from start of line.
+	// 1. No useful previous match: search from start of line.
-	 * 2. Not Vi compatible or empty match: continue at next character.
+	// 2. Not Vi compatible or empty match: continue at next character.
-	 *    Break the loop if this is beyond the end of the line.
+	//    Break the loop if this is beyond the end of the line.
-	 * 3. Vi compatible searching: continue at end of previous match.
+	// 3. Vi compatible searching: continue at end of previous match.
-	 */
 	if (shl->lnum == 0)
 	    matchcol = 0;
 	else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL
 		|| (shl->rm.endpos[0].lnum == 0
 		    && shl->rm.endpos[0].col <= shl->rm.startpos[0].col))
 	    matchcol = shl->rm.endpos[0].col;
 	shl->lnum = lnum;
 	if (shl->rm.regprog != NULL)
 	{
-	    /* Remember whether shl->rm is using a copy of the regprog in
+	    // Remember whether shl->rm is using a copy of the regprog in
-	     * cur->match. */
+	    // cur->match.
 	    int regprog_is_copy = (shl != search_hl && cur != NULL
 				&& shl == &cur->hl
 				&& cur->match.regprog == cur->hl.rm.regprog);
 	    int timed_out = FALSE;
 		    &(shl->tm), &timed_out
 #else
 		    NULL, NULL
 #endif
 		    );
-	    /* Copy the regprog, in case it got freed and recompiled. */
+	    // Copy the regprog, in case it got freed and recompiled.
 	    if (regprog_is_copy)
 		cur->match.regprog = cur->hl.rm.regprog;
 	    if (called_emsg || got_int || timed_out)
 	    {
-		/* Error while handling regexp: stop using this regexp. */
+		// Error while handling regexp: stop using this regexp.
 		if (shl == search_hl)
 		{
-		    /* don't free regprog in the match list, it's a copy */
+		    // don't free regprog in the match list, it's a copy
 		    vim_regfree(shl->rm.regprog);
 		    set_no_hlsearch(TRUE);
 		}
 		shl->rm.regprog = NULL;
 		shl->lnum = 0;
-		got_int = FALSE;  /* avoid the "Type :quit to exit Vim"
+		got_int = FALSE;  // avoid the "Type :quit to exit Vim" message
-				     message */
 		break;
 	    }
 	}
 	else if (cur != NULL)
 	    nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol);
 	else
 	    nmatched = 0;
 	if (nmatched == 0)
 	{
-	    shl->lnum = 0;		/* no match found */
+	    shl->lnum = 0;		// no match found
 	    break;
 	}
 	if (shl->rm.startpos[0].lnum > 0
 		|| shl->rm.startpos[0].col >= mincol
 		|| nmatched > 1
 		|| shl->rm.endpos[0].col > mincol)
 	{
 	    shl->lnum += shl->rm.startpos[0].lnum;
-	    break;			/* useful match found */
+	    break;			// useful match found
 	}
 }
 // Restore called_emsg for assert_fails().
 called_emsg = save_called_emsg;
 * Advance to the match in window "wp" line "lnum" or past it.
 */
 void
 prepare_search_hl(win_T *wp, match_T *search_hl, linenr_T lnum)
 {
-matchitem_T *cur;		/* points to the match list */
+matchitem_T *cur;		// points to the match list
-match_T	*shl;		/* points to search_hl or a match */
+match_T	*shl;		// points to search_hl or a match
-int		shl_flag;	/* flag to indicate whether search_hl
+int		shl_flag;	// flag to indicate whether search_hl
-				   has been processed or not */
+				// has been processed or not
-int		pos_inprogress;	/* marks that position match search is
+int		pos_inprogress;	// marks that position match search is
-				   in progress */
+				// in progress
 int		n;
-/*
+// When using a multi-line pattern, start searching at the top
-* When using a multi-line pattern, start searching at the top
+// of the window or just after a closed fold.
-* of the window or just after a closed fold.
+// Do this both for search_hl and the match list.
-* Do this both for search_hl and the match list.
-*/
 cur = wp->w_match_head;
 shl_flag = WIN_IS_POPUP(wp);  // skip search_hl in a popup window
 while (cur != NULL || shl_flag == FALSE)
 {
 	if (shl_flag == FALSE)
 		if (has_mbyte && (*line)[shl->endcol] != NUL)
 		    shl->endcol += (*mb_ptr2len)((*line) + shl->endcol);
 		else
 		    ++shl->endcol;
 	    }
-	    if ((long)shl->startcol < mincol)  /* match at leftcol */
+	    if ((long)shl->startcol < mincol)  // match at leftcol
 	    {
 		shl->attr_cur = shl->attr;
 		*search_attr = shl->attr;
 	    }
 	    area_highlighting = TRUE;
 	win_T	    *wp,
 	linenr_T    lnum,
 	colnr_T	    col,
 	char_u	    **line,
 	match_T	    *search_hl,
-	int	    *has_match_conc,
+	int	    *has_match_conc UNUSED,
-	int	    *match_conc,
+	int	    *match_conc UNUSED,
 	int	    did_line_attr,
 	int	    lcs_eol_one)
 {
 matchitem_T *cur;		    // points to the match list
 match_T	*shl;		    // points to search_hl or a match
 		    else
 			shl->endcol = MAXCOL;
 		    if (shl->startcol == shl->endcol)
 		    {
-			/* highlight empty match, try again after
+			// highlight empty match, try again after
-			 * it */
+			// it
 			if (has_mbyte)
 			    shl->endcol += (*mb_ptr2len)(*line + shl->endcol);
 			else
 			    ++shl->endcol;
 		    }
-		    /* Loop to check if the match starts at the
+		    // Loop to check if the match starts at the
-		     * current position */
+		    // current position
 		    continue;
 		}
 	    }
 	    break;
 	}
 	if (shl->attr_cur != 0)
 	    search_attr = shl->attr_cur;
 	if (shl != search_hl && cur != NULL)
 	    cur = cur->next;
 }
-/* Only highlight one character after the last column. */
+// Only highlight one character after the last column.
 if (*(*line + col) == NUL && (did_line_attr >= 1
 				       || (wp->w_p_list && lcs_eol_one == -1)))
 	search_attr = 0;
 return search_attr;
 }
 	dict = dict_alloc();
 	if (dict == NULL)
 	    return;
 	if (cur->match.regprog == NULL)
 	{
-	    /* match added with matchaddpos() */
+	    // match added with matchaddpos()
 	    for (i = 0; i < MAXPOSMATCH; ++i)
 	    {
 		llpos_T	*llpos;
 		char	buf[30];  // use 30 to avoid compiler warning
 		list_T	*l;
 if (win == NULL)
 	return;
 if ((l = argvars[0].vval.v_list) != NULL)
 {
-	/* To some extent make sure that we are dealing with a list from
+	// To some extent make sure that we are dealing with a list from
-	 * "getmatches()". */
+	// "getmatches()".
 	li = l->lv_first;
 	while (li != NULL)
 	{
 	    if (li->li_tv.v_type != VAR_DICT
 		    || (d = li->li_tv.vval.v_dict) == NULL)
 		    s = list_alloc();
 		    if (s == NULL)
 			return;
 		}
-		/* match from matchaddpos() */
+		// match from matchaddpos()
 		for (i = 1; i < 9; i++)
 		{
 		    sprintf((char *)buf, (char *)"pos%d", i);
 		    if ((di = dict_find(d, (char_u *)buf, -1)) != NULL)
 		    {
 void
 f_matchadd(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
 {
 # ifdef FEAT_SEARCH_EXTRA
 char_u	buf[NUMBUFLEN];
-char_u	*grp = tv_get_string_buf_chk(&argvars[0], buf);	/* group */
+char_u	*grp = tv_get_string_buf_chk(&argvars[0], buf);	// group
-char_u	*pat = tv_get_string_buf_chk(&argvars[1], buf);	/* pattern */
+char_u	*pat = tv_get_string_buf_chk(&argvars[1], buf);	// pattern
-int		prio = 10;	/* default priority */
+int		prio = 10;	// default priority
 int		id = -1;
 int		error = FALSE;
 char_u	*conceal_char = NULL;
 win_T	*win = curwin;
 	}
 }
 if (error == TRUE)
 	return;
-/* id == 3 is ok because matchaddpos() is supposed to substitute :3match */
+// id == 3 is ok because matchaddpos() is supposed to substitute :3match
 if (id == 1 || id == 2)
 {
 	semsg(_("E798: ID is reserved for \":match\": %d"), id);
 	return;
 }
 {
 	emsg(_(e_invcmd));
 	return;
 }
-/* First clear any old pattern. */
+// First clear any old pattern.
 if (!eap->skip)
 	match_delete(curwin, id, FALSE);
 if (ends_excmd(*eap->arg))
 	end = eap->arg;
 	if (!eap->skip)
 	    g = vim_strnsave(eap->arg, (int)(p - eap->arg));
 	p = skipwhite(p);
 	if (*p == NUL)
 	{
-	    /* There must be two arguments. */
+	    // There must be two arguments.
 	    vim_free(g);
 	    semsg(_(e_invarg2), eap->arg);
 	    return;
 	}
 	end = skip_regexp(p + 1, *p, TRUE, NULL);

Mercurial > vim

comparison src/highlight.c @ 17494:c8df7f8ccdf8 v8.1.1745