replace tab by two space.
authorlgao4 <lgao4@7335b38e-4728-0410-8992-fb3ffe349368>
Mon, 24 Nov 2008 05:04:23 +0000 (05:04 +0000)
committerlgao4 <lgao4@7335b38e-4728-0410-8992-fb3ffe349368>
Mon, 24 Nov 2008 05:04:23 +0000 (05:04 +0000)
git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1370 7335b38e-4728-0410-8992-fb3ffe349368

Source/C/VfrCompile/VfrSyntax.g

index a9b1ab6..da30a05 100644 (file)
@@ -321,13 +321,13 @@ vfrDataStructDefinition :
 vfrDataStructFields :\r
   (\r
      dataStructField64     |\r
-        dataStructField32     |\r
-        dataStructField16     |\r
-        dataStructField8      |\r
+   dataStructField32     |\r
+   dataStructField16     |\r
+   dataStructField8      |\r
      dataStructFieldBool   |\r
-        dataStructFieldString |\r
-        dataStructFieldDate   |\r
-        dataStructFieldTime   |\r
+   dataStructFieldString |\r
+   dataStructFieldDate   |\r
+   dataStructFieldTime   |\r
      dataStructFieldUser\r
   )*\r
   ;\r
@@ -429,14 +429,14 @@ dataStructFieldUser :
 guidSubDefinition [EFI_GUID &Guid] :\r
   G4:Number "," G5:Number "," G6:Number "," G7:Number "," G8:Number "," G9:Number "," G10:Number "," G11:Number\r
                                                     <<\r
-                                                                                                          Guid.Data4[0] = _STOU8(G4->getText());\r
-                                                                                                          Guid.Data4[1] = _STOU8(G5->getText());\r
-                                                                                                          Guid.Data4[2] = _STOU8(G6->getText());\r
-                                                                                                          Guid.Data4[3] = _STOU8(G7->getText());\r
-                                                                                                          Guid.Data4[4] = _STOU8(G8->getText());\r
-                                                                                                          Guid.Data4[5] = _STOU8(G9->getText());\r
-                                                                                                          Guid.Data4[6] = _STOU8(G10->getText());\r
-                                                                                                          Guid.Data4[7] = _STOU8(G11->getText());\r
+                             Guid.Data4[0] = _STOU8(G4->getText());\r
+                             Guid.Data4[1] = _STOU8(G5->getText());\r
+                             Guid.Data4[2] = _STOU8(G6->getText());\r
+                             Guid.Data4[3] = _STOU8(G7->getText());\r
+                             Guid.Data4[4] = _STOU8(G8->getText());\r
+                             Guid.Data4[5] = _STOU8(G9->getText());\r
+                             Guid.Data4[6] = _STOU8(G10->getText());\r
+                             Guid.Data4[7] = _STOU8(G11->getText());\r
                                                     >>\r
   ;\r
 \r
@@ -522,12 +522,12 @@ vfrStatementDefaultStore :
                                                        if (mCVfrDefaultStore.DefaultIdRegistered (DefaultId) == FALSE) {\r
                                                          CIfrDefaultStore DSObj;\r
                                                          _PCATCH(mCVfrDefaultStore.RegisterDefaultStore (DSObj.GetObjBinAddr(), N->getText(), _STOSID(S->getText()), DefaultId)), D->getLine();\r
-                                                                                                                DSObj.SetLineNo(D->getLine());\r
+                             DSObj.SetLineNo(D->getLine());\r
                                                          DSObj.SetDefaultName (_STOSID(S->getText()));\r
                                                          DSObj.SetDefaultId (DefaultId);\r
-                                                                                                          } else {\r
+                             } else {\r
                                                          _PCATCH(mCVfrDefaultStore.ReRegisterDefaultStoreById (DefaultId, N->getText(), _STOSID(S->getText()))), D->getLine();\r
-                                                                                                          }\r
+                             }\r
                                                     >>\r
   ";"\r
   ;\r
@@ -538,19 +538,19 @@ vfrStatementVarStoreLinear :
      CIfrVarStore    VSObj;\r
      CHAR8           *TypeName;\r
      CHAR8           *StoreName;\r
