From 1d218f83f1d2aefb28d728ff01c89b10d103dc65 Mon Sep 17 00:00:00 2001 From: Eric Dong Date: Fri, 25 Jul 2014 21:09:48 +0000 Subject: Report warning info if an action opcode has text two statement. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eric Dong Reviewed-by: Liming Gao git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15682 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Source/C/VfrCompile/VfrError.cpp | 1 + BaseTools/Source/C/VfrCompile/VfrError.h | 1 + BaseTools/Source/C/VfrCompile/VfrSyntax.g | 7 +++++++ 3 files changed, 9 insertions(+) (limited to 'BaseTools/Source') diff --git a/BaseTools/Source/C/VfrCompile/VfrError.cpp b/BaseTools/Source/C/VfrCompile/VfrError.cpp index ffed732a41..b5167e515d 100644 --- a/BaseTools/Source/C/VfrCompile/VfrError.cpp +++ b/BaseTools/Source/C/VfrCompile/VfrError.cpp @@ -52,6 +52,7 @@ static SVFR_ERROR_HANDLE VFR_ERROR_HANDLE_TABLE [] = { static SVFR_WARNING_HANDLE VFR_WARNING_HANDLE_TABLE [] = { { VFR_WARNING_DEFAULT_VALUE_REDEFINED, ": default value re-defined with different value"}, { VFR_WARNING_STRING_TO_UINT_OVERFLOW, ": String to UINT* Overflow"}, + { VFR_WARNING_ACTION_WITH_TEXT_TWO, ": Action opcode should not have TextTwo part"}, { VFR_WARNING_CODEUNDEFINED, ": undefined Warning Code" } }; diff --git a/BaseTools/Source/C/VfrCompile/VfrError.h b/BaseTools/Source/C/VfrCompile/VfrError.h index 622cba6cbe..c0b4ec64a2 100644 --- a/BaseTools/Source/C/VfrCompile/VfrError.h +++ b/BaseTools/Source/C/VfrCompile/VfrError.h @@ -50,6 +50,7 @@ typedef enum { typedef enum { VFR_WARNING_DEFAULT_VALUE_REDEFINED = 0, VFR_WARNING_STRING_TO_UINT_OVERFLOW, + VFR_WARNING_ACTION_WITH_TEXT_TWO, VFR_WARNING_CODEUNDEFINED } EFI_VFR_WARNING_CODE; diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C/VfrCompile/VfrSyntax.g index a38f770e3b..5da87675ae 100644 --- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g +++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g @@ -1685,6 +1685,13 @@ vfrStatementStaticText : } << if (Flags & EFI_IFR_FLAG_CALLBACK) { + if (TxtTwo != EFI_STRING_ID_INVALID) { + gCVfrErrorHandle.HandleWarning ( + VFR_WARNING_ACTION_WITH_TEXT_TWO, + S3->getLine(), + S3->getText() + ); + } CIfrAction AObj; mCVfrQuestionDB.RegisterQuestion (NULL, NULL, QId); AObj.SetLineNo (F->getLine()); -- cgit v1.2.3