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

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

Revision: 2365
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2365&view=rev
Author:   ydong10
Date:     2011-10-11 02:33:50 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Enable goto op-code to have the question option list
Signed-off-by: ydong10
Reviewed-by: lgao4

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

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g	2011-10-10 14:38:38 UTC (rev 2364)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g	2011-10-11 02:33:50 UTC (rev 2365)
@@ -1646,6 +1646,7 @@
      EFI_QUESTION_ID     QId    = EFI_QUESTION_ID_INVALID;
      UINT32              BitMask;
      CIfrQuestionHeader  *QHObj = NULL;
+     CIfrOpHeader        *OHObj = NULL;
      CIfrRef             *R1Obj = NULL;
      CIfrRef2            *R2Obj = NULL;
      CIfrRef3            *R3Obj = NULL;
@@ -1705,6 +1706,7 @@
                                                             {
                                                               R5Obj = new CIfrRef5;
                                                               QHObj = R5Obj;
+                                                              OHObj = R5Obj;
                                                               R5Obj->SetLineNo(G->getLine());
                                                               break;
                                                             }
@@ -1712,6 +1714,7 @@
                                                             {
                                                               R4Obj = new CIfrRef4;
                                                               QHObj = R4Obj;
+                                                              OHObj = R4Obj;
                                                               R4Obj->SetLineNo(G->getLine());
                                                               R4Obj->SetDevicePath (DevPath);
                                                               R4Obj->SetFormSetId (FSId);
@@ -1723,6 +1726,7 @@
                                                             {
                                                               R3Obj = new CIfrRef3;
                                                               QHObj = R3Obj;
+                                                              OHObj = R3Obj;
                                                               R3Obj->SetLineNo(G->getLine());
                                                               R3Obj->SetFormSetId (FSId);
                                                               R3Obj->SetFormId (FId);
@@ -1733,6 +1737,7 @@
                                                             {
                                                               R2Obj = new CIfrRef2;
                                                               QHObj = R2Obj;
+                                                              OHObj = R2Obj;
                                                               R2Obj->SetLineNo(G->getLine());
                                                               R2Obj->SetFormId (FId);
                                                               R2Obj->SetQuestionId (QId);
@@ -1742,6 +1747,7 @@
                                                             {
                                                               R1Obj = new CIfrRef;
                                                               QHObj = R1Obj;
+                                                              OHObj = R1Obj;
                                                               R1Obj->SetLineNo(G->getLine());
                                                               R1Obj->SetFormId (FId);
                                                               break;
@@ -1750,11 +1756,14 @@
                                                           }
                                                        >>
   vfrQuestionHeader[*QHObj, QUESTION_REF]
-  { "," vfrStatementStatTagList }
   { "," F:FLAGS  "=" vfrGotoFlags[QHObj, F->getLine()] }
   {
     "," Key "=" KN:Number                              << AssignQuestionKey (*QHObj, KN); >>
   }
+  {
+    E:"," 
+      vfrStatementQuestionOptionList                   << OHObj->SetScope(1); CRT_END_OP (E);>>
+  }
   ";"                                                  << if (R1Obj != NULL) {delete R1Obj;} if (R2Obj != NULL) {delete R2Obj;} if (R3Obj != NULL) {delete R3Obj;} if (R4Obj != NULL) {delete R4Obj;} if (R5Obj != NULL) {delete R5Obj;}>>
   ;
 

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