-          UINT32          LineNum;\r
+     UINT32          LineNum;\r
      EFI_VARSTORE_ID VarStoreId = EFI_VARSTORE_ID_INVALID;\r
      UINT32          Size;\r
   >>\r
   V:Varstore                                        << VSObj.SetLineNo(V->getLine()); >>\r
   (\r
       TN:StringIdentifier ","                       << TypeName = TN->getText(); LineNum = TN->getLine(); >>\r
-       | U8:"UINT8" ","                                << TypeName = "UINT8"; LineNum = U8->getLine(); >>\r
-       | U16:"UINT16" ","                              << TypeName = "UINT16"; LineNum = U16->getLine(); >>\r
-       | U32:"UINT32" ","                              << TypeName = "UINT32"; LineNum = U32->getLine(); >>\r
-       | U64:"UINT64" ","                              << TypeName = "UINT64"; LineNum = U64->getLine(); >>\r
-       | D:"EFI_HII_DATE" ","                          << TypeName = "EFI_HII_DATE"; LineNum = D->getLine(); >>\r
-       | T:"EFI_HII_TIME" ","                          << TypeName = "EFI_HII_TIME"; LineNum = T->getLine(); >>\r
+  | U8:"UINT8" ","                                << TypeName = "UINT8"; LineNum = U8->getLine(); >>\r
+  | U16:"UINT16" ","                              << TypeName = "UINT16"; LineNum = U16->getLine(); >>\r
+  | U32:"UINT32" ","                              << TypeName = "UINT32"; LineNum = U32->getLine(); >>\r
+  | U64:"UINT64" ","                              << TypeName = "UINT64"; LineNum = U64->getLine(); >>\r
+  | D:"EFI_HII_DATE" ","                          << TypeName = "EFI_HII_DATE"; LineNum = D->getLine(); >>\r
+  | T:"EFI_HII_TIME" ","                          << TypeName = "EFI_HII_TIME"; LineNum = T->getLine(); >>\r
   )\r
   { Key "=" FID:Number ","                       << // Key is used to assign Varid in Framework VFR but no use in UEFI2.1 VFR\r
                                                      if (mCompatibleMode) {\r
@@ -581,7 +581,7 @@ vfrStatementVarStoreLinear :
                                                                                   &Guid,\r
                                                                                   &mCVfrVarDataTypeDB,\r
                                                                                   TypeName,\r
-                                                                                                                                                                                                         VarStoreId\r
+                                                                                  VarStoreId\r
                                                                                   ), LineNum);\r
                                                     >>\r
                                                     <<\r
@@ -693,7 +693,7 @@ vfrStatementHeader[CIfrStatementHeader *SHObj] :
 vfrQuestionHeader[CIfrQuestionHeader & QHObj, EFI_QUESION_TYPE QType = QUESTION_NORMAL]:\r
   <<\r
      EFI_VARSTORE_INFO Info;\r
-          EFI_QUESTION_ID   QId       = EFI_QUESTION_ID_INVALID;\r
+     EFI_QUESTION_ID   QId       = EFI_QUESTION_ID_INVALID;\r
      CHAR8             *QName    = NULL;\r
      CHAR8             *VarIdStr = NULL;\r
   >>\r
@@ -715,26 +715,26 @@ vfrQuestionHeader[CIfrQuestionHeader & QHObj, EFI_QUESION_TYPE QType = QUESTION_
                                                        case QUESTION_NORMAL:\r
                                                          mCVfrQuestionDB.RegisterQuestion (QName, VarIdStr, QId);\r
                                                          break;\r
-                                                                                                          case QUESTION_DATE:\r
-                                                                                                                mCVfrQuestionDB.RegisterNewDateQuestion (QName, VarIdStr, QId);\r
-                                                                                                                break;\r
-                                                                                                          case QUESTION_TIME:\r
-                                                                                                                mCVfrQuestionDB.RegisterNewTimeQuestion (QName, VarIdStr, QId);\r
-                                                                                                                break;\r
-                                                                                                          default:\r
-                                                                                                                _PCATCH(VFR_RETURN_FATAL_ERROR);\r
-                                                                                                          }\r
+                             case QUESTION_DATE:\r
+                             mCVfrQuestionDB.RegisterNewDateQuestion (QName, VarIdStr, QId);\r
+                             break;\r
+                             case QUESTION_TIME:\r
+                             mCVfrQuestionDB.RegisterNewTimeQuestion (QName, VarIdStr, QId);\r
+                             break;\r
+                             default:\r
+                             _PCATCH(VFR_RETURN_FATAL_ERROR);\r
+                             }\r
                                                        $QHObj.SetQuestionId (QId);\r
                                                        $QHObj.SetVarStoreInfo (&Info);\r
                                                     >>\r
   vfrStatementHeader[&$QHObj]\r
                                                     << _SAVE_CURRQEST_VARINFO (Info); >>\r
-                                                                                                       << if (VarIdStr != NULL) delete VarIdStr; >>\r
+                          << if (VarIdStr != NULL) delete VarIdStr; >>\r
   ;\r
 \r
 vfrQuestionHeaderWithNoStorage[CIfrQuestionHeader *QHObj] :\r
   <<\r
-        EFI_QUESTION_ID   QId = EFI_QUESTION_ID_INVALID;\r
+   EFI_QUESTION_ID   QId = EFI_QUESTION_ID_INVALID;\r
      CHAR8             *QName = NULL;\r
   >>\r
   {\r
@@ -800,8 +800,8 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr] :
                                                        }\r
                                                        _PCATCH(VfrReturnCode, SN1);\r
                                                        _PCATCH(mCVfrDataStorage.GetVarStoreId (SName, &$Info.mVarStoreId), SN1);\r
-                                                                                                                                  _PCATCH(mCVfrDataStorage.GetNameVarStoreInfo (&$Info, Idx), SN1);\r
-                                                                                                                               >>\r
+                                                       _PCATCH(mCVfrDataStorage.GetNameVarStoreInfo (&$Info, Idx), SN1);\r
+                                                    >>\r
   )\r
   |\r
   (\r
@@ -821,17 +821,17 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr] :
                                                        }\r
                                                        _PCATCH(VfrReturnCode, SN2);\r
                                                        _PCATCH(mCVfrDataStorage.GetVarStoreId (SName, &$Info.mVarStoreId), SN2);\r
