diff options
Diffstat (limited to 'Tools/Java')
| -rw-r--r-- | Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java | 2 | ||||
| -rw-r--r-- | Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java index f6cfa85582..d6a7ed639e 100644 --- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java +++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java @@ -310,7 +310,7 @@ public final class ModuleReader implements Common.ForDoAll { }
public boolean recognize(String filename) {
- return filename.contains(".c") || filename.contains(".h");
+ return filename.contains(".c") || filename.contains(".h") || filename.contains(".dxs");
}
public String namechange(String oldname) {
diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java index cdb833db83..b8d37c3bb6 100644 --- 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) {
if (!r8thing.equals(r9thing)) {
if (wholeline.contains(r8thing)) {
- wholeline = wholeline.replaceAll(r8thing, r9thing);
+ String findString = "(?<!(?:\\d|\\w))" + r8thing + "(?!(?:\\d|\\w))";
+ wholeline = wholeline.replaceAll(findString, r9thing);
filefunc.add(new r8tor9(r8thing, r9thing));
Iterator<r8tor9> rt = filefunc.iterator();
while (rt.hasNext()) {
|