Sync BaseTool trunk (version r2599) into EDKII BaseTools.

[mirror_edk2.git] / BaseTools / Source / C / VfrCompile / VfrError.h

diff --git a/BaseTools/Source/C/VfrCompile/VfrError.h b/BaseTools/Source/C/VfrCompile/VfrError.h
index 258ae9b8af4ece7548ec23f104d5e601ff74c2be..8e73e2e99732cffabc682555c8b0caf39b0ac617 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrError.h
+++ b/BaseTools/Source/C/VfrCompile/VfrError.h
@@ -2,7 +2,7 @@
   \r
   VfrCompiler Error definition\r
 \r
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -43,14 +43,25 @@ typedef enum {
   VFR_RETURN_DATA_STRING_ERROR,\r
   VFR_RETURN_DEFAULT_VALUE_REDEFINED,\r
   VFR_RETURN_CONSTANT_ONLY,\r
+  VFR_RETURN_VARSTORE_NAME_REDEFINED_ERROR,\r
   VFR_RETURN_CODEUNDEFINED\r
 } EFI_VFR_RETURN_CODE;\r
 \r
+typedef enum {\r
+  VFR_WARNING_DEFAULT_VALUE_REDEFINED = 0,\r
+  VFR_WARNING_CODEUNDEFINED\r
+} EFI_VFR_WARNING_CODE;\r
+\r
 typedef struct _SVFR_ERROR_HANDLE {\r
   EFI_VFR_RETURN_CODE    mErrorCode;\r
   CONST CHAR8            *mErrorMsg;\r
 } SVFR_ERROR_HANDLE;\r
 \r
+typedef struct _SVFR_WARNING_HANDLE {\r
+  EFI_VFR_WARNING_CODE    mWarningCode;\r
+  CONST CHAR8            *mWarningMsg;\r
+} SVFR_WARNING_HANDLE;\r
+\r
 struct SVfrFileScopeRecord {\r
   CHAR8                 *mFileName;\r
   UINT32                mWholeScopeLine;\r
@@ -65,17 +76,21 @@ class CVfrErrorHandle {
 private:\r
   CHAR8               *mInputFileName;\r
   SVFR_ERROR_HANDLE   *mVfrErrorHandleTable;\r
+  SVFR_WARNING_HANDLE *mVfrWarningHandleTable;\r
   SVfrFileScopeRecord *mScopeRecordListHead;\r
   SVfrFileScopeRecord *mScopeRecordListTail;\r
+  BOOLEAN             mWarningAsError;\r
 \r
 public:\r
   CVfrErrorHandle (VOID);\r
   ~CVfrErrorHandle (VOID);\r
 \r
+  VOID  SetWarningAsError (IN BOOLEAN);\r
   VOID  SetInputFile (IN CHAR8 *);\r
   VOID  ParseFileScopeRecord (IN CHAR8 *, IN UINT32);\r
   VOID  GetFileNameLineNum (IN UINT32, OUT CHAR8 **, OUT UINT32 *);\r
   UINT8 HandleError (IN EFI_VFR_RETURN_CODE, IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL);\r
+  UINT8 HandleWarning (IN EFI_VFR_WARNING_CODE, IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL);\r
   VOID  PrintMsg (IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL, IN CONST CHAR8 *MsgType = "Error", IN CONST CHAR8 *ErrorMsg = "");\r
 };\r
 \r