-                                                                                                                                  if (VarStoreType == EFI_VFR_VARSTORE_BUFFER) {\r
+                                                       if (VarStoreType == EFI_VFR_VARSTORE_BUFFER) {\r
                                                          _PCATCH(mCVfrDataStorage.GetBufferVarStoreDataTypeName(SName, &TName), SN2);\r
-                                                                                                                                          _STRCAT(&VarStr, TName);\r
-                                                                                                                                  }\r
+                                                         _STRCAT(&VarStr, TName);\r
+                                                       }\r
                                                     >>\r
 \r
     (\r
       "."                                           <<\r
                                                        _PCATCH(((VarStoreType != EFI_VFR_VARSTORE_BUFFER) ? VFR_RETURN_EFIVARSTORE_USE_ERROR : VFR_RETURN_SUCCESS), SN2);\r
-                                                                                                                                  _STRCAT(&VarIdStr, "."); _STRCAT(&VarStr, ".");\r
-                                                                                                                               >>\r
+                                                       _STRCAT(&VarIdStr, "."); _STRCAT(&VarStr, ".");\r
+                                                    >>\r
       SF:StringIdentifier                           << _STRCAT(&VarIdStr, SF->getText()); _STRCAT(&VarStr, SF->getText()); >>\r
       {\r
         OpenBracket I2:Number CloseBracket          <<\r
@@ -926,28 +926,28 @@ vfrConstantValueField[UINT8 Type] > [EFI_IFR_TYPE_VALUE Value] :
     N1:Number                                       <<\r
                                                        switch ($Type) {\r
                                                        case EFI_IFR_TYPE_NUM_SIZE_8 :\r
-                                                                                                                                    $Value.u8     = _STOU8(N1->getText());\r
-                                                                                                                                        break;\r
-                                                                                                                                  case EFI_IFR_TYPE_NUM_SIZE_16 :\r
-                                                                                                                                    $Value.u16    = _STOU16(N1->getText());\r
-                                                                                                                                        break;\r
-                                                                                                                                  case EFI_IFR_TYPE_NUM_SIZE_32 :\r
-                                                                                                                                    $Value.u32    = _STOU32(N1->getText());\r
-                                                                                                                                        break;\r
-                                                                                                                                  case EFI_IFR_TYPE_NUM_SIZE_64 :\r
-                                                                                                                                    $Value.u64    = _STOU64(N1->getText());\r
-                                                                                                                                        break;\r
-                                                                                                                                  case EFI_IFR_TYPE_BOOLEAN :\r
-                                                                                                                                    $Value.b      = _STOU8(N1->getText());\r
-                                                                                                                                        break;\r
-                                                                                                                                  case EFI_IFR_TYPE_STRING :\r
-                                                                                                                                    $Value.string = _STOU16(N1->getText());\r
-                                                                                                                                        break;\r
-                                                                                                                                  case EFI_IFR_TYPE_TIME :\r
-                                                                                                                                  case EFI_IFR_TYPE_DATE :\r
-                                                                                                                                  default :\r
-                                                                                                                                        break;\r
-                                                                                                                                  }\r
+                                                         $Value.u8     = _STOU8(N1->getText());\r
+                                                       break;\r
+                                                       case EFI_IFR_TYPE_NUM_SIZE_16 :\r
+                                                         $Value.u16    = _STOU16(N1->getText());\r
+                                                       break;\r
+                                                       case EFI_IFR_TYPE_NUM_SIZE_32 :\r
+                                                         $Value.u32    = _STOU32(N1->getText());\r
+                                                       break;\r
+                                                       case EFI_IFR_TYPE_NUM_SIZE_64 :\r
+                                                         $Value.u64    = _STOU64(N1->getText());\r
+                                                       break;\r
+                                                       case EFI_IFR_TYPE_BOOLEAN :\r
+                                                         $Value.b      = _STOU8(N1->getText());\r
+                                                       break;\r
+                                                       case EFI_IFR_TYPE_STRING :\r
+                                                         $Value.string = _STOU16(N1->getText());\r
+                                                       break;\r
+                                                       case EFI_IFR_TYPE_TIME :\r
+                                                       case EFI_IFR_TYPE_DATE :\r
+                                                       default :\r
+                                                       break;\r
+                                                       }\r
                                                     >>\r
   | B1:True                                         << $Value.b      = TRUE; >>\r
   | B2:False                                        << $Value.b      = FALSE; >>\r
@@ -1042,19 +1042,19 @@ vfrStatementDefault :
       DefaultStore "=" SN:StringIdentifier ","      << _PCATCH(mCVfrDefaultStore.GetDefaultId (SN->getText(), &DefaultId), SN); DObj.SetDefaultId (DefaultId); >>\r
     }\r
                                                     <<\r
-                                                                                                                                  _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), D->getLine());\r
-                                                                                                                                  _PCATCH(mCVfrDataStorage.GetVarStoreType (VarStoreName, VarStoreType), D->getLine());\r
-                                                                                                                                  if ((IsExp == FALSE) && (VarStoreType == EFI_VFR_VARSTORE_BUFFER)) {\r
-                                                                                                                                    _PCATCH(mCVfrDefaultStore.BufferVarStoreAltConfigAdd (\r
-                                                                                                                                                                  DefaultId,\r
-                                                                                                                                                                                                _GET_CURRQEST_VARTINFO(),\r
-                                                                                                                                                                                                VarStoreName,\r
-                                                                                                                                                                                                _GET_CURRQEST_DATATYPE (),\r
-                                                                                                                                                                                                Val),\r
-                                                                                                                                                                                                D->getLine()\r
-                                                                                                                                                                                                );\r
-                                                                                                                                  }\r
-                                                                                                       >>\r
+                                                       _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), D->getLine());\r
+                                                       _PCATCH(mCVfrDataStorage.GetVarStoreType (VarStoreName, VarStoreType), D->getLine());\r
+                                                       if ((IsExp == FALSE) && (VarStoreType == EFI_VFR_VARSTORE_BUFFER)) {\r
+                                                         _PCATCH(mCVfrDefaultStore.BufferVarStoreAltConfigAdd (\r
+                                                                   DefaultId,\r
+                                                                   _GET_CURRQEST_VARTINFO(),\r
+                                                                   VarStoreName,\r
+                                                                   _GET_CURRQEST_DATATYPE (),\r
+                                                                   Val),\r
+                                                                   D->getLine()\r
+                                                                   );\r
+                                                       }\r
+                          >>\r
   )\r
   ;\r
 \r
