Enhance doxygening function headers for .h file.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1481 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 3 insertions, 3 deletions

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java b/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java
index 993449e..09518d5 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java
@@ -18,7 +18,7 @@ import java.io.*;
 public final class Critic {

 	public static final Pattern PTN_NEW_HEAD_COMMENT = Pattern.compile("^\\/\\*\\*.*?\\*\\*\\/",Pattern.DOTALL);

 	private static final Pattern ptnheadcomment = Pattern.compile("^\\/\\*\\+\\+(.*?)\\-\\-\\*\\/",Pattern.DOTALL);

-	private static final Pattern ptnfunccomment = Pattern.compile("([\\};\\/\">]\\s*)([\\w\\s]*?[_\\w][_\\w\\d]*\\s*\\([^\\)\\(]*\\)\\s*)\\/\\*\\+\\+(.*?)\\-\\-\\*\\/(\\s*.*?)([\\{;])",Pattern.DOTALL);		// find function with {;">/ , may be unsafe

+	private static final Pattern ptnfunccomment = Pattern.compile("([\\};\\/\">]\\s*)([\\w\\s]*?[_\\w][_\\w\\d]*\\s*\\([^\\)\\(]*\\)\\s*)\\/\\*\\+\\+(.*?)\\-\\-\\*\\/(\\s*.*?)(?=[\\{;])",Pattern.DOTALL);		// find function with {;">/ , may be unsafe

 	//private static Pattern ptncommentstructure = Pattern.compile("\\/\\*\\+\\+\\s*Routine Description:\\s*(.*?)\\s*Arguments:\\s*(.*?)\\s*Returns:\\s*(.*?)\\s*\\-\\-\\*\\/",Pattern.DOTALL);

 	private static final Pattern ptncommentequation = Pattern.compile("([^\\s]*)\\s+-\\s+(.*)\\s*");

 	private static Matcher mtrcommentequation;

@@ -45,7 +45,7 @@ public final class Critic {
 

 			wholeline = wholeline.replaceAll("\t", "  ");

 			wholeline = Common.replaceAll(wholeline, ptnheadcomment, "/** @file$1**/");

-			wholeline = Common.replaceAll(wholeline, ptnfunccomment, "$1/**$3**/$4$2$5");

+			wholeline = Common.replaceAll(wholeline, ptnfunccomment, "$1/**$3**/$4$2");

 			//wholeline = Common.replaceAll(wholeline, ptncommentstructure, "/**\n#%\n$1\n%#\n#%%\n$2\n%%#\n#%%%\n$3\n%%%#\n**/");

 

 			// first scan

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index d191344..07f93ce 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -302,7 +302,7 @@ public final class SourceFileReplacer implements Common.ForDoAll {
 				}

 				//generate R8lib.h

 				while ((mtrr8onlyhead = Func.ptnbrace.matcher(paragraph)).find()) {

-					paragraph = mtrr8onlyhead.replaceAll(";\n//");

+					paragraph = mtrr8onlyhead.replaceAll(";");

 				}

 				outfile2.append(paragraph + "\n\n");

 			}