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

Halibut: Allow macros to work across files (Upstream rev4803)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6213 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2012-02-24 12:56:57 +00:00
parent 6cf12d3c83
commit bc9f86d506
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Docs/src/bin/halibut/input.c
View file

@ -107,6 +107,7 @@ static int get(input * in, filepos * pos)
} else if (in->stack)
{
wchar_t c = in->stack->text[in->stack->ptr];
if (pos) *pos = in->stack->pos;
if (in->stack->text[++in->stack->ptr] == L'\0')
{
macrostack *tmp = in->stack;
@ -637,12 +638,11 @@ static paragraph *addpara(paragraph newpara, paragraph *** hptrptr)
/*
* Reads a single file (ie until get() returns EOF)
*/
static void read_file(paragraph *** ret, input * in, indexdata * idx)
static void read_file(paragraph *** ret, input * in, indexdata * idx, tree234 *macros)
{
token t;
paragraph par;
word wd, **whptr, **idximplicit;
tree234 *macros;
wchar_t utext[2], *wdtext;
int style, spcstyle;
int already;
@ -669,7 +669,6 @@ static void read_file(paragraph *** ret, input * in, indexdata * idx)
wchar_t uchr;
t.text = NULL;
macros = newtree234(macrocmp);
already = FALSE;
/*
@ -924,7 +923,7 @@ static void read_file(paragraph *** ret, input * in, indexdata * idx)
rdadd(&macrotext, L'\n');
rdadds(&macrotext, t.text);
dtor(t), t = get_token(in);
if (t.type == tok_eop)
if (t.type == tok_eop || t.type == tok_eof)
break;
}
macrodef(macros, rs.text, macrotext.text, fp);
@ -1465,13 +1464,15 @@ static void read_file(paragraph *** ret, input * in, indexdata * idx)
* this cleanup doesn't happen.
*/
dtor(t);
macrocleanup(macros);
}
paragraph *read_input(input * in, indexdata * idx)
{
paragraph *head = NULL;
paragraph **hptr = &head;
tree234 *macros;
macros = newtree234(macrocmp);
while (in->currindex < in->nfiles)
{
@ -1479,10 +1480,11 @@ paragraph *read_input(input * in, indexdata * idx)
if (in->currfp)
{
setpos(in, in->filenames[in->currindex]);
read_file(&hptr, in, idx);
read_file(&hptr, in, idx, macros);
}
in->currindex++;
}
macrocleanup(macros);
return head;
}