@@ -1167,12 +1167,12 @@ vfrStatementStaticText :
                                                             AssignQuestionKey (AObj, KN);\r
                                                             CRT_END_OP (KN);\r
                                                           } else {\r
-                                                                                                                                           CIfrText TObj;\r
-                                                                                                                                           TObj.SetLineNo (T->getLine());\r
-                                                                                                                                                 TObj.SetHelp (_STOSID(S1->getText()));\r
-                                                                                                                                                 TObj.SetPrompt (_STOSID(S2->getText()));\r
-                                                                                                                                                 TObj.SetTextTwo (TxtTwo);\r
-                                                                                                                                           }\r
+                                                            CIfrText TObj;\r
+                                                            TObj.SetLineNo (T->getLine());\r
+                                                            TObj.SetHelp (_STOSID(S1->getText()));\r
+                                                            TObj.SetPrompt (_STOSID(S2->getText()));\r
+                                                            TObj.SetTextTwo (TxtTwo);\r
+                                                          }\r
                                                        >>\r
   { "," vfrStatementStatTagList }\r
   ";"\r
@@ -1194,7 +1194,7 @@ vfrStatementGoto :
      EFI_STRING_ID       DevPath;\r
      EFI_GUID            FSId;\r
      EFI_FORM_ID         FId;\r
-          EFI_QUESTION_ID     QId    = EFI_QUESTION_ID_INVALID;\r
+     EFI_QUESTION_ID     QId    = EFI_QUESTION_ID_INVALID;\r
      UINT32              BitMask;\r
      CIfrQuestionHeader  *QHObj = NULL;\r
      CIfrRef             *R1Obj = NULL;\r
@@ -1396,8 +1396,8 @@ vfrStatementCheckBox :
                                                               L,\r
                                                               "No manufacturing default storage found"\r
                                                               );\r
-                                                                                                                                         }\r
-                                                                                                                                  >>\r
+                                                          }\r
+                                                         >>\r
   }\r
   {\r
     Key "=" KN:Number  ","                             << AssignQuestionKey (CBObj, KN); >>\r
@@ -1496,7 +1496,7 @@ vfrStatementDate :
   (\r
     (\r
       vfrQuestionHeader[DObj, QUESTION_DATE] ","\r
-         { F:FLAGS "=" vfrDateFlags[DObj, F->getLine()] "," }\r
+    { F:FLAGS "=" vfrDateFlags[DObj, F->getLine()] "," }\r
       vfrStatementQuestionOptionList\r
     )\r
     |\r
@@ -1522,11 +1522,11 @@ vfrStatementDate :
                                                           mCVfrQuestionDB.RegisterOldDateQuestion (VarIdStr[0], VarIdStr[1], VarIdStr[2], QId);\r
                                                           DObj.SetQuestionId (QId);\r
                                                           DObj.SetFlags (EFI_IFR_QUESTION_FLAG_DEFAULT, QF_DATE_STORAGE_TIME);\r
-                                                                                                                                         DObj.SetPrompt (_STOSID(YP->getText()));\r
-                                                                                                                                         DObj.SetHelp (_STOSID(YH->getText()));\r
-                                                                                                                                         if (VarIdStr[0] != NULL) { delete VarIdStr[0]; } if (VarIdStr[1] != NULL) { delete VarIdStr[1]; } if (VarIdStr[2] != NULL) { delete VarIdStr[2]; }\r
+                                                          DObj.SetPrompt (_STOSID(YP->getText()));\r
+                                                          DObj.SetHelp (_STOSID(YH->getText()));\r
+                                                          if (VarIdStr[0] != NULL) { delete VarIdStr[0]; } if (VarIdStr[1] != NULL) { delete VarIdStr[1]; } if (VarIdStr[2] != NULL) { delete VarIdStr[2]; }\r
                                                        >>\r
-                                                          << {CIfrDefault DefaultObj(EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_DATE, Val); DefaultObj.SetLineNo(L->getLine());} >>\r
+                                                     << {CIfrDefault DefaultObj(EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_DATE, Val); DefaultObj.SetLineNo(L->getLine());} >>\r
     )\r
     ( vfrStatementInconsistentIf )*\r
   )\r
@@ -1544,7 +1544,7 @@ minMaxDateStepDefault[EFI_HII_DATE & D, UINT8 KeyValue] :
                                                           case 0: D.Year  = _STOU16(N->getText()); break;\r
                                                           case 1: D.Month = _STOU8(N->getText()); break;\r
                                                           case 2: D.Day   = _STOU8(N->getText()); break;\r
