vim: src/tag.c comparison

comparison src/tag.c @ 692:a28f83d37113

updated for version 7.0208

author	vimboss
date	Mon, 27 Feb 2006 00:08:02 +0000
parents	d7e33248b9c8
children	e402b0af6083

comparison

equal deleted inserted replaced

-:8106f3da02d0
+:a28f83d37113
 #endif
 		num_matches = 0;
 		goto end_do_tag;
 	    }
-	    if (type == DT_TAG)
+	    if (type == DT_TAG
+#if defined(FEAT_QUICKFIX)
+		|| type == DT_LTAG
+#endif
+		)
 	    {
 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
 		if (g_do_tagpreview)
 		{
 		    cur_match = ptag_entry.cur_match;
 		    cur_fnum = tagstack[tagstackidx].cur_fnum;
 		}
 		switch (type)
 		{
 		    case DT_FIRST: cur_match = count - 1; break;
-#ifdef FEAT_QUICKFIX
-		    case DT_LTAG: cur_match = 0; break;
-#endif
 		    case DT_SELECT:
 		    case DT_JUMP:
 #ifdef FEAT_CSCOPE
 		    case DT_CSCOPE:
 #endif
 	     * jump to count'th matching tag.
 	     */
 	    if (type == DT_TAG && count > 0)
 		cur_match = count - 1;
-	    if (type == DT_SELECT || type == DT_JUMP)
+	    if (type == DT_SELECT || type == DT_JUMP
+#if defined(FEAT_QUICKFIX)
+		|| type == DT_LTAG
+#endif
+		)
 		cur_match = MAXCOL - 1;
 	    max_num_matches = cur_match + 1;
 	    /* when the argument starts with '/', use it as a regexp */
 	    if (!no_regexp && *name == '/')
 		    }
 		}
 		ask_for_selection = TRUE;
 	    }
 #if defined(FEAT_QUICKFIX) && defined(FEAT_EVAL)
-	    else
+	    else if (type == DT_LTAG)
-	    if (type == DT_LTAG)
 	    {
 		list_T	*list;
 		char_u	tag_name[128 + 1];
 		char_u	fname[MAXPATHL + 1];
 		char_u	cmd[CMDBUFFSIZE + 1];
 			    for (p = tagp.command;
 				 *p && *p != '\r' && *p != '\n'; ++p)
 				;
 			    cmd_end = p;
 			}
 			/*
 			 * Now, cmd_end points to the character after the
 			 * command. Adjust it to point to the last
 			 * character of the command.
 			 */
 			STRNCAT(cmd, cmd_start, cmd_len);
 			len += cmd_len;
 			if (cmd[len - 1] == '$')
 			{
 			    /*
 			     * Replace '$' at the end of the search pattern
 			     * with '\$'
 			     */
 			    cmd[len - 1] = '\\';
 			    cmd[len] = '$';
 		}
 		set_errorlist(curwin, list, ' ');
 		list_free(list);
+		cur_match = 0;		/* Jump to the first tag */
 	    }
 #endif
 	    if (ask_for_selection == TRUE)
 	    {
 char_u	*buf_ffname;		/* name of buffer for priority */
 {
 FILE       *fp;
 char_u     *lbuf;			/* line buffer */
 char_u     *tag_fname;		/* name of tag file */
+tagname_T	tn;			/* info for get_tagfname() */
 int		first_file;		/* trying first tag file */
 tagptrs_T	tagp;
 int		did_open = FALSE;	/* did open a tag file */
 int		stop_searching = FALSE;	/* stop when match found or error */
 int		retval = FAIL;		/* return value */
 */
 for (first_file = TRUE;
 #ifdef FEAT_CSCOPE
 	    use_cscope ||
 #endif
-		get_tagfname(first_file, tag_fname) == OK; first_file = FALSE)
+		get_tagfname(&tn, first_file, tag_fname) == OK;
+							   first_file = FALSE)
 {
 	/*
 	 * A file that doesn't exist is silently ignored.  Only when not a
 	 * single file is found, an error message is given (further on).
 	 */
 #endif
 	    break;
 } /* end of for-each-file loop */
+#ifdef FEAT_CSCOPE
+	if (!use_cscope)
+#endif
+	    tagname_free(&tn);
 #ifdef FEAT_TAG_BINS
 /* stop searching when already did a linear search, or when TAG_NOIC
 * used, and 'ignorecase' not set or already did case-ignore search */
 if (stop_searching || linear || (!p_ic && noic) || pats->regmatch.rm_ic)
 	  break;
 if (ga_grow(&tag_fnames, 1) == OK)
 	((char_u **)(tag_fnames.ga_data))[tag_fnames.ga_len++] =
 							   vim_strsave(fname);
 }
