vim: src/search.c comparison

comparison src/search.c @ 11121:778c10516955 v8.0.0448

patch 8.0.0448: some macros are in lower case commit https://github.com/vim/vim/commit/b5aedf3e228d35821591da9ae8501b61cf2e264c Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 12 18:23:53 2017 +0100 patch 8.0.0448: some macros are in lower case Problem: Some macros are in lower case, which can be confusing. Solution: Make a few lower case macros upper case.

author	Christian Brabandt <cb@256bit.org>
date	Sun, 12 Mar 2017 18:30:06 +0100
parents	e2258e86d8e1
children	506f5d8b7d8b

comparison

equal deleted inserted replaced

-:29ee7ffe8df7
+:778c10516955
 	backwards = !backwards;
 #endif
 do_quotes = -1;
 start_in_quotes = MAYBE;
-clearpos(&match_pos);
+CLEAR_POS(&match_pos);
 /* backward search: Check if this line contains a single-line comment */
 if ((backwards && comment_dir)
 #ifdef FEAT_LISP
 	    || lisp
 		found_dot = TRUE;
 	    }
 	    if (decl(&pos) == -1)
 		break;
 	    /* when going forward: Stop in front of empty line */
-	    if (lineempty(pos.lnum) && dir == FORWARD)
+	    if (LINEEMPTY(pos.lnum) && dir == FORWARD)
 	    {
 		incl(&pos);
 		goto found;
 	    }
 	}
 	     * Stop on an empty line.
 	     */
 	    while (cls() == 0)
 	    {
 		if (curwin->w_cursor.col == 0
-				      && lineempty(curwin->w_cursor.lnum))
+				      && LINEEMPTY(curwin->w_cursor.lnum))
 		    goto finished;
 		if (dec_cursor() == -1) /* hit start of file, stop here */
 		    return OK;
 	    }
 	     * First skip white space, if 'empty' is TRUE, stop at empty line.
 	     */
 	    while (cls() == 0)
 	    {
 		if (empty && curwin->w_cursor.col == 0
-					  && lineempty(curwin->w_cursor.lnum))
+					  && LINEEMPTY(curwin->w_cursor.lnum))
 		    goto finished;
 		if (inc_cursor() == -1)	    /* hit end of file, stop here */
 		    return FAIL;
 	    }
 	/*
 	 * Move backward to end of the previous word
 	 */
 	while (cls() == 0)
 	{
-	    if (curwin->w_cursor.col == 0 && lineempty(curwin->w_cursor.lnum))
+	    if (curwin->w_cursor.col == 0 && LINEEMPTY(curwin->w_cursor.lnum))
 		break;
 	    if ((i = dec_cursor()) == -1 || (eol && i == 1))
 		return OK;
 	}
 }
 pos_T	pos;
 int		inclusive = TRUE;
 int		include_white = FALSE;
 cls_bigword = bigword;
-clearpos(&start_pos);
+CLEAR_POS(&start_pos);
 /* Correct cursor when 'selection' is exclusive */
-if (VIsual_active && *p_sel == 'e' && lt(VIsual, curwin->w_cursor))
+if (VIsual_active && *p_sel == 'e' && LT_POS(VIsual, curwin->w_cursor))
 	dec_cursor();
 /*
 * When Visual mode is not active, or when the VIsual area is only one
 * character, select the word and/or white space under the cursor.
 */
