SF.net SVN: edk2-buildtools:[2564] trunk/BaseTools/Source/C/VfrCompile

[<yd...@us...>]

Revision: 2564
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2564&view=rev
Author:   ydong10
Date:     2012-12-17 03:08:20 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Enhance to check for the return status of the function.

Signed-off-by: Eric Dong <eri...@in...>
Reviewed-by: Liming Gao <lim...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
    trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp	2012-11-02 05:39:20 UTC (rev 2563)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp	2012-12-17 03:08:20 UTC (rev 2564)
@@ -596,6 +596,10 @@
 {
   EFI_VFR_RETURN_CODE Status;
 
+  if (!IS_RUN_STATUS(STATUS_COMPILEED)) {
+    return;
+  }
+
   UpdateInfoForDynamicOpcode ();
 
   //

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g	2012-11-02 05:39:20 UTC (rev 2563)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g	2012-12-17 03:08:20 UTC (rev 2564)
@@ -591,7 +591,7 @@
                                                       // Declare undefined Question so that they can be used in expression.
                                                       //
                                                       if (gCFormPkg.HavePendingUnassigned()) {
-                                                        gCFormPkg.DeclarePendingQuestion (
+                                                        mParserStatus += gCFormPkg.DeclarePendingQuestion (
                                                                     gCVfrVarDataTypeDB,
                                                                     mCVfrDataStorage,
                                                                     mCVfrQuestionDB,

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