-                                                                                                                 }\r
+                              }\r
                                                        >>\r
   }\r
   ;\r
@@ -1585,7 +1585,7 @@ vfrSetMinMaxStep[CIfrMinMaxStepData & MMSDObj] :
                                                           case EFI_IFR_TYPE_NUM_SIZE_16 : MinU2 = _STOU16(I->getText()); break;\r
                                                           case EFI_IFR_TYPE_NUM_SIZE_8 :  MinU1 = _STOU8(I->getText());  break;\r
                                                           }\r
-                                                                                                          >>\r
+                             >>\r
   Maximum   "=" A:Number ","\r
                                                        <<\r
                                                           switch (_GET_CURRQEST_DATATYPE ()) {\r
@@ -1594,7 +1594,7 @@ vfrSetMinMaxStep[CIfrMinMaxStepData & MMSDObj] :
                                                           case EFI_IFR_TYPE_NUM_SIZE_16 : MaxU2 = _STOU16(A->getText()); break;\r
                                                           case EFI_IFR_TYPE_NUM_SIZE_8 :  MaxU1 = _STOU8(A->getText());  break;\r
                                                           }\r
-                                                                                                          >>\r
+                             >>\r
   {\r
     STEP    "=" S:Number ","\r
                                                        <<\r
@@ -1604,7 +1604,7 @@ vfrSetMinMaxStep[CIfrMinMaxStepData & MMSDObj] :
                                                           case EFI_IFR_TYPE_NUM_SIZE_16 : StepU2 = _STOU16(S->getText()); break;\r
                                                           case EFI_IFR_TYPE_NUM_SIZE_8 :  StepU1 = _STOU8(S->getText());  break;\r
                                                           }\r
-                                                                                                          >>\r
+                             >>\r
   }\r
                                                        <<\r
                                                           switch (_GET_CURRQEST_DATATYPE ()) {\r
@@ -1613,7 +1613,7 @@ vfrSetMinMaxStep[CIfrMinMaxStepData & MMSDObj] :
                                                           case EFI_IFR_TYPE_NUM_SIZE_16 : $MMSDObj.SetMinMaxStepData (MinU2, MaxU2, StepU2); break;\r
                                                           case EFI_IFR_TYPE_NUM_SIZE_8 :  $MMSDObj.SetMinMaxStepData (MinU1, MaxU1, StepU1);  break;\r
                                                           }\r
-                                                                                                          >>\r
+                             >>\r
   ;\r
 \r
 vfrStatementNumeric :\r
@@ -1796,7 +1796,7 @@ vfrStatementTime :
   (\r
     (\r
       vfrQuestionHeader[TObj, QUESTION_TIME] ","\r
-         { F:FLAGS "=" vfrTimeFlags[TObj, F->getLine()] "," }\r
+    { F:FLAGS "=" vfrTimeFlags[TObj, F->getLine()] "," }\r
       vfrStatementDefault\r
     )\r
     |\r
@@ -1822,9 +1822,9 @@ vfrStatementTime :
                                                           mCVfrQuestionDB.RegisterOldTimeQuestion (VarIdStr[0], VarIdStr[1], VarIdStr[2], QId);\r
                                                           TObj.SetQuestionId (QId);\r
                                                           TObj.SetFlags (EFI_IFR_QUESTION_FLAG_DEFAULT, QF_TIME_STORAGE_TIME);\r
-                                                                                                                                         TObj.SetPrompt (_STOSID(HP->getText()));\r
-                                                                                                                                         TObj.SetHelp (_STOSID(HH->getText()));\r
-                                                                                                                                         if (VarIdStr[0] != NULL) { delete VarIdStr[0]; } if (VarIdStr[1] != NULL) { delete VarIdStr[1]; } if (VarIdStr[2] != NULL) { delete VarIdStr[2]; }\r
+                                                          TObj.SetPrompt (_STOSID(HP->getText()));\r
+                                                          TObj.SetHelp (_STOSID(HH->getText()));\r
+                                                          if (VarIdStr[0] != NULL) { delete VarIdStr[0]; } if (VarIdStr[1] != NULL) { delete VarIdStr[1]; } if (VarIdStr[2] != NULL) { delete VarIdStr[2]; }\r
                                                        >>\r
                                                        << {CIfrDefault DefaultObj(EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_TIME, Val); DefaultObj.SetLineNo(L->getLine());} >>\r
     )\r
@@ -1844,7 +1844,7 @@ minMaxTimeStepDefault[EFI_HII_TIME & T, UINT8 KeyValue] :
                                                           case 0: T.Hour   = _STOU8(N->getText()); break;\r
                                                           case 1: T.Minute = _STOU8(N->getText()); break;\r
                                                           case 2: T.Second = _STOU8(N->getText()); break;\r
-                                                                                                                 }\r
+                              }\r
                                                        >>\r
   }\r
   ;\r
