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

Added LogicLib & operator

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6754 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2016-06-07 18:51:09 +00:00
parent 2fa183f20c
commit e7e58a9814
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Docs/src/history.but
View file

@ -14,6 +14,8 @@ Released on ???? ?nd, 2016
\b Zip2Exe aborts if the zip file is encrypted (\W{http://sf.net/p/nsis/bugs/1141}{bug #1141}) \b Zip2Exe aborts if the zip file is encrypted (\W{http://sf.net/p/nsis/bugs/1141}{bug #1141})
\b Added LogicLib & operator
\S2{} Translations \S2{} Translations
\b Minor tweaks to Danish.nlf (scootergrisen) (\W{http://sf.net/p/nsis/bugs/1140}{bug #1140}) \b Minor tweaks to Danish.nlf (scootergrisen) (\W{http://sf.net/p/nsis/bugs/1140}{bug #1140})

8
Include/LogicLib.nsh
View file

@ -47,7 +47,7 @@
; Case-sensitive string tests: ; Case-sensitive string tests:
; a S== b; a S!= b ; a S== b; a S!= b
; Standard (built-in) signed integer tests: ; Standard (built-in) signed integer tests:
; a = b; a <> b; a < b; a >= b; a > b; a <= b ; a = b; a <> b; a < b; a >= b; a > b; a <= b; a & b
; Standard (built-in) unsigned integer tests: ; Standard (built-in) unsigned integer tests:
; a U< b; a U>= b; a U> b; a U<= b ; a U< b; a U>= b; a U> b; a U<= b
; 64-bit integer tests (using System.dll): ; 64-bit integer tests (using System.dll):
@ -206,6 +206,12 @@
!insertmacro _> `${_a}` `${_b}` `${_f}` `${_t}` !insertmacro _> `${_a}` `${_b}` `${_f}` `${_t}`
!macroend !macroend
!macro _& _a _b _t _f
!insertmacro _LOGICLIB_TEMP
IntOp $_LOGICLIB_TEMP `${_a}` & `${_b}`
!insertmacro _<> $_LOGICLIB_TEMP 0 `${_t}` `${_f}`
!macroend
; Unsigned integer tests (NB: no need for extra equality tests) ; Unsigned integer tests (NB: no need for extra equality tests)
!macro _U< _a _b _t _f !macro _U< _a _b _t _f
IntCmpU `${_a}` `${_b}` `${_f}` `${_t}` `${_f}` IntCmpU `${_a}` `${_b}` `${_f}` `${_t}` `${_f}`