dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

!verbose varargs support (Ex: !verbose push 3)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6183 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2011-11-20 18:51:35 +00:00
parent 3095000536
commit 9a3f4e0cb1
2 changed files with 43 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

70
Source/script.cpp
View file

@ -3397,54 +3397,68 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
case TOK_P_VERBOSE: case TOK_P_VERBOSE:
{ {
extern int g_display_errors; extern int g_display_errors;
int k=line.gettoken_enum(1,_T("push\0pop\0")); for(int argi=1; argi<line.getnumtokens(); ++argi)
int v;
if (k < 0)
// just set
v=line.gettoken_int(1);
else
{ {
if (k) int v,k=line.gettoken_enum(argi,_T("push\0pop\0"));
if (k < 0)
{ {
// pop // just set
int l=verbose_stack.getlen(); int numconv;
if (l) v=line.gettoken_int(argi,&numconv);
if (!numconv || v < 0 || v > 4 )
{ {
v=((int*)verbose_stack.get())[(l/sizeof(int))-1]; // < 2.47 would reset level to 0 without warning!
verbose_stack.resize(l-sizeof(int)); ERROR_MSG("!verbose: Invalid verbose level\n");
return PS_ERROR;
} }
else
return PS_OK;
} }
else else
{ {
// push if (k)
v=0;
if (display_errors)
{ {
v++; // pop
if (display_warnings) int l=verbose_stack.getlen();
if (l)
{
v=((int*)verbose_stack.get())[(l/sizeof(int))-1];
verbose_stack.resize(l-sizeof(int));
}
else
{
warning_fl("!verbose: Pop failed, stack is empty");
continue; // Pop failed, should still process the next parameter
}
}
else
{
// push
v=0;
if (display_errors)
{ {
v++; v++;
if (display_info) if (display_warnings)
{ {
v++; v++;
if (display_script) if (display_info)
{ {
v++; v++;
if (display_script)
{
v++;
}
} }
} }
} }
verbose_stack.add(&v,sizeof(int));
continue;
} }
verbose_stack.add(&v,sizeof(int));
return PS_OK;
} }
display_script=v>3;
display_info=v>2;
display_warnings=v>1;
display_errors=v>0;
g_display_errors=display_errors;
} }
display_script=v>3;
display_info=v>2;
display_warnings=v>1;
display_errors=v>0;
g_display_errors=display_errors;
} }
return PS_OK; return PS_OK;

2
Source/tokens.cpp
View file

@ -258,7 +258,7 @@ static tokenType tokenlist[TOK__LAST] =
{TOK_P_WARNING,_T("!warning"),0,1,_T("[warning_message]"),TP_ALL}, {TOK_P_WARNING,_T("!warning"),0,1,_T("[warning_message]"),TP_ALL},
{TOK_P_ERROR,_T("!error"),0,1,_T("[error_message]"),TP_ALL}, {TOK_P_ERROR,_T("!error"),0,1,_T("[error_message]"),TP_ALL},
{TOK_P_VERBOSE,_T("!verbose"),1,0,_T("verbose_level | push | pop"),TP_ALL}, {TOK_P_VERBOSE,_T("!verbose"),1,-1,_T("(verbose_level | push | pop) [...]"),TP_ALL},
{TOK_P_MACRO,_T("!macro"),1,-1,_T("macroname [parms ...]"),TP_ALL}, {TOK_P_MACRO,_T("!macro"),1,-1,_T("macroname [parms ...]"),TP_ALL},
{TOK_P_MACROEND,_T("!macroend"),0,0,_T(""),TP_ALL}, {TOK_P_MACROEND,_T("!macroend"),0,0,_T(""),TP_ALL},