@@ -2110,21 +2110,21 @@ vfrStatementOneOfOption :
                                                           _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), L->getLine());\r
                                                           if (OOOObj.GetFlags () & 0x10) {\r
                                                             _PCATCH(mCVfrDefaultStore.BufferVarStoreAltConfigAdd (\r
-                                                                                                                                                               EFI_HII_DEFAULT_CLASS_STANDARD,\r
-                                                                                                                                                                                       _GET_CURRQEST_VARTINFO(),\r
-                                                                                                                                                                                         VarStoreName,\r
-                                                                                                                                                                                   _GET_CURRQEST_DATATYPE (),\r
-                                                                                                                                                                                         Val\r
-                                                                                                                                                                                         ), L->getLine());\r
+                                                                      EFI_HII_DEFAULT_CLASS_STANDARD,\r
+                                                                       _GET_CURRQEST_VARTINFO(),\r
+                                                                      VarStoreName,\r
+                                                                      _GET_CURRQEST_DATATYPE (),\r
+                                                                      Val\r
+                                                                      ), L->getLine());\r
                                                           }\r
                                                           if (OOOObj.GetFlags () & 0x20) {\r
                                                             _PCATCH(mCVfrDefaultStore.BufferVarStoreAltConfigAdd (\r
-                                                                                                                                                               EFI_HII_DEFAULT_CLASS_MANUFACTURING,\r
-                                                                                                                                                                                       _GET_CURRQEST_VARTINFO(),\r
-                                                                                                                                                                                         VarStoreName,\r
-                                                                                                                                                                                   _GET_CURRQEST_DATATYPE (),\r
-                                                                                                                                                                                         Val\r
-                                                                                                                                                                                         ), L->getLine());\r
+                                                                      EFI_HII_DEFAULT_CLASS_MANUFACTURING,\r
+                                                                       _GET_CURRQEST_VARTINFO(),\r
+                                                                      VarStoreName,\r
+                                                                      _GET_CURRQEST_DATATYPE (),\r
+                                                                      Val\r
+                                                                      ), L->getLine());\r
                                                           }\r
                                                        >>\r
   {\r
@@ -2296,7 +2296,7 @@ vfrStatementInvalidSaveRestoreDefaults :
 #token StringRefVal("stringrefval")             "stringrefval"\r
 \r
 vfrStatementExpression [UINT32 RootLevel, UINT32 ExpOpCount = 0] :\r
-                                                                                                          << if ($RootLevel == 0) {_CLEAR_SAVED_OPHDR ();} >>\r
+                             << if ($RootLevel == 0) {_CLEAR_SAVED_OPHDR ();} >>\r
   andTerm[$RootLevel, $ExpOpCount]\r
   (\r
     L:OR andTerm[$RootLevel, $ExpOpCount]              << $ExpOpCount++; CIfrOr OObj(L->getLine()); >>\r
@@ -2421,7 +2421,7 @@ castTerm [UINT32 & RootLevel, UINT32 & ExpOpCount]:
                                                            case 0: { CIfrToBoolean TBObj(L->getLine()); $ExpOpCount++; } break;\r
                                                            case 1: { CIfrToUint TUObj(L->getLine()); $ExpOpCount++; } break;\r
                                                            }\r
-                                                                                                               >>\r
+                            >>\r
   ;\r
 \r
 atomTerm [UINT32 & RootLevel, UINT32 & ExpOpCount]:\r
@@ -2518,16 +2518,16 @@ vareqvalExp [UINT32 & RootLevel, UINT32 & ExpOpCount] :
       "=="\r
       V1:Number                                        << ConstVal = _STOU16(V1->getText()); >>\r
                                                        <<\r
-                                                                                                                                     if (Mask == 0) {\r
-                                                                                                                                               CIfrEqIdVal EIVObj (L->getLine());\r
-                                                                                                                                               _SAVE_OPHDR_COND (EIVObj, ($ExpOpCount == 0));\r
-                                                                                                                                               EIVObj.SetQuestionId (QId, VarIdStr, LineNo);\r
-                                                                                                                                               EIVObj.SetValue (ConstVal);\r
-                                                                                                                                               $ExpOpCount++;\r
-                                                                                                                                         } else {\r
-                                                                                                                                               IdEqValDoSpecial ($ExpOpCount, L->getLine(), QId, VarIdStr, Mask, ConstVal, EQUAL);\r
-                                                                                                                                         }\r
-                                                                                                                                  >>\r
+                                                          if (Mask == 0) {\r
+                                                            CIfrEqIdVal EIVObj (L->getLine());\r
+                                                            _SAVE_OPHDR_COND (EIVObj, ($ExpOpCount == 0));\r
+                                                            EIVObj.SetQuestionId (QId, VarIdStr, LineNo);\r
+                                                            EIVObj.SetValue (ConstVal);\r
+                                                            $ExpOpCount++;\r
+                                                          } else {\r
+                                                            IdEqValDoSpecial ($ExpOpCount, L->getLine(), QId, VarIdStr, Mask, ConstVal, EQUAL);\r
+                                                          }\r
+                                                       >>\r
     )\r
     |\r
     (\r
@@ -2571,16 +2571,16 @@ ideqvalExp [UINT32 & RootLevel, UINT32 & ExpOpCount] :
       "=="\r
       V1:Number                                        << ConstVal = _STOU16(V1->getText()); >>\r
                                                        <<\r
-                                                                                                                                     if (Mask == 0) {\r
-                                                                                                                                               CIfrEqIdVal EIVObj (L->getLine());\r
-                                                                                                                                               _SAVE_OPHDR_COND (EIVObj, ($ExpOpCount == 0));\r
-                                                                                                                                               EIVObj.SetQuestionId (QId, VarIdStr, LineNo);\r
-                                                                                                                                               EIVObj.SetValue (ConstVal);\r
-                                                                                                                                               $ExpOpCount++;\r
-                                                                                                                                         } else {\r
-                                                                                                                                               IdEqValDoSpecial ($ExpOpCount, L->getLine(), QId, VarIdStr, Mask, ConstVal, EQUAL);\r
-                                                                                                                                         }\r
-                                                                                                                                  >>\r
+                                                          if (Mask == 0) {\r
+                                                            CIfrEqIdVal EIVObj (L->getLine());\r
+                                                            _SAVE_OPHDR_COND (EIVObj, ($ExpOpCount == 0));\r
+                                                            EIVObj.SetQuestionId (QId, VarIdStr, LineNo);\r
+                                                            EIVObj.SetValue (ConstVal);\r
+                                                            $ExpOpCount++;\r
+                                                          } else {\r
+                                                            IdEqValDoSpecial ($ExpOpCount, L->getLine(), QId, VarIdStr, Mask, ConstVal, EQUAL);\r
+                                                          }\r
+                                                       >>\r
     )\r
     |\r
     (\r
@@ -2623,16 +2623,16 @@ ideqidExp[UINT32 & RootLevel, UINT32 & ExpOpCount] :
       "=="\r
       vfrQuestionDataFieldName[QId[1], Mask[1], VarIdStr[1], LineNo[1]]\r
                              <<\r
-                                                                                                             if (Mask[0] & Mask[1]) {\r
-                                                                                                                       IdEqIdDoSpecial ($ExpOpCount, L->getLine(), QId[0], VarIdStr[0], Mask[0], QId[1], VarIdStr[1], Mask[1], EQUAL);\r
-                                                                                                                 } else {\r
+                                if (Mask[0] & Mask[1]) {\r
+                                  IdEqIdDoSpecial ($ExpOpCount, L->getLine(), QId[0], VarIdStr[0], Mask[0], QId[1], VarIdStr[1], Mask[1], EQUAL);\r
+                                } else {\r
                                   CIfrEqIdId      EIIObj(L->getLine());\r
-                                                                                                                       _SAVE_OPHDR_COND (EIIObj, ($ExpOpCount == 0));\r
+                                  _SAVE_OPHDR_COND (EIIObj, ($ExpOpCount == 0));\r
                                   EIIObj.SetQuestionId1 (QId[0], VarIdStr[0], LineNo[0]);\r
-                                                                                                                       EIIObj.SetQuestionId2 (QId[1], VarIdStr[1], LineNo[1]);\r
-                                                                                                                       $ExpOpCount++;\r
-                                                                                                                 }\r
-                                                                                                          >>\r
+                                  EIIObj.SetQuestionId2 (QId[1], VarIdStr[1], LineNo[1]);\r
+                                  $ExpOpCount++;\r
+                                }\r
+                             >>\r
     )\r
     |\r
     (\r
@@ -2677,26 +2677,26 @@ ideqvallistExp[UINT32 & RootLevel, UINT32 & ExpOpCount] :
     V:Number                                           << ValueList[ListLen] = _STOU16(V->getText()); ListLen++; >>\r
   )+\r
                                                        <<\r