-static void	*search_ctx = NULL;
 #if defined(EXITFREE) || defined(PROTO)
 void
 free_tag_stuff()
 {
-vim_findfile_cleanup(search_ctx);
+ga_clear_strings(&tag_fnames);
 do_tag(NULL, DT_FREE, 0, 0, 0);
 }
 #endif
 /*
 * For help files, use "tags" file only.
 *
 * Return FAIL if no more tag file names, OK otherwise.
 */
 int
-get_tagfname(first, buf)
+get_tagfname(tnp, first, buf)
+tagname_T	*tnp;	/* holds status info */
 int		first;	/* TRUE when first file name is wanted */
 char_u	*buf;	/* pointer to buffer of MAXPATHL chars */
 {
-static char_u	*np = NULL;
-static int		did_filefind_init;
-static int		hf_idx = 0;
 char_u		*fname = NULL;
 char_u		*r_ptr;
+if (first)
+	vim_memset(tnp, 0, sizeof(tagname_T));
 if (curbuf->b_help)
 {
 	/*
 	 * For help files it's done in a completely different way:
 # endif
 #else
 		    "doc/tags"
 #endif
 					      , TRUE, found_tagfile_cb, NULL);
-	    hf_idx = 0;
+	}
-	}
+	if (tnp->tn_hf_idx >= tag_fnames.ga_len)
-	if (hf_idx >= tag_fnames.ga_len)
 	{
 	    /* Not found in 'runtimepath', use 'helpfile', if it exists and
 	     * wasn't used yet, replacing "help.txt" with "tags". */
-	    if (hf_idx > tag_fnames.ga_len || *p_hf == NUL)
+	    if (tnp->tn_hf_idx > tag_fnames.ga_len || *p_hf == NUL)
 		return FAIL;
-	    ++hf_idx;
+	    ++tnp->tn_hf_idx;
 	    STRCPY(buf, p_hf);
 	    STRCPY(gettail(buf), "tags");
 	}
 	else
-	    vim_strncpy(buf, ((char_u **)(tag_fnames.ga_data))[hf_idx++],
+	    vim_strncpy(buf, ((char_u **)(tag_fnames.ga_data))[
-								MAXPATHL - 1);
+					     tnp->tn_hf_idx++], MAXPATHL - 1);
 	return OK;
 }
 if (first)
 {
-	/* Init. */
+	/* Init.  We make a copy of 'tags', because autocommands may change
-	if (*curbuf->b_p_tags != NUL)
+	 * the value without notifying us. */
-	    np = curbuf->b_p_tags;
+	tnp->tn_tags = vim_strsave((*curbuf->b_p_tags != NUL)
+						 ? curbuf->b_p_tags : p_tags);
+	if (tnp->tn_tags == NULL)
+	    return FAIL;
+	tnp->tn_np = tnp->tn_tags;
+}
+/*
+* Loop until we have found a file name that can be used.
+* There are two states:
+* tnp->tn_did_filefind_init == FALSE: setup for next part in 'tags'.
+* tnp->tn_did_filefind_init == TRUE: find next file in this part.
+*/
+for (;;)
+{
+	if (tnp->tn_did_filefind_init)
+	{
+	    fname = vim_findfile(tnp->tn_search_ctx);
+	    if (fname != NULL)
+		break;
+	    tnp->tn_did_filefind_init = FALSE;
+	}
 	else
-	    np = p_tags;
+	{
-	vim_findfile_free_visited(search_ctx);
+	    char_u  *filename = NULL;
-	did_filefind_init = FALSE;
-}
+	    /* Stop when used all parts of 'tags'. */
-else
+	    if (*tnp->tn_np == NUL)
-{
+	    {
-	if (np == NULL)
+		vim_findfile_cleanup(tnp->tn_search_ctx);
-	    return FAIL;	/* tried already (or bogus call) */
+		tnp->tn_search_ctx = NULL;
+		return FAIL;
-	/*
+	    }
-	 * Loop until we have found a file name that can be used.
-	 * There are two states:
+	    /*
-	 * did_filefind_init == FALSE: setup for next part in 'tags'.
+	     * Copy next file name into buf.
-	 * did_filefind_init == TRUE: find next file in this part.
+	     */
-	 */
+	    buf[0] = NUL;
-	for (;;)
+	    (void)copy_option_part(&tnp->tn_np, buf, MAXPATHL - 1, " ,");
-	{
-	    if (did_filefind_init)
-	    {
-		fname = vim_findfile(search_ctx);
-		if (fname != NULL)
-		    break;
-		did_filefind_init = FALSE;
-	    }
-	    else
-	    {
-		char_u  *filename = NULL;
-		/* Stop when used all parts of 'tags'. */
-		if (*np == NUL)
-		{
-		    vim_findfile_cleanup(search_ctx);
-		    search_ctx = NULL;
-		    return FAIL;
-		}
-		/*
-		 * Copy next file name into buf.
-		 */
-		buf[0] = NUL;
-		(void)copy_option_part(&np, buf, MAXPATHL - 1, " ,");
 #ifdef FEAT_PATH_EXTRA
-		r_ptr = vim_findfile_stopdir(buf);
+	    r_ptr = vim_findfile_stopdir(buf);
 #else
-		r_ptr = NULL;
+	    r_ptr = NULL;
 #endif
-		/* move the filename one char forward and truncate the
+	    /* move the filename one char forward and truncate the
-		 * filepath with a NUL */
+	     * filepath with a NUL */
-		filename = gettail(buf);
+	    filename = gettail(buf);
-		mch_memmove(filename + 1, filename, STRLEN(filename) + 1);
+	    mch_memmove(filename + 1, filename, STRLEN(filename) + 1);
-		*filename++ = NUL;
+	    *filename++ = NUL;
-		search_ctx = vim_findfile_init(buf, filename, r_ptr, 100,
+	    tnp->tn_search_ctx = vim_findfile_init(buf, filename,
-			FALSE, /* don't free visited list */
+		    r_ptr, 100,
-			FALSE, /* we search for a file */
+		    FALSE, /* don't free visited list */
-			search_ctx, TRUE, curbuf->b_ffname);
+		    FALSE, /* we search for a file */
-		if (search_ctx != NULL)
+		    tnp->tn_search_ctx, TRUE, curbuf->b_ffname);
-		    did_filefind_init = TRUE;
+	    if (tnp->tn_search_ctx != NULL)
-	    }
+		tnp->tn_did_filefind_init = TRUE;
 	}
-	STRCPY(buf, fname);
+}
-	vim_free(fname);
-}
+STRCPY(buf, fname);
+vim_free(fname);
 return OK;
+}
+/*
+* Free the contents of a tagname_T that was filled by get_tagfname().
+*/
+void
+tagname_free(tnp)
+tagname_T	*tnp;
+{
+vim_free(tnp->tn_tags);
+vim_findfile_cleanup(tnp->tn_search_ctx);
+ga_clear_strings(&tag_fnames);
 }
 /*
 * Parse one line from the tags file. Find start/end of tag name, start/end of
 * file name and start of search pattern.

Mercurial > vim

comparison src/tag.c @ 692:a28f83d37113