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

Can't use !macro inside !macro

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1598 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-11-05 17:24:49 +00:00
parent 76df5fbe08
commit c533dc7470
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/script.cpp
View file

@ -402,7 +402,15 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
while (p >= str && (*p == '\r' || *p == '\n' || *p == ' ' || *p == '\t')) p--; while (p >= str && (*p == '\r' || *p == '\n' || *p == ' ' || *p == '\t')) p--;
*++p=0; *++p=0;
LineParser l2; LineParser l2;
if (!l2.parse(str) && !stricmp(l2.gettoken_str(0),"!macroend")) break; if (!l2.parse(str))
{
if (!stricmp(l2.gettoken_str(0),"!macroend")) break;
if (!stricmp(l2.gettoken_str(0),"!macro"))
{
ERROR_MSG("Error: can't define a macro inside a macro!\n");
return PS_ERROR;
}
}
if (str[0]) m_macros.add(str,strlen(str)+1); if (str[0]) m_macros.add(str,strlen(str)+1);
else m_macros.add(" ",2); else m_macros.add(" ",2);
} }