diff options
| author | Eric Dong <eric.dong@intel.com> | 2015-10-15 01:03:47 +0000 |
|---|---|---|
| committer | ydong10 <ydong10@Edk2> | 2015-10-15 01:03:47 +0000 |
| commit | c0c300a15cabb08cd40c400caa4a4b42cd09b3f2 (patch) | |
| tree | f2f2e6d00df7b881e75ad9f268d1c5be7b12b085 /BaseTools/Source | |
| parent | 84db9040cc8ba556faec61ad3480c774ca8b984c (diff) | |
| download | edk2-c0c300a15cabb08cd40c400caa4a4b42cd09b3f2.tar.gz edk2-c0c300a15cabb08cd40c400caa4a4b42cd09b3f2.tar.bz2 edk2-c0c300a15cabb08cd40c400caa4a4b42cd09b3f2.zip | |
BaseTools VfrCompiler: In order to keep consistent, add an optional ";" for condition op-code.
Current grammar for suppressif opcode not consistent in statement and option case, this patch fixed this issue. The same case also existed for other condition opcodes.
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@18606 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'BaseTools/Source')
| -rw-r--r-- | BaseTools/Source/C/VfrCompile/VfrSyntax.g | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C/VfrCompile/VfrSyntax.g index ad839b2ab6..d74fec8815 100644 --- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g +++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g @@ -3258,7 +3258,7 @@ vfrStatementInconsistentIf : Prompt "=" "STRING_TOKEN" "\(" S:Number "\)" "," << IIObj.SetError (_STOSID(S->getText(), S->getLine())); >>
{ FLAGS "=" flagsField ( "\|" flagsField )* "," }
vfrStatementExpression[0]
- E:EndIf << CRT_END_OP (E); >>
+ E:EndIf {";"} << CRT_END_OP (E); >>
;
vfrStatementNoSubmitIf :
@@ -3267,7 +3267,7 @@ vfrStatementNoSubmitIf : Prompt "=" "STRING_TOKEN" "\(" S:Number "\)" "," << NSIObj.SetError (_STOSID(S->getText(), S->getLine())); >>
{ FLAGS "=" flagsField ( "\|" flagsField )* "," }
vfrStatementExpression[0]
- E:EndIf << CRT_END_OP (E); >>
+ E:EndIf {";"} << CRT_END_OP (E); >>
;
vfrStatementWarningIf :
@@ -3276,7 +3276,7 @@ vfrStatementWarningIf : Prompt "=" "STRING_TOKEN" "\(" S:Number "\)" "," << WIObj.SetWarning (_STOSID(S->getText(), S->getLine())); >>
{Timeout "=" T:Number "," << WIObj.SetTimeOut (_STOU8(T->getText(), T->getLine())); >>}
vfrStatementExpression[0]
- E:EndIf << CRT_END_OP (E); >>
+ E:EndIf {";"} << CRT_END_OP (E); >>
;
vfrStatementDisableIfQuest :
@@ -3286,7 +3286,7 @@ vfrStatementDisableIfQuest : L:DisableIf << DIObj.SetLineNo(L->getLine()); >>
vfrStatementExpression[0] ";"
vfrStatementQuestionOptionList
- E:EndIf << CRT_END_OP (E); >>
+ E:EndIf {";"} << CRT_END_OP (E); >>
;
vfrStatementRefresh :
@@ -3316,7 +3316,7 @@ vfrStatementSuppressIfQuest : { FLAGS "=" flagsField ( "\|" flagsField )* "," }
vfrStatementExpression[0] ";"
vfrStatementQuestionOptionList
- E:EndIf << CRT_END_OP (E); >>
+ E:EndIf {";"} << CRT_END_OP (E); >>
;
vfrStatementGrayOutIfQuest :
@@ -3325,7 +3325,7 @@ vfrStatementGrayOutIfQuest : { FLAGS "=" flagsField ( "\|" flagsField )* "," }
vfrStatementExpression[0] ";"
vfrStatementQuestionOptionList
- E:EndIf << CRT_END_OP (E); >>
+ E:EndIf {";"} << CRT_END_OP (E); >>
;
vfrStatementOptions :
|