Skip to content

Commit fd781c1

Browse files
committed
main: report the char when an acceptable char is given as a part of a role, extra, or field name
Signed-off-by: Masatake YAMATO <[email protected]>
1 parent f67d638 commit fd781c1

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

Tmain/broken-extradef.d/stderr-expected.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ ctags: no extra definition specified in "--_extradef-IMAGINARY" option
1010
# wrong char in a field name
1111
ctags: no extra description specified in "--_extradef-IMAGINARY" option
1212
ctags: no extra description specified in "--_extradef-IMAGINARY" option
13-
ctags: unacceptable char as part of extra name in "--_extradef-IMAGINARY" option
14-
ctags: unacceptable char as part of extra name in "--_extradef-IMAGINARY" option
13+
ctags: unacceptable char as part of extra name in "--_extradef-IMAGINARY" option: ':'
14+
ctags: unacceptable char as part of extra name in "--_extradef-IMAGINARY" option: ':'
1515

1616
# empty extra name
1717
ctags: the extra name in "--_extradef-IMAGINARY" option is empty

Tmain/broken-fielddef.d/stderr-expected.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ ctags: no field definition specified in "--_fielddef-IMAGINARY" option
1010
# wrong char in a field name
1111
ctags: no field description specified in "--_fielddef-IMAGINARY" option
1212
ctags: no field description specified in "--_fielddef-IMAGINARY" option
13-
ctags: unacceptable char as part of field name in "--_fielddef-IMAGINARY" option
14-
ctags: unacceptable char as part of field name in "--_fielddef-IMAGINARY" option
13+
ctags: unacceptable char as part of field name in "--_fielddef-IMAGINARY" option: ':'
14+
ctags: unacceptable char as part of field name in "--_fielddef-IMAGINARY" option: ':'
1515

1616
# empty field name
1717
ctags: the field name in "--_fielddef-IMAGINARY" option is empty

Tmain/roledef.d/stderr-expected.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ ctags: the role name in "--_roledef-IMAGINARY.{variable}" option is empty
4545
ctags: the role name in "--_roledef-IMAGINARY.{variable}" option is empty
4646

4747
# wrong char in role name
48-
ctags: unacceptable char as part of role name in "--_roledef-IMAGINARY.v" option: +
49-
ctags: unacceptable char as part of role name in "--_roledef-IMAGINARY.{variable}" option: +
48+
ctags: unacceptable char as part of role name in "--_roledef-IMAGINARY.v" option: '+'
49+
ctags: unacceptable char as part of role name in "--_roledef-IMAGINARY.{variable}" option: '+'
5050

5151
# empty description
5252
ctags: no role description specified in "--_roledef-IMAGINARY.v" option

main/parse.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2868,7 +2868,7 @@ static bool processLangDefineRole(const langType language,
28682868
while (p != tmp_end)
28692869
{
28702870
if (!isalnum ((unsigned char) *p))
2871-
error (FATAL, "unacceptable char as part of role name in \"--%s\" option: %c",
2871+
error (FATAL, "unacceptable char as part of role name in \"--%s\" option: '%c'",
28722872
option, *p);
28732873
p++;
28742874
}
@@ -3553,8 +3553,8 @@ static bool processLangDefineParam (const langType language,
35533553
for (; p < name_end; p++)
35543554
{
35553555
if (!isalnum ((unsigned char) *p) && *p != '_')
3556-
error (FATAL, "unacceptable char as part of extra name in \"--%s\" option",
3557-
option);
3556+
error (FATAL, "unacceptable char as part of extra name in \"--%s\" option: '%c'",
3557+
option, *p);
35583558
}
35593559

35603560
p++;
@@ -3959,8 +3959,8 @@ static bool processLangDefineExtra (const langType language,
39593959
for (; p < name_end; p++)
39603960
{
39613961
if (!isalnum ((unsigned char) *p))
3962-
error (FATAL, "unacceptable char as part of extra name in \"--%s\" option",
3963-
option);
3962+
error (FATAL, "unacceptable char as part of extra name in \"--%s\" option: '%c'",
3963+
option, *p);
39643964
}
39653965

39663966
p++;
@@ -4028,8 +4028,8 @@ static bool processLangDefineField (const langType language,
40284028
for (; p < name_end; p++)
40294029
{
40304030
if (!isalpha ((unsigned char) *p))
4031-
error (FATAL, "unacceptable char as part of field name in \"--%s\" option",
4032-
option);
4031+
error (FATAL, "unacceptable char as part of field name in \"--%s\" option: '%c'",
4032+
option, *p);
40334033
}
40344034

40354035
p++;

0 commit comments

Comments
 (0)