vim: src/ex_cmds.c comparison

comparison src/ex_cmds.c @ 170:8c60f65311fa v7.0052

updated for version 7.0052

author	vimboss
date	Sat, 26 Feb 2005 23:04:13 +0000
parents	0e902b8f511f
children	906b37d2f9c3

comparison

equal deleted inserted replaced

-:0e902b8f511f
+:8c60f65311fa
 static int check_overwrite __ARGS((exarg_T *eap, buf_T *buf, char_u *fname, char_u *ffname, int other));
 static int check_readonly __ARGS((int *forceit, buf_T *buf));
 #ifdef FEAT_AUTOCMD
 static void delbuf_msg __ARGS((char_u *name));
 #endif
-static int do_sub_msg __ARGS((void));
+static int do_sub_msg __ARGS((int count_only));
 static int
 #ifdef __BORLANDC__
 _RTLENTRYF
 #endif
 	help_compare __ARGS((const void *s1, const void *s2));
 linenr_T	lnum;
 long	i = 0;
 regmmatch_T regmatch;
 static int	do_all = FALSE;		/* do multiple substitutions per line */
 static int	do_ask = FALSE;		/* ask for confirmation */
+static int	do_count = FALSE;	/* count only */
 static int	do_error = TRUE;	/* if false, ignore errors */
 static int	do_print = FALSE;	/* print last line with subs. */
 static int	do_list = FALSE;	/* list last line with subs. */
 static int	do_number = FALSE;	/* list last line with line nr*/
 static int	do_ic = 0;		/* ignore case flag */
 linenr_T	line2;
 long	nmatch;			/* number of lines in match */
 linenr_T	sub_firstlnum;		/* nr of first sub line */
 char_u	*sub_firstline;		/* allocated copy of first sub line */
 int		endcolumn = FALSE;	/* cursor in last column when done */
+pos_T	old_cursor = curwin->w_cursor;
 cmd = eap->arg;
 if (!global_busy)
 {
 	sub_nsubs = 0;
 	 */
 	if (*cmd == 'g')
 	    do_all = !do_all;
 	else if (*cmd == 'c')
 	    do_ask = !do_ask;
+	else if (*cmd == 'n')
+	    do_count = TRUE;
 	else if (*cmd == 'e')
 	    do_error = !do_error;
 	else if (*cmd == 'r')	    /* use last used regexp */
 	    which_pat = RE_LAST;
 	else if (*cmd == 'p')
 	    do_ic = 'I';
 	else
 	    break;
 	++cmd;
 }
+if (do_count)
+	do_ask = FALSE;
 /*
 * check for a trailing count
 */
 cmd = skipwhite(cmd);
 		 * previous match. */
 		matchcol = regmatch.endpos[0].col;
 		prev_matchcol = matchcol;
 		/*
-		 * 2. If do_ask is set, ask for confirmation.
+		 * 2. If do_count is set only increase the counter.
+		 *    If do_ask is set, ask for confirmation.
 		 */
