From a817ecbf365c84fdd67ee6144dc163fea1665b45 Mon Sep 17 00:00:00 2001 From: alfred Date: Wed, 6 Sep 2006 07:32:58 +0000 Subject: [PATCH] debug R8Lib.h add @return git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1478 6f19259b-4bc3-4df7-8a09-765794883524 --- .../MigrationTools/org/tianocore/migration/Common.java | 2 ++ .../MigrationTools/org/tianocore/migration/Critic.java | 6 +++++- .../org/tianocore/migration/SourceFileReplacer.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Common.java b/Tools/Source/MigrationTools/org/tianocore/migration/Common.java index da560ec10b..3371a54518 100644 --- a/Tools/Source/MigrationTools/org/tianocore/migration/Common.java +++ b/Tools/Source/MigrationTools/org/tianocore/migration/Common.java @@ -29,9 +29,11 @@ public final class Common { public static final String replaceAll(String line, Pattern ptn, String des) { Matcher mtr = ptn.matcher(line); + if (mtr.find()) { return mtr.replaceAll(des); } + return line; } diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java b/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java index 49c13bfa94..993449ebd1 100644 --- a/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java +++ b/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java @@ -105,7 +105,11 @@ public final class Critic { } else if (inequation && line.trim().length() != 0) { templine.append("#%#%" + line + "\n"); } else { - templine.append(" " + line.trim() + "\n"); + if (line.trim().length() == 0) { + templine.append(" " + line.trim() + "\n"); + } else { + templine.append(" @return " + line.trim() + "\n"); + } } } } else { diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java index 07f93cecad..d19134465d 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(";"); + paragraph = mtrr8onlyhead.replaceAll(";\n//"); } outfile2.append(paragraph + "\n\n"); }