Report warning info if an action opcode has text two statement.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15682 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Source/C/VfrCompile/VfrError.cpp b/BaseTools/Source/C/VfrCompile/VfrError.cpp
index ffed732a4171274773fc8ba5c7cedbf554d9f2be..b5167e515d9fd3219e7811ac32743b7f82d022da 100644 (file)
--- 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 [] = {\r
   { VFR_WARNING_DEFAULT_VALUE_REDEFINED, ": default value re-defined with different value"},\r
   { VFR_WARNING_STRING_TO_UINT_OVERFLOW, ": String to UINT* Overflow"},\r
+  { VFR_WARNING_ACTION_WITH_TEXT_TWO, ": Action opcode should not have TextTwo part"},\r
   { VFR_WARNING_CODEUNDEFINED, ": undefined Warning Code" }\r
 };\r
 \r

diff --git a/BaseTools/Source/C/VfrCompile/VfrError.h b/BaseTools/Source/C/VfrCompile/VfrError.h
index 622cba6cbeb1436a6a3752aafe004705bfaea2fc..c0b4ec64a2ce48333e91c8da6e190b3527948a26 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrError.h
+++ b/BaseTools/Source/C/VfrCompile/VfrError.h
@@ -50,6 +50,7 @@ typedef enum {
 typedef enum {\r
   VFR_WARNING_DEFAULT_VALUE_REDEFINED = 0,\r
   VFR_WARNING_STRING_TO_UINT_OVERFLOW,\r
+  VFR_WARNING_ACTION_WITH_TEXT_TWO,\r
   VFR_WARNING_CODEUNDEFINED\r
 } EFI_VFR_WARNING_CODE;\r
 \r

diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
index a38f770e3b8c01c628dd1ce86f6e822f7a53a0f9..5da87675ae80c2ccb83b04b52b8033dda2ad046c 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g
+++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
@@ -1685,6 +1685,13 @@ vfrStatementStaticText :
   }\r
                                                        <<\r
                                                           if (Flags & EFI_IFR_FLAG_CALLBACK) {\r
+                                                            if (TxtTwo != EFI_STRING_ID_INVALID) {\r
+                                                              gCVfrErrorHandle.HandleWarning (\r
+                                                                                VFR_WARNING_ACTION_WITH_TEXT_TWO,\r
+                                                                                S3->getLine(),\r
+                                                                                S3->getText()\r
+                                                                                );\r
+                                                            }\r
                                                             CIfrAction AObj;\r
                                                             mCVfrQuestionDB.RegisterQuestion (NULL, NULL, QId);\r
                                                             AObj.SetLineNo (F->getLine());\r