+		if (do_count)
+		{
+		    /* For a multi-line match, put matchcol at the NUL at
+		     * the end of the line and set nmatch to one, so that
+		     * we continue looking for a match on the next line.
+		     * Avoids that ":s/\nB\@=//gc" get stuck. */
+		    if (nmatch > 1)
+		    {
+			matchcol = STRLEN(sub_firstline);
+			nmatch = 1;
+		    }
+		    sub_nsubs++;
+		    did_sub = TRUE;
+		    goto skip;
+		}
 		if (do_ask)
 		{
 		    /* change State to CONFIRM, so that the mouse works
 		     * properly */
 		    save_State = State;
 			    getvcol(curwin, &curwin->w_cursor, &sc, NULL, NULL);
 			    curwin->w_cursor.col = regmatch.endpos[0].col - 1;
 			    getvcol(curwin, &curwin->w_cursor, NULL, NULL, &ec);
 			    msg_start();
-			    for (i = 0; i < sc; ++i)
+			    for (i = 0; i < (long)sc; ++i)
 				msg_putchar(' ');
-			    for ( ; i <= ec; ++i)
+			    for ( ; i <= (long)ec; ++i)
 				msg_putchar('^');
 			    resp = getexmodeline('?', NULL, 0);
 			    if (resp != NULL)
 			    {
 	changed_lines(first_line, 0, last_line - i, i);
 }
 outofmem:
 vim_free(sub_firstline); /* may have to free allocated copy of the line */
+/* ":s/pat//n" doesn't move the cursor */
+if (do_count)
+	curwin->w_cursor = old_cursor;
 if (sub_nsubs)
 {
 	/* Set the '[ and '] marks. */
 	curbuf->b_op_start.lnum = eap->line1;
 	curbuf->b_op_end.lnum = line2;
 	{
 	    if (endcolumn)
 		coladvance((colnr_T)MAXCOL);
 	    else
 		beginline(BL_WHITE | BL_FIX);
-	    if (!do_sub_msg() && do_ask)
+	    if (!do_sub_msg(do_count) && do_ask)
 		MSG("");
 	}
 	else
 	    global_need_beginline = TRUE;
 	if (do_print)
 * Give message for number of substitutions.
 * Can also be used after a ":global" command.
 * Return TRUE if a message was given.
 */
 static int
-do_sub_msg()
+do_sub_msg(count_only)
+int	    count_only;		/* used 'n' flag for ":s" */
 {
 /*
 * Only report substitutions when:
 * - more than 'report' substitutions
 * - command was typed by user, or number of changed lines > 'report'
 * - giving messages is not disabled by 'lazyredraw'
 */
-if (sub_nsubs > p_report
+if (((sub_nsubs > p_report && (KeyTyped || sub_nlines > 1 || p_report < 1))
-	    && (KeyTyped || sub_nlines > 1 || p_report < 1)
+		|| count_only)
 	    && messaging())
 {
 	if (got_int)
 	    STRCPY(msg_buf, _("(Interrupted) "));
 	else
 	    msg_buf[0] = NUL;
 	if (sub_nsubs == 1)
-	    STRCAT(msg_buf, _("1 substitution"));
+	    STRCAT(msg_buf, count_only ? _("1 match") : _("1 substitution"));
 	else
-	    sprintf((char *)msg_buf + STRLEN(msg_buf), _("%ld substitutions"),
+	    sprintf((char *)msg_buf + STRLEN(msg_buf),
+		    count_only ? _("%ld matches") : _("%ld substitutions"),
 								   sub_nsubs);
 	if (sub_nlines == 1)
 	    STRCAT(msg_buf, _(" on 1 line"));
 	else
 	    sprintf((char *)msg_buf + STRLEN(msg_buf), _(" on %ld lines"),
 void
 ex_global(eap)
 exarg_T	*eap;
 {
 linenr_T	lnum;		/* line number according to old situation */
-int		ndone;
+int		ndone = 0;
 int		type;		/* first char of cmd: 'v' or 'g' */
 char_u	*cmd;		/* command argument */
 char_u	delim;		/* delimiter, normally '/' */
 char_u	*pat;
 {
 	EMSG(_(e_invcmd));
 	return;
 }
+#ifdef HAVE_SETJMP_H
+/*
+* Matching with a regexp may cause a very deep recursive call of
+* regmatch().  Vim will crash when running out of stack space.
+* Catch this here if the system supports it.
+* It's a bit slow, thus do it outside of the loop.
+*/
+mch_startjmp();
+if (SETJMP(lc_jump_env) != 0)
+{
+	mch_didjmp();
+# ifdef SIGHASARG
+	if (lc_signal != SIGINT)
+# endif
+	    EMSG(_(e_complex));
+	got_int = TRUE;
+	goto jumpend;
+}
+#endif
 /*
 * pass 1: set marks for each (not) matching line
 */
-ndone = 0;
 for (lnum = eap->line1; lnum <= eap->line2 && !got_int; ++lnum)
 {
 	/* a match on this line? */
 	match = vim_regexec_multi(&regmatch, curwin, curbuf, lnum, (colnr_T)0);
 	if ((type == 'g' && match) || (type == 'v' && !match))
 	    ml_setmarked(lnum);
 	    ndone++;
 	}
 	line_breakcheck();
 }
+#ifdef HAVE_SETJMP_H
+jumpend:
+mch_endjmp();
+#endif
 /*
 * pass 2: execute the command for each line that has been marked
 */
 if (got_int)
 if (msg_col == 0 && msg_scrolled == 0)
 	msg_didout = FALSE;
 /* If subsitutes done, report number of substitues, otherwise report
 * number of extra or deleted lines. */
-if (!do_sub_msg())
+if (!do_sub_msg(FALSE))
 	msgmore(curbuf->b_ml.ml_line_count - old_lcount);
 }
 #ifdef FEAT_VIMINFO
 int

Mercurial > vim

comparison src/ex_cmds.c @ 170:8c60f65311fa v7.0052