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

Added ~, !, && and || !define /math operators

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6947 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2017-11-04 17:59:37 +00:00
parent 8d756f41c7
commit dda1998421
4 changed files with 18 additions and 7 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 to 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!
If \e{/file} is used, the entire text file specified (including whitespace and newlines) will be read and stuffed into \e{gflag}.

2
Docs/src/history.but
View file

@ -26,6 +26,8 @@ Released on ??? ??rd, 20??
\b Added IntOp and System::Int64Op >>> operator
\b Added more !define /math operators
\b Plug-ins now set the ASLR, DEP, LAA, NOSEH and TS PE flags (\W{http://sf.net/p/nsis/bugs/1188}{bug #1188})
\b MakeNSIS exits with code 0 for various information commands (\W{http://sf.net/p/nsis/bugs/1193}{bug #1193})

19
Source/scriptpp.cpp
View file

@ -952,10 +952,10 @@ int CEXEBuild::pp_define(LineParser&line)
}
else if (!_tcsicmp(define, _T("/math")))
{
int value1, value2;
int value1, value2, tc = line.getnumtokens(), onlyval1 = 0;
TCHAR *mathop;
if (line.getnumtokens() != 6) PRINTHELPEX(cmdnam)
if (tc != 5 && tc != 6) badmathsyntax: PRINTHELPEX(cmdnam)
define = line.gettoken_str(2);
value1 = line.gettoken_int(3);
mathop = line.gettoken_str(4);
@ -974,6 +974,14 @@ int CEXEBuild::pp_define(LineParser&line)
_stprintf(value, _T("%d"), value1 | value2);
} else if (!_tcscmp(mathop, _T("^"))) {
_stprintf(value, _T("%d"), value1 ^ value2);
} else if (!_tcscmp(mathop, _T("~"))) {
_stprintf(value, _T("%d"), ~ value1), ++onlyval1;
} else if (!_tcscmp(mathop, _T("!"))) {
_stprintf(value, _T("%d"), ! value1), ++onlyval1;
} else if (!_tcscmp(mathop, _T("&&"))) {
_stprintf(value, _T("%d"), value1 && value2);
} else if (!_tcscmp(mathop, _T("||"))) {
_stprintf(value, _T("%d"), value1 || value2);
} else if (!_tcscmp(mathop, _T("<<")) || !_tcscmp(mathop, _T("<<<")) ) {
_stprintf(value, _T("%d"), value1 << value2);
} else if (!_tcscmp(mathop, _T(">>"))) {
@ -987,8 +995,7 @@ int CEXEBuild::pp_define(LineParser&line)
return PS_ERROR;
}
_stprintf(value, _T("%d"), value1 / value2);
} else if (!_tcscmp(mathop, _T("%")))
{
} else if (!_tcscmp(mathop, _T("%"))) {
if (value2 == 0)
{
ERROR_MSG(_T("!define /math: division by zero! (\"%i %") NPRIs _T(" %i\")\n"),value1,mathop,value2);
@ -997,7 +1004,9 @@ int CEXEBuild::pp_define(LineParser&line)
_stprintf(value, _T("%d"), value1 % value2);
}
else
PRINTHELPEX(cmdnam)
goto badmathsyntax;
if (tc + onlyval1 != 6) goto badmathsyntax;
}
else
{

2
Source/tokens.cpp
View file

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