SF.net SVN: edk2-buildtools:[2227] trunk/BaseTools/Source/Python/GenFds/ FdfParser.py

[<gi...@us...>]

Revision: 2227
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2227&view=rev
Author:   gikidy
Date:     2011-08-05 01:46:23 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
Fix a bug for Genfds doesn't parse the correct macro value in conditional statement.
Signed-off-by: gikidy
Reviewed-by: lhauch
Reviewed-by: lgao4

Modified Paths:
--------------
    trunk/BaseTools/Source/Python/GenFds/FdfParser.py

Modified: trunk/BaseTools/Source/Python/GenFds/FdfParser.py
===================================================================
--- trunk/BaseTools/Source/Python/GenFds/FdfParser.py	2011-07-19 09:23:29 UTC (rev 2226)
+++ trunk/BaseTools/Source/Python/GenFds/FdfParser.py	2011-08-05 01:46:23 UTC (rev 2227)
@@ -327,10 +327,10 @@
     #
     def __GetOneChar(self):
         if self.CurrentOffsetWithinLine == len(self.Profile.FileLinesList[self.CurrentLineNumber - 1]) - 1:
-                self.CurrentLineNumber += 1
-                self.CurrentOffsetWithinLine = 0
+            self.CurrentLineNumber += 1
+            self.CurrentOffsetWithinLine = 0
         else:
-                self.CurrentOffsetWithinLine += 1
+            self.CurrentOffsetWithinLine += 1
 
     ## __CurrentChar() method
     #
@@ -574,7 +574,16 @@
                 self.Profile.FileLinesList[IncludeLine - 1] = ''.join(TempList)
 
         self.Rewind()
-
+        
+    def __GetIfListCurrentItemStat(self, IfList):
+        if len(IfList) == 0:
+            return True
+        
+        for Item in IfList:
+            if Item[1] == False:
+                return False
+        
+        return True
     
     ## PreprocessConditionalStatement() method
     #
@@ -589,28 +598,29 @@
         RegionLayoutLine = 0
         while self.__GetNextToken():
             if self.__Token == 'DEFINE':
-                DefineLine = self.CurrentLineNumber - 1
-                DefineOffset = self.CurrentOffsetWithinLine - len('DEFINE')
-                if not self.__GetNextToken():
-                    raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)
-                Macro = self.__Token
-                if not self.__IsToken( "="):
-                    raise Warning("expected '='", self.FileName, self.CurrentLineNumber)
-
-                if not self.__GetNextToken():
-                    raise Warning("expected value", self.FileName, self.CurrentLineNumber)
-
-                if self.__GetStringData():
-                    pass
-                Value = self.__Token
-                if not Macro in InputMacroDict:
-                    FileLineTuple = GetRealFileLine(self.FileName, DefineLine + 1)
-                    MacProfile = MacroProfile(FileLineTuple[0], FileLineTuple[1])
-                    MacProfile.MacroName = Macro
-                    MacProfile.MacroValue = Value
-                    AllMacroList.append(MacProfile)
-                    InputMacroDict[MacProfile.MacroName] = MacProfile.MacroValue
-                self.__WipeOffArea.append(((DefineLine, DefineOffset), (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))
+                if self.__GetIfListCurrentItemStat(IfList): 
+                    DefineLine = self.CurrentLineNumber - 1
+                    DefineOffset = self.CurrentOffsetWithinLine - len('DEFINE')
+                    if not self.__GetNextToken():
+                        raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)
+                    Macro = self.__Token
+                    if not self.__IsToken( "="):
+                        raise Warning("expected '='", self.FileName, self.CurrentLineNumber)
+    
+                    if not self.__GetNextToken():
+                        raise Warning("expected value", self.FileName, self.CurrentLineNumber)
+    
+                    if self.__GetStringData():
+                        pass
+                    Value = self.__Token
+                    if not Macro in InputMacroDict:
+                        FileLineTuple = GetRealFileLine(self.FileName, DefineLine + 1)
+                        MacProfile = MacroProfile(FileLineTuple[0], FileLineTuple[1])
+                        MacProfile.MacroName = Macro
+                        MacProfile.MacroValue = Value
+                        AllMacroList.append(MacProfile)
+                        InputMacroDict[MacProfile.MacroName] = MacProfile.MacroValue
+                    self.__WipeOffArea.append(((DefineLine, DefineOffset), (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))
             elif self.__Token == 'SET':
                 PcdPair = self.__GetNextPcdName()
                 PcdName = "%s.%s" % (PcdPair[1], PcdPair[0])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.