main: make automatic FQ tag emission based on the language associated with the target tag

A language can specify whether the main part does automagic-FQ-tag emission or not
with requestAutomaticFQTag field of parserDefinition.

To access the requestAutomaticFQTag field, the original code calls
getInputLanguage(). However, this didn't work expectedly. When a
subparser made a tag, it was stored to the corkQueue. The corkQueue
was flushed after the subparser run, within the base parser run.
As the result requestAutomaticFQTag field of the base parser was
referred when calling getInputLanguage().

This changes refers the tag itself to access the requestAutomaticFQTag
field instead of calling getInputLanguage().

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

main/entry.c

@@ -1546,7 +1546,7 @@ static void writeTagEntry (const tagEntryInfo *const tag)
 
 	if (includeExtensionFlags ()
 	    && isXtagEnabled (XTAG_QUALIFIED_TAGS)
-	    && doesInputLanguageRequestAutomaticFQTag ()
+	    && doesInputLanguageRequestAutomaticFQTag (tag)
 		&& !isTagExtraBitMarked (tag, XTAG_QUALIFIED_TAGS)
 		&& !tag->skipAutoFQEmission)
 	{
@@ -1616,7 +1616,7 @@ extern void uncorkTagFile(void)
 
 		writeTagEntry (tag);
 
-		if (doesInputLanguageRequestAutomaticFQTag ()
+		if (doesInputLanguageRequestAutomaticFQTag (tag)
 		    && isXtagEnabled (XTAG_QUALIFIED_TAGS)
 			&& !isTagExtraBitMarked (tag, XTAG_QUALIFIED_TAGS)
 			&& !tag->skipAutoFQEmission

main/read.c

@@ -245,9 +245,9 @@ extern bool doesInputLanguageAllowNullTag (void)
 	return doesLanguageAllowNullTag (getInputLanguage ());
 }
 
-extern bool doesInputLanguageRequestAutomaticFQTag (void)
+extern bool doesInputLanguageRequestAutomaticFQTag (const tagEntryInfo *e)
 {
-	return doesLanguageRequestAutomaticFQTag (getInputLanguage ());
+	return doesLanguageRequestAutomaticFQTag (e->langType);
 }
 
 extern const char *getSourceFileTagPath (void)

main/read_p.h

@@ -40,7 +40,7 @@ extern unsigned int countInputLanguageKinds (void);
 extern unsigned int countInputLanguageRoles (int kindIndex);
 
 extern bool doesInputLanguageAllowNullTag (void);
-extern bool doesInputLanguageRequestAutomaticFQTag (void);
+extern bool doesInputLanguageRequestAutomaticFQTag (const tagEntryInfo *e);
 extern bool doesParserRunAsGuest (void);
 extern bool doesSubparserRun (void);
 extern langType getLanguageForBaseParser (void);