Thrift: extract C++ headers specified with cpp_include

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

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'

peg/thrift.peg

@@ -55,15 +55,22 @@ Grammar <- __ ( Statement __ )* (EOF / SyntaxError)
 SyntaxError <- .
 
 # MODIFIED
-    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;

peg/thrift_pre.h

@@ -15,6 +15,8 @@
 #include "field.h"
 #include "peg_common.h"
 
+#include "parsers/cxx/cxx_tag.h"
+
 /*
 *   MACROS
 */