tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-30 09:04:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

BaseTools VfrCompiler: In order to keep consistent, add an optional ";" for condition op-code.

Browse Source 
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
This commit is contained in:
Eric Dong 2015-10-15 01:03:47 +00:00 committed by ydong10
parent 84db9040cc
commit c0c300a15c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BaseTools/Source/C/VfrCompile/VfrSyntax.g
View File

@ -3258,7 +3258,7 @@ vfrStatementInconsistentIf :
Prompt "=" "STRING_TOKEN" "\(" S:Number "\)" "," << IIObj.SetError (_STOSID(S->getText(), S->getLine())); >> Prompt "=" "STRING_TOKEN" "\(" S:Number "\)" "," << IIObj.SetError (_STOSID(S->getText(), S->getLine())); >>
{ FLAGS "=" flagsField ( "\|" flagsField )* "," } { FLAGS "=" flagsField ( "\|" flagsField )* "," }
vfrStatementExpression[0] vfrStatementExpression[0]
E:EndIf << CRT_END_OP (E); >> E:EndIf {";"} << CRT_END_OP (E); >>
; ;
vfrStatementNoSubmitIf : vfrStatementNoSubmitIf :
@ -3267,7 +3267,7 @@ vfrStatementNoSubmitIf :
Prompt "=" "STRING_TOKEN" "\(" S:Number "\)" "," << NSIObj.SetError (_STOSID(S->getText(), S->getLine())); >> Prompt "=" "STRING_TOKEN" "\(" S:Number "\)" "," << NSIObj.SetError (_STOSID(S->getText(), S->getLine())); >>
{ FLAGS "=" flagsField ( "\|" flagsField )* "," } { FLAGS "=" flagsField ( "\|" flagsField )* "," }
vfrStatementExpression[0] vfrStatementExpression[0]
E:EndIf << CRT_END_OP (E); >> E:EndIf {";"} << CRT_END_OP (E); >>
; ;
vfrStatementWarningIf : vfrStatementWarningIf :
@ -3276,7 +3276,7 @@ vfrStatementWarningIf :
Prompt "=" "STRING_TOKEN" "\(" S:Number "\)" "," << WIObj.SetWarning (_STOSID(S->getText(), S->getLine())); >> Prompt "=" "STRING_TOKEN" "\(" S:Number "\)" "," << WIObj.SetWarning (_STOSID(S->getText(), S->getLine())); >>
{Timeout "=" T:Number "," << WIObj.SetTimeOut (_STOU8(T->getText(), T->getLine())); >>} {Timeout "=" T:Number "," << WIObj.SetTimeOut (_STOU8(T->getText(), T->getLine())); >>}
vfrStatementExpression[0] vfrStatementExpression[0]
E:EndIf << CRT_END_OP (E); >> E:EndIf {";"} << CRT_END_OP (E); >>
; ;
vfrStatementDisableIfQuest : vfrStatementDisableIfQuest :
@ -3286,7 +3286,7 @@ vfrStatementDisableIfQuest :
L:DisableIf << DIObj.SetLineNo(L->getLine()); >> L:DisableIf << DIObj.SetLineNo(L->getLine()); >>
vfrStatementExpression[0] ";" vfrStatementExpression[0] ";"
vfrStatementQuestionOptionList vfrStatementQuestionOptionList
E:EndIf << CRT_END_OP (E); >> E:EndIf {";"} << CRT_END_OP (E); >>
; ;
vfrStatementRefresh : vfrStatementRefresh :
@ -3316,7 +3316,7 @@ vfrStatementSuppressIfQuest :
{ FLAGS "=" flagsField ( "\|" flagsField )* "," } { FLAGS "=" flagsField ( "\|" flagsField )* "," }
vfrStatementExpression[0] ";" vfrStatementExpression[0] ";"
vfrStatementQuestionOptionList vfrStatementQuestionOptionList
E:EndIf << CRT_END_OP (E); >> E:EndIf {";"} << CRT_END_OP (E); >>
; ;
vfrStatementGrayOutIfQuest : vfrStatementGrayOutIfQuest :
@ -3325,7 +3325,7 @@ vfrStatementGrayOutIfQuest :
{ FLAGS "=" flagsField ( "\|" flagsField )* "," } { FLAGS "=" flagsField ( "\|" flagsField )* "," }
vfrStatementExpression[0] ";" vfrStatementExpression[0] ";"
vfrStatementQuestionOptionList vfrStatementQuestionOptionList
E:EndIf << CRT_END_OP (E); >> E:EndIf {";"} << CRT_END_OP (E); >>
; ;
vfrStatementOptions : vfrStatementOptions :