Sync BaseTools Branch (version r2149) to EDKII main trunk.

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / FdfParser.py

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 83b58bcd468dc332ad0ab500a7bae002776f04de..9e7771dc7de8b2c14cb266426c5400ad1130cb90 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -564,10 +564,20 @@ class FdfParser:
 \r
         self.Rewind()\r
 \r
-    \r
-    ## PreprocessIncludeFile() method\r
+    def __GetIfListCurrentItemStat(self, IfList):\r
+        if len(IfList) == 0:\r
+            return True\r
+        \r
+        for Item in IfList:\r
+            if Item[1] == False:\r
+                return False\r
+        \r
+        return True\r
+                   \r
+\r
+    ## PreprocessConditionalStatement() method\r
     #\r
-    #   Preprocess file contents, replace !include statements with file contents.\r
+    #   Preprocess conditional statement.\r
     #   In the end, rewind the file buffer pointer to the beginning\r
     #\r
     #   @param  self        The object pointer\r
@@ -577,27 +587,28 @@ class FdfParser:
         IfList = []\r
         while self.__GetNextToken():\r
             if self.__Token == 'DEFINE':\r
-                DefineLine = self.CurrentLineNumber - 1\r
-                DefineOffset = self.CurrentOffsetWithinLine - len('DEFINE')\r
-                if not self.__GetNextToken():\r
-                    raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
-                Macro = self.__Token\r
-                if not self.__IsToken( "="):\r
-                    raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
-\r
-                if not self.__GetNextToken():\r
-                    raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
-\r
-                if self.__GetStringData():\r
-                    pass\r
-                Value = self.__Token\r
-                if not Macro in InputMacroDict:\r
-                    FileLineTuple = GetRealFileLine(self.FileName, DefineLine + 1)\r
-                    MacProfile = MacroProfile(FileLineTuple[0], FileLineTuple[1])\r
-                    MacProfile.MacroName = Macro\r
-                    MacProfile.MacroValue = Value\r
-                    AllMacroList.append(MacProfile)\r
-                self.__WipeOffArea.append(((DefineLine, DefineOffset), (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
+                if self.__GetIfListCurrentItemStat(IfList):\r
+                    DefineLine = self.CurrentLineNumber - 1\r
+                    DefineOffset = self.CurrentOffsetWithinLine - len('DEFINE')\r
+                    if not self.__GetNextToken():\r
+                        raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
+                    Macro = self.__Token\r
+                    if not self.__IsToken( "="):\r
+                        raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+    \r
+                    if not self.__GetNextToken():\r
+                        raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
+    \r
+                    if self.__GetStringData():\r
+                        pass\r
+                    Value = self.__Token\r
+                    if not Macro in InputMacroDict:\r
+                        FileLineTuple = GetRealFileLine(self.FileName, DefineLine + 1)\r
+                        MacProfile = MacroProfile(FileLineTuple[0], FileLineTuple[1])\r
+                        MacProfile.MacroName = Macro\r
+                        MacProfile.MacroValue = Value\r
+                        AllMacroList.append(MacProfile)\r
+                    self.__WipeOffArea.append(((DefineLine, DefineOffset), (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
 \r
             elif self.__Token in ('!ifdef', '!ifndef', '!if'):\r
                 IfStartPos = (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - len(self.__Token))\r
@@ -751,7 +762,7 @@ class FdfParser:
                     raise Warning("Value %s is not a number", self.FileName, Line)\r
 \r
         for Profile in AllMacroList:\r
-            if Profile.FileName == FileLineTuple[0] and Profile.MacroName == Name and Profile.DefinedAtLine <= FileLineTuple[1]:\r
+            if Profile.MacroName == Name and Profile.DefinedAtLine <= FileLineTuple[1]:\r
                 if Op == None:\r
                     if Value == 'Bool' and Profile.MacroValue == None or Profile.MacroValue.upper() == 'FALSE':\r
                         return False\r
@@ -1264,6 +1275,12 @@ class FdfParser:
             raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
 \r
         while self.__GetNextWord():\r
+            # handle the SET statement\r
+            if self.__Token == 'SET':\r
+                self.__UndoToken()\r
+                self.__GetSetStatement(None)\r
+                continue\r
+            \r
             Macro = self.__Token\r
             \r
             if not self.__IsToken("="):\r
@@ -1489,7 +1506,7 @@ class FdfParser:
         \r
         for Item in Obj.BlockSizeList:\r
             if Item[0] == None or Item[1] == None:\r
-                raise Warning("expected block statement for Fd Section", self.FileName, self.CurrentLineNumber)\r
+                raise Warning("expected block statement", self.FileName, self.CurrentLineNumber)\r
 \r
     ## __GetBlockStatement() method\r
     #\r
@@ -1508,7 +1525,7 @@ class FdfParser:
             raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
 \r
         if not self.__GetNextHexNumber() and not self.__GetNextDecimalNumber():\r
-            raise Warning("expected Hex block size", self.FileName, self.CurrentLineNumber)\r
+            raise Warning("expected Hex or Integer block size", self.FileName, self.CurrentLineNumber)\r
 \r
         BlockSize = self.__Token\r
         BlockSizePcd = None\r
@@ -1609,7 +1626,8 @@ class FdfParser:
                     raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
                 Value += self.__SkippedChars\r
 \r
-            Obj.SetVarDict[PcdPair] = Value\r
+            if Obj:\r
+                Obj.SetVarDict[PcdPair] = Value\r
             self.Profile.PcdDict[PcdPair] = Value\r
             return True\r
 \r
@@ -1904,7 +1922,8 @@ class FdfParser:
 \r
         self.__GetAddressStatements(FvObj)\r
 \r
-        self.__GetBlockStatement(FvObj)\r
+        while self.__GetBlockStatement(FvObj):\r
+            pass\r
 \r
         self.__GetSetStatements(FvObj)\r
 \r