Enhance make_ctags and make_etags.

make_ctags did not include field members of structs since the commit
964d01ae90c314eb31132c2e7712d5d9fc237331.

For example, in the following field of RestrictInfo:

   Selectivity norm_selec pg_node_attr(equal_ignore);

pg_node_attr was mistakenly interpreted to be the name of the field.
To fix this, add -I option to ctags command if the command is
Exuberant ctags or Universal ctags (for plain old ctags, struct
members are not included in the tags file anyway).

Also add "-e" and "-n" options to make_ctags. The -e option invokes
ctags command with -e option, which produces TAGS file for emacs. This
allows to eliminate duplicate codes in make_etags so that make_etags
just exec make_ctags with -e option.

The -n option allows not to produce symbolic links in each
sub directory (the default is producing symbolic links).

Author: Yugo Nagata
Reviewers: Alvaro Herrera, Tatsuo Ishii
Discussion: https://postgr.es/m/flat/20221007154442.76233afc7c5b255c4de6528a%40sraoss.co.jp
This commit is contained in:
Tatsuo Ishii 2022-10-19 12:59:29 +09:00
parent c68ec1b027
commit d1e2a380cb
2 changed files with 48 additions and 22 deletions

View File

@ -1,12 +1,37 @@
#!/bin/sh
# src/tools/make_ctags
# src/tools/make_ctags [-e] [-n]
# If -e is specified, generate tags files for emacs.
# If -n is specified, don't create symbolic links of tags file.
usage="Usage: $0 [-e][-n]"
if [ $# -gt 2 ]
then echo $usage
exit 1
fi
MODE=
NO_SYMLINK=
TAGS_FILE="tags"
while [ $# -gt 0 ]
do
if [ $1 = "-e" ]
then MODE="-e"
TAGS_FILE="TAGS"
elif [ $1 = "-n" ]
then NO_SYMLINK="Y"
else
echo $usage
exit 1
fi
shift
done
command -v ctags >/dev/null || \
{ echo "'ctags' program not found" 1>&2; exit 1; }
trap "ret=$?; rm -rf /tmp/$$; exit $ret" 0 1 2 3 15
rm -f ./tags
rm -f ./$TAGS_FILE
IS_EXUBERANT=""
ctags --version 2>&1 | grep Exuberant && IS_EXUBERANT="Y"
@ -34,9 +59,17 @@ then FLAGS="--c-kinds=+dfmstuv"
else FLAGS="-dt"
fi
# Use -I option to ignore a macro
if [ "$IS_EXUBERANT" ]
then IGNORE_IDENTIFIES="-I pg_node_attr+"
else IGNORE_IDENTIFIES=
fi
# this is outputting the tags into the file 'tags', and appending
find `pwd`/ -type f -name '*.[chyl]' -print |
xargs ctags -a -f tags "$FLAGS"
find `pwd`/ \( -name tmp_install -prune -o -name tmp_check -prune \) \
-o \( -name "*.[chly]" -o -iname "*makefile*" -o -name "*.mk" -o -name "*.in" \
-o -name "*.sql" -o -name "*.p[lm]" \) -type f -print |
xargs ctags $MODE -a -f $TAGS_FILE "$FLAGS" "$IGNORE_IDENTIFIES"
# Exuberant tags has a header that we cannot sort in with the other entries
# so we skip the sort step
@ -45,10 +78,13 @@ find `pwd`/ -type f -name '*.[chyl]' -print |
if [ ! "$IS_EXUBERANT" ]
then LC_ALL=C
export LC_ALL
sort tags >/tmp/$$ && mv /tmp/$$ tags
sort $TAGS_FILE >/tmp/$$ && mv /tmp/$$ $TAGS_FILE
fi
find . \( -name 'CVS' -prune \) -o \( -name .git -prune \) -o -type d -print |
while read DIR
do [ "$DIR" != "." ] && ln -f -s `echo "$DIR" | sed 's;/[^/]*;/..;g'`/tags "$DIR"/tags
done
# create symbolic links
if [ ! "$NO_SYMLINK" ]
then find . \( -name 'CVS' -prune \) -o \( -name .git -prune \) -o -type d -print |
while read DIR
do [ "$DIR" != "." ] && ln -f -s `echo "$DIR" | sed 's;/[^/]*;/..;g'`/$TAGS_FILE "$DIR"/$TAGS_FILE
done
fi

View File

@ -1,16 +1,6 @@
#!/bin/sh
# src/tools/make_etags
command -v etags >/dev/null || \
{ echo "'etags' program not found" 1>&2; exit 1; }
rm -f ./TAGS
find `pwd`/ -type f -name '*.[chyl]' -print |
xargs etags --append -o TAGS
find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -type d -print |
while read DIR
do [ "$DIR" != "." ] && ln -f -s `pwd`/TAGS "$DIR"
done
cdir=`dirname $0`
dir=`(cd $cdir && pwd)`
exec $dir/make_ctags -e $*