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

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

Revision: 2464
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2464&view=rev
Author:   gikidy
Date:     2011-12-13 05:28:44 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Fix an issue while using !ifndef in FDF file build tool cannot parse !ifndef statement correctly.
Signed-off-by: gikidy
Reviewed-by: lgao4
Reviewed-by: jliu66

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-12-09 09:56:48 UTC (rev 2463)
+++ trunk/BaseTools/Source/Python/GenFds/FdfParser.py	2011-12-13 05:28:44 UTC (rev 2464)
@@ -679,7 +679,7 @@
                     PreIndex = 0
                     StartPos = CurLine.find('$(', PreIndex)
                     EndPos = CurLine.find(')', StartPos+2)
-                    while StartPos != -1 and EndPos != -1:
+                    while StartPos != -1 and EndPos != -1 and not (self.__Token == 'ifdef' or self.__Token == '!ifndef'):
                         MacroName = CurLine[StartPos+2 : EndPos]
                         MacorValue = self.__GetMacroValue(MacroName)
                         if MacorValue != None:

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