vim: src/misc1.c comparison

comparison src/misc1.c @ 11129:f4ea50924c6d v8.0.0452

patch 8.0.0452: some macros are in lower case commit https://github.com/vim/vim/commit/1c46544412382db8b3203d6c78e550df885540bd Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 12 20:10:05 2017 +0100 patch 8.0.0452: some macros are in lower case Problem: Some macros are in lower case. Solution: Make a few more macros upper case.

author	Christian Brabandt <cb@256bit.org>
date	Sun, 12 Mar 2017 20:15:06 +0100
parents	506f5d8b7d8b
children	501f46f7644c

comparison

equal deleted inserted replaced

-:23154628ab7f
+:f4ea50924c6d
 	if (!(flags & SIN_INSERT) && curbuf->b_p_pi)
 	{
 	    ind_done = 0;
 	    /* count as many characters as we can use */
-	    while (todo > 0 && vim_iswhite(*p))
+	    while (todo > 0 && VIM_ISWHITE(*p))
 	    {
 		if (*p == TAB)
 		{
 		    tab_pad = (int)curbuf->b_p_ts
 					   - (ind_done % (int)curbuf->b_p_ts);
 	++ind_len;
 	/* ++ind_done; */
 }
 /* Return if the indent is OK already. */
-if (!doit && !vim_iswhite(*p) && !(flags & SIN_INSERT))
+if (!doit && !VIM_ISWHITE(*p) && !(flags & SIN_INSERT))
 	return FALSE;
 /* Allocate memory for the new line. */
 if (flags & SIN_INSERT)
 	p = oldline;
 	    orig_char_len--;
 	}
 	/* Skip over any additional white space (useful when newindent is less
 	 * than old) */
-	while (vim_iswhite(*p))
+	while (VIM_ISWHITE(*p))
 	    ++p;
 }
 else
 {
 	if (!(flags & SIN_INSERT) && curbuf->b_p_pi)
 	{
 	    p = oldline;
 	    ind_done = 0;
-	    while (todo > 0 && vim_iswhite(*p))
+	    while (todo > 0 && VIM_ISWHITE(*p))
 	    {
 		if (*p == TAB)
 		{
 		    tab_pad = (int)curbuf->b_p_ts
 					   - (ind_done % (int)curbuf->b_p_ts);
 	ind_len = 0;
 	ind_done = 0;
 	s = src;
 	/* Count/copy the usable portion of the source line */
-	while (todo > 0 && vim_iswhite(*s))
+	while (todo > 0 && VIM_ISWHITE(*s))
 	{
 	    if (*s == TAB)
 	    {
 		tab_pad = (int)curbuf->b_p_ts
 					   - (ind_done % (int)curbuf->b_p_ts);
 		else	/* Not a comment line */
 # endif
 		{
 		    /* Find last non-blank in line */
 		    p = ptr + STRLEN(ptr) - 1;
-		    while (p > ptr && vim_iswhite(*p))
+		    while (p > ptr && VIM_ISWHITE(*p))
 			--p;
 		    last_char = *p;
 		    /*
 		     * find the character just before the '{' or ';'
 		     */
 		    if (last_char == '{' || last_char == ';')
 		    {
 			if (p > ptr)
 			    --p;
-			while (p > ptr && vim_iswhite(*p))
+			while (p > ptr && VIM_ISWHITE(*p))
 			    --p;
 		    }
 		    /*
 		     * Try to catch lines that are split over multiple
 		     * lines.  eg:
 		    /*
 		     * If we have hit RETURN immediately after the start
 		     * comment leader, then put a space after the middle
 		     * comment leader on the next line.
 		     */
-		    if (!vim_iswhite(saved_line[lead_len - 1])
+		    if (!VIM_ISWHITE(saved_line[lead_len - 1])
 			    && ((p_extra != NULL
 				    && (int)curwin->w_cursor.col == lead_len)
 				|| (p_extra == NULL
 				    && saved_line[lead_len] == NUL)
 				|| require_blank))
 		    }
 		    if (c == COM_RIGHT)    /* right adjusted leader */
 		    {
 			/* find last non-white in the leader to line up with */
 			for (p = leader + lead_len - 1; p > leader
-						      && vim_iswhite(*p); --p)
+						      && VIM_ISWHITE(*p); --p)
 			    ;
 			++p;
 #ifdef FEAT_MBYTE
 			/* Compute the length of the replaced characters in
 				lead_len -= l;
 				*p = ' ';
 			    }
 			    else
 #endif
-			    if (!vim_iswhite(*p))
+			    if (!VIM_ISWHITE(*p))
 				*p = ' ';
 			}
 		    }
 		    else		    /* left adjusted leader */
 		    {
 			/* Replace any remaining non-white chars in the old
 			 * leader by spaces.  Keep Tabs, the indent must
 			 * remain the same. */
 			for (p += lead_repl_len; p < leader + lead_len; ++p)
-			    if (!vim_iswhite(*p))
+			    if (!VIM_ISWHITE(*p))
 			    {
 				/* Don't put a space before a TAB. */
 				if (p + 1 < leader + lead_len && p[1] == TAB)
 				{
 				    --lead_len;
 			--off;
 		    }
 		    /* If the leader ends in white space, don't add an
 		     * extra space */
-		    if (lead_len > 0 && vim_iswhite(leader[lead_len - 1]))
+		    if (lead_len > 0 && VIM_ISWHITE(leader[lead_len - 1]))
 			extra_space = FALSE;
 		    leader[lead_len] = NUL;
 		}
 		if (extra_space)
 #ifdef FEAT_SMARTINDENT
 				|| did_si
 #endif
 					   )
 		{
-		    while (lead_len && vim_iswhite(*leader))
+		    while (lead_len && VIM_ISWHITE(*leader))
 		    {
 			--lead_len;
 			--newcol;
 			++leader;
 		    }
 int		middle_match_len = 0;
 char_u	*prev_list;
 char_u	*saved_flags = NULL;
 result = i = 0;
-while (vim_iswhite(line[i]))    /* leading white space is ignored */
+while (VIM_ISWHITE(line[i]))    /* leading white space is ignored */
 	++i;
 /*
 * Repeat to match several nested comment strings.
 */
 	    /* Line contents and string must match.
 	     * When string starts with white space, must have some white space
 	     * (but the amount does not need to match, there might be a mix of
 	     * TABs and spaces). */
-	    if (vim_iswhite(string[0]))
+	    if (VIM_ISWHITE(string[0]))
 	    {
-		if (i == 0 || !vim_iswhite(line[i - 1]))
+		if (i == 0 || !VIM_ISWHITE(line[i - 1]))
 		    continue;  /* missing white space */
-		while (vim_iswhite(string[0]))
+		while (VIM_ISWHITE(string[0]))
 		    ++string;
 	    }
 	    for (j = 0; string[j] != NUL && string[j] == line[i + j]; ++j)
 		;
 	    if (string[j] != NUL)
 		continue;  /* string doesn't match */
 	    /* When 'b' flag used, there must be white space or an
 	     * end-of-line after the string in the line. */
 	    if (vim_strchr(part_buf, COM_BLANK) != NULL
-			   && !vim_iswhite(line[i + j]) && line[i + j] != NUL)
+			   && !VIM_ISWHITE(line[i + j]) && line[i + j] != NUL)
 		continue;
 	    /* We have found a match, stop searching unless this is a middle
 	     * comment. The middle comment can be a substring of the end
 	     * comment in which case it's better to return the length of the
 	    break;
 	result = i;
 	/* Include any trailing white space. */
-	while (vim_iswhite(line[i]))
+	while (VIM_ISWHITE(line[i]))
 	    ++i;
 	if (include_space)
 	    result = i;
 	     * Line contents and string must match.
 	     * When string starts with white space, must have some white space
 	     * (but the amount does not need to match, there might be a mix of
 	     * TABs and spaces).
 	     */
-	    if (vim_iswhite(string[0]))
+	    if (VIM_ISWHITE(string[0]))
 	    {
-		if (i == 0 || !vim_iswhite(line[i - 1]))
+		if (i == 0 || !VIM_ISWHITE(line[i - 1]))
 		    continue;
-		while (vim_iswhite(string[0]))
+		while (VIM_ISWHITE(string[0]))
 		    ++string;
 	    }
 	    for (j = 0; string[j] != NUL && string[j] == line[i + j]; ++j)
 		/* do nothing */;
 	    if (string[j] != NUL)
 	    /*
 	     * When 'b' flag used, there must be white space or an
 	     * end-of-line after the string in the line.
 	     */
 	    if (vim_strchr(part_buf, COM_BLANK) != NULL
-		    && !vim_iswhite(line[i + j]) && line[i + j] != NUL)
+		    && !VIM_ISWHITE(line[i + j]) && line[i + j] != NUL)
 	    {
 		continue;
 	    }
 	    /*
 	     * of other comment leaders. If it is, let's adjust the
 	     * lower_check_bound so that we make sure that we have determined
 	     * the comment leader correctly.
 	     */
-	    while (vim_iswhite(*com_leader))
+	    while (VIM_ISWHITE(*com_leader))
 		++com_leader;
 	    len1 = (int)STRLEN(com_leader);
 	    for (list = curbuf->b_p_com; *list; )
 	    {
 		(void)copy_option_part(&list, part_buf2, COM_MAX_LEN, ",");
 		if (flags_save == com_flags)
 		    continue;
 		string = vim_strchr(part_buf2, ':');
 		++string;
-		while (vim_iswhite(*string))
+		while (VIM_ISWHITE(*string))
 		    ++string;
 		len2 = (int)STRLEN(string);
 		if (len2 == 0)
 		    continue;
 inindent(int extra)
 {
 char_u	*ptr;
 colnr_T	col;
-for (col = 0, ptr = ml_get_curline(); vim_iswhite(*ptr); ++col)
+for (col = 0, ptr = ml_get_curline(); VIM_ISWHITE(*ptr); ++col)
 	++ptr;
 if (col >= curwin->w_cursor.col + extra)
 	return TRUE;
 else
 	return FALSE;
 if (STRNCMP(s, "namespace", 9) == 0 && (s[9] == NUL || !vim_iswordc(s[9])))
 {
 	p = cin_skipcomment(skipwhite(s + 9));
 	while (*p != NUL)
 	{
-	    if (vim_iswhite(*p))
+	    if (VIM_ISWHITE(*p))
 	    {
 		has_name = TRUE; /* found end of a name */
 		p = cin_skipcomment(skipwhite(p));
 	    }
 	    else if (*p == '{')
 if (STRNCMP(s, "extern", 6) == 0 && (s[6] == NUL || !vim_iswordc(s[6])))
 {
 	p = cin_skipcomment(skipwhite(s + 6));
 	while (*p != NUL)
 	{
-	    if (vim_iswhite(*p))
+	    if (VIM_ISWHITE(*p))
 	    {
 		p = cin_skipcomment(skipwhite(p));
 	    }
 	    else if (*p == '{')
 	    {
 	p = skipwhite(p + 4);
 else if ((len == 8 && STRNCMP(p, "unsigned", 8) == 0)
 	    || (len == 6 && STRNCMP(p, "signed", 6) == 0))
 {
 	s = skipwhite(p + len);
-	if ((STRNCMP(s, "int", 3) == 0 && vim_iswhite(s[3]))
+	if ((STRNCMP(s, "int", 3) == 0 && VIM_ISWHITE(s[3]))
-		|| (STRNCMP(s, "long", 4) == 0 && vim_iswhite(s[4]))
+		|| (STRNCMP(s, "long", 4) == 0 && VIM_ISWHITE(s[4]))
-		|| (STRNCMP(s, "short", 5) == 0 && vim_iswhite(s[5]))
+		|| (STRNCMP(s, "short", 5) == 0 && VIM_ISWHITE(s[5]))
-		|| (STRNCMP(s, "char", 4) == 0 && vim_iswhite(s[4])))
+		|| (STRNCMP(s, "char", 4) == 0 && VIM_ISWHITE(s[4])))
 	    p = s;
 }
 for (len = 0; vim_isIDc(p[len]); ++len)
 	;
-if (len == 0 || !vim_iswhite(p[len]) || cin_nocode(p))
+if (len == 0 || !VIM_ISWHITE(p[len]) || cin_nocode(p))
 	return 0;
 p = skipwhite(p + len);
 fp.lnum = curwin->w_cursor.lnum;
 fp.col = (colnr_T)(p - line);
 {
 int offset = *poffset;
 if (offset-- < 2)
 	return 0;
-while (offset > 2 && vim_iswhite(line[offset]))
+while (offset > 2 && VIM_ISWHITE(line[offset]))
 	--offset;
 offset -= 1;
 if (!STRNCMP(line + offset, "if", 2))
 	goto probablyFound;
 		    else if (curbuf->b_ind_unclosed_whiteok)
 			our_paren_pos.col++;
 		    else
 		    {
 			col = our_paren_pos.col + 1;
-			while (vim_iswhite(l[col]))
+			while (VIM_ISWHITE(l[col]))
 			    col++;
 			if (l[col] != NUL)	/* In case of trailing space */
 			    our_paren_pos.col = col;
 			else
 			    our_paren_pos.col++;
 		{
 		    that++;
 		    amount++;
 		    firsttry = amount;
-		    while (vim_iswhite(*that))
+		    while (VIM_ISWHITE(*that))
 		    {
 			amount += lbr_chartabsize(line, that, (colnr_T)amount);
 			++that;
 		    }
 				    && *that != '\''
 				    && *that != '#'
 				    && (*that < '0' || *that > '9')))
 			{
 			    while (*that
-				    && (!vim_iswhite(*that)
+				    && (!VIM_ISWHITE(*that)
 					|| quotecount
 					|| parencount)
 				    && (!((*that == '(' || *that == '[')
 					    && !quotecount
 					    && !parencount
 						line, &that, (colnr_T)amount);
 				amount += lbr_chartabsize_adv(
 						line, &that, (colnr_T)amount);
 			    }
 			}
-			while (vim_iswhite(*that))
+			while (VIM_ISWHITE(*that))
 			{
 			    amount += lbr_chartabsize(
 						 line, that, (colnr_T)amount);
 			    that++;
 			}

Mercurial > vim

comparison src/misc1.c @ 11129:f4ea50924c6d v8.0.0452