[Emacs-commit] emacs/lib-src etags.c

[Francesco Potortì]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Francesco Potortì <address@hidden>      02/04/15 10:18:47

Modified files:
        lib-src        : etags.c 

Log message:
        Avoid doubly tagging parse.y when both parse.c and parse.y are given on
        the command line, in either order.
        
        * etags.c (find_entries): Delete tags previously obtained from
        file xxx.c's #line directives when parsing file xxx.y.  This is
        generally done for automatically generated files containing
        #line directives.  This handles the case when xxx.y is tagged
        before xxx.c, and the entries of xxx.c pointing to xxx.y should
        be discarded.
        (language): Added the metasource member.  Initializers changed.
        (invalidate_nodes): New function.
        (readline): Discard lines after having found a #line
        directive pointing to an already tagged file.  This handles the
        case when xxx.y is tagged before xxx.c, and the entries of
        xxx.c pointing to xxx.y should be discarded.
        (fdesc): New structure for keeping track of input files.
        (fdesc): Remove `file' member (a string) and use instead a pointer
        to a file description structure.
        (curfile, curfiledir, curtagfname, curlang, nocharno,
        forced_lang): Global variables removed in favor of fdhead and
        curfdp, pointers to file description strucures.
        (longopts, main, print_help): Use the CTAGS conditional to include
        or exclude options that work on etags or ctags only.
        (process_file, find_entries, pfnote, add_node, put_entries,
        readline): Use fdhead and curfdp.
        (process_file, find_entries): Do not take an arg string, all
        callers changed.
        
        * etags.c (longopts, print_help, main): Test CTAGS to disallow
        options that are not right for either etags or ctags.
        
        * etags.c (number_len, total_size_of_entries): Define them also
        in CTAGS mode, because gcc does not compile all refs away.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lib-src/etags.c.diff?tr1=3.11&tr2=3.12&r1=text&r2=text