BaseTools/Trim: Fixed a bug that cannot trim long values

[mirror_edk2.git] / BaseTools / Source / Python / Trim / Trim.py

diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python/Trim/Trim.py
index 7df83649d0a1cb3262030d7520306fc43fc038d7..8fefa1bcd9d273f03e8a0f431e3fdb092bf0dd0b 100644 (file)
--- a/BaseTools/Source/Python/Trim/Trim.py
+++ b/BaseTools/Source/Python/Trim/Trim.py
@@ -177,13 +177,13 @@ def TrimPreprocessedFile(Source, Target, ConvertHex, TrimLong):
             EdkLogger.verbose("Found original file content starting from line %d"\r
                               % (LineIndexOfOriginalFile + 1))\r
 \r
+        if TrimLong:\r
+            Line = gLongNumberPattern.sub(r"\1", Line)\r
         # convert HEX number format if indicated\r
         if ConvertHex:\r
             Line = gHexNumberPattern.sub(r"0\2h", Line)\r
         else:\r
             Line = gHexNumberPattern.sub(r"\1\2", Line)\r
-        if TrimLong:\r
-            Line = gLongNumberPattern.sub(r"\1", Line)\r
 \r
         # convert Decimal number format\r
         Line = gDecNumberPattern.sub(r"\1", Line)\r