Fix hpp parser

undici77 · Jan 16, 2022 · 17eff95 · 17eff95
1 parent 481e388
commit 17eff95
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/DoxyPatch/Doxygen.HPP.cs b/DoxyPatch/Doxygen.HPP.cs
@@ -17,7 +17,7 @@ class DoxygenHPP
 	/// @brief Recognize a doxygen brief tag
 	private static readonly string _Doxygen_Brief_Regex = @"^[\s\t]*\/\/\/[\s\t]*@brief([^\r\n]*(?:\\.[^\r\n]*)*(\r\n|\r|\n))";
 	/// @brief Recognize a doxygen param tag
-	private static readonly string _Doxygen_Param_Regex = @"^[\s\t]*\/\/\/[\s]*@param[\s]*([^\s]+)([^\r\n]*(?:\\.[^\r\n]*)*(\r\n|\r|\n))";
+	private static readonly string _Doxygen_Param_Regex = @"^[\s\t]*\/\/\/[\s]*@param[\s]*(\[[\w]*\])*[\s]*([^\s]+)([^\r\n]*(?:\\.[^\r\n]*)*(\r\n|\r|\n))";
 	/// @brief Recognize a doxygen retval tag
 	private static readonly string _Doxygen_Retval_Regex = @"^[\s\t]*\/\/\/[\s]*@retval([^\r\n]*(?:\\.[^\r\n]*)*(\r\n|\r|\n))";
 	/// @brief Recognize a generic doxygen tag
@@ -525,7 +525,7 @@ private bool AnalyzeDoxygenCommentBlock(Match input_match, ref string doxygen_co
 				}
 				else
 				{
-					error_log.Add(function_name + " - @param '" + p.Groups[1].Value + "' not present, remove it manually");
+					error_log.Add(function_name + " - @param '" + p.Groups[2].Value + "' not present, remove it manually");
 				}
 			}
 
@@ -607,7 +607,7 @@ private bool ParamListContains(string pattern, List<Match> list)
 		pattern = pattern.Trim();
 		foreach (Match s in list)
 		{
-			if (s.Groups[1].Value.Trim() == pattern)
+			if (s.Groups[2].Value.Trim() == pattern)
 			{
 				return (true);
 			}
@@ -623,7 +623,7 @@ private bool ParamListContains(Match pattern, List<string> list)
 	{
 		string p;
 
-		p = pattern.Groups[1].Value.Trim();
+		p = pattern.Groups[2].Value.Trim();
 		foreach (string s in list)
 		{
 			if (p == s.Trim())

diff --git a/DoxyPatch/Properties/AssemblyInfo.cs b/DoxyPatch/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1.0")]
-[assembly: AssemblyFileVersion("1.7.1.0")]
+[assembly: AssemblyVersion("1.7.1.1")]
+[assembly: AssemblyFileVersion("1.7.1.1")]