SF.net SVN: edk2-buildtools:[2671] trunk/BaseTools/Source/C/VfrCompile

[<yd...@us...>]

Revision: 2671
          http://sourceforge.net/p/edk2-buildtools/code/2671
Author:   ydong10
Date:     2014-07-09 02:47:47 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
Report warning info if an action opcode has text two statement.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eri...@in...>
Reviewed-by: Liming Gao <lim...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Source/C/VfrCompile/VfrError.cpp
    trunk/BaseTools/Source/C/VfrCompile/VfrError.h
    trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrError.cpp
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrError.cpp	2014-06-25 04:59:46 UTC (rev 2670)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrError.cpp	2014-07-09 02:47:47 UTC (rev 2671)
@@ -52,6 +52,7 @@
 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" }
 };
 

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrError.h
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrError.h	2014-06-25 04:59:46 UTC (rev 2670)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrError.h	2014-07-09 02:47:47 UTC (rev 2671)
@@ -50,6 +50,7 @@
 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;
 

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g	2014-06-25 04:59:46 UTC (rev 2670)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g	2014-07-09 02:47:47 UTC (rev 2671)
@@ -1685,6 +1685,13 @@
   }
                                                        <<
                                                           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());

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.