Merge pull request #3182 from masatake/thrift-parser

Thrift: extract C++ headers specified with cpp_include

Author: masatake

Units/parser-thrift.r/cpp_include.d/args.ctags

@@ -0,0 +1,3 @@
+--sort=no
+--extras=+r
+--fields=+rln

Units/parser-thrift.r/cpp_include.d/expected.tags

@@ -0,0 +1,2 @@
+iostream	input.thrift	/^cpp_include "iostream"$/;"	h	line:1	language:C++	roles:local
+vector	input.thrift	/^cpp_include 'vector'$/;"	h	line:2	language:C++	roles:local

Units/parser-thrift.r/cpp_include.d/input.thrift

@@ -0,0 +1,2 @@
+cpp_include "iostream"
+cpp_include 'vector'

main/dependency.c

@@ -43,7 +43,7 @@ extern void linkDependencyAtInitializeParsing (depType dtype,
 {
 	if (dtype == DEPTYPE_KIND_OWNER)
 		linkKindDependency (masterKCB, slaveKCB);
-	else if (dtype == DEPTYPE_SUBPARSER)
+	else if (dtype == DEPTYPE_SUBPARSER || dtype == DEPTYPE_FOREIGNER)
 	{
 		slaveParser *s = xMalloc (1, slaveParser);
 
@@ -118,8 +118,9 @@ extern void initializeDependencies (parserDefinition *parser,
 	for (i = 0; i < parser->dependencyCount; i++)
 	{
 		parserDependency *d = parser->dependencies + i;
-		if (d->type == DEPTYPE_SUBPARSER &&
-			((subparser *)(d->data))->direction & SUBPARSER_SUB_RUNS_BASE)
+		if ((d->type == DEPTYPE_SUBPARSER &&
+			 ((subparser *)(d->data))->direction & SUBPARSER_SUB_RUNS_BASE)
+			|| (d->type == DEPTYPE_FOREIGNER))
 		{
 			langType baseParser;
 			baseParser = getNamedLanguage (d->upperParser, 0);
@@ -320,6 +321,9 @@ extern void subparserColprintAddSubparsers (struct colprintTable *table,
 	pushLanguage (scb->owner);
 	foreachSlaveParser(tmp)
 	{
+		if (tmp->type != DEPTYPE_SUBPARSER)
+			continue;
+
 		struct colprintLine *line = colprintTableGetNewLine(table);
 
 		colprintLineAppendColumnCString (line, getLanguageName (tmp->id));

main/dependency.h

@@ -26,6 +26,7 @@
 typedef enum eDepType {
 	DEPTYPE_KIND_OWNER,
 	DEPTYPE_SUBPARSER,
+	DEPTYPE_FOREIGNER,
 	COUNT_DEPTYPES,
 } depType;
 

main/entry.h

@@ -139,6 +139,15 @@ extern void initTagEntry (tagEntryInfo *const e, const char *const name,
 			  int kindIndex);
 extern void initRefTagEntry (tagEntryInfo *const e, const char *const name,
 			     int kindIndex, int roleIndex);
+
+/* initForeignRefTagEntry() is for making a tag for the language X when parsing
+ * source code of Y language.
+ * From the view point of the language Y, we call the language X a foreign
+ * language.
+ *
+ * When making a tag for a foreign with this function, you must declare the
+ * language X in the parser of Y with DEPTYPE_FOREIGNER dependency.
+ */
 extern void initForeignRefTagEntry (tagEntryInfo *const e, const char *const name,
 									langType type,
 									int kindIndex, int roleIndex);

main/parse.c

@@ -1865,19 +1865,37 @@ static void linkDependenciesAtInitializeParsing (parserDefinition *const parser)
 	unsigned int i;
 	parserDependency *d;
 	langType upper;
+	parserDefinition *lowerParser;
 	parserObject *upperParser;
 
 	for (i = 0; i < parser->dependencyCount; i++)
 	{
 		d = parser->dependencies + i;
-		upper = getNamedLanguage (d->upperParser, 0);
+
+		if (d->type == DEPTYPE_FOREIGNER)
+		{
+			upper = parser->id;
+			langType lower = getNamedLanguage (d->upperParser, 0);
+			if (lower == LANG_IGNORE)
+				error (FATAL,
+					   "Unknown language: \"%s\" as a foreigner for %s",
+					   d->upperParser, parser->name);
+
+			lowerParser = LanguageTable [lower].def;
+		}
+		else
+		{
+			upper = getNamedLanguage (d->upperParser, 0);
+			lowerParser = parser;
+		}
+
 		upperParser = LanguageTable + upper;
 
 		linkDependencyAtInitializeParsing (d->type, upperParser->def,
 										   upperParser->slaveControlBlock,
 										   upperParser->kindControlBlock,
-										   parser,
-										   (LanguageTable + parser->id)->kindControlBlock,
+										   lowerParser,
+										   (LanguageTable + lowerParser->id)->kindControlBlock,
 										   d->data);
 	}
 }
@@ -3743,11 +3761,39 @@ static rescanReason createTagsForFile (const langType language,
 
 extern void notifyLanguageRegexInputStart (langType language)
 {
-	notifyRegexInputStart((LanguageTable + language)->lregexControlBlock);
+	parserObject *pobj = LanguageTable + language;
+	parserDefinition *pdef = pobj->def;
+
+	notifyRegexInputStart(pobj->lregexControlBlock);
+	for (unsigned int i = 0; i < pdef->dependencyCount; i++)
+	{
+		parserDependency *d = pdef->dependencies + i;
+		if (d->type != DEPTYPE_FOREIGNER)
+			continue;
+		langType foreigner = getNamedLanguage (d->upperParser, 0);
+		if (foreigner == LANG_IGNORE)
+			continue;
+
+		notifyLanguageRegexInputStart (foreigner);
+	}
 }
 
 extern void notifyLanguageRegexInputEnd (langType language)
 {
+	parserObject *pobj = LanguageTable + language;
+	parserDefinition *pdef = pobj->def;
+
+	for (unsigned int i = 0; i < pdef->dependencyCount; i++)
+	{
+		parserDependency *d = pdef->dependencies + i;
+		if (d->type != DEPTYPE_FOREIGNER)
+			continue;
+		langType foreigner = getNamedLanguage (d->upperParser, 0);
+		if (foreigner == LANG_IGNORE)
+			continue;
+
+		notifyLanguageRegexInputEnd (foreigner);
+	}
 	notifyRegexInputEnd((LanguageTable + language)->lregexControlBlock);
 }
 

parsers/rpmspec.c

@@ -31,6 +31,7 @@
 #include "routines.h"
 #include "trace.h"
 
+#include "dependency.h"
 #include "autoconf.h"
 
 typedef enum {
@@ -385,10 +386,17 @@ extern parserDefinition* RpmSpecParser (void)
 		"rpm-spec",				/* the mode name in Emacs */
 		NULL };
 	parserDefinition* const def = parserNew ("RpmSpec");
+
+	static parserDependency dependencies [] = {
+		[0] = { DEPTYPE_FOREIGNER, "Autoconf", NULL },
+	};
+
 	def->kindTable = RpmSpecKinds;
 	def->kindCount = ARRAY_SIZE (RpmSpecKinds);
 	def->extensions = extensions;
 	def->aliases = aliases;
+	def->dependencies = dependencies;
+	def->dependencyCount = ARRAY_SIZE (dependencies);
 	def->initialize = initializeRpmSpecParser;
 	def->parser = findRpmSpecTags;
 	def->method     = METHOD_REGEX;

peg/thrift.peg

@@ -55,16 +55,23 @@ Grammar <- __ ( Statement __ )* (EOF / SyntaxError)
 SyntaxError <- .
 
 # MODIFIED
-Include <- <( "include" / "cpp_include" )> _ <Literal> EOS {{
-    if ($1[0] == 'i')
+Include <- <( "include" / "cpp_include" )> _ <Literal> EOS {
+    vString *f = unliteral ($2);
+    if (vStringLength(f) > 0)
     {
-        vString *f = unliteral ($2);
-	if (vStringLength(f) > 0)
+        if ($1[0] == 'i')
             makeThriftTagFull (auxil, vStringValue (f), $2s, K_THRIFTFILE, THRIFT_THRIFT_FILE_INCLUDED, false);
-	vStringDelete (f);
+        else
+        {
+            tagEntryInfo e;
+            initForeignRefTagEntry (&e, vStringValue(f), getNamedLanguage ("C++", 0), CXXTagKindINCLUDE, CR_HEADER_LOCAL);
+            e.lineNumber = getInputLineNumberForFileOffset ($2s);
+            e.filePosition = getInputFilePositionForLine (e.lineNumber);
+            makeTagEntry (&e);
+        }
     }
-    /* TODO: cpp_include */
-}}
+    vStringDelete (f);
+}
 
 Statement <- Include / Namespace / Const / Enum / TypeDef / Struct / Exception / Union / Service
 

peg/thrift_post.h

@@ -14,6 +14,7 @@
 #include "options.h"
 #include "parse.h"
 #include "routines.h"
+#include "dependency.h"
 
 static int makeThriftTagFull (struct parserCtx *auxil, const char *name, long offset, int kind, int role,
 							  bool pushScope)
@@ -99,11 +100,18 @@ extern parserDefinition* ThriftParser (void)
 {
 	static const char *const extensions [] = { "thrift", NULL };
 	parserDefinition* def = parserNew ("Thrift");
+
+	static parserDependency dependencies [] = {
+		[0] = { DEPTYPE_FOREIGNER, "C++", NULL },
+	};
+
 	def->kindTable  = ThriftKinds;
 	def->kindCount  = ARRAY_SIZE (ThriftKinds);
 	def->fieldTable = ThriftFields;
 	def->fieldCount = ARRAY_SIZE (ThriftFields);
 	def->extensions = extensions;
+	def->dependencies = dependencies;
+	def->dependencyCount = ARRAY_SIZE (dependencies);
 	def->parser     = findThriftTags;
 	def->useCork    = true;
 	def->enabled    = true;