-                                                                                                                                     if (Mask != 0) {\r
+                                                          if (Mask != 0) {\r
                                                             IdEqListDoSpecial ($ExpOpCount, LineNo, QId, VarIdStr, Mask, ListLen, ValueList);\r
-                                                                                                                                         } else {\r
-                                                                                                       UINT16       Index;\r
+                                                          } else {\r
+                                                            UINT16       Index;\r
                                                             CIfrEqIdList EILObj(L->getLine());\r
-                                                                                                                                               _SAVE_OPHDR_COND (EILObj, ($ExpOpCount == 0));\r
-                                                                                                                                               if (QId != EFI_QUESTION_ID_INVALID) {\r
+                                                            _SAVE_OPHDR_COND (EILObj, ($ExpOpCount == 0));\r
+                                                            if (QId != EFI_QUESTION_ID_INVALID) {\r
+                                                              EILObj.SetQuestionId (QId, VarIdStr, LineNo);\r
+                                                            }\r
+                                                            EILObj.SetListLength (ListLen);\r
+                                                            for (Index = 0; Index < ListLen; Index++) {\r
+                                                              EILObj.SetValueList (Index, ValueList[Index]);\r
+                                                            }\r
+                                                            if (QId == EFI_QUESTION_ID_INVALID) {\r
+                                                              EILObj.UpdateIfrBuffer();\r
                                                               EILObj.SetQuestionId (QId, VarIdStr, LineNo);\r
-                                                                                                                                               }\r
-                                                                                                                                               EILObj.SetListLength (ListLen);\r
-                                                                                                                                               for (Index = 0; Index < ListLen; Index++) {\r
-                                                                                                                                                 EILObj.SetValueList (Index, ValueList[Index]);\r
-                                                                                                                                               }\r
-                                                                                                                                               if (QId == EFI_QUESTION_ID_INVALID) {\r
-                                                                                                                                                 EILObj.UpdateIfrBuffer();\r
-                                                                                                                                                 EILObj.SetQuestionId (QId, VarIdStr, LineNo);\r
-                                                                                                                                               }\r
-                                                                                                                                               $ExpOpCount++;\r
-                                                                                                                                         }\r
-                                                                                                                                     >>\r
+                                                            }\r
+                                                            $ExpOpCount++;\r
+                                                          }\r
+                                                        >>\r
   ;\r
 \r
 questionref13Exp[UINT32 & RootLevel, UINT32 & ExpOpCount] :\r
