From fd781c1a8171c026dfca7f1319da58d4c8af3793 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Thu, 8 Feb 2024 06:53:16 +0900 Subject: [PATCH] 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 --- Tmain/broken-extradef.d/stderr-expected.txt | 4 ++-- Tmain/broken-fielddef.d/stderr-expected.txt | 4 ++-- Tmain/roledef.d/stderr-expected.txt | 4 ++-- main/parse.c | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Tmain/broken-extradef.d/stderr-expected.txt b/Tmain/broken-extradef.d/stderr-expected.txt index 6c32f9ff84..ef10cb9eb0 100644 --- a/Tmain/broken-extradef.d/stderr-expected.txt +++ b/Tmain/broken-extradef.d/stderr-expected.txt @@ -10,8 +10,8 @@ ctags: no extra definition specified in "--_extradef-IMAGINARY" option # wrong char in a field name ctags: no extra description specified in "--_extradef-IMAGINARY" option ctags: no extra description specified in "--_extradef-IMAGINARY" option -ctags: unacceptable char as part of extra name in "--_extradef-IMAGINARY" option -ctags: unacceptable char as part of extra name in "--_extradef-IMAGINARY" option +ctags: unacceptable char as part of extra name in "--_extradef-IMAGINARY" option: ':' +ctags: unacceptable char as part of extra name in "--_extradef-IMAGINARY" option: ':' # empty extra name ctags: the extra name in "--_extradef-IMAGINARY" option is empty diff --git a/Tmain/broken-fielddef.d/stderr-expected.txt b/Tmain/broken-fielddef.d/stderr-expected.txt index 08e92e014b..08b2b7d98f 100644 --- a/Tmain/broken-fielddef.d/stderr-expected.txt +++ b/Tmain/broken-fielddef.d/stderr-expected.txt @@ -10,8 +10,8 @@ ctags: no field definition specified in "--_fielddef-IMAGINARY" option # wrong char in a field name ctags: no field description specified in "--_fielddef-IMAGINARY" option ctags: no field description specified in "--_fielddef-IMAGINARY" option -ctags: unacceptable char as part of field name in "--_fielddef-IMAGINARY" option -ctags: unacceptable char as part of field name in "--_fielddef-IMAGINARY" option +ctags: unacceptable char as part of field name in "--_fielddef-IMAGINARY" option: ':' +ctags: unacceptable char as part of field name in "--_fielddef-IMAGINARY" option: ':' # empty field name ctags: the field name in "--_fielddef-IMAGINARY" option is empty diff --git a/Tmain/roledef.d/stderr-expected.txt b/Tmain/roledef.d/stderr-expected.txt index 7f6ed8d663..5c14d94c60 100644 --- a/Tmain/roledef.d/stderr-expected.txt +++ b/Tmain/roledef.d/stderr-expected.txt @@ -45,8 +45,8 @@ ctags: the role name in "--_roledef-IMAGINARY.{variable}" option is empty ctags: the role name in "--_roledef-IMAGINARY.{variable}" option is empty # wrong char in role name -ctags: unacceptable char as part of role name in "--_roledef-IMAGINARY.v" option: + -ctags: unacceptable char as part of role name in "--_roledef-IMAGINARY.{variable}" option: + +ctags: unacceptable char as part of role name in "--_roledef-IMAGINARY.v" option: '+' +ctags: unacceptable char as part of role name in "--_roledef-IMAGINARY.{variable}" option: '+' # empty description ctags: no role description specified in "--_roledef-IMAGINARY.v" option diff --git a/main/parse.c b/main/parse.c index aa9a1a1620..87b0730c96 100644 --- a/main/parse.c +++ b/main/parse.c @@ -2868,7 +2868,7 @@ static bool processLangDefineRole(const langType language, while (p != tmp_end) { if (!isalnum ((unsigned char) *p)) - error (FATAL, "unacceptable char as part of role name in \"--%s\" option: %c", + error (FATAL, "unacceptable char as part of role name in \"--%s\" option: '%c'", option, *p); p++; } @@ -3553,8 +3553,8 @@ static bool processLangDefineParam (const langType language, for (; p < name_end; p++) { if (!isalnum ((unsigned char) *p) && *p != '_') - error (FATAL, "unacceptable char as part of extra name in \"--%s\" option", - option); + error (FATAL, "unacceptable char as part of extra name in \"--%s\" option: '%c'", + option, *p); } p++; @@ -3959,8 +3959,8 @@ static bool processLangDefineExtra (const langType language, for (; p < name_end; p++) { if (!isalnum ((unsigned char) *p)) - error (FATAL, "unacceptable char as part of extra name in \"--%s\" option", - option); + error (FATAL, "unacceptable char as part of extra name in \"--%s\" option: '%c'", + option, *p); } p++; @@ -4028,8 +4028,8 @@ static bool processLangDefineField (const langType language, for (; p < name_end; p++) { if (!isalpha ((unsigned char) *p)) - error (FATAL, "unacceptable char as part of field name in \"--%s\" option", - option); + error (FATAL, "unacceptable char as part of field name in \"--%s\" option: '%c'", + option, *p); } p++;