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

applied patch #1372561 - !define /math compile time enhancement

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4528 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2006-02-24 15:52:40 +00:00
parent f9b8b44682
commit 2b3aa18846
4 changed files with 83 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Source/Tests/preprocessor.nsi
View file

@ -84,6 +84,46 @@ f
!error "!if 'test' == 'test' is true!"
!endif
; testing of two math functions and a macro hack :)
!define increase "!insertmacro increase"
!macro increase DEFINE
!define /math ${DEFINE}_MACROTEMP ${${DEFINE}} + 1
!undef ${DEFINE}
!define ${DEFINE} ${${DEFINE}_MACROTEMP}
!undef ${DEFINE}_MACROTEMP
!macroend
!define number1 1 # 1
!define /math number2 2 + 3
!define /math number3 ${number2} - ${number1}
${increase} number3
!define /math number4 2 * ${number3}
!define /math number5 ${number4} % 3
!if ${number1} != 1
!error "number1 != 1"
!endif
!if ${number2} != 5
!error "number1 != 5"
!endif
!if ${number3} != 5
!error "number1 != 5"
!endif
!if ${number4} != 10
!error "number1 != 10"
!endif
!if ${number5} != 1
!error "number1 != 1"
!endif
!undef number1
!undef number2
!undef number3
; end math functions
# this should just give a warning, not an error
!include /NONFATAL file_that_doesnt_exist.nsh

38
Source/script.cpp
View file

@ -405,7 +405,7 @@ parse_again:
int istrue=0;
int mod=0;
int p=0;
if (tkid == TOK_P_IF) {
@ -2698,7 +2698,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
value=line.gettoken_str(3);
time_t rawtime;
time(&rawtime);
time(&rawtime);
datebuf[0]=0;
size_t s=strftime(datebuf,sizeof(datebuf),value,localtime(&rawtime));
@ -2711,6 +2711,40 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
value=datebuf;
date=true;
} else if (!stricmp(define,"/math")) {
int value1;
int value2;
char *mathop;
if (line.getnumtokens()!=6) PRINTHELP()
define = line.gettoken_str(2);
value1 = line.gettoken_int(3));
mathop = line.gettoken_str(4);
value2 = line.gettoken_int(5);
if (!strcmp(mathop,"+")) {
sprintf(value,"%d",value1+value2);
} else if (!strcmp(mathop,"-")) {
sprintf(value,"%d",value1-value2);
} else if (!strcmp(mathop,"*")) {
sprintf(value,"%d",value1*value2);
} else if (!strcmp(mathop,"%")) {
if (value2==0) {
ERROR_MSG("!define /math: division by zero! (\"%i / %i\")\n",value1,value2);
return PS_ERROR;
}
sprintf(value,"%d",value1/value2);
} else if (!strcmp(mathop,"%")) {
if (value2==0) {
ERROR_MSG("!define /math: division by zero! (\"%i %% %i\")\n",value1,value2);
return PS_ERROR;
}
sprintf(value,"%d",value1%value2);
} else PRINTHELP()
} else {
if (line.getnumtokens()==4) PRINTHELP()

2
Source/tokens.cpp
View file

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