2.3:
- Much reworking and refactoring. - Added built-in support for the rest of NSIS's conditional tests. - Added ability to use any NSIS conditional command in a normal If type statement. - Optimised the code produced by If (fewer Goto's). - Added statement similar to If that works in reverse: "Unless". - Fixed bug where using Continue in a Do..LoopUntil loop went to the top of the loop and not the loop condition. - Added DoWhile..Loop and Do..LoopWhile loop varieties. - Optimised the code prodiced by Select (fewer Goto's). - Renamed Case_Else to CaseElse. - CaseElse can also be called Default (for the C-minded). git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3278 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
eccles
parent
a641ca3621
commit
8a66228b7c
2 changed files with 637 additions and 403 deletions
|
|
@ -1,109 +1,290 @@
|
||||||
Name "NSIS LogicLib Example"
|
Name "NSIS LogicLib Example"
|
||||||
OutFile "example.exe"
|
OutFile "example.exe"
|
||||||
SilentInstall silent
|
ShowInstDetails show
|
||||||
|
|
||||||
|
;!define LOGICLIB_VERBOSITY 4
|
||||||
!include "logiclib.nsh"
|
!include "logiclib.nsh"
|
||||||
!define MsgBox "MessageBox MB_OK"
|
|
||||||
|
|
||||||
Section
|
Section
|
||||||
|
|
||||||
|
; if..endif
|
||||||
|
StrCpy $R1 1
|
||||||
|
StrCpy $R2 ""
|
||||||
|
${If} $R1 = 1
|
||||||
|
StrCpy $R2 $R2A
|
||||||
|
${EndIf}
|
||||||
|
${If} $R1 = 2
|
||||||
|
StrCpy $R2 $R2B
|
||||||
|
${EndIf}
|
||||||
|
${If} $R1 < 2
|
||||||
|
StrCpy $R2 $R2C
|
||||||
|
${EndIf}
|
||||||
|
${If} $R1 < -2
|
||||||
|
StrCpy $R2 $R2D
|
||||||
|
${EndIf}
|
||||||
|
${If} $R1 > 2
|
||||||
|
StrCpy $R2 $R2E
|
||||||
|
${EndIf}
|
||||||
|
${If} $R1 > -2
|
||||||
|
StrCpy $R2 $R2F
|
||||||
|
${EndIf}
|
||||||
|
${If} $R1 <> 1
|
||||||
|
StrCpy $R2 $R2G
|
||||||
|
${EndIf}
|
||||||
|
${If} $R1 <> 2
|
||||||
|
StrCpy $R2 $R2H
|
||||||
|
${EndIf}
|
||||||
|
${If} $R1 >= 2
|
||||||
|
StrCpy $R2 $R2I
|
||||||
|
${EndIf}
|
||||||
|
${If} $R1 >= -2
|
||||||
|
StrCpy $R2 $R2J
|
||||||
|
${EndIf}
|
||||||
|
${If} $R1 <= 2
|
||||||
|
StrCpy $R2 $R2K
|
||||||
|
${EndIf}
|
||||||
|
${If} $R1 <= -2
|
||||||
|
StrCpy $R2 $R2L
|
||||||
|
${EndIf}
|
||||||
|
${If} $R2 == "ACFHJK"
|
||||||
|
DetailPrint "PASSED If..EndIf test"
|
||||||
|
${Else}
|
||||||
|
DetailPrint "FAILED If..EndIf test"
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
; if..elseif..else..endif
|
; if..elseif..else..endif
|
||||||
StrCpy $R1 1 ;change to test the following if statement
|
StrCpy $R1 A
|
||||||
${if} $R1 = 1
|
StrCpy $R2 ""
|
||||||
MessageBox MB_OK "if: R1=1"
|
${If} $R1 == A
|
||||||
${elseif} $R1 = 2
|
StrCpy $R2 $R2A
|
||||||
MessageBox MB_OK "ifelse: R1=2"
|
${ElseIf} $R1 == B
|
||||||
${else}
|
StrCpy $R2 $R2B
|
||||||
MessageBox MB_OK "else: R1=$R1"
|
${ElseUnless} $R1 != C
|
||||||
${endif}
|
StrCpy $R2 $R2C
|
||||||
|
${Else}
|
||||||
|
StrCpy $R2 $R2D
|
||||||
|
${EndIf}
|
||||||
|
${If} $R1 == D
|
||||||
|
StrCpy $R2 $R2D
|
||||||
|
${ElseIf} $R1 == A
|
||||||
|
StrCpy $R2 $R2A
|
||||||
|
${ElseUnless} $R1 != B
|
||||||
|
StrCpy $R2 $R2B
|
||||||
|
${Else}
|
||||||
|
StrCpy $R2 $R2C
|
||||||
|
${EndIf}
|
||||||
|
${If} $R1 == C
|
||||||
|
StrCpy $R2 $R2C
|
||||||
|
${ElseIf} $R1 == D
|
||||||
|
StrCpy $R2 $R2D
|
||||||
|
${ElseUnless} $R1 != A
|
||||||
|
StrCpy $R2 $R2A
|
||||||
|
${Else}
|
||||||
|
StrCpy $R2 $R2B
|
||||||
|
${EndIf}
|
||||||
|
${If} $R1 == B
|
||||||
|
StrCpy $R2 $R2B
|
||||||
|
${ElseIf} $R1 == C
|
||||||
|
StrCpy $R2 $R2C
|
||||||
|
${ElseUnless} $R1 != D
|
||||||
|
StrCpy $R2 $R2D
|
||||||
|
${Else}
|
||||||
|
StrCpy $R2 $R2A
|
||||||
|
${EndIf}
|
||||||
|
${If} $R2 == "$R1$R1$R1$R1"
|
||||||
|
DetailPrint "PASSED If..ElseIf..Else..EndIf test"
|
||||||
|
${Else}
|
||||||
|
DetailPrint "FAILED If..ElseIf..Else..EndIf test"
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
; ifthen..|..|
|
; ifthen..|..|
|
||||||
StrCpy $R1 1 ; change to test ifthen statement.
|
StrCpy $R1 1
|
||||||
${ifthen} $R1 = 1 ${|} MessageBox MB_OK "R1=1" ${|}
|
StrCpy $R2 ""
|
||||||
|
${ifthen} $R1 = 1 ${|} StrCpy $R2 $R2A ${|}
|
||||||
|
${ifthen} $R1 = 2 ${|} StrCpy $R2 $R2B ${|}
|
||||||
|
${If} $R2 == "A"
|
||||||
|
DetailPrint "PASSED IfThen test"
|
||||||
|
${Else}
|
||||||
|
DetailPrint "FAILED IfThen test"
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
; ifcmd..||..|
|
; ifcmd..||..|
|
||||||
StrCpy $R1 "example.nsi" ; change to test ifcmd statement
|
StrCpy $R2 ""
|
||||||
${ifcmd} IfFileExists "example.nsi" ${||} MessageBox MB_OK "IfFileExists: R1=$R1" ${|}
|
${ifcmd} MessageBox MB_YESNO "Please press Yes" IDYES ${||} StrCpy $R2 $R2A ${|}
|
||||||
|
${ifcmd} MessageBox MB_YESNO|MB_DEFBUTTON2 "Please press No" IDYES ${||} StrCpy $R2 $R2B ${|}
|
||||||
|
${If} $R2 == "A"
|
||||||
|
DetailPrint "PASSED IfCmd test"
|
||||||
|
${Else}
|
||||||
|
DetailPrint "FAILED IfCmd test"
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
; select..case..case2..case3..case4..case5..case_else..endselect
|
; select..case..case2..case3..case4..case5..caseelse..endselect
|
||||||
StrCpy $R1 1 ;change to test the following if statement
|
StrCpy $R1 1
|
||||||
${select} $R1
|
StrCpy $R2 ""
|
||||||
${case} "1"
|
${Select} $R1
|
||||||
MessageBox MB_OK "case: R1=1"
|
${Case} "1"
|
||||||
${case} "2"
|
StrCpy $R2 $R2A
|
||||||
MessageBox MB_OK "case: R1=2"
|
${Case} "2"
|
||||||
${case2} "3" "4"
|
StrCpy $R2 $R2B
|
||||||
MessageBox MB_OK "case2: R1=3 or 4, R1=$R1"
|
${Case2} "3" "4"
|
||||||
${case_else}
|
StrCpy $R2 $R2C
|
||||||
MessageBox MB_OK "caseelse: R1=$R1"
|
${CaseElse}
|
||||||
${endselect}
|
StrCpy $R2 $R2D
|
||||||
|
${EndSelect}
|
||||||
|
${Select} $R1
|
||||||
|
${Case} "2"
|
||||||
|
StrCpy $R2 $R2A
|
||||||
|
${Case} "3"
|
||||||
|
StrCpy $R2 $R2B
|
||||||
|
${Case2} "4" "5"
|
||||||
|
StrCpy $R2 $R2C
|
||||||
|
${CaseElse}
|
||||||
|
StrCpy $R2 $R2D
|
||||||
|
${EndSelect}
|
||||||
|
${Select} $R1
|
||||||
|
${Case} "3"
|
||||||
|
StrCpy $R2 $R2A
|
||||||
|
${Case} "4"
|
||||||
|
StrCpy $R2 $R2B
|
||||||
|
${Case2} "5" "1"
|
||||||
|
StrCpy $R2 $R2C
|
||||||
|
${CaseElse}
|
||||||
|
StrCpy $R2 $R2D
|
||||||
|
${EndSelect}
|
||||||
|
${Select} $R1
|
||||||
|
${Case} "4"
|
||||||
|
StrCpy $R2 $R2A
|
||||||
|
${Case} "5"
|
||||||
|
StrCpy $R2 $R2B
|
||||||
|
${Case2} "1" "2"
|
||||||
|
StrCpy $R2 $R2C
|
||||||
|
${CaseElse}
|
||||||
|
StrCpy $R2 $R2D
|
||||||
|
${EndSelect}
|
||||||
|
${If} $R2 == "ADCC"
|
||||||
|
DetailPrint "PASSED Select..Case*..EndSelect test"
|
||||||
|
${Else}
|
||||||
|
DetailPrint "FAILED Select..Case*..EndSelect test"
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
; for..exitfor..next
|
; for[each]..exitfor..next
|
||||||
${for} $R1 1 5
|
StrCpy $R2 ""
|
||||||
MessageBox MB_OK "for: R1=$R1"
|
${For} $R1 1 5
|
||||||
${next}
|
StrCpy $R2 $R2$R1
|
||||||
|
${Next}
|
||||||
; foreach..exitfor..next
|
${ForEach} $R1 10 1 - 1
|
||||||
${foreach} $R1 10 1 - 1
|
StrCpy $R2 $R2$R1
|
||||||
MessageBox MB_OK "foreach: R1=$R1"
|
${Next}
|
||||||
${next}
|
${For} $R1 1 0
|
||||||
|
StrCpy $R2 $R2$R1
|
||||||
|
${Next}
|
||||||
|
${If} $R2 == "1234510987654321"
|
||||||
|
DetailPrint "PASSED For[Each]..Next test"
|
||||||
|
${Else}
|
||||||
|
DetailPrint "FAILED For[Each]..Next test"
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
; do..exitdo..loop
|
; do..exitdo..loop
|
||||||
StrCpy $R1 0
|
StrCpy $R1 0
|
||||||
${do}
|
StrCpy $R2 ""
|
||||||
|
${Do}
|
||||||
|
StrCpy $R2 $R2$R1
|
||||||
IntOp $R1 $R1 + 1
|
IntOp $R1 $R1 + 1
|
||||||
MessageBox MB_YESNO "Do..Loop statement test, iteration $R1.$\nDo you want to stop?" IDYES 0 IDNO +2
|
${If} $R1 > 10
|
||||||
${exitdo}
|
${ExitDo}
|
||||||
${loop}
|
${EndIf}
|
||||||
|
${Loop}
|
||||||
|
${If} $R2 == "012345678910"
|
||||||
|
DetailPrint "PASSED Do..ExitDo..Loop test"
|
||||||
|
${Else}
|
||||||
|
DetailPrint "FAILED Do..ExitDo..Loop test"
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
; do..exitdo..loopuntil
|
; do..exitdo..loopuntil
|
||||||
StrCpy $R1 0
|
StrCpy $R1 0
|
||||||
${do}
|
StrCpy $R2 ""
|
||||||
|
${Do}
|
||||||
|
StrCpy $R2 $R2$R1
|
||||||
IntOp $R1 $R1 + 1
|
IntOp $R1 $R1 + 1
|
||||||
${loopuntil} $R1 >= 5 ; Change to test loop until
|
${LoopUntil} $R1 >= 5
|
||||||
MessageBox MB_OK "do..loopuntil: R1=$R1"
|
${If} $R2 == "01234"
|
||||||
|
DetailPrint "PASSED Do..ExitDo..LoopUntil test"
|
||||||
|
${Else}
|
||||||
|
DetailPrint "FAILED Do..ExitDo..LoopUntil test"
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
; dountil..exitdo..loop
|
; dountil..exitdo..loop
|
||||||
StrCpy $R1 0
|
StrCpy $R1 0
|
||||||
${dountil} $R1 >= 5 ; Change to test loop until
|
StrCpy $R2 ""
|
||||||
|
${DoUntil} $R1 >= 5
|
||||||
|
StrCpy $R2 $R2$R1
|
||||||
IntOp $R1 $R1 + 1
|
IntOp $R1 $R1 + 1
|
||||||
${loop}
|
${Loop}
|
||||||
MessageBox MB_OK "dountil..loop: R1=$R1"
|
${If} $R2 == "01234"
|
||||||
|
DetailPrint "PASSED DoUntil..ExitDo..Loop test"
|
||||||
|
${Else}
|
||||||
|
DetailPrint "FAILED DoUntil..ExitDo..Loop test"
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
; exitdo statement test
|
; nested do test
|
||||||
StrCpy $R1 0
|
StrCpy $R1 0
|
||||||
StrCpy $R2 0
|
StrCpy $R2 0
|
||||||
${do}
|
StrCpy $R3 ""
|
||||||
|
${Do}
|
||||||
|
StrCpy $R3 $R3$R1$R2
|
||||||
IntOp $R1 $R1 + 1
|
IntOp $R1 $R1 + 1
|
||||||
IntCmp $R1 5 +2 +2 0
|
${If} $R1 > 5
|
||||||
${exitdo}
|
${ExitDo}
|
||||||
|
${EndIf}
|
||||||
StrCpy $R2 0
|
StrCpy $R2 0
|
||||||
${do}
|
${Do}
|
||||||
|
StrCpy $R3 $R3$R1$R2
|
||||||
IntOp $R2 $R2 + 1
|
IntOp $R2 $R2 + 1
|
||||||
MessageBox MB_OK "loop1: $R1$\nloop2: $R2"
|
${If} $R2 >= 5
|
||||||
IntCmp $R2 5 0 +2 0
|
${ExitDo}
|
||||||
${exitdo}
|
${EndIf}
|
||||||
${loop}
|
${Loop}
|
||||||
${loop}
|
${Loop}
|
||||||
MessageBox MB_OK "loopR1: $R1$\nloop2: $R2"
|
${If} $R3 == "00101112131415202122232425303132333435404142434445505152535455"
|
||||||
|
DetailPrint "PASSED nested Do test"
|
||||||
|
${Else}
|
||||||
|
DetailPrint "FAILED nested Do test"
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
; break..continue labels
|
; while..exitwhile..endwhile (exact replica of dowhile..enddo}
|
||||||
StrCpy $R1 0
|
StrCpy $R1 0
|
||||||
${do}
|
StrCpy $R2 ""
|
||||||
StrCpy $R2 0
|
${While} $R1 < 5
|
||||||
${do}
|
StrCpy $R2 $R2$R1
|
||||||
IntOp $R2 $R2 + 1
|
|
||||||
MessageBox MB_YESNO "Do..Loop1: $R1.$\nDo..Loop2: $R2.$\n$\nDo you want to stop Loop2?" IDYES ${_Break} IDNO ${_Continue}
|
|
||||||
${loop}
|
|
||||||
IntOp $R1 $R1 + 1
|
IntOp $R1 $R1 + 1
|
||||||
MessageBox MB_YESNO "Do..Loop1: $R1.$\nDo..Loop2: $R2.$\n$\nDo you want to stop Loop1?" IDYES ${_Break} IDNO ${_Continue}
|
${EndWhile}
|
||||||
${loop}
|
${If} $R2 == "01234"
|
||||||
|
DetailPrint "PASSED While..ExitWhile..EndWhile test"
|
||||||
|
${Else}
|
||||||
|
DetailPrint "FAILED While..ExitWhile..EndWhile test"
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
; while..exitwhile..endwhile
|
; kinds of if other than "value1 comparison value2"
|
||||||
StrCpy $R1 0
|
ClearErrors
|
||||||
${while} $R1 < 5 ;change to test while statement.
|
FindFirst $R1 $R2 "$PROGRAMFILES\*"
|
||||||
IntOp $R1 $R1 + 1
|
${Unless} ${Errors}
|
||||||
${endwhile}
|
${Do}
|
||||||
MessageBox MB_OK "while: R1=$R1"
|
${Select} $R2
|
||||||
|
${Case2} "." ".."
|
||||||
|
; Do nothing
|
||||||
|
${CaseElse}
|
||||||
|
DetailPrint "Found $PROGRAMFILES\$R2"
|
||||||
|
${EndSelect}
|
||||||
|
FindNext $R1 $R2
|
||||||
|
${LoopUntil} ${Errors}
|
||||||
|
FindClose $R1
|
||||||
|
${EndUnless}
|
||||||
|
|
||||||
SectionEnd
|
StrCpy $R1 "example.xxx"
|
||||||
|
${If} ${FileExists} "${__FILE__}"
|
||||||
|
DetailPrint 'Source file "${__FILE__}" still exists'
|
||||||
|
${Else}
|
||||||
|
DetailPrint 'Source file "${__FILE__}" has gone'
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
|
SectionEnd
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,10 @@
|
||||||
; NSIS LOGIC LIBRARY - logiclib.nsh
|
; NSIS LOGIC LIBRARY - logiclib.nsh
|
||||||
; Version 2.2 - 10/07/2003
|
; Version 2.3 - 12/06/2003
|
||||||
; Questions/Comments - dselkirk@hotmail.com
|
; By dselkirk@hotmail.com
|
||||||
; Special thanks to eccles for Push/Pop Logic!
|
; and eccles@users.sf.net
|
||||||
|
;
|
||||||
|
; Questions/Comments -
|
||||||
|
; See http://forums.winamp.com/showthread.php?s=&postid=1116241
|
||||||
;
|
;
|
||||||
; Description:
|
; Description:
|
||||||
; Provides the use of various logic statements within NSIS.
|
; Provides the use of various logic statements within NSIS.
|
||||||
|
|
@ -11,48 +14,83 @@
|
||||||
; - Structure redesign based upon version by eccles.
|
; - Structure redesign based upon version by eccles.
|
||||||
; - No statement limitations.
|
; - No statement limitations.
|
||||||
; - Following statements are now available.
|
; - Following statements are now available.
|
||||||
; if..elseif..else..endif
|
; if/unless..elseif/unless..else..endif/unless
|
||||||
; - Conditionally executes a group of statements, depending on the value of an expression.
|
; - Conditionally executes a group of statements, depending on the value of an expression.
|
||||||
; ifthen..|..|
|
; ifthen..|..|
|
||||||
; - Conditionally executes an inline statement, depending on the value of an expression.
|
; - Conditionally executes an inline statement, depending on the value of an expression.
|
||||||
; ifcmd..||..|
|
; ifcmd..||..|
|
||||||
; - Conditionally executes an inline statement, depending on a True value of the provided NSIS function.
|
; - Conditionally executes an inline statement, depending on a True value of the provided NSIS function.
|
||||||
; select..case..case2..case3..case4..case5..case_else..endselect
|
; select..case..case2..case3..case4..case5..caseelse..endselect
|
||||||
; - Executes one of several groups of statements, depending on the value of an expression.
|
; - Executes one of several groups of statements, depending on the value of an expression.
|
||||||
; for..exitfor..next
|
; for..exitfor..continue..break..next
|
||||||
; - Repeats a group of statements a specified number of times.
|
; - Repeats a group of statements a specified number of times.
|
||||||
; foreach..exitfor..continue..break..next
|
; foreach..exitfor..continue..break..next
|
||||||
; - Repeats a group of statements a specified number of times stepping in order specified.
|
; - Repeats a group of statements a specified number of times stepping in order specified.
|
||||||
; do..exitdo..continue..break..loop
|
; do..exitdo..continue..break..loop
|
||||||
; - Repeats a block of statements until stopped.
|
; - Repeats a block of statements until stopped.
|
||||||
|
; dowhile..exitdo..continue..break..loop
|
||||||
|
; - Repeats a block of statements while a condition is True.
|
||||||
; dountil..exitdo..continue..break..loop
|
; dountil..exitdo..continue..break..loop
|
||||||
; - Repeats a block of statements until a condition is True.
|
; - Repeats a block of statements until a condition is True.
|
||||||
|
; do..exitdo..continue..break..loopwhile
|
||||||
|
; - Repeats a block of statements while a condition is True.
|
||||||
; do..exitdo..continue..break..loopuntil
|
; do..exitdo..continue..break..loopuntil
|
||||||
; - Repeats a block of statements until a condition is True.
|
; - Repeats a block of statements until a condition is True.
|
||||||
; while..exitwhile..continue..break..endwhile
|
; while..exitwhile..continue..break..endwhile
|
||||||
; - Executes a series of statements as long as a given condition is True.
|
; - Same as dowhile..loop.
|
||||||
;
|
;
|
||||||
; Usage:
|
; Usage:
|
||||||
; See example.nsi
|
; See example.nsi
|
||||||
;
|
;
|
||||||
; History:
|
; History:
|
||||||
; 1.0 - 09/19/2003 - Initial release.
|
; 1.0 - 09/19/2003 - Initial release.
|
||||||
; 1.1 - 09/20/2003 - Added simplified macros and removed NAME requirement.
|
; 1.1 - 09/20/2003 - Added simplified macros and removed NAME requirement.
|
||||||
; 1.2 - 09/21/2003 - Changed library name to LogicLib.
|
; 1.2 - 09/21/2003 - Changed library name to LogicLib.
|
||||||
; - Allow for 5 statements deep without use of name variable.
|
; - Allow for 5 statements deep without use of name variable.
|
||||||
; - Added If..ElseIf..Else..Endif statements.
|
; - Added If..ElseIf..Else..Endif statements.
|
||||||
; 1.3 - 09/22/2003 - Fixed maximum allow statements.
|
; 1.3 - 09/22/2003 - Fixed maximum allow statements.
|
||||||
; - Now allows 10 statement depth.
|
; - Now allows 10 statement depth.
|
||||||
; - Condensed code.
|
; - Condensed code.
|
||||||
; 2.0 - 10/03/2003 - Inital release 2, see notes.
|
; 2.0 - 10/03/2003 - Inital release 2, see notes.
|
||||||
; 2.1 - 10/05/2003 - Added continue and break labels to repeat type statements.
|
; 2.1 - 10/05/2003 - Added continue and break labels to repeat type statements.
|
||||||
; 2.2 - 10/07/2003 - Updates by eccles
|
; 2.2 - 10/07/2003 - Updates by eccles
|
||||||
; - Simplified IfThen by utilising If and EndIf.
|
; - Simplified IfThen by utilising If and EndIf.
|
||||||
; - Simplified For by utilising ForEach.
|
; - Simplified For by utilising ForEach.
|
||||||
; - Fixed ForEach missing the final iteration.
|
; - Fixed ForEach missing the final iteration.
|
||||||
; - Fixed a couple of Break/Continue bugs.
|
; - Fixed a couple of Break/Continue bugs.
|
||||||
|
; 2.3 - 12/10/2003 - Much reworking and refactoring of things to help reduce
|
||||||
|
; duplication, etc. E.g. all loop varieties now go through
|
||||||
|
; a common set of macros.
|
||||||
|
; - Added built-in support for the rest of NSIS's built-in
|
||||||
|
; conditional tests (Abort, Errors, FileExists, RebootFlag,
|
||||||
|
; Silent).
|
||||||
|
; - Added ability to use any NSIS conditional command in a
|
||||||
|
; normal If type statement (no longer restricted to the
|
||||||
|
; specialised IfCmd statement).
|
||||||
|
; - Optimised the code produced by If (fewer Goto's).
|
||||||
|
; - Added statement similar to If that works in reverse:
|
||||||
|
; "Unless" executes the code in the contained block if the
|
||||||
|
; condition is false. If, Unless, ElseIf, ElseUnless, EndIf
|
||||||
|
; and ElseUnless can be used freely in any combination.
|
||||||
|
; - Fixed bug where using Continue in a Do..LoopUntil loop
|
||||||
|
; went to the top of the loop and not the loop condition.
|
||||||
|
; - Added DoWhile..Loop and Do..LoopWhile loop varieties (the
|
||||||
|
; existing While..EndWhile loop is still available and is
|
||||||
|
; identical to DoWhile..Loop).
|
||||||
|
; - Optimised the code prodiced by Select (fewer Goto's).
|
||||||
|
; - Renamed Case_Else to CaseElse (nothing else has an
|
||||||
|
; underscore so why should that one). The old name is still
|
||||||
|
; available too though (if you must).
|
||||||
|
; - CaseElse can also be called Default (for the C-minded).
|
||||||
|
|
||||||
|
!verbose push
|
||||||
!verbose 3
|
!verbose 3
|
||||||
|
!ifndef LOGICLIB_VERBOSITY
|
||||||
|
!define LOGICLIB_VERBOSITY 3
|
||||||
|
!endif
|
||||||
|
!define _LOGICLIB_VERBOSITY ${LOGICLIB_VERBOSITY}
|
||||||
|
!undef LOGICLIB_VERBOSITY
|
||||||
|
!verbose ${_LOGICLIB_VERBOSITY}
|
||||||
|
|
||||||
!ifndef LOGICLIB
|
!ifndef LOGICLIB
|
||||||
!define LOGICLIB
|
!define LOGICLIB
|
||||||
|
|
@ -60,46 +98,30 @@
|
||||||
!define || "' '"
|
!define || "' '"
|
||||||
|
|
||||||
!macro _PushLogic
|
!macro _PushLogic
|
||||||
!ifdef _Logic ; If we already have a statement
|
!insertmacro _PushScope Logic _${__LINE__}
|
||||||
!define _CurLogic ${_Logic}
|
|
||||||
!undef _Logic
|
|
||||||
!define _Logic _${__LINE__}
|
|
||||||
!define ${_Logic}Prev ${_CurLogic} ; Save the current logic
|
|
||||||
!undef _CurLogic
|
|
||||||
!else
|
|
||||||
!define _Logic _${__LINE__} ; Initialise for first statement
|
|
||||||
!endif
|
|
||||||
!macroend
|
!macroend
|
||||||
|
|
||||||
!macro _PopLogic
|
!macro _PopLogic
|
||||||
!ifdef ${_Logic}Prev ; If a previous statment was active then restore it
|
!insertmacro _PopScope Logic
|
||||||
!define _CurLogic ${_Logic}
|
|
||||||
!undef _Logic
|
|
||||||
!define _Logic ${${_CurLogic}Prev}
|
|
||||||
!undef ${_CurLogic}Prev
|
|
||||||
!undef _CurLogic
|
|
||||||
!else
|
|
||||||
!undef _Logic
|
|
||||||
!endif
|
|
||||||
!macroend
|
!macroend
|
||||||
|
|
||||||
!macro _PushCustom Type label
|
!macro _PushScope Type label
|
||||||
!ifdef _${Type} ; If we already have a statement
|
!ifdef _${Type} ; If we already have a statement
|
||||||
!define _Cur${Type} ${_${Type}}
|
!define _Cur${Type} ${_${Type}}
|
||||||
!undef _${Type}
|
!undef _${Type}
|
||||||
!define _${Type} ${label}
|
!define _${Type} ${label}
|
||||||
!define ${_${Type}}Prev${Type} ${_Cur${Type}} ; Save the current logic
|
!define ${_${Type}}Prev${Type} ${_Cur${Type}} ; Save the current logic
|
||||||
!undef _Cur${Type}
|
!undef _Cur${Type}
|
||||||
!else
|
!else
|
||||||
!define _${Type} ${label} ; Initialise for first statement
|
!define _${Type} ${label} ; Initialise for first statement
|
||||||
!endif
|
!endif
|
||||||
!macroend
|
!macroend
|
||||||
|
|
||||||
!macro _PopCustom Type
|
!macro _PopScope Type
|
||||||
!ifndef _${Type}
|
!ifndef _${Type}
|
||||||
!error "Cannot use _Pop${Type} without a preceding _Push${Type}"
|
!error "Cannot use _Pop${Type} without a preceding _Push${Type}"
|
||||||
!endif
|
!endif
|
||||||
!ifdef ${_${Type}}Prev${Type} ; If a previous statment was active then restore it
|
!ifdef ${_${Type}}Prev${Type} ; If a previous statment was active then restore it
|
||||||
!define _Cur${Type} ${_${Type}}
|
!define _Cur${Type} ${_${Type}}
|
||||||
!undef _${Type}
|
!undef _${Type}
|
||||||
!define _${Type} ${${_Cur${Type}}Prev${Type}}
|
!define _${Type} ${${_Cur${Type}}Prev${Type}}
|
||||||
|
|
@ -112,366 +134,397 @@
|
||||||
|
|
||||||
; String tests
|
; String tests
|
||||||
!macro _== _a _b _t _f
|
!macro _== _a _b _t _f
|
||||||
StrCmp "${_a}" "${_b}" "${_t}" "${_f}"
|
StrCmp `${_a}` `${_b}` `${_t}` `${_f}`
|
||||||
!macroend
|
!macroend
|
||||||
|
|
||||||
!macro _!= _a _b _t _f
|
!macro _!= _a _b _t _f
|
||||||
!insertmacro _== "${_a}" "${_b}" "${_f}" "${_t}"
|
!insertmacro _== `${_a}` `${_b}` `${_f}` `${_t}`
|
||||||
!macroend
|
!macroend
|
||||||
|
|
||||||
; Integer tests
|
; Integer tests
|
||||||
!macro _= _a _b _t _f
|
!macro _= _a _b _t _f
|
||||||
IntCmp "${_a}" "${_b}" "${_t}" "${_f}" "${_f}"
|
IntCmp `${_a}` `${_b}` `${_t}` `${_f}` `${_f}`
|
||||||
!macroend
|
!macroend
|
||||||
|
|
||||||
!macro _<> _a _b _t _f
|
!macro _<> _a _b _t _f
|
||||||
!insertmacro _= "${_a}" "${_b}" "${_f}" "${_t}"
|
!insertmacro _= `${_a}` `${_b}` `${_f}` `${_t}`
|
||||||
!macroend
|
!macroend
|
||||||
|
|
||||||
!macro _< _a _b _t _f
|
!macro _< _a _b _t _f
|
||||||
IntCmp "${_a}" "${_b}" "${_f}" "${_t}" "${_f}"
|
IntCmp `${_a}` `${_b}` `${_f}` `${_t}` `${_f}`
|
||||||
!macroend
|
!macroend
|
||||||
|
|
||||||
!macro _>= _a _b _t _f
|
!macro _>= _a _b _t _f
|
||||||
!insertmacro _< "${_a}" "${_b}" "${_f}" "${_t}"
|
!insertmacro _< `${_a}` `${_b}` `${_f}` `${_t}`
|
||||||
!macroend
|
!macroend
|
||||||
|
|
||||||
!macro _> _a _b _t _f
|
!macro _> _a _b _t _f
|
||||||
IntCmp "${_a}" "${_b}" "${_f}" "${_f}" "${_t}"
|
IntCmp `${_a}` `${_b}` `${_f}` `${_f}` `${_t}`
|
||||||
!macroend
|
!macroend
|
||||||
|
|
||||||
!macro _<= _a _b _t _f
|
!macro _<= _a _b _t _f
|
||||||
!insertmacro _> "${_a}" "${_b}" "${_f}" "${_t}"
|
!insertmacro _> `${_a}` `${_b}` `${_f}` `${_t}`
|
||||||
!macroend
|
!macroend
|
||||||
|
|
||||||
!macro IfCmd _a _t
|
; Flag tests
|
||||||
!verbose 3
|
!macro _Abort _a _b _t _f
|
||||||
|
IfAbort `${_t}` `${_f}`
|
||||||
|
!macroend
|
||||||
|
!define Abort `"" Abort ""`
|
||||||
|
|
||||||
|
!macro _Errors _a _b _t _f
|
||||||
|
IfErrors `${_t}` `${_f}`
|
||||||
|
!macroend
|
||||||
|
!define Errors `"" Errors ""`
|
||||||
|
|
||||||
|
!macro _FileExists _a _b _t _f
|
||||||
|
IfFileExists `${_b}` `${_t}` `${_f}`
|
||||||
|
!macroend
|
||||||
|
!define FileExists `"" FileExists`
|
||||||
|
|
||||||
|
!macro _RebootFlag _a _b _t _f
|
||||||
|
IfRebootFlag `${_t}` `${_f}`
|
||||||
|
!macroend
|
||||||
|
!define RebootFlag `"" RebootFlag ""`
|
||||||
|
|
||||||
|
!macro _Silent _a _b _t _f
|
||||||
|
IfSilent `${_t}` `${_f}`
|
||||||
|
!macroend
|
||||||
|
!define Silent `"" Silent ""`
|
||||||
|
|
||||||
|
; "Any instruction" test
|
||||||
|
!macro _Cmd _a _b _t _f
|
||||||
|
!define _t=${_t}
|
||||||
|
!ifdef _t=
|
||||||
|
!define __t +2 ; If no jump then make sure we skip the Goto below
|
||||||
|
!else
|
||||||
|
!define __t ${_t}
|
||||||
|
!endif
|
||||||
|
!undef _t=${_t}
|
||||||
|
${_b} ${__t}
|
||||||
|
!undef __t
|
||||||
|
Goto ${_f}
|
||||||
|
!macroend
|
||||||
|
!define Cmd `"" Cmd`
|
||||||
|
|
||||||
|
!define IfCmd `!insertmacro _IfThen "" Cmd ${|}`
|
||||||
|
|
||||||
|
!macro _If _c _a _o _b
|
||||||
|
!verbose push
|
||||||
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
!insertmacro _PushLogic
|
!insertmacro _PushLogic
|
||||||
!define ${_Logic}IfTrue _${__LINE__}
|
!define ${_Logic}If
|
||||||
!define ${_Logic}IfCmd _${__LINE__}
|
!define ${_Logic}Else _${__LINE__} ; Get a label for the Else
|
||||||
${_a} ${${_Logic}IfTrue}
|
!define _c=${_c}
|
||||||
Goto ${${_Logic}IfCmd}
|
!ifdef _c=true ; If is true
|
||||||
${${_Logic}IfTrue}:
|
!insertmacro _${_o} `${_a}` `${_b}` "" ${${_Logic}Else}
|
||||||
${_t}
|
!else ; If condition is false
|
||||||
Goto ${${_Logic}IfCmd}
|
!insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}Else} ""
|
||||||
${${_Logic}IfCmd}: ; Place the EndIf
|
!endif
|
||||||
!undef ${_Logic}IfTrue
|
!undef _c=${_c}
|
||||||
!undef ${_Logic}IfCmd
|
!verbose pop
|
||||||
!insertmacro _PopLogic
|
|
||||||
!verbose 4
|
|
||||||
!macroend
|
!macroend
|
||||||
!define IfCmd "!insertmacro IfCmd '"
|
!define If `!insertmacro _If true`
|
||||||
|
!define Unless `!insertmacro _If false`
|
||||||
|
|
||||||
!macro If _a _o _b
|
!macro _Else
|
||||||
!verbose 3
|
!verbose push
|
||||||
!insertmacro _PushLogic
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
!define ${_Logic}Elseif _${__LINE__} ; Get a label for the (provisional) EndIf (it might turn out to be Else)
|
!ifndef _Logic | ${_Logic}If
|
||||||
!define ${_Logic}EndIf _${__LINE__} ; Get a label for the (provisional) EndIf (it might turn out to be Else)
|
!error "Cannot use Else without a preceding If or Unless"
|
||||||
!insertmacro _${_o} "${_a}" "${_b}" "" ${${_Logic}Elseif}
|
!endif
|
||||||
!verbose 4
|
!ifndef ${_Logic}Else
|
||||||
|
!error "Cannot use Else following an Else"
|
||||||
|
!endif
|
||||||
|
!ifndef ${_Logic}EndIf ; First Else for this If?
|
||||||
|
!define ${_Logic}EndIf _${__LINE__} ; Get a label for the EndIf
|
||||||
|
!endif
|
||||||
|
Goto ${${_Logic}EndIf} ; Go to the EndIf
|
||||||
|
${${_Logic}Else}: ; Place the Else label
|
||||||
|
!undef ${_Logic}Else ; and remove it
|
||||||
|
!verbose pop
|
||||||
!macroend
|
!macroend
|
||||||
!define If "!insertmacro If"
|
!define Else `!insertmacro _Else`
|
||||||
|
|
||||||
!macro Else
|
!macro _ElseIf _c _a _o _b
|
||||||
!verbose 3
|
!verbose push
|
||||||
!ifndef _Logic | ${_Logic}Elseif
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
!error "Cannot use Else|Elseif without a preceding If"
|
${Else} ; Perform the Else
|
||||||
|
!define ${_Logic}Else _${__LINE__} ; Get a label for the next Else and perform the new If
|
||||||
|
!define _c=${_c}
|
||||||
|
!ifdef _c=true ; If is true
|
||||||
|
!insertmacro _${_o} `${_a}` `${_b}` "" ${${_Logic}Else}
|
||||||
|
!else ; If condition is false
|
||||||
|
!insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}Else} ""
|
||||||
|
!endif
|
||||||
|
!undef _c=${_c}
|
||||||
|
!verbose pop
|
||||||
|
!macroend
|
||||||
|
!define ElseIf `!insertmacro _ElseIf true`
|
||||||
|
!define ElseUnless `!insertmacro _ElseIf false`
|
||||||
|
|
||||||
|
!macro _EndIf _n
|
||||||
|
!verbose push
|
||||||
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
|
!ifndef _Logic | ${_Logic}If
|
||||||
|
!error "Cannot use End${_n} without a preceding If or Unless"
|
||||||
!endif
|
!endif
|
||||||
!ifdef ${_Logic}Else
|
!ifdef ${_Logic}Else
|
||||||
!error "Cannot use Else after Else"
|
${${_Logic}Else}: ; Place the Else label
|
||||||
|
!undef ${_Logic}Else ; and remove it
|
||||||
!endif
|
!endif
|
||||||
Goto ${${_Logic}EndIf}
|
!ifdef ${_Logic}EndIf
|
||||||
!define ${_Logic}Else ${${_Logic}Elseif} ; Save current Else label
|
${${_Logic}EndIf}: ; Place the EndIf
|
||||||
!undef ${_Logic}Elseif
|
!undef ${_Logic}EndIf ; and remove it
|
||||||
!define ${_Logic}Elseif _${__LINE__} ; Get a label for the (new) EndIf and go there
|
|
||||||
${${_Logic}Else}: ; Place the saved Else label
|
|
||||||
!verbose 4
|
|
||||||
!macroend
|
|
||||||
!define Else "!insertmacro Else"
|
|
||||||
|
|
||||||
!macro ElseIf _a _o _b
|
|
||||||
!verbose 3
|
|
||||||
!insertmacro Else ; Place in Else code as normal
|
|
||||||
!undef ${_Logic}Else ; Forget the Else and perform the new If
|
|
||||||
!insertmacro _${_o} "${_a}" "${_b}" "" ${${_Logic}Elseif}
|
|
||||||
!verbose 4
|
|
||||||
!macroend
|
|
||||||
!define ElseIf "!insertmacro ElseIf"
|
|
||||||
|
|
||||||
!macro EndIf
|
|
||||||
!verbose 3
|
|
||||||
!ifndef _Logic | ${_Logic}Elseif
|
|
||||||
!error "Cannot use EndIf without a preceding If"
|
|
||||||
!endif
|
|
||||||
Goto ${${_Logic}EndIf}
|
|
||||||
Goto ${${_Logic}ElseIf}
|
|
||||||
${${_Logic}ElseIf}:
|
|
||||||
${${_Logic}EndIf}: ; Place the EndIf
|
|
||||||
!undef ${_Logic}Elseif
|
|
||||||
!undef ${_Logic}EndIf
|
|
||||||
!ifdef ${_Logic}Else
|
|
||||||
!undef ${_Logic}Else ; Clear the Else flag
|
|
||||||
!endif
|
!endif
|
||||||
|
!undef ${_Logic}If
|
||||||
!insertmacro _PopLogic
|
!insertmacro _PopLogic
|
||||||
!verbose 4
|
!verbose pop
|
||||||
!macroend
|
!macroend
|
||||||
!define EndIf "!insertmacro EndIf"
|
!define EndIf `!insertmacro _EndIf If`
|
||||||
|
!define EndUnless `!insertmacro _EndIf Unless`
|
||||||
|
|
||||||
!macro IfThen _a _o _b _t
|
!macro _IfThen _a _o _b _t
|
||||||
!verbose 3
|
!verbose push
|
||||||
${If} "${_a}" "${_o}" "${_b}"
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
|
${If} `${_a}` `${_o}` `${_b}`
|
||||||
${_t}
|
${_t}
|
||||||
${EndIf}
|
${EndIf}
|
||||||
!verbose 4
|
!verbose pop
|
||||||
!macroend
|
!macroend
|
||||||
!define IfThen "!insertmacro IfThen"
|
!define IfThen `!insertmacro _IfThen`
|
||||||
|
|
||||||
!macro ForEach _v _f _t _o _s
|
!macro _ForEach _v _f _t _o _s
|
||||||
!verbose 3
|
!verbose push
|
||||||
StrCpy ${_v} ${_f}
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
!insertmacro _PushLogic
|
StrCpy "${_v}" "${_f}" ; Assign the initial value
|
||||||
!define ${_Logic}For _${__LINE__} ; Get a label for the start of the loop
|
Goto +2 ; Skip the loop expression for the first iteration
|
||||||
!define ${_Logic}For2 _${__LINE__} ; Get a label for the start of the loop
|
!define _DoLoopExpression `IntOp "${_v}" "${_v}" "${_o}" "${_s}"` ; Define the loop expression
|
||||||
!define ${_Logic}Next _${__LINE__} ; Get a label for the end of the loop
|
|
||||||
!insertmacro _PushCustom "ExitFor" ${${_Logic}Next}
|
|
||||||
!insertmacro _PushCustom "Break" ${${_Logic}Next}
|
|
||||||
!insertmacro _PushCustom "Continue" ${${_Logic}For}
|
|
||||||
Goto ${${_Logic}For2}
|
|
||||||
${${_Logic}For}: ; Insert the loop condition
|
|
||||||
IntOp ${_v} ${_v} ${_o} ${_s}
|
|
||||||
${${_Logic}For2}: ; Insert the loop condition
|
|
||||||
!define _o=${_o}
|
!define _o=${_o}
|
||||||
!ifdef _o=+
|
!ifdef _o=+ ; Check the loop expression operator
|
||||||
!insertmacro _> ${_v} ${_t} ${${_Logic}Next} ""
|
!define __o > ; to determine the correct loop condition
|
||||||
!else ifdef _o=-
|
!else ifdef _o=-
|
||||||
!insertmacro _< ${_v} ${_t} ${${_Logic}Next} ""
|
!define __o <
|
||||||
!else
|
!else
|
||||||
!error "Unsupported ForEach step operator"
|
!error "Unsupported ForEach step operator (must be + or -)"
|
||||||
!endif
|
!endif
|
||||||
!undef _o=${_o}
|
!undef _o=${_o}
|
||||||
!undef ${_Logic}For2
|
!insertmacro _Do For false `${_v}` `${__o}` `${_t}` ; Let Do do the rest
|
||||||
!verbose 4
|
!undef __o
|
||||||
|
!verbose pop
|
||||||
!macroend
|
!macroend
|
||||||
!define ForEach "!insertmacro ForEach"
|
!define ForEach `!insertmacro _ForEach`
|
||||||
|
|
||||||
!macro For _v _f _t
|
!macro _For _v _f _t
|
||||||
!verbose 3
|
!verbose push
|
||||||
${ForEach} "${_v}" "${_f}" "${_t}" + 1
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
!verbose 4
|
${ForEach} `${_v}` `${_f}` `${_t}` + 1 ; Pass on to ForEach
|
||||||
|
!verbose pop
|
||||||
!macroend
|
!macroend
|
||||||
!define For "!insertmacro For"
|
!define For `!insertmacro _For`
|
||||||
|
|
||||||
!define ExitFor "Goto ${_ExitFor}"
|
!define ExitFor `!insertmacro _Goto ExitFor For`
|
||||||
|
|
||||||
!macro Next
|
!define Next `!insertmacro _Loop For Next "" "" "" ""`
|
||||||
!verbose 3
|
|
||||||
!ifndef _Logic | ${_Logic}For
|
|
||||||
!error "Cannot use Next without a preceding For"
|
|
||||||
!endif
|
|
||||||
Goto ${${_Logic}For} ; Loop back to the For condition
|
|
||||||
${${_Logic}Next}: ; Place the Next
|
|
||||||
!undef ${_Logic}For
|
|
||||||
!undef ${_Logic}Next
|
|
||||||
!insertmacro _PopLogic
|
|
||||||
!insertmacro _PopCustom "ExitFor"
|
|
||||||
!insertmacro _PopCustom "Break"
|
|
||||||
!insertmacro _PopCustom "Continue"
|
|
||||||
!verbose 4
|
|
||||||
!macroend
|
|
||||||
!define Next "!insertmacro Next"
|
|
||||||
|
|
||||||
!macro While _a _o _b
|
!define While `!insertmacro _Do While true`
|
||||||
!verbose 3
|
|
||||||
|
!define ExitWhile `!insertmacro _Goto ExitWhile While`
|
||||||
|
|
||||||
|
!define EndWhile `!insertmacro _Loop While EndWhile "" "" "" ""`
|
||||||
|
|
||||||
|
!macro _Do _n _c _a _o _b
|
||||||
|
!verbose push
|
||||||
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
!insertmacro _PushLogic
|
!insertmacro _PushLogic
|
||||||
!define ${_Logic}While _${__LINE__} ; Get a label for the start of the loop
|
!define ${_Logic}${_n} _${__LINE__} ; Get a label for the start of the loop
|
||||||
!define ${_Logic}EndWhile _${__LINE__} ; Get a label for the end of the loop
|
${${_Logic}${_n}}:
|
||||||
!insertmacro _PushCustom "ExitWhile" ${${_Logic}EndWhile}
|
!insertmacro _PushScope Exit${_n} _${__LINE__} ; Get a label for the end of the loop
|
||||||
!insertmacro _PushCustom "Break" ${${_Logic}EndWhile}
|
!insertmacro _PushScope Break ${_Exit${_n}} ; Break goes to the end of the loop
|
||||||
!insertmacro _PushCustom "Continue" ${${_Logic}While}
|
!ifdef _DoLoopExpression
|
||||||
${${_Logic}While}: ; Insert the loop condition
|
${_DoLoopExpression} ; Special extra parameter for inserting code
|
||||||
!insertmacro _${_o} "${_a}" "${_b}" "" ${${_Logic}EndWhile}
|
!undef _DoLoopExpression ; between the Continue label and the loop condition
|
||||||
!verbose 4
|
|
||||||
!macroend
|
|
||||||
!define While "!insertmacro While"
|
|
||||||
|
|
||||||
!define ExitWhile "Goto ${_ExitWhile}"
|
|
||||||
|
|
||||||
!macro EndWhile
|
|
||||||
!verbose 3
|
|
||||||
!ifndef _Logic | ${_Logic}While
|
|
||||||
!error "Cannot use EndWhile without a preceding While"
|
|
||||||
!endif
|
!endif
|
||||||
Goto ${${_Logic}While} ; Loop back to the While condition
|
!define _c=${_c}
|
||||||
${${_Logic}EndWhile}: ; Place the EndWhile
|
!ifdef _c= ; No starting condition
|
||||||
!undef ${_Logic}While
|
!insertmacro _PushScope Continue _${__LINE__} ; Get a label for Continue at the end of the loop
|
||||||
!undef ${_Logic}EndWhile
|
!else
|
||||||
!insertmacro _PopLogic
|
!insertmacro _PushScope Continue ${${_Logic}${_n}} ; Continue goes to the start of the loop
|
||||||
!insertmacro _PopCustom "ExitWhile"
|
!ifdef _c=true ; If is true
|
||||||
!insertmacro _PopCustom "Break"
|
!insertmacro _${_o} `${_a}` `${_b}` "" ${_Exit${_n}}
|
||||||
!insertmacro _PopCustom "Continue"
|
!else ; If condition is false
|
||||||
!verbose 4
|
!insertmacro _${_o} `${_a}` `${_b}` ${_Exit${_n}} ""
|
||||||
|
!endif
|
||||||
|
!endif
|
||||||
|
!undef _c=${_c}
|
||||||
|
!define ${_Logic}Condition ${_c} ; Remember the condition used
|
||||||
|
!verbose pop
|
||||||
!macroend
|
!macroend
|
||||||
!define EndWhile "!insertmacro EndWhile"
|
!define Do `!insertmacro _Do Do "" "" "" ""`
|
||||||
|
!define DoWhile `!insertmacro _Do Do true`
|
||||||
|
!define DoUntil `!insertmacro _Do Do false`
|
||||||
|
|
||||||
!macro Do
|
!macro _Goto _n _s
|
||||||
!verbose 3
|
!verbose push
|
||||||
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
|
!ifndef _${_n}
|
||||||
|
!error "Cannot use ${_n} without a preceding ${_s}"
|
||||||
|
!endif
|
||||||
|
Goto ${_${_n}}
|
||||||
|
!verbose pop
|
||||||
|
!macroend
|
||||||
|
!define ExitDo `!insertmacro _Goto ExitDo Do`
|
||||||
|
|
||||||
|
!macro _Loop _n _e _c _a _o _b
|
||||||
|
!verbose push
|
||||||
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
|
!ifndef _Logic | ${_Logic}${_n}
|
||||||
|
!error "Cannot use ${_e} without a preceding ${_n}"
|
||||||
|
!endif
|
||||||
|
!define _c=${${_Logic}Condition}
|
||||||
|
!ifdef _c= ; If Do had no condition place the Continue label
|
||||||
|
${_Continue}:
|
||||||
|
!endif
|
||||||
|
!undef _c=${${_Logic}Condition}
|
||||||
|
!define _c=${_c}
|
||||||
|
!ifdef _c= ; No ending condition
|
||||||
|
Goto ${${_Logic}${_n}}
|
||||||
|
!else ifdef _c=true ; If condition is true
|
||||||
|
!insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}${_n}} ${_Exit${_n}}
|
||||||
|
!else ; If condition is false
|
||||||
|
!insertmacro _${_o} `${_a}` `${_b}` ${_Exit${_n}} ${${_Logic}${_n}}
|
||||||
|
!endif
|
||||||
|
!undef _c=${_c}
|
||||||
|
Goto ${_Continue} ; Just to ensure it is referenced at least once
|
||||||
|
${_Exit${_n}}: ; Place the loop exit point
|
||||||
|
!undef ${_Logic}Condition
|
||||||
|
!insertmacro _PopScope Continue
|
||||||
|
!insertmacro _PopScope Break
|
||||||
|
!insertmacro _PopScope Exit${_n}
|
||||||
|
!undef ${_Logic}${_n}
|
||||||
|
!insertmacro _PopLogic
|
||||||
|
!verbose pop
|
||||||
|
!macroend
|
||||||
|
!define Loop `!insertmacro _Loop Do Loop "" "" "" ""`
|
||||||
|
!define LoopWhile `!insertmacro _Loop Do LoopWhile true`
|
||||||
|
!define LoopUntil `!insertmacro _Loop Do LoopUntil false`
|
||||||
|
|
||||||
|
!define Continue `!insertmacro _Goto Continue "For or Do or While"`
|
||||||
|
!define Break `!insertmacro _Goto Break "For or Do or While"`
|
||||||
|
|
||||||
|
!macro _Select _a
|
||||||
|
!verbose push
|
||||||
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
!insertmacro _PushLogic
|
!insertmacro _PushLogic
|
||||||
!define ${_Logic}Do _${__LINE__} ; Get a label for the start of the loop
|
!define ${_Logic}Select `${_a}` ; Remember the left hand side of the comparison
|
||||||
!define ${_Logic}Loop _${__LINE__} ; Get a label for the end of the loop
|
!verbose pop
|
||||||
!insertmacro _PushCustom "ExitDo" ${${_Logic}Loop}
|
|
||||||
!insertmacro _PushCustom "Break" ${${_Logic}Loop}
|
|
||||||
!insertmacro _PushCustom "Continue" ${${_Logic}Do}
|
|
||||||
${${_Logic}Do}: ; Insert the loop condition
|
|
||||||
!verbose 4
|
|
||||||
!macroend
|
!macroend
|
||||||
!define Do "!insertmacro Do"
|
!define Select `!insertmacro _Select`
|
||||||
|
|
||||||
!macro DoUntil _a _o _b
|
!macro _CaseElse
|
||||||
!verbose 3
|
!verbose push
|
||||||
!insertmacro Do
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
!insertmacro _${_o} "${_a}" "${_b}" ${${_Logic}Loop} ""
|
!ifndef _Logic | ${_Logic}Select
|
||||||
!verbose 4
|
!error "Cannot use Case without a preceding Select"
|
||||||
!macroend
|
|
||||||
!define DoUntil "!insertmacro DoUntil"
|
|
||||||
|
|
||||||
!define ExitDo "Goto ${_ExitDo}"
|
|
||||||
|
|
||||||
!macro Loop
|
|
||||||
!verbose 3
|
|
||||||
!ifndef _Logic | ${_Logic}Do
|
|
||||||
!error "Cannot use EndWhile without a preceding Do"
|
|
||||||
!endif
|
!endif
|
||||||
Goto ${${_Logic}Do} ; Loop back to the Do condition
|
!ifdef ${_Logic}EndSelect ; This is set only after the first case
|
||||||
${${_Logic}Loop}: ; Place the Loop
|
!ifndef ${_Logic}Else
|
||||||
!undef ${_Logic}Do
|
!error "Cannot use Case following a CaseElse"
|
||||||
!undef ${_Logic}Loop
|
!endif
|
||||||
!insertmacro _PopLogic
|
Goto ${${_Logic}EndSelect} ; Go to the EndSelect
|
||||||
!insertmacro _PopCustom "ExitDo"
|
${${_Logic}Else}: ; Place the Else label
|
||||||
!insertmacro _PopCustom "Break"
|
!undef ${_Logic}Else ; and remove it
|
||||||
!insertmacro _PopCustom "Continue"
|
!else
|
||||||
!verbose 4
|
!define ${_Logic}EndSelect _${__LINE__} ; Get a label for the EndSelect
|
||||||
!macroend
|
|
||||||
!define Loop "!insertmacro Loop"
|
|
||||||
|
|
||||||
!macro LoopUntil _a _o _b
|
|
||||||
!verbose 3
|
|
||||||
!ifndef _Logic | ${_Logic}Do
|
|
||||||
!error "Cannot use EndWhile without a preceding Do"
|
|
||||||
!endif
|
!endif
|
||||||
!insertmacro _${_o} "${_a}" "${_b}" ${${_Logic}Loop} ${${_Logic}Do}
|
!verbose pop
|
||||||
${${_Logic}Loop}: ; Place the Loop
|
|
||||||
!undef ${_Logic}Do
|
|
||||||
!undef ${_Logic}Loop
|
|
||||||
!insertmacro _PopLogic
|
|
||||||
!insertmacro _PopCustom "ExitDo"
|
|
||||||
!insertmacro _PopCustom "Break"
|
|
||||||
!insertmacro _PopCustom "Continue"
|
|
||||||
!verbose 4
|
|
||||||
!macroend
|
!macroend
|
||||||
!define LoopUntil "!insertmacro LoopUntil"
|
!define CaseElse `!insertmacro _CaseElse`
|
||||||
|
!define Case_Else `!insertmacro _CaseElse` ; Compatibility with 2.2 and earlier
|
||||||
|
!define Default `!insertmacro _CaseElse` ; For the C-minded
|
||||||
|
|
||||||
!macro Select _a
|
!macro _Case _a
|
||||||
!verbose 3
|
!verbose push
|
||||||
!insertmacro _PushLogic
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
!define ${_Logic}Case _${__LINE__} ; Get a label for the (provisional) EndSelect (it might turn out to be case_else)
|
${CaseElse} ; Perform the CaseElse
|
||||||
!define ${_Logic}EndSelect _${__LINE__} ; Get a label for the (provisional) EndIf (it might turn out to be Else)
|
!define ${_Logic}Else _${__LINE__} ; Get a label for the next Else and perform the new Case
|
||||||
!define ${_Logic}Value "${_a}"
|
!insertmacro _== `${${_Logic}Select}` `${_a}` "" ${${_Logic}Else}
|
||||||
Goto ${${_Logic}Case}
|
!verbose pop
|
||||||
!verbose 4
|
|
||||||
!macroend
|
!macroend
|
||||||
!define Select "!insertmacro Select"
|
!define Case `!insertmacro _Case`
|
||||||
|
|
||||||
!macro Case_Else
|
!macro _Case2 _a _b
|
||||||
!verbose 3
|
!verbose push
|
||||||
!ifndef _Logic | ${_Logic}Case
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
!error "Cannot use Case|case_else without a preceding Select"
|
${CaseElse} ; Perform the CaseElse
|
||||||
!endif
|
!define ${_Logic}Else _${__LINE__} ; Get a label for the next Else and perform the new Case
|
||||||
!ifdef ${_Logic}case_else
|
!insertmacro _== `${${_Logic}Select}` `${_a}` +2 ""
|
||||||
!error "Cannot use case_else after case_else"
|
!insertmacro _== `${${_Logic}Select}` `${_b}` "" ${${_Logic}Else}
|
||||||
!endif
|
!verbose pop
|
||||||
Goto ${${_Logic}EndSelect}
|
|
||||||
!define ${_Logic}case_else ${${_Logic}Case} ; Save current case_else label
|
|
||||||
!undef ${_Logic}Case
|
|
||||||
!define ${_Logic}Case _${__LINE__} ; Get a label for the (new) EndSelect and go there
|
|
||||||
${${_Logic}case_else}: ; Place the saved case_else label
|
|
||||||
!verbose 4
|
|
||||||
!macroend
|
!macroend
|
||||||
!define case_else "!insertmacro case_else"
|
!define Case2 `!insertmacro _Case2`
|
||||||
|
|
||||||
!macro Case _a
|
!macro _Case3 _a _b _c
|
||||||
!verbose 3
|
!verbose push
|
||||||
!insertmacro Case_Else ; Place in case_else code as normal
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
!undef ${_Logic}case_else ; Forget the case_else and perform the new Case
|
${CaseElse} ; Perform the CaseElse
|
||||||
!insertmacro _== "${_a}" "${${_Logic}Value}" "" ${${_Logic}Case}
|
!define ${_Logic}Else _${__LINE__} ; Get a label for the next Else and perform the new Case
|
||||||
!verbose 4
|
!insertmacro _== `${${_Logic}Select}` `${_a}` +3 ""
|
||||||
|
!insertmacro _== `${${_Logic}Select}` `${_b}` +2 ""
|
||||||
|
!insertmacro _== `${${_Logic}Select}` `${_c}` "" ${${_Logic}Else}
|
||||||
|
!verbose pop
|
||||||
!macroend
|
!macroend
|
||||||
!define Case "!insertmacro Case"
|
!define Case3 `!insertmacro _Case3`
|
||||||
|
|
||||||
!macro Case2 _a _b
|
!macro _Case4 _a _b _c _d
|
||||||
!verbose 3
|
!verbose push
|
||||||
!insertmacro case_else ; Place in case_else code as normal
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
!undef ${_Logic}case_else ; Forget the case_else and perform the new Case
|
${CaseElse} ; Perform the CaseElse
|
||||||
!insertmacro _== "${_a}" "${${_Logic}Value}" +2 0
|
!define ${_Logic}Else _${__LINE__} ; Get a label for the next Else and perform the new Case
|
||||||
!insertmacro _== "${_b}" "${${_Logic}Value}" 0 ${${_Logic}Case}
|
!insertmacro _== `${${_Logic}Select}` `${_a}` +4 ""
|
||||||
!verbose 4
|
!insertmacro _== `${${_Logic}Select}` `${_b}` +3 ""
|
||||||
|
!insertmacro _== `${${_Logic}Select}` `${_c}` +2 ""
|
||||||
|
!insertmacro _== `${${_Logic}Select}` `${_d}` "" ${${_Logic}Else}
|
||||||
|
!verbose pop
|
||||||
!macroend
|
!macroend
|
||||||
!define Case2 "!insertmacro Case2"
|
!define Case4 `!insertmacro _Case4`
|
||||||
|
|
||||||
!macro Case3 _a _b _c
|
!macro _Case5 _a _b _c _d _e
|
||||||
!verbose 3
|
!verbose push
|
||||||
!insertmacro case_else ; Place in case_else code as normal
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
!undef ${_Logic}case_else ; Forget the case_else and perform the new Case
|
${CaseElse} ; Perform the CaseElse
|
||||||
!insertmacro _== "${_a}" "${${_Logic}Value}" +3 0
|
!define ${_Logic}Else _${__LINE__} ; Get a label for the next Else and perform the new Case
|
||||||
!insertmacro _== "${_b}" "${${_Logic}Value}" +2 0
|
!insertmacro _== `${${_Logic}Select}` `${_a}` +5 ""
|
||||||
!insertmacro _== "${_c}" "${${_Logic}Value}" 0 ${${_Logic}Case}
|
!insertmacro _== `${${_Logic}Select}` `${_b}` +4 ""
|
||||||
!verbose 4
|
!insertmacro _== `${${_Logic}Select}` `${_c}` +3 ""
|
||||||
|
!insertmacro _== `${${_Logic}Select}` `${_d}` +2 ""
|
||||||
|
!insertmacro _== `${${_Logic}Select}` `${_e}` "" ${${_Logic}Else}
|
||||||
|
!verbose pop
|
||||||
!macroend
|
!macroend
|
||||||
!define Case3 "!insertmacro Case3"
|
!define Case5 `!insertmacro _Case5`
|
||||||
|
|
||||||
!macro Case4 _a _b _c _d
|
!macro _EndSelect
|
||||||
!verbose 3
|
!verbose push
|
||||||
!insertmacro case_else ; Place in case_else code as normal
|
!verbose ${LOGICLIB_VERBOSITY}
|
||||||
!undef ${_Logic}case_else ; Forget the case_else and perform the new Case
|
!ifndef _Logic | ${_Logic}Select
|
||||||
!insertmacro _== "${_a}" "${${_Logic}Value}" +4 0
|
|
||||||
!insertmacro _== "${_b}" "${${_Logic}Value}" +3 0
|
|
||||||
!insertmacro _== "${_c}" "${${_Logic}Value}" +2 0
|
|
||||||
!insertmacro _== "${_d}" "${${_Logic}Value}" 0 ${${_Logic}Case}
|
|
||||||
!verbose 4
|
|
||||||
!macroend
|
|
||||||
!define Case4 "!insertmacro Case4"
|
|
||||||
|
|
||||||
!macro Case5 _a _b _c _d _e
|
|
||||||
!verbose 3
|
|
||||||
!insertmacro case_else ; Place in case_else code as normal
|
|
||||||
!undef ${_Logic}case_else ; Forget the case_else and perform the new Case
|
|
||||||
!insertmacro _== "${_a}" "${${_Logic}Value}" +5 0
|
|
||||||
!insertmacro _== "${_b}" "${${_Logic}Value}" +4 0
|
|
||||||
!insertmacro _== "${_c}" "${${_Logic}Value}" +3 0
|
|
||||||
!insertmacro _== "${_d}" "${${_Logic}Value}" +2 0
|
|
||||||
!insertmacro _== "${_e}" "${${_Logic}Value}" 0 ${${_Logic}Case}
|
|
||||||
!verbose 4
|
|
||||||
!macroend
|
|
||||||
!define Case5 "!insertmacro Case5"
|
|
||||||
|
|
||||||
!macro EndSelect
|
|
||||||
!verbose 3
|
|
||||||
!ifndef _Logic | ${_Logic}Case
|
|
||||||
!error "Cannot use EndSelect without a preceding Select"
|
!error "Cannot use EndSelect without a preceding Select"
|
||||||
!endif
|
!endif
|
||||||
Goto ${${_Logic}Case}
|
!ifdef ${_Logic}Else
|
||||||
Goto ${${_Logic}EndSelect}
|
${${_Logic}Else}: ; Place the Else label
|
||||||
${${_Logic}Case}:
|
!undef ${_Logic}Else ; and remove it
|
||||||
${${_Logic}EndSelect}: ; Place the EndSelect
|
|
||||||
!undef ${_Logic}Case
|
|
||||||
!undef ${_Logic}EndSelect
|
|
||||||
!undef ${_Logic}Value
|
|
||||||
!ifdef ${_Logic}case_else
|
|
||||||
!undef ${_Logic}case_else ; Clear the case_else flag
|
|
||||||
!endif
|
!endif
|
||||||
|
!ifdef ${_Logic}EndSelect ; This won't be set if there weren't any cases
|
||||||
|
${${_Logic}EndSelect}: ; Place the EndSelect
|
||||||
|
!undef ${_Logic}EndSelect ; and remove it
|
||||||
|
!endif
|
||||||
|
!undef ${_Logic}Select
|
||||||
!insertmacro _PopLogic
|
!insertmacro _PopLogic
|
||||||
!verbose 4
|
!verbose pop
|
||||||
!macroend
|
!macroend
|
||||||
!define EndSelect "!insertmacro EndSelect"
|
!define EndSelect `!insertmacro _EndSelect`
|
||||||
|
|
||||||
!endif ; LOGICLIB
|
!endif ; LOGICLIB
|
||||||
!verbose 4
|
!verbose 3
|
||||||
|
!define LOGICLIB_VERBOSITY ${_LOGICLIB_VERBOSITY}
|
||||||
|
!undef _LOGICLIB_VERBOSITY
|
||||||
|
!verbose pop
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue