rtyler
/
ctags
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

trunk/ctags.1: (Bug #1745301) clarify the "--options" option. 

trunk/lregex.c: 
trunk/options.c: 
trunk/parse.c: improve the "unknown language" error messages.


git-svn-id: svn://svn.code.sf.net/p/ctags/code/trunk@576 c5d04d22-be80-434c-894e-aa346cc9e8e8
This commit is contained in:
elliotth 2007-06-30 04:16:23 +00:00
parent 3e5a4a949c
commit 81a577defd
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ctags.1
View File

@ -674,7 +674,8 @@ These language names are case insensitive and may be used in the
.TP 5
\fB\-\-options\fP=\fIfile\fP
Read additional options from \fIfile\fP. As a special case, if
Read additional options from \fIfile\fP. The file should contain one option
per line. As a special case, if
\fB\-\-options\fP=\fINONE\fP is specified as the first option on the command
line, it will disable the automatic reading of any configuration options from
either a file or the environment (see \fBFILES\fP).

2
lregex.c
View File

@ -612,7 +612,7 @@ extern boolean processRegexOption (const char *const option,
langType language;
language = getNamedLanguage (dash + 1);
if (language == LANG_IGNORE)
error (WARNING, "unknown language in --%s option", option);
error (WARNING, "unknown language \"%s\" in --%s option", (dash + 1), option);
else
processLanguageRegex (language, parameter);
#else

10
options.c
View File

@ -955,7 +955,7 @@ static void processLanguageForceOption (
"\"--%s\" option is obsolete; use \"--language-force\" instead",
option);
if (language == LANG_IGNORE)
error (FATAL, "Unknown language specified in \"%s\" option", option);
error (FATAL, "Unknown language \"%s\" in \"%s\" option", parameter, option);
else
Option.language = language;
}
@ -1080,7 +1080,7 @@ static void processLanguageMapOption (
{
char* const next = processLanguageMap (map);
if (next == NULL)
error (WARNING, "Unknown language specified in \"%s\" option", option);
error (WARNING, "Unknown language \"%s\" in \"%s\" option", parameter, option);
map = next;
}
eFree (maps);
@ -1122,7 +1122,7 @@ static void processLanguagesOption (
{
const langType language = getNamedLanguage (lang);
if (language == LANG_IGNORE)
error (WARNING, "Unknown language specified in \"%s\" option", option);
error (WARNING, "Unknown language \"%s\" in \"%s\" option", lang, option);
else
enableLanguage (language, (boolean) (mode != Remove));
}
@ -1158,7 +1158,7 @@ static void processListKindsOption (
{
langType language = getNamedLanguage (parameter);
if (language == LANG_IGNORE)
error (FATAL, "Unknown language specified in \"%s\" option",option);
error (FATAL, "Unknown language \"%s\" in \"%s\" option", parameter, option);
else
printLanguageKinds (language);
}
@ -1175,7 +1175,7 @@ static void processListMapsOption (
{
langType language = getNamedLanguage (parameter);
if (language == LANG_IGNORE)
error (FATAL, "Unknown language specified in \"%s\" option",option);
error (FATAL, "Unknown language \"%s\" in \"%s\" option", parameter, option);
else
printLanguageMaps (language);
}

2
parse.c
View File

@ -482,7 +482,7 @@ extern boolean processKindOption (
vStringNCopyS (langName, option, dash - option);
language = getNamedLanguage (vStringValue (langName));
if (language == LANG_IGNORE)
error (WARNING, "Unknown language specified in \"%s\" option", option);
error (WARNING, "Unknown language \"%s\" in \"%s\" option", vStringValue (langName), option);
else
processLangKindOption (language, option, parameter);
vStringDelete (langName);