From 940a12b76cbfb7457aeca66261ab142fb28c41d3 Mon Sep 17 00:00:00 2001 From: anders_k Date: Thu, 17 Nov 2011 21:04:20 +0000 Subject: [PATCH] Fixed two old token definition bugs: !if only supports a single expression !undef only takes one parameter git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6179 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/tokens.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/tokens.cpp b/Source/tokens.cpp index 4c398fea..c1a8a790 100644 --- a/Source/tokens.cpp +++ b/Source/tokens.cpp @@ -247,12 +247,12 @@ static tokenType tokenlist[TOK__LAST] = {TOK_P_ADDINCLUDEDIR,_T("!AddIncludeDir"),1,0,_T("dir"),TP_ALL}, {TOK_P_INCLUDE,_T("!include"),1,1,_T("[/NONFATAL] filename.nsh"),TP_ALL}, {TOK_P_CD,_T("!cd"),1,0,_T("absolute_or_relative_new_directory"),TP_ALL}, -{TOK_P_IF,_T("!if"),1,3,_T("[!] (value [(==,!=,<=,<,>,>=,&,&&,||) value2] | /FILEEXISTS path) [...]"),TP_ALL}, +{TOK_P_IF,_T("!if"),1,3,_T("[!] (value [(==,!=,<=,<,>,>=,&,&&,||) value2] | /FILEEXISTS path)"),TP_ALL}, {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_UNDEF,_T("!undef"),1,1,_T("symbol [value]"),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}, {TOK_P_WARNING,_T("!warning"),0,1,_T("[warning_message]"),TP_ALL},