-if (!VIsual_active || equalpos(curwin->w_cursor, VIsual))
+if (!VIsual_active || EQUAL_POS(curwin->w_cursor, VIsual))
 {
 	/*
 	 * Go to start of current word or white space.
 	 */
 	back_in_line();
 * When count is still > 0, extend with more objects.
 */
 while (count > 0)
 {
 	inclusive = TRUE;
-	if (VIsual_active && lt(curwin->w_cursor, VIsual))
+	if (VIsual_active && LT_POS(curwin->w_cursor, VIsual))
 	{
 	    /*
 	     * In Visual mode, with cursor at start: move cursor back.
 	     */
 	    if (decl(&curwin->w_cursor) == -1)
 	curwin->w_cursor = pos;	/* put cursor back at end */
 }
 if (VIsual_active)
 {
-	if (*p_sel == 'e' && inclusive && ltoreq(VIsual, curwin->w_cursor))
+	if (*p_sel == 'e' && inclusive && LTOREQ_POS(VIsual, curwin->w_cursor))
 	    inc_cursor();
 	if (VIsual_mode == 'V')
 	{
 	    VIsual_mode = 'v';
 	    redraw_cmdline = TRUE;		/* show mode later */
 findsent(FORWARD, 1L);	/* Find start of next sentence. */
 /*
 * When the Visual area is bigger than one character: Extend it.
 */
-if (VIsual_active && !equalpos(start_pos, VIsual))
+if (VIsual_active && !EQUAL_POS(start_pos, VIsual))
 {
 extend:
-	if (lt(start_pos, VIsual))
+	if (LT_POS(start_pos, VIsual))
 	{
 	    /*
 	     * Cursor at start of Visual area.
 	     * Find out where we are:
 	     * - in the white space before a sentence
 	     * - in a sentence or just after it
 	     * - at the start of a sentence
 	     */
 	    at_start_sent = TRUE;
 	    decl(&pos);
-	    while (lt(pos, curwin->w_cursor))
+	    while (LT_POS(pos, curwin->w_cursor))
 	    {
 		c = gchar_pos(&pos);
 		if (!vim_iswhite(c))
 		{
 		    at_start_sent = FALSE;
 		incl(&pos);
 	    }
 	    if (!at_start_sent)
 	    {
 		findsent(BACKWARD, 1L);
-		if (equalpos(curwin->w_cursor, start_pos))
+		if (EQUAL_POS(curwin->w_cursor, start_pos))
 		    at_start_sent = TRUE;  /* exactly at start of sentence */
 		else
 		    /* inside a sentence, go to its end (start of next) */
 		    findsent(FORWARD, 1L);
 	    }
 	     * - just before or in the white space before a sentence
 	     * - in a sentence
 	     */
 	    incl(&pos);
 	    at_start_sent = TRUE;
-	    if (!equalpos(pos, curwin->w_cursor)) /* not just before a sentence */
+	    /* not just before a sentence */
+	    if (!EQUAL_POS(pos, curwin->w_cursor))
 	    {
 		at_start_sent = FALSE;
-		while (lt(pos, curwin->w_cursor))
+		while (LT_POS(pos, curwin->w_cursor))
 		{
 		    c = gchar_pos(&pos);
 		    if (!vim_iswhite(c))
 		    {
 			at_start_sent = TRUE;
 * If the cursor started on a blank, check if it is just before the start
 * of the next sentence.
 */
 while (c = gchar_pos(&pos), vim_iswhite(c))	/* vim_iswhite() is a macro */
 	incl(&pos);
-if (equalpos(pos, curwin->w_cursor))
+if (EQUAL_POS(pos, curwin->w_cursor))
 {
 	start_blank = TRUE;
 	find_first_blank(&start_pos);	/* go back to first blank */
 }
 else
 }
 if (VIsual_active)
 {
 	/* Avoid getting stuck with "is" on a single space before a sentence. */
-	if (equalpos(start_pos, curwin->w_cursor))
+	if (EQUAL_POS(start_pos, curwin->w_cursor))
 	    goto extend;
 	if (*p_sel == 'e')
 	    ++curwin->w_cursor.col;
 	VIsual = start_pos;
 	VIsual_mode = 'v';
 old_start = old_end;
 /*
 * If we start on '(', '{', ')', '}', etc., use the whole block inclusive.
 */
-if (!VIsual_active || equalpos(VIsual, curwin->w_cursor))
+if (!VIsual_active || EQUAL_POS(VIsual, curwin->w_cursor))
 {
 	setpcmark();
 	if (what == '{')		/* ignore indent */
 	    while (inindent(1))
 		if (inc_cursor() != 0)
 		    break;
 	if (gchar_cursor() == what)
 	    /* cursor on '(' or '{', move cursor just after it */
 	    ++curwin->w_cursor.col;
 }
-else if (lt(VIsual, curwin->w_cursor))
+else if (LT_POS(VIsual, curwin->w_cursor))
 {
 	old_start = VIsual;
 	curwin->w_cursor = VIsual;	    /* cursor at low end of Visual */
 }
 else
 	/*
 	 * In Visual mode, when the resulting area is not bigger than what we
 	 * started with, extend it to the next block, and then exclude again.
 	 */
-	if (!lt(start_pos, old_start) && !lt(old_end, curwin->w_cursor)
+	if (!LT_POS(start_pos, old_start) && !LT_POS(old_end, curwin->w_cursor)
 		&& VIsual_active)
 	{
 	    curwin->w_cursor = old_start;
 	    decl(&curwin->w_cursor);
 	    if ((pos = findmatch(NULL, what)) == NULL)
 	oap->start = start_pos;
 	oap->motion_type = MCHAR;
 	oap->inclusive = FALSE;
 	if (sol)
 	    incl(&curwin->w_cursor);
-	else if (ltoreq(start_pos, curwin->w_cursor))
+	else if (LTOREQ_POS(start_pos, curwin->w_cursor))
 	    /* Include the character under the cursor. */
 	    oap->inclusive = TRUE;
 	else
 	    /* End is before the start (no text in between <>, [], etc.): don't
 	     * operate on any text. */
 	decl(&old_end);			    /* old_end is inclusive */
 /*
 * If we start on "<aaa>" select that block.
 */
-if (!VIsual_active || equalpos(VIsual, curwin->w_cursor))
+if (!VIsual_active || EQUAL_POS(VIsual, curwin->w_cursor))
 {
 	setpcmark();
 	/* ignore indent */
 	while (inindent(1))
 		    break;
 	    dec_cursor();
 	    old_end = curwin->w_cursor;
 	}
 }
-else if (lt(VIsual, curwin->w_cursor))
+else if (LT_POS(VIsual, curwin->w_cursor))
 {
 	old_start = VIsual;
 	curwin->w_cursor = VIsual;	    /* cursor at low end of Visual */
 }
 else
 						    0, NULL, (linenr_T)0, 0L);
 vim_free(spat);
 vim_free(epat);
-if (r < 1 || lt(curwin->w_cursor, old_end))
+if (r < 1 || LT_POS(curwin->w_cursor, old_end))
 {
 	/* Can't find other end or it's before the previous end.  Could be a
 	 * HTML tag that doesn't have a matching end.  Search backwards for
 	 * another starting tag. */
 	count = 1;
 	    }
 	curwin->w_cursor = end_pos;
 	/* If we now have the same text as before reset "do_include" and try
 	 * again. */
-	if (equalpos(start_pos, old_start) && equalpos(end_pos, old_end))
+	if (EQUAL_POS(start_pos, old_start) && EQUAL_POS(end_pos, old_end))
 	{
 	    do_include = TRUE;
 	    curwin->w_cursor = old_start;
 	    count = count_arg;
 	    goto again;
 if (VIsual_active)
 {
 	/* If the end is before the start there is no text between tags, select
 	 * the char under the cursor. */
-	if (lt(end_pos, start_pos))
+	if (LT_POS(end_pos, start_pos))
 	    curwin->w_cursor = start_pos;
 	else if (*p_sel == 'e')
 	    inc_cursor();
 	VIsual = start_pos;
 	VIsual_mode = 'v';
 }
 else
 {
 	oap->start = start_pos;
 	oap->motion_type = MCHAR;
-	if (lt(end_pos, start_pos))
+	if (LT_POS(end_pos, start_pos))
 	{
 	    /* End is before the start: there is no text between tags; operate
 	     * on an empty area. */
 	    curwin->w_cursor = start_pos;
 	    oap->inclusive = FALSE;
 {
 	/* this only works within one line */
 	if (VIsual.lnum != curwin->w_cursor.lnum)
 	    return FALSE;
-	vis_bef_curs = lt(VIsual, curwin->w_cursor);
+	vis_bef_curs = LT_POS(VIsual, curwin->w_cursor);
 	if (*p_sel == 'e' && vis_bef_curs)
 	    dec_cursor();
-	vis_empty = equalpos(VIsual, curwin->w_cursor);
+	vis_empty = EQUAL_POS(VIsual, curwin->w_cursor);
 }
 if (!vis_empty)
 {
 	/* Check if the existing selection exactly spans the text inside
 /* wrapping should not occur */
 p_ws = FALSE;
 /* Correct cursor when 'selection' is exclusive */
-if (VIsual_active && *p_sel == 'e' && lt(VIsual, curwin->w_cursor))
+if (VIsual_active && *p_sel == 'e' && LT_POS(VIsual, curwin->w_cursor))
 	dec_cursor();
 if (VIsual_active)
 {
 	orig_pos = curwin->w_cursor;
 	    p_ws = old_p_ws;
 	    return FAIL;
 	}
 	else if (!i && !result)
 	{
-	    if (forward) /* try again from start of buffer */
+	    if (forward)
 	    {
-		clearpos(&pos);
+		/* try again from start of buffer */
-	    }
+		CLEAR_POS(&pos);
-	    else /* try again from end of buffer */
+	    }
-	    {
+	    else
+	    {
+		/* try again from end of buffer */
 		/* searching backwards, so set pos to last line and col */
 		pos.lnum = curwin->w_buffer->b_ml.ml_line_count;
 		pos.col  = (colnr_T)STRLEN(
 				ml_get(curwin->w_buffer->b_ml.ml_line_count));
 	    }
 {
 	redraw_curbuf_later(INVERTED);	/* update the inversion */
 	if (*p_sel == 'e')
 	{
 	    /* Correction for exclusive selection depends on the direction. */
-	    if (forward && ltoreq(VIsual, curwin->w_cursor))
+	    if (forward && LTOREQ_POS(VIsual, curwin->w_cursor))
 		inc_cursor();
-	    else if (!forward && ltoreq(curwin->w_cursor, VIsual))
+	    else if (!forward && LTOREQ_POS(curwin->w_cursor, VIsual))
 		inc(&VIsual);
 	}
 }
 /* init startcol correctly */
 regmatch.startpos[0].col = -1;
 /* move to match */
 if (move)
-	clearpos(&pos)
+{
+	CLEAR_POS(&pos);
+}
 else
 {
 	pos = curwin->w_cursor;
 	/* accept a match at the cursor position */
 	flag = SEARCH_START;

Mercurial > vim

comparison src/search.c @ 11121:778c10516955 v8.0.0448