Sync BaseTool trunk (version r2601) into EDKII BaseTools.

Signed-off-by: Liming Gao <liming.gao@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14710 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Liming Gao
2013-09-24 07:13:44 +00:00
committed by lgao4
parent ac0908afc2
commit ea0f646433
33 changed files with 58 additions and 7 deletions

View File

@@ -184,6 +184,7 @@ VfrParserStart (
#token Goto("goto") "goto"
#token FormSetGuid("formsetguid") "formsetguid"
#token InconsistentIf("inconsistentif") "inconsistentif"
#token WarningIf("warningif") "warningif"
#token NoSubmitIf("nosubmitif") "nosubmitif"
#token EndIf("endif") "endif"
#token Key("key") "key"
@@ -2627,7 +2628,8 @@ vfrStatementQuestionTag :
vfrStatementRefresh |
vfrStatementVarstoreDevice |
vfrStatementExtension |
vfrStatementRefreshEvent
vfrStatementRefreshEvent |
vfrStatementWarningIf
;
vfrStatementQuestionTagList :
@@ -2825,6 +2827,15 @@ vfrStatementNoSubmitIf :
E:EndIf << CRT_END_OP (E); >>
;
vfrStatementWarningIf :
<< CIfrWarningIf WIObj; >>
L:WarningIf << WIObj.SetLineNo(L->getLine()); >>
Prompt "=" "STRING_TOKEN" "\(" S:Number "\)" "," << WIObj.SetWarning (_STOSID(S->getText())); >>
{Timeout "=" T:Number "," << WIObj.SetTimeOut (_STOU8(T->getText())); >>}
vfrStatementExpression[0]
E:EndIf << CRT_END_OP (E); >>
;
vfrStatementDisableIfQuest :
<<
CIfrDisableIf DIObj;