1. Move ASSERT to proper place.

2. Move EFI_IFR_BUTTON_OP to Statemens block since now IfrButton is updated from Question to be Statement.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9345 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index 48f608a14e22f60042bf123a61127a22da6cc842..7d31ed5e9fcfb3f0c94b9882e6d99bc24f2aa52c 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
@@ -1031,6 +1031,7 @@ ParseOpCodes (
         break;\r
       }\r
 \r
+      ASSERT (CurrentExpression != NULL);\r
       InsertTailList (&CurrentExpression->OpCodeListHead, &ExpressionOpCode->Link);\r
 \r
       if (SingleOpCodeExpression) {\r
@@ -1050,7 +1051,6 @@ ParseOpCodes (
             return Status;\r
           }\r
 \r
-          ASSERT (CurrentExpression != NULL);\r
           if (CurrentExpression->Result.Type != EFI_IFR_TYPE_BOOLEAN) {\r
             return EFI_INVALID_PARAMETER;\r
           }\r
@@ -1071,7 +1071,7 @@ ParseOpCodes (
 \r
     case EFI_IFR_FORM_SET_OP:\r
       //\r
-      // check the formset GUID\r
+      // Check the formset GUID\r
       //\r
       if (CompareMem (&FormSet->Guid, &((EFI_IFR_FORM_SET *) OpCodeData)->Guid, sizeof (EFI_GUID)) != 0) {\r
         return EFI_INVALID_PARAMETER;\r
@@ -1202,6 +1202,12 @@ ParseOpCodes (
       CopyMem (&CurrentStatement->TextTwo, &((EFI_IFR_TEXT *) OpCodeData)->TextTwo, sizeof (EFI_STRING_ID));\r
       break;\r
 \r
+    case EFI_IFR_RESET_BUTTON_OP:\r
+      CurrentStatement = CreateStatement (OpCodeData, FormSet, CurrentForm);\r
+      ASSERT (CurrentStatement != NULL);\r
+      CopyMem (&CurrentStatement->DefaultId, &((EFI_IFR_RESET_BUTTON *) OpCodeData)->DefaultId, sizeof (EFI_DEFAULT_ID));\r
+      break;\r
+\r
     //\r
     // Questions\r
     //\r
@@ -1219,15 +1225,6 @@ ParseOpCodes (
       }\r
       break;\r
 \r
-    case EFI_IFR_RESET_BUTTON_OP:\r
-      //\r
-      // Create Statement\r
-      //\r
-      CurrentStatement = CreateStatement (OpCodeData, FormSet, CurrentForm);\r
-      ASSERT (CurrentStatement != NULL);\r
-      CopyMem (&CurrentStatement->DefaultId, &((EFI_IFR_RESET_BUTTON *) OpCodeData)->DefaultId, sizeof (EFI_DEFAULT_ID));\r
-      break;\r
-\r
     case EFI_IFR_REF_OP:\r
       CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
       ASSERT (CurrentStatement != NULL);\r
@@ -1746,12 +1743,12 @@ ParseOpCodes (
             //\r
             // This is DisableIf expression for Form, it should be a constant expression\r
             //\r
+            ASSERT (CurrentExpression != NULL);\r
             Status = EvaluateExpression (FormSet, CurrentForm, CurrentExpression);\r
             if (EFI_ERROR (Status)) {\r
               return Status;\r
             }\r
 \r
-            ASSERT (CurrentExpression != NULL);\r
             if (CurrentExpression->Result.Type != EFI_IFR_TYPE_BOOLEAN) {\r
               return EFI_INVALID_PARAMETER;\r
             }\r