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

implemented RFE #1669513 - bitwise operators for !define /math

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4959 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-02-27 21:04:12 +00:00
parent b8bf22affb
commit 695fddbc32
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Docs/src/defines.but
View file

@ -16,7 +16,7 @@ This command will add \e{gflag} to the global define list. This will have a simi
If \e{/date} or \e{/utcdate} are used, \e{value} will be passed into strftime and the result will be used as the value of \e{gflag}. strftime converts special symbols into certain parts of the current time or date. For example, %H will be converted into the current hour in 24-hour format. For a complete list of available symbols, search for strftime on \W{http://msdn.microsoft.com/}{MSDN}. On POSIX, you can get the list by using \c{man strftime}.
If \e{/math} is used, the result of 'val1 OP val2', where OP may be +,-,*,/ or % , will be used as the value of \e{gflag}. Note that val1 AND val2 MUST be integer values!
If \e{/math} is used, the result of 'val1 OP val2', where OP may be +,-,*,&,|,^,/ or % , will be used as the value of \e{gflag}. Note that val1 AND val2 MUST be integer values!
\c !define USE_SOMETHING
\c !define VERSION 1.2

6
Source/script.cpp
View file

@ -2795,6 +2795,12 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
sprintf(value,"%d",value1-value2);
} else if (!strcmp(mathop,"*")) {
sprintf(value,"%d",value1*value2);
} else if (!strcmp(mathop,"&")) {
sprintf(value,"%d",value1&value2);
} else if (!strcmp(mathop,"|")) {
sprintf(value,"%d",value1|value2);
} else if (!strcmp(mathop,"^")) {
sprintf(value,"%d",value1^value2);
} else if (!strcmp(mathop,"/")) {
if (value2==0) {
ERROR_MSG("!define /math: division by zero! (\"%i / %i\")\n",value1,value2);

2
Source/tokens.cpp
View file

@ -237,7 +237,7 @@ static tokenType tokenlist[TOK__LAST] =
{TOK_P_IFDEF,"!ifdef",1,-1,"symbol [| symbol2 [& symbol3 [...]]]",TP_ALL},
{TOK_P_IFNDEF,"!ifndef",1,-1,"symbol [| symbol2 [& symbol3 [...]]]",TP_ALL},
{TOK_P_ENDIF,"!endif",0,0,"",TP_ALL},
{TOK_P_DEFINE,"!define",1,4,"([/date|/utcdate] symbol [value]) | (/math symbol val1 OP val2)\n OP=(+ - * / %)",TP_ALL},
{TOK_P_DEFINE,"!define",1,4,"([/date|/utcdate] symbol [value]) | (/math symbol val1 OP val2)\n OP=(+ - * / % & | ^)",TP_ALL},
{TOK_P_UNDEF,"!undef",1,1,"symbol [value]",TP_ALL},
{TOK_P_ELSE,"!else",0,-1,"[if[macro][n][def] ...]",TP_ALL},
{TOK_P_ECHO,"!echo",1,0,"message",TP_ALL},