Merge pull request #3191 from masatake/doc--typo-in-role-desc

Minor fix about --role-<LANG>.<KIND> option and cleanups in CPreProcessor

Author: masatake

docs/man/ctags.1.rst

@@ -735,7 +735,7 @@ See "`TAG ENTRIES`_" about fields, kinds, roles, and extras.
 	In the above example, the prefix is put to ``end`` field which is
 	newly introduced in Universal Ctags.
 
-``--roles-(<LANG>|all).(<kind>|all)=[+|-][<roles>|*]``
+``--roles-(<LANG>|all).(<kind>|*)=[+|-][<roles>|*]``
 	Specifies a list of kind-specific roles of tags to include in the
 	output file for a particular language.
 	*<kind>* specifies the kind where the *<roles>* are defined.

main/options.c

@@ -337,7 +337,7 @@ static optionDescription LongOptionDescription [] = {
  {0,0,"  --put-field-prefix"},
  {0,0,"       Put \"" CTAGS_FIELD_PREFIX "\" as prefix for the name of fields newly introduced in"},
  {0,0,"       universal-ctags."},
- {1,0,"  --roles-(<LANG>|all).(<kind>|all)=[+|-][<roles>|*]"},
+ {1,0,"  --roles-(<LANG>|all).(<kind>|*)=[+|-][<roles>|*]"},
  {1,0,"       Enable/disable tag roles for kinds of language <LANG>."},
  {0,0,"  --tag-relative=(yes|no|always|never)"},
  {0,0,"       Should paths be relative to location of tag file [no; yes when -e]?"},

man/ctags.1.rst.in

@@ -735,7 +735,7 @@ See "`TAG ENTRIES`_" about fields, kinds, roles, and extras.
 	In the above example, the prefix is put to ``end`` field which is
 	newly introduced in Universal Ctags.
 
-``--roles-(<LANG>|all).(<kind>|all)=[+|-][<roles>|*]``
+``--roles-(<LANG>|all).(<kind>|*)=[+|-][<roles>|*]``
 	Specifies a list of kind-specific roles of tags to include in the
 	output file for a particular language.
 	*<kind>* specifies the kind where the *<roles>* are defined.

parsers/cpreprocessor.c

@@ -826,30 +826,30 @@ static void makeIncludeTag (const  char *const name, bool systemHeader)
 
 	if (isLanguageRoleEnabled(lang, Cpp.headerKindIndex, role_index))
 	{
-		if (doesCPreProRunAsStandaloneParser (CPREPRO_HEADER))
+		if (standing_alone)
 			pushLanguage (Cpp.lang);
 
 		initRefTagEntry (&e, name, Cpp.headerKindIndex, role_index);
 		e.isFileScope  = false;
 		e.truncateLineAfterTag = true;
 		makeTagEntry (&e);
 
-		if (doesCPreProRunAsStandaloneParser (CPREPRO_HEADER))
+		if (standing_alone)
 			popLanguage ();
 	}
 }
 
 static void makeParamTag (vString *name, short nth, bool placeholder)
 {
 	bool standing_alone = doesCPreProRunAsStandaloneParser(CPREPRO_MACRO);
-	langType lang = standing_alone ? Cpp.lang: Cpp.clientLang;
 
 	Assert (Cpp.macroParamKindIndex != KIND_GHOST_INDEX);
 
-	int r;
-	pushLanguage (lang);
-	r = makeSimpleTag (name, Cpp.macroParamKindIndex);
-	popLanguage ();
+	if (standing_alone)
+		pushLanguage (Cpp.lang);
+	int r = makeSimpleTag (name, Cpp.macroParamKindIndex);
+	if (standing_alone)
+		popLanguage ();
 
 	tagEntryInfo *e = getEntryInCorkQueue (r);
 	if (e)
@@ -1076,8 +1076,8 @@ static bool handleDirective (const int c, int *macroCorkIndex)
 		case DRCTV_HASH:    ignore = directiveHash (c);  break;
 		case DRCTV_IF:      ignore = directiveIf (c);    break;
 		case DRCTV_PRAGMA:  directivePragma (c);         break;
-		case DRCTV_UNDEF:   directiveUndef (c);         break;
-		case DRCTV_INCLUDE: directiveInclude (c);         break;
+		case DRCTV_UNDEF:   directiveUndef (c);          break;
+		case DRCTV_INCLUDE: directiveInclude (c);        break;
 	}
 	return ignore;
 }