Mercurial > vim

comparison src/tag.c @ 16070:c435843c7535 v8.1.1040

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1040: FEAT_TAG_ANYWHITE is not enabled in any build commit https://github.com/vim/vim/commit/b99abaa480a7dd983ee4998c5cfdeb997214dcae Author: Bram Moolenaar <Bram@vim.org> Date: Fri Mar 22 17:03:05 2019 +0100 patch 8.1.1040: FEAT_TAG_ANYWHITE is not enabled in any build Problem: FEAT_TAG_ANYWHITE is not enabled in any build. Solution: Remove the feature.
author Bram Moolenaar <Bram@vim.org>
date Fri, 22 Mar 2019 17:15:04 +0100
parents 734b1928a5aa
children 570a296aa0b4
comparison
equal deleted inserted replaced
16069:277daf5f4a43 16070:c435843c7535
1929 #endif 1929 #endif
1930 ) 1930 )
1931 { 1931 {
1932 vim_memset(&tagp, 0, sizeof(tagp)); 1932 vim_memset(&tagp, 0, sizeof(tagp));
1933 tagp.tagname = lbuf; 1933 tagp.tagname = lbuf;
1934 #ifdef FEAT_TAG_ANYWHITE
1935 tagp.tagname_end = skiptowhite(lbuf);
1936 if (*tagp.tagname_end == NUL)
1937 #else
1938 tagp.tagname_end = vim_strchr(lbuf, TAB); 1934 tagp.tagname_end = vim_strchr(lbuf, TAB);
1939 if (tagp.tagname_end == NULL) 1935 if (tagp.tagname_end == NULL)
1940 #endif
1941 { 1936 {
1942 if (vim_strchr(lbuf, NL) == NULL) 1937 if (vim_strchr(lbuf, NL) == NULL)
1943 { 1938 {
1944 /* Truncated line, ignore it. Has been reported for 1939 /* Truncated line, ignore it. Has been reported for
1945 * Mozilla JS with extremely long names. */ 1940 * Mozilla JS with extremely long names. */
1974 for (p = lbuf; p < tagp.tagname_end; ++p) 1969 for (p = lbuf; p < tagp.tagname_end; ++p)
1975 { 1970 {
1976 if (*p == ':') 1971 if (*p == ':')
1977 { 1972 {
1978 if (tagp.fname == NULL) 1973 if (tagp.fname == NULL)
1979 # ifdef FEAT_TAG_ANYWHITE
1980 tagp.fname = skipwhite(tagp.tagname_end);
1981 # else
1982 tagp.fname = tagp.tagname_end + 1; 1974 tagp.fname = tagp.tagname_end + 1;
1983 # endif 1975 if (fnamencmp(lbuf, tagp.fname, p - lbuf) == 0
1984 if ( fnamencmp(lbuf, tagp.fname, p - lbuf) == 0 1976 && tagp.fname[p - lbuf] == TAB)
1985 # ifdef FEAT_TAG_ANYWHITE
1986 && VIM_ISWHITE(tagp.fname[p - lbuf])
1987 # else
1988 && tagp.fname[p - lbuf] == TAB
1989 # endif
1990 )
1991 { 1977 {
1992 /* found one */ 1978 // found one
1993 tagp.tagname = p + 1; 1979 tagp.tagname = p + 1;
1994 break; 1980 break;
1995 } 1981 }
1996 } 1982 }
1997 } 1983 }
2110 * Can be a matching tag, isolate the file name and command. 2096 * Can be a matching tag, isolate the file name and command.
2111 */ 2097 */
2112 #ifdef FEAT_TAG_OLDSTATIC 2098 #ifdef FEAT_TAG_OLDSTATIC
2113 if (tagp.fname == NULL) 2099 if (tagp.fname == NULL)
2114 #endif 2100 #endif
2115 #ifdef FEAT_TAG_ANYWHITE
2116 tagp.fname = skipwhite(tagp.tagname_end);
2117 #else
2118 tagp.fname = tagp.tagname_end + 1; 2101 tagp.fname = tagp.tagname_end + 1;
2119 #endif
2120 #ifdef FEAT_TAG_ANYWHITE
2121 tagp.fname_end = skiptowhite(tagp.fname);
2122 tagp.command = skipwhite(tagp.fname_end);
2123 if (*tagp.command == NUL)
2124 #else
2125 tagp.fname_end = vim_strchr(tagp.fname, TAB); 2102 tagp.fname_end = vim_strchr(tagp.fname, TAB);
2126 tagp.command = tagp.fname_end + 1; 2103 tagp.command = tagp.fname_end + 1;
2127 if (tagp.fname_end == NULL) 2104 if (tagp.fname_end == NULL)
2128 #endif
2129 i = FAIL; 2105 i = FAIL;
2130 else 2106 else
2131 i = OK; 2107 i = OK;
2132 } 2108 }
2133 else 2109 else
2841 } 2817 }
2842 } 2818 }
2843 else /* not an Emacs tag */ 2819 else /* not an Emacs tag */
2844 { 2820 {
2845 #endif 2821 #endif
2846 /* Isolate the tagname, from lbuf up to the first white */ 2822 // Isolate the tagname, from lbuf up to the first white
2847 tagp->tagname = lbuf; 2823 tagp->tagname = lbuf;
2848 #ifdef FEAT_TAG_ANYWHITE
2849 p = skiptowhite(lbuf);
2850 #else
2851 p = vim_strchr(lbuf, TAB); 2824 p = vim_strchr(lbuf, TAB);
2852 if (p == NULL) 2825 if (p == NULL)
2853 return FAIL; 2826 return FAIL;
2854 #endif
2855 tagp->tagname_end = p; 2827 tagp->tagname_end = p;
2856 2828
2857 /* Isolate file name, from first to second white space */ 2829 // Isolate file name, from first to second white space
2858 #ifdef FEAT_TAG_ANYWHITE
2859 p = skipwhite(p);
2860 #else
2861 if (*p != NUL) 2830 if (*p != NUL)
2862 ++p; 2831 ++p;
2863 #endif
2864 tagp->fname = p; 2832 tagp->fname = p;
2865 #ifdef FEAT_TAG_ANYWHITE
2866 p = skiptowhite(p);
2867 #else
2868 p = vim_strchr(p, TAB); 2833 p = vim_strchr(p, TAB);
2869 if (p == NULL) 2834 if (p == NULL)
2870 return FAIL; 2835 return FAIL;
2871 #endif
2872 tagp->fname_end = p; 2836 tagp->fname_end = p;
2873 2837
2874 /* find start of search command, after second white space */ 2838 // find start of search command, after second white space
2875 #ifdef FEAT_TAG_ANYWHITE
2876 p = skipwhite(p);
2877 #else
2878 if (*p != NUL) 2839 if (*p != NUL)
2879 ++p; 2840 ++p;
2880 #endif
2881 if (*p == NUL) 2841 if (*p == NUL)
2882 return FAIL; 2842 return FAIL;
2883 tagp->command = p; 2843 tagp->command = p;
2884 #ifdef FEAT_EMACS_TAGS 2844 #ifdef FEAT_EMACS_TAGS
2885 } 2845 }