Hopefully readable now: indent -nut -kr -bl -bli0 -i2 *
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2423 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik
parent
e1bc9f0971
commit
0e30afb5d9
16 changed files with 6231 additions and 5689 deletions
|
|
@ -9,21 +9,21 @@
|
|||
|
||||
static int kwcmp(void *av, void *bv)
|
||||
{
|
||||
const keyword *a = (const keyword *) av;
|
||||
const keyword *b = (const keyword *) bv;
|
||||
return ustrcmp(a->key, b->key);
|
||||
const keyword *a = (const keyword *) av;
|
||||
const keyword *b = (const keyword *) bv;
|
||||
return ustrcmp(a->key, b->key);
|
||||
}
|
||||
|
||||
static int kwfind(void *av, void *bv)
|
||||
{
|
||||
wchar_t *a = (wchar_t *) av;
|
||||
const keyword *b = (const keyword *) bv;
|
||||
return ustrcmp(a, b->key);
|
||||
wchar_t *a = (wchar_t *) av;
|
||||
const keyword *b = (const keyword *) bv;
|
||||
return ustrcmp(a, b->key);
|
||||
}
|
||||
|
||||
keyword *kw_lookup(keywordlist * kl, wchar_t * str)
|
||||
{
|
||||
return find234(kl->keys, str, kwfind);
|
||||
return find234(kl->keys, str, kwfind);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -34,126 +34,138 @@ keyword *kw_lookup(keywordlist * kl, wchar_t * str)
|
|||
*/
|
||||
keywordlist *get_keywords(paragraph * source)
|
||||
{
|
||||
int errors = FALSE;
|
||||
keywordlist *kl = mknew(keywordlist);
|
||||
numberstate *n = number_init();
|
||||
int prevpara = para_NotParaType;
|
||||
int errors = FALSE;
|
||||
keywordlist *kl = mknew(keywordlist);
|
||||
numberstate *n = number_init();
|
||||
int prevpara = para_NotParaType;
|
||||
|
||||
number_cfg(n, source);
|
||||
number_cfg(n, source);
|
||||
|
||||
kl->size = 0;
|
||||
kl->keys = newtree234(kwcmp);
|
||||
kl->nlooseends = kl->looseendssize = 0;
|
||||
kl->looseends = NULL;
|
||||
for (; source; source = source->next) {
|
||||
wchar_t *p, *q;
|
||||
p = q = source->keyword;
|
||||
kl->size = 0;
|
||||
kl->keys = newtree234(kwcmp);
|
||||
kl->nlooseends = kl->looseendssize = 0;
|
||||
kl->looseends = NULL;
|
||||
for (; source; source = source->next)
|
||||
{
|
||||
wchar_t *p, *q;
|
||||
p = q = source->keyword;
|
||||
|
||||
/*
|
||||
* Look for the section type override (`example',
|
||||
* `question' or whatever - to replace `chapter' or
|
||||
* `section' on a per-section basis).
|
||||
*/
|
||||
if (q) {
|
||||
q = uadv(q); /* point q at the word beyond */
|
||||
if (!*q)
|
||||
q = NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Number the chapter / section / list-item / whatever.
|
||||
* This also sets up the `parent', `child' and `sibling'
|
||||
* links.
|
||||
*/
|
||||
source->kwtext = number_mktext(n, source, q, prevpara, &errors);
|
||||
prevpara = source->type;
|
||||
|
||||
if (p && *p) {
|
||||
if (source->kwtext || source->type == para_Biblio) {
|
||||
keyword *kw, *ret;
|
||||
|
||||
kw = mknew(keyword);
|
||||
kw->key = p;
|
||||
kw->text = source->kwtext;
|
||||
kw->para = source;
|
||||
ret = add234(kl->keys, kw);
|
||||
if (ret != kw) {
|
||||
error(err_multikw, &source->fpos, &ret->para->fpos, p);
|
||||
sfree(kw);
|
||||
/* FIXME: what happens to kw->text? Does it leak? */
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (kl->nlooseends >= kl->looseendssize) {
|
||||
kl->looseendssize = kl->nlooseends + 32;
|
||||
kl->looseends = resize(kl->looseends, kl->looseendssize);
|
||||
}
|
||||
kl->looseends[kl->nlooseends++] = source->kwtext;
|
||||
}
|
||||
/*
|
||||
* Look for the section type override (`example',
|
||||
* `question' or whatever - to replace `chapter' or
|
||||
* `section' on a per-section basis).
|
||||
*/
|
||||
if (q)
|
||||
{
|
||||
q = uadv(q); /* point q at the word beyond */
|
||||
if (!*q)
|
||||
q = NULL;
|
||||
}
|
||||
|
||||
number_free(n);
|
||||
/*
|
||||
* Number the chapter / section / list-item / whatever.
|
||||
* This also sets up the `parent', `child' and `sibling'
|
||||
* links.
|
||||
*/
|
||||
source->kwtext = number_mktext(n, source, q, prevpara, &errors);
|
||||
prevpara = source->type;
|
||||
|
||||
if (errors) {
|
||||
free_keywords(kl);
|
||||
return NULL;
|
||||
if (p && *p)
|
||||
{
|
||||
if (source->kwtext || source->type == para_Biblio)
|
||||
{
|
||||
keyword *kw, *ret;
|
||||
|
||||
kw = mknew(keyword);
|
||||
kw->key = p;
|
||||
kw->text = source->kwtext;
|
||||
kw->para = source;
|
||||
ret = add234(kl->keys, kw);
|
||||
if (ret != kw)
|
||||
{
|
||||
error(err_multikw, &source->fpos, &ret->para->fpos, p);
|
||||
sfree(kw);
|
||||
/* FIXME: what happens to kw->text? Does it leak? */
|
||||
}
|
||||
}
|
||||
} else
|
||||
{
|
||||
if (kl->nlooseends >= kl->looseendssize)
|
||||
{
|
||||
kl->looseendssize = kl->nlooseends + 32;
|
||||
kl->looseends = resize(kl->looseends, kl->looseendssize);
|
||||
}
|
||||
kl->looseends[kl->nlooseends++] = source->kwtext;
|
||||
}
|
||||
}
|
||||
|
||||
return kl;
|
||||
number_free(n);
|
||||
|
||||
if (errors)
|
||||
{
|
||||
free_keywords(kl);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return kl;
|
||||
}
|
||||
|
||||
void free_keywords(keywordlist * kl)
|
||||
{
|
||||
keyword *kw;
|
||||
while (kl->nlooseends)
|
||||
free_word_list(kl->looseends[--kl->nlooseends]);
|
||||
sfree(kl->looseends);
|
||||
while ((kw = index234(kl->keys, 0)) != NULL) {
|
||||
delpos234(kl->keys, 0);
|
||||
free_word_list(kw->text);
|
||||
sfree(kw);
|
||||
}
|
||||
freetree234(kl->keys);
|
||||
sfree(kl);
|
||||
keyword *kw;
|
||||
while (kl->nlooseends)
|
||||
free_word_list(kl->looseends[--kl->nlooseends]);
|
||||
sfree(kl->looseends);
|
||||
while ((kw = index234(kl->keys, 0)) != NULL)
|
||||
{
|
||||
delpos234(kl->keys, 0);
|
||||
free_word_list(kw->text);
|
||||
sfree(kw);
|
||||
}
|
||||
freetree234(kl->keys);
|
||||
sfree(kl);
|
||||
}
|
||||
|
||||
void subst_keywords(paragraph * source, keywordlist * kl)
|
||||
{
|
||||
for (; source; source = source->next) {
|
||||
word *ptr;
|
||||
for (ptr = source->words; ptr; ptr = ptr->next) {
|
||||
if (ptr->type == word_UpperXref || ptr->type == word_LowerXref) {
|
||||
keyword *kw;
|
||||
word **endptr, *close, *subst;
|
||||
for (; source; source = source->next)
|
||||
{
|
||||
word *ptr;
|
||||
for (ptr = source->words; ptr; ptr = ptr->next)
|
||||
{
|
||||
if (ptr->type == word_UpperXref || ptr->type == word_LowerXref)
|
||||
{
|
||||
keyword *kw;
|
||||
word **endptr, *close, *subst;
|
||||
|
||||
kw = kw_lookup(kl, ptr->text);
|
||||
if (!kw) {
|
||||
error(err_nosuchkw, &ptr->fpos, ptr->text);
|
||||
subst = NULL;
|
||||
} else
|
||||
subst = dup_word_list(kw->text);
|
||||
kw = kw_lookup(kl, ptr->text);
|
||||
if (!kw)
|
||||
{
|
||||
error(err_nosuchkw, &ptr->fpos, ptr->text);
|
||||
subst = NULL;
|
||||
} else
|
||||
subst = dup_word_list(kw->text);
|
||||
|
||||
if (subst && ptr->type == word_LowerXref &&
|
||||
kw->para->type != para_Biblio &&
|
||||
kw->para->type != para_BiblioCited)
|
||||
ustrlow(subst->text);
|
||||
if (subst && ptr->type == word_LowerXref &&
|
||||
kw->para->type != para_Biblio &&
|
||||
kw->para->type != para_BiblioCited)
|
||||
ustrlow(subst->text);
|
||||
|
||||
close = mknew(word);
|
||||
close->text = NULL;
|
||||
close->alt = NULL;
|
||||
close->type = word_XrefEnd;
|
||||
close->fpos = ptr->fpos;
|
||||
close = mknew(word);
|
||||
close->text = NULL;
|
||||
close->alt = NULL;
|
||||
close->type = word_XrefEnd;
|
||||
close->fpos = ptr->fpos;
|
||||
|
||||
close->next = ptr->next;
|
||||
ptr->next = subst;
|
||||
close->next = ptr->next;
|
||||
ptr->next = subst;
|
||||
|
||||
for (endptr = &ptr->next; *endptr;
|
||||
endptr = &(*endptr)->next)
|
||||
(*endptr)->fpos = ptr->fpos;
|
||||
for (endptr = &ptr->next; *endptr; endptr = &(*endptr)->next)
|
||||
(*endptr)->fpos = ptr->fpos;
|
||||
|
||||
*endptr = close;
|
||||
ptr = close;
|
||||
}
|
||||
}
|
||||
*endptr = close;
|
||||
ptr = close;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue