From dca62fbbc743ebb5e93f8955c02615190097dcec Mon Sep 17 00:00:00 2001 From: anders_k Date: Tue, 6 Dec 2011 21:04:47 +0000 Subject: [PATCH] Added <<, >> and >>> !define /math operations git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6199 212acab6-be3b-0410-9dea-997c60f758d6 --- Docs/src/defines.but | 2 +- Source/script.cpp | 6 ++++++ Source/tokens.cpp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Docs/src/defines.but b/Docs/src/defines.but index c442816f..527459aa 100644 --- a/Docs/src/defines.but +++ b/Docs/src/defines.but @@ -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! If \e{/file} is used, the entire text file specified (including whitespace and newlines) will be read and stuffed into \e{gflag}. diff --git a/Source/script.cpp b/Source/script.cpp index 15b193fd..46b49bf4 100644 --- a/Source/script.cpp +++ b/Source/script.cpp @@ -3062,6 +3062,12 @@ int CEXEBuild::doCommand(int which_token, LineParser &line) _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<>"))) { + _stprintf(value,_T("%d"),(signed)value1>>(signed)value2); + } else if (!_tcscmp(mathop,_T(">>>"))) { + _stprintf(value,_T("%d"),(unsigned)value1>>(unsigned)value2); } else if (!_tcscmp(mathop,_T("/"))) { if (value2==0) { ERROR_MSG(_T("!define /math: division by zero! (\"%i / %i\")\n"),value1,value2); diff --git a/Source/tokens.cpp b/Source/tokens.cpp index 7bba53e9..bcd78baa 100644 --- a/Source/tokens.cpp +++ b/Source/tokens.cpp @@ -251,7 +251,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},