Fix several issues:

[mirror_edk2.git] / Tools / Java / Source / MigrationTools / org / tianocore / migration / SourceFileReplacer.java

diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index cdb833db838ff372e79ff6dca6978a814887f0ed..b8d37c3bb6eba234c46e20c0db61d007b9aa574e 100644 (file)
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -315,7 +315,8 @@ public final class SourceFileReplacer implements Common.ForDoAll {
             if ((r9thing = MigrationTool.db.getR9Func(r8thing)) != null) {\r
                 if (!r8thing.equals(r9thing)) {\r
                     if (wholeline.contains(r8thing)) {\r
-                        wholeline = wholeline.replaceAll(r8thing, r9thing);\r
+                       String findString = "(?<!(?:\\d|\\w))" + r8thing + "(?!(?:\\d|\\w))";\r
+                        wholeline = wholeline.replaceAll(findString, r9thing);\r
                         filefunc.add(new r8tor9(r8thing, r9thing));\r
                         Iterator<r8tor9> rt = filefunc.iterator();\r
                         while (rt.hasNext()) {\r