Merge pull request #3694 from masatake/c++--prototype-starting-from-s…

…cope-op C++: accept prototypes starting from :: operator
universal-ctags · Apr 15, 2023 · 5ba7dfc · 5ba7dfc
2 parents 2149d23 + 0ee0832
commit 5ba7dfc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/Units/parser-cxx.r/prototype-starting-from-scope-op.d/args.ctags b/Units/parser-cxx.r/prototype-starting-from-scope-op.d/args.ctags
@@ -0,0 +1,2 @@
+--sort=no
+--C++-kinds=+p
diff --git a/Units/parser-cxx.r/prototype-starting-from-scope-op.d/expected.tags b/Units/parser-cxx.r/prototype-starting-from-scope-op.d/expected.tags
@@ -0,0 +1,2 @@
+bar	input.cpp	/^::std::string bar();$/;"	p	typeref:typename:::std::string	file:
+baz	input.cpp	/^::std::string baz() { return "not a prototype"; }$/;"	f	typeref:typename:::std::string
diff --git a/Units/parser-cxx.r/prototype-starting-from-scope-op.d/input.cpp b/Units/parser-cxx.r/prototype-starting-from-scope-op.d/input.cpp
@@ -0,0 +1,5 @@
+// Taken from #3693 submitted by @b4n
+#include <string>
+
+::std::string bar();
+::std::string baz() { return "not a prototype"; }
diff --git a/parsers/cxx/cxx_parser.c b/parsers/cxx/cxx_parser.c
@@ -1497,7 +1497,8 @@ void cxxParserAnalyzeOtherStatement(void)
 
 	CXXToken * t = cxxTokenChainFirst(g_cxx.pTokenChain);
 
-	if(!cxxTokenTypeIsOneOf(t,CXXTokenTypeIdentifier | CXXTokenTypeKeyword))
+	if(!cxxTokenTypeIsOneOf(t,CXXTokenTypeIdentifier | CXXTokenTypeKeyword
+							| CXXTokenTypeMultipleColons))
 	{
 		CXX_DEBUG_LEAVE_TEXT("Statement does not start with an identifier or keyword");
 		return;