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

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

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}.

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})