@@ -2704,7 +2704,7 @@ questionref13Exp[UINT32 & RootLevel, UINT32 & ExpOpCount] :
      UINT8           Type = 0x1;\r
      EFI_STRING_ID   DevPath;\r
      EFI_GUID        Guid;\r
-        EFI_QUESTION_ID QId = EFI_QUESTION_ID_INVALID;\r
+   EFI_QUESTION_ID QId = EFI_QUESTION_ID_INVALID;\r
      UINT32          BitMask;\r
      CHAR8           *QName = NULL;\r
      UINT32          LineNo = 0;\r
@@ -2723,10 +2723,10 @@ questionref13Exp[UINT32 & RootLevel, UINT32 & ExpOpCount] :
     |\r
     (\r
       "\("\r
-         (\r
+    (\r
           QN:StringIdentifier                          <<\r
                                                           QName  = QN->getText();\r
-                                                                                                                 LineNo = QN->getLine();\r
+                              LineNo = QN->getLine();\r
                                                           mCVfrQuestionDB.GetQuestionId (QN->getText(), NULL, QId, BitMask);\r
                                                        >>\r
         | ID:Number                                    << QId = _STOQID(ID->getText()); >>\r
@@ -3024,7 +3024,7 @@ EfiVfrParser::_SAVE_OPHDR_COND (
 #endif\r
       return ;\r
     }\r
-       mCIfrOpHdr = new CIfrOpHeader(OpHdr);\r
+  mCIfrOpHdr = new CIfrOpHeader(OpHdr);\r
   }\r
 }\r
 \r
@@ -3201,7 +3201,7 @@ EfiVfrParser::_STOU8 (
     //\r
     // BUG: does not handle overflow here\r
     //\r
-       (IsHex == TRUE) ? (Value <<= 4) : (Value *= 10);\r
+  (IsHex == TRUE) ? (Value <<= 4) : (Value *= 10);\r
 \r
     if ((IsHex == TRUE) && (c >= 'a') && (c <= 'f')) {\r
       Value += (c - 'a' + 10);\r
@@ -3231,7 +3231,7 @@ EfiVfrParser::_STOU16 (
     //\r
     // BUG: does not handle overflow here\r
     //\r
-       (IsHex == TRUE) ? (Value <<= 4) : (Value *= 10);\r
+  (IsHex == TRUE) ? (Value <<= 4) : (Value *= 10);\r
 \r
     if ((IsHex == TRUE) && (c >= 'a') && (c <= 'f')) {\r
       Value += (c - 'a' + 10);\r
@@ -3261,7 +3261,7 @@ EfiVfrParser::_STOU32 (
     //\r
     // BUG: does not handle overflow here\r
     //\r
-       (IsHex == TRUE) ? (Value <<= 4) : (Value *= 10);\r
+  (IsHex == TRUE) ? (Value <<= 4) : (Value *= 10);\r
 \r
     if ((IsHex == TRUE) && (c >= 'a') && (c <= 'f')) {\r
       Value += (c - 'a' + 10);\r
@@ -3291,7 +3291,7 @@ EfiVfrParser::_STOU64 (
     //\r
     // BUG: does not handle overflow here\r
     //\r
-       (IsHex == TRUE) ? (Value <<= 4) : (Value *= 10);\r
+  (IsHex == TRUE) ? (Value <<= 4) : (Value *= 10);\r
 \r
     if ((IsHex == TRUE) && (c >= 'a') && (c <= 'f')) {\r
       Value += (c - 'a' + 10);\r
@@ -3462,8 +3462,8 @@ EfiVfrParser::_DeclareDefaultFrameworkVarStore (
         VSObj.SetVarStoreId (pNode->mVarStoreId);\r
         VSObj.SetSize (pNode->mStorageInfo.mDataType->mTotalSize);\r
         if (FirstNode) {\r
-               VSObj.SetName ("Setup");\r
-               FirstNode = FALSE;\r
+          VSObj.SetName ("Setup");\r
+          FirstNode = FALSE;\r
         } else {\r
           VSObj.SetName (pNode->mVarStoreName);\r
         }\r
@@ -3538,9 +3538,9 @@ EfiVfrParser::_DeclareDefaultLinearVarStore (
     VSObj.SetLineNo (LineNo);\r
     mCVfrDataStorage.DeclareBufferVarStore (\r
                        "Date",\r
-                                                  &mFormsetGuid,\r
-                                                  &mCVfrVarDataTypeDB,\r
-                                                  "EFI_HII_DATE",\r
+                       &mFormsetGuid,\r
+                       &mCVfrVarDataTypeDB,\r
+                       "EFI_HII_DATE",\r
                        EFI_VARSTORE_ID_INVALID\r
                        );\r
     mCVfrDataStorage.GetVarStoreId("Date", &VarStoreId);\r
@@ -3568,7 +3568,7 @@ EfiVfrParser::_DeclareDefaultLinearVarStore (
     VSObj.SetVarStoreId (VarStoreId);\r
     mCVfrVarDataTypeDB.GetDataTypeSize("EFI_HII_TIME", &Size);\r
     VSObj.SetSize (Size);\r
-         VSObj.SetName ("Time");\r
+    VSObj.SetName ("Time");\r
     VSObj.SetGuid (&mFormsetGuid);\r
   }\r
 }\r