vim: src/fileio.c comparison

comparison src/fileio.c @ 153:19670b05ee32

updated for version 7.0047

author	vimboss
date	Wed, 02 Feb 2005 23:04:36 +0000
parents	f67f8a8d81ba
children	6df0106fc595

comparison

equal deleted inserted replaced

-:c837baf03d43
+:19670b05ee32
 {
 int		    group;		/* group ID */
 char_u	    *pat;		/* pattern as typed (NULL when pattern
 					   has been removed) */
 int		    patlen;		/* strlen() of pat */
-char_u	    *reg_pat;		/* pattern converted to regexp */
+regprog_T	    *reg_prog;		/* compiled regprog for pattern */
 char	    allow_dirs;		/* Pattern may match whole path */
 char	    last;		/* last pattern for apply_autocmds() */
 AutoCmd	    *cmds;		/* list of commands to do */
 struct AutoPat  *next;		/* next AutoPat in AutoPat list */
 int		    buflocal_nr;	/* !=0 for buffer-local AutoPat */
 	    /* remove the pattern if it has been marked for deletion */
 	    if (ap->pat == NULL)
 	    {
 		*prev_ap = ap->next;
-		vim_free(ap->reg_pat);
+		vim_free(ap->reg_prog);
 		vim_free(ap);
 	    }
 	    else
 		prev_ap = &(ap->next);
 	}
 char_u	*old_ei;
 {
 if (old_ei != NULL)
 {
 	set_string_option_direct((char_u *)"ei", -1, old_ei, OPT_FREE);
-	apply_autocmds(EVENT_SYNTAX, curbuf->b_p_syn,
-					       curbuf->b_fname, TRUE, curbuf);
 	vim_free(old_ei);
 }
 }
 # endif  /* FEAT_SYN_HL */
 		}
 		if (is_buflocal)
 		{
 		    ap->buflocal_nr = buflocal_nr;
-		    ap->reg_pat = NULL;
+		    ap->reg_prog = NULL;
 		}
 		else
 		{
+		    char_u	*reg_pat;
 		    ap->buflocal_nr = 0;
-		    ap->reg_pat = file_pat_to_reg_pat(pat, endpat,
+		    reg_pat = file_pat_to_reg_pat(pat, endpat,
 							 &ap->allow_dirs, TRUE);
-		    if (ap->reg_pat == NULL)
+		    if (reg_pat != NULL)
+			ap->reg_prog = vim_regcomp(reg_pat, RE_MAGIC);
+		    if (reg_pat == NULL || ap->reg_prog == NULL)
 		    {
+			vim_free(reg_pat);
 			vim_free(ap->pat);
 			vim_free(ap);
 			return FAIL;
 		    }
 		}
 	if (ap->pat != NULL && ap->cmds != NULL
 		&& (apc->group == AUGROUP_ALL || apc->group == ap->group))
 	{
 	    /* execution-condition */
 	    if (ap->buflocal_nr == 0
-		    ? (match_file_pat(ap->reg_pat, apc->fname, apc->sfname,
+		    ? (match_file_pat(NULL, ap->reg_prog, apc->fname,
-						   apc->tail, ap->allow_dirs))
+				      apc->sfname, apc->tail, ap->allow_dirs))
 		    : ap->buflocal_nr == apc->arg_bufnr)
 	    {
 		name = event_nr2name(apc->event);
 		s = _("%s Auto commands for \"%s\"");
 		sourcing_name = alloc((unsigned)(STRLEN(s)
 #endif
 for (ap = first_autopat[(int)event]; ap != NULL; ap = ap->next)
 	if (ap->pat != NULL && ap->cmds != NULL
 && (ap->buflocal_nr == 0
-		? match_file_pat(ap->reg_pat, fname, sfname, tail,
+		? match_file_pat(NULL, ap->reg_prog,
-							       ap->allow_dirs)
+					  fname, sfname, tail, ap->allow_dirs)
 : buf != NULL && ap->buflocal_nr == buf->b_fnum
 	   ))
 	{
 	    retval = TRUE;
 	    break;
 #endif	/* FEAT_AUTOCMD */
 #if defined(FEAT_AUTOCMD) || defined(FEAT_WILDIGN) || defined(PROTO)
 /*
-* Try matching a filename with a pattern.
+* Try matching a filename with a "pattern" ("prog" is NULL), or use the
+* precompiled regprog "prog" ("pattern" is NULL).  That avoids calling
+* vim_regcomp() often.
 * Used for autocommands and 'wildignore'.
 * Returns TRUE if there is a match, FALSE otherwise.
 */
 int
-match_file_pat(pattern, fname, sfname, tail, allow_dirs)
+match_file_pat(pattern, prog, fname, sfname, tail, allow_dirs)
 char_u	*pattern;		/* pattern to match with */
+regprog_T	*prog;			/* pre-compiled regprog or NULL */
 char_u	*fname;			/* full path of file name */
 char_u	*sfname;		/* short file name or NULL */
 char_u	*tail;			/* tail of path */
 int		allow_dirs;		/* allow matching with dir */
 {
 	else
 	    regmatch.regprog = vim_regcomp(pattern + 1, RE_MAGIC);
 }
 else
 #endif
-	regmatch.regprog = vim_regcomp(pattern, RE_MAGIC);
+{
+	if (prog != NULL)
+	    regmatch.regprog = prog;
+	else
+	    regmatch.regprog = vim_regcomp(pattern, RE_MAGIC);
+}
 /*
 * Try for a match with the pattern with:
 * 1. the full file name, when the pattern has a '/'.
 * 2. the short file name, when the pattern has a '/'.
 			 || (sfname != NULL
 			     && vim_regexec(&regmatch, sfname, (colnr_T)0))))
 		 || (!allow_dirs && vim_regexec(&regmatch, tail, (colnr_T)0)))))
 	result = TRUE;
-vim_free(regmatch.regprog);
+if (prog == NULL)
+	vim_free(regmatch.regprog);
 return result;
 }
 #endif
 #if defined(FEAT_WILDIGN) || defined(PROTO)
 {
 	copy_option_part(&p, buf, 100, ",");
 	regpat = file_pat_to_reg_pat(buf, NULL, &allow_dirs, FALSE);
 	if (regpat == NULL)
 	    break;
-	match = match_file_pat(regpat, ffname, sfname, tail, (int)allow_dirs);
+	match = match_file_pat(regpat, NULL, ffname, sfname,
+						       tail, (int)allow_dirs);
 	vim_free(regpat);
 	if (match)
 	    return TRUE;
 }
 return FALSE;

Mercurial > vim

comparison src/fileio.c @ 153:19670b05ee32