Sync BaseTool trunk (version r2599) into EDKII BaseTools.

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

diff --git a/BaseTools/Source/C/VfrCompile/VfrError.cpp b/BaseTools/Source/C/VfrCompile/VfrError.cpp
index 3289101710f055943bd3b9c55e559917ae870d90..71305364f69ad2d2e4e7c185bcb8ed930b098ff9 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrError.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrError.cpp
@@ -2,8 +2,8 @@
   \r
   VfrCompiler error handler.\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \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
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -34,6 +34,7 @@ static SVFR_ERROR_HANDLE VFR_ERROR_HANDLE_TABLE [] = {
   { VFR_RETURN_VARSTOREID_REDEFINED, ": varstore id already defined" },\r
   { VFR_RETURN_UNDEFINED, ": undefined" },\r
   { VFR_RETURN_VAR_NOTDEFINED_BY_QUESTION, ": some variable has not defined by a question"},\r
+  { VFR_RETURN_VARSTORE_DATATYPE_REDEFINED_ERROR, ": Data Structure is defined by more than one varstores, it can't be referred as varstore, only varstore name could be used."},\r
   { VFR_RETURN_GET_EFIVARSTORE_ERROR, ": get efi varstore error"},\r
   { VFR_RETURN_EFIVARSTORE_USE_ERROR, ": can not use the efi varstore like this" },\r
   { VFR_RETURN_EFIVARSTORE_SIZE_ERROR, ": unsupport efi varstore size should be <= 8 bytes" },\r
@@ -44,17 +45,24 @@ static SVFR_ERROR_HANDLE VFR_ERROR_HANDLE_TABLE [] = {
   { VFR_RETURN_DATA_STRING_ERROR, ": data field string error or not support"},\r
   { VFR_RETURN_DEFAULT_VALUE_REDEFINED, ": default value re-defined with different value"},\r
   { VFR_RETURN_CONSTANT_ONLY, ": only constant is allowed in the expression"},\r
+  { VFR_RETURN_VARSTORE_NAME_REDEFINED_ERROR, ": Varstore name is defined by more than one varstores, it can't be referred as varstore, only varstore strucure name could be used."},\r
   { VFR_RETURN_CODEUNDEFINED, ": undefined Error Code" }\r
 };\r
 \r
+static SVFR_WARNING_HANDLE VFR_WARNING_HANDLE_TABLE [] = {\r
+  { VFR_WARNING_DEFAULT_VALUE_REDEFINED, ": default value re-defined with different value"},\r
+  { VFR_WARNING_CODEUNDEFINED, ": undefined Warning Code" }\r
+};\r
+\r
 CVfrErrorHandle::CVfrErrorHandle (\r
   VOID\r
   )\r
 {\r
-  mInputFileName       = NULL;\r
-  mScopeRecordListHead = NULL;\r
-  mScopeRecordListTail = NULL;\r
-  mVfrErrorHandleTable = VFR_ERROR_HANDLE_TABLE;\r
+  mInputFileName         = NULL;\r
+  mScopeRecordListHead   = NULL;\r
+  mScopeRecordListTail   = NULL;\r
+  mVfrErrorHandleTable   = VFR_ERROR_HANDLE_TABLE;\r
+  mVfrWarningHandleTable = VFR_WARNING_HANDLE_TABLE;\r
 }\r
 \r
 CVfrErrorHandle::~CVfrErrorHandle (\r
@@ -73,9 +81,18 @@ CVfrErrorHandle::~CVfrErrorHandle (
     delete pNode;\r
   }\r
 \r
-  mScopeRecordListHead = NULL;\r
-  mScopeRecordListTail = NULL;\r
-  mVfrErrorHandleTable = NULL;\r
+  mScopeRecordListHead   = NULL;\r
+  mScopeRecordListTail   = NULL;\r
+  mVfrErrorHandleTable   = NULL;\r
+  mVfrWarningHandleTable = NULL;\r
+}\r
+\r
+VOID\r
+CVfrErrorHandle::SetWarningAsError (\r
+  IN BOOLEAN  WarningAsError\r
+  )\r
+{\r
+  mWarningAsError = WarningAsError;\r
 }\r
 \r
 VOID\r
@@ -241,4 +258,41 @@ CVfrErrorHandle::HandleError (
   }\r
 }\r
 \r
+UINT8\r
+CVfrErrorHandle::HandleWarning (\r
+  IN EFI_VFR_WARNING_CODE WarningCode,\r
+  IN UINT32               LineNum,\r
+  IN CHAR8                *TokName\r
+  )\r
+{\r
+  UINT32                 Index;\r
+  CHAR8                  *FileName = NULL;\r
+  UINT32                 FileLine;\r
+  CONST CHAR8            *WarningMsg = NULL;\r
+\r
+  if (mVfrWarningHandleTable == NULL) {\r
+    return 1;\r
+  }\r
+\r
+  GetFileNameLineNum (LineNum, &FileName, &FileLine);\r
+\r
+  if (mWarningAsError) {\r
+    Error (FileName, FileLine, 0x2220, "warning treated as error", NULL);\r
+  }\r
+\r
+  for (Index = 0; mVfrWarningHandleTable[Index].mWarningCode != VFR_WARNING_CODEUNDEFINED; Index++) {\r
+    if (WarningCode == mVfrWarningHandleTable[Index].mWarningCode) {\r
+      WarningMsg = mVfrWarningHandleTable[Index].mWarningMsg;\r
+      break;\r
+    }\r
+  }\r
+\r
+  if (WarningMsg != NULL) {\r
+    Warning (FileName, FileLine, 0, TokName, (CHAR8 *) "\t%s\n", (CHAR8 *) WarningMsg);\r
+    return 1;\r
+  } else {\r
+    return 0;\r
+  }\r
+}\r
+\r
 CVfrErrorHandle gCVfrErrorHandle;\r