Merge pull request universal-ctags#1747 from masatake/cxx-handling-fu…

…nction-try-block C++: handle function-try-block
tony534 · Apr 30, 2018 · 576c750 · 576c750
2 parents 54afb0f + 98ba4ee
commit 576c750
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 0 deletions.
diff --git a/Units/parser-cxx.r/function_try_block.d/args.ctags b/Units/parser-cxx.r/function_try_block.d/args.ctags
@@ -0,0 +1 @@
+--sort=no
diff --git a/Units/parser-cxx.r/function_try_block.d/expected.tags b/Units/parser-cxx.r/function_try_block.d/expected.tags
@@ -0,0 +1,4 @@
+S	input.cxx	/^struct S {$/;"	s	file:
+m	input.cxx	/^    std::string m;$/;"	m	struct:S	typeref:typename:std::string	file:
+S	input.cxx	/^    S(const std::string& arg) try : m(arg, 100) {$/;"	f	struct:S	file:
+f	input.cxx	/^int f(int n = 2) try {$/;"	f	typeref:typename:int
diff --git a/Units/parser-cxx.r/function_try_block.d/input.cxx b/Units/parser-cxx.r/function_try_block.d/input.cxx
@@ -0,0 +1,20 @@
+/* Taken from
+ * http://en.cppreference.com/w/cpp/language/function-try-block */
+
+struct S {
+    std::string m;
+    S(const std::string& arg) try : m(arg, 100) {
+        std::cout << "constructed, mn = " << m << '\n';
+    } catch(const std::exception& e) {
+        std::cerr << "arg=" << arg << " failed: " << e.what() << '\n';
+    } // implicit throw; here
+};
+
+int f(int n = 2) try {
+   ++n; // increments the function parameter
+   throw n;
+} catch(...) {
+   ++n; // n is in scope and still refers to the function parameter
+   assert(n == 4);
+   return n;
+}
diff --git a/parsers/cxx/cxx_parser_block.c b/parsers/cxx/cxx_parser_block.c
@@ -355,6 +355,15 @@ static bool cxxParserParseBlockInternal(bool bExpectClosingBracket)
 						cppBeginStatement();
 					break;
 					case CXXKeywordTRY:
+						if (g_cxx.pToken->pPrev
+							&& cxxTokenTypeIs(g_cxx.pToken->pPrev, CXXTokenTypeParenthesisChain))
+						{
+							/* Maybe we are at "try" of "Function-try-block" like
+							   int f(int n = 2) try { ...
+							   Let's ignore this "try". */
+							continue;
+						}
+						/* Fall through */
 					case CXXKeywordELSE:
 					case CXXKeywordDO:
 						// parse as normal statement/block