Skip to content

Commit

Permalink
Merge pull request #2692 from masatake/enable-TAG_PROC_CWD-ptag
Browse files Browse the repository at this point in the history
main: enable TAG_PROC_CWD pseudo tag by default
  • Loading branch information
masatake committed Nov 7, 2020
2 parents 2e3a064 + 0ee8776 commit 4729393
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 6 deletions.
1 change: 1 addition & 0 deletions Tmain/extras-field-for-pseudo-tags.d/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ run_ctags()
${CTAGS} --quiet --options=NONE \
--fields=E --extras=p \
--pseudo-tags=-TAG_PROGRAM_VERSION \
--pseudo-tags=-TAG_PROC_CWD \
$@ \
-o - input.c
}
Expand Down
1 change: 1 addition & 0 deletions Tmain/input-encoding-option.d/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ BUILDDIR=$2

if ${CTAGS} --quiet --options=NONE --list-features | grep -q iconv; then
if ${CTAGS} --quiet --options=NONE \
--pseudo-tags=-TAG_PROC_CWD \
--input-encoding=utf-8 --input-encoding-java=cp932 --input-encoding-javascript=euc-jp \
-o ${BUILDDIR}/tags \
input.js input.java ; then
Expand Down
5 changes: 4 additions & 1 deletion Tmain/json-output-format.d/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@ if is_feature_available "${CTAGS}" json; then
run_with_format json --languages=+man
run_with_format json --languages=+man --fields="*"
run_with_format json --languages=+man --fields="*" --extras='*'
} | grep -v TAG_PROGRAM_VERSION | grep -v TAG_OUTPUT_FILESEP
} | cat \
| grep -v TAG_PROGRAM_VERSION \
| grep -v TAG_OUTPUT_FILESEP \
| grep -v TAG_PROC_CWD
fi
2 changes: 1 addition & 1 deletion Tmain/list-pseudo-tags.d/stdout-expected.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ TAG_KIND_SEPARATOR off the separators used in kinds
TAG_OUTPUT_FILESEP on the separator used in file name (slash or backslash)
TAG_OUTPUT_MODE on the output mode: u-ctags or e-ctags
TAG_PATTERN_LENGTH_LIMIT on the limit of pattern length
TAG_PROC_CWD off the current working directory of the tags generator
TAG_PROC_CWD on the current working directory of the tags generator
TAG_PROGRAM_AUTHOR on the author of this ctags implementation
TAG_PROGRAM_NAME on the name of this ctags implementation
TAG_PROGRAM_URL on the official site URL of this ctags implementation
Expand Down
1 change: 1 addition & 0 deletions Tmain/output-encoding-option.d/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ BUILDDIR=$2

if ${CTAGS} --quiet --options=NONE --list-features | grep -q iconv; then
if ${CTAGS} --quiet --options=NONE \
--pseudo-tags=-TAG_PROC_CWD \
--output-encoding=cp932 --input-encoding=utf-8 --input-encoding-javascript=euc-jp \
-o ${BUILDDIR}/tags \
input.js input.java ; then
Expand Down
7 changes: 4 additions & 3 deletions Tmain/ptag-kind-sep.d/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ${CTAGS} --quiet --options=NONE -o - \

${CTAGS} --quiet --options=NONE -o - \
--extras=+p --kinds-all= \
--pseudo-tags=+TAG_KIND_SEPARATOR --pseudo-tags=-TAG_PROGRAM_VERSION \
input.php

--pseudo-tags=+TAG_KIND_SEPARATOR \
--pseudo-tags=-TAG_PROGRAM_VERSION \
--pseudo-tags=-TAG_PROC_CWD \
input.php
2 changes: 1 addition & 1 deletion main/ptag.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ static ptagDesc ptagDescs [] = {
"the limit of pattern length",
ptagMakePatternLengthLimit,
PTAGF_COMMON },
{ false, "TAG_PROC_CWD",
{ true, "TAG_PROC_CWD",
"the current working directory of the tags generator",
ptagMakeProcCwd,
PTAGF_COMMON },
Expand Down

0 comments on commit 4729393

Please sign in to comment.