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
|
|
@ -8,7 +8,7 @@
|
|||
#ifdef __GNUC__
|
||||
#define NORETURN __attribute__((__noreturn__))
|
||||
#else
|
||||
#define NORETURN /* nothing */
|
||||
#define NORETURN /* nothing */
|
||||
#endif
|
||||
|
||||
#ifndef TRUE
|
||||
|
|
@ -44,27 +44,27 @@ typedef struct macrostack_Tag macrostack;
|
|||
* column number, for reporting errors
|
||||
*/
|
||||
struct filepos_Tag {
|
||||
char *filename;
|
||||
int line, col;
|
||||
char *filename;
|
||||
int line, col;
|
||||
};
|
||||
|
||||
/*
|
||||
* Data structure to hold all the file names etc for input
|
||||
*/
|
||||
typedef struct pushback_Tag {
|
||||
int chr;
|
||||
filepos pos;
|
||||
int chr;
|
||||
filepos pos;
|
||||
} pushback;
|
||||
struct input_Tag {
|
||||
char **filenames; /* complete list of input files */
|
||||
int nfiles; /* how many in the list */
|
||||
FILE *currfp; /* the currently open one */
|
||||
int currindex; /* which one is that in the list */
|
||||
pushback *pushback; /* pushed-back input characters */
|
||||
int npushback, pushbacksize;
|
||||
filepos pos;
|
||||
int reportcols; /* report column numbers in errors */
|
||||
macrostack *stack; /* macro expansions in force */
|
||||
char **filenames; /* complete list of input files */
|
||||
int nfiles; /* how many in the list */
|
||||
FILE *currfp; /* the currently open one */
|
||||
int currindex; /* which one is that in the list */
|
||||
pushback *pushback; /* pushed-back input characters */
|
||||
int npushback, pushbacksize;
|
||||
filepos pos;
|
||||
int reportcols; /* report column numbers in errors */
|
||||
macrostack *stack; /* macro expansions in force */
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -72,95 +72,95 @@ struct input_Tag {
|
|||
* list of paragraphs
|
||||
*/
|
||||
struct paragraph_Tag {
|
||||
paragraph *next;
|
||||
int type;
|
||||
wchar_t *keyword; /* for most special paragraphs */
|
||||
word *words; /* list of words in paragraph */
|
||||
int aux; /* number, in a numbered paragraph
|
||||
* or subsection level
|
||||
*/
|
||||
word *kwtext; /* chapter/section indication */
|
||||
word *kwtext2; /* numeric-only form of kwtext */
|
||||
filepos fpos;
|
||||
paragraph *next;
|
||||
int type;
|
||||
wchar_t *keyword; /* for most special paragraphs */
|
||||
word *words; /* list of words in paragraph */
|
||||
int aux; /* number, in a numbered paragraph
|
||||
* or subsection level
|
||||
*/
|
||||
word *kwtext; /* chapter/section indication */
|
||||
word *kwtext2; /* numeric-only form of kwtext */
|
||||
filepos fpos;
|
||||
|
||||
paragraph *parent, *child, *sibling; /* for hierarchy navigation */
|
||||
paragraph *parent, *child, *sibling; /* for hierarchy navigation */
|
||||
|
||||
void *private_data; /* for temp use in backends */
|
||||
void *private_data; /* for temp use in backends */
|
||||
};
|
||||
enum {
|
||||
para_IM, /* index merge */
|
||||
para_BR, /* bibliography rewrite */
|
||||
para_Rule, /* random horizontal rule */
|
||||
para_Chapter,
|
||||
para_Appendix,
|
||||
para_UnnumberedChapter,
|
||||
para_Heading,
|
||||
para_Subsect,
|
||||
para_Normal,
|
||||
para_Biblio, /* causes no output unless turned ... */
|
||||
para_BiblioCited, /* ... into this paragraph type */
|
||||
para_Bullet,
|
||||
para_NumberedList,
|
||||
para_Code,
|
||||
para_Copyright,
|
||||
para_Preamble,
|
||||
para_NoCite,
|
||||
para_Title,
|
||||
para_VersionID,
|
||||
para_Config, /* configuration directive */
|
||||
para_NotParaType /* placeholder value */
|
||||
para_IM, /* index merge */
|
||||
para_BR, /* bibliography rewrite */
|
||||
para_Rule, /* random horizontal rule */
|
||||
para_Chapter,
|
||||
para_Appendix,
|
||||
para_UnnumberedChapter,
|
||||
para_Heading,
|
||||
para_Subsect,
|
||||
para_Normal,
|
||||
para_Biblio, /* causes no output unless turned ... */
|
||||
para_BiblioCited, /* ... into this paragraph type */
|
||||
para_Bullet,
|
||||
para_NumberedList,
|
||||
para_Code,
|
||||
para_Copyright,
|
||||
para_Preamble,
|
||||
para_NoCite,
|
||||
para_Title,
|
||||
para_VersionID,
|
||||
para_Config, /* configuration directive */
|
||||
para_NotParaType /* placeholder value */
|
||||
};
|
||||
|
||||
/*
|
||||
* Data structure to hold an individual word
|
||||
*/
|
||||
struct word_Tag {
|
||||
word *next, *alt;
|
||||
int type;
|
||||
int aux;
|
||||
int breaks; /* can a line break after it? */
|
||||
wchar_t *text;
|
||||
filepos fpos;
|
||||
word *next, *alt;
|
||||
int type;
|
||||
int aux;
|
||||
int breaks; /* can a line break after it? */
|
||||
wchar_t *text;
|
||||
filepos fpos;
|
||||
};
|
||||
enum {
|
||||
/* ORDERING CONSTRAINT: these normal-word types ... */
|
||||
word_Normal,
|
||||
word_Emph,
|
||||
word_Code, /* monospaced; `quoted' in text */
|
||||
word_WeakCode, /* monospaced, normal in text */
|
||||
/* ... must be in the same order as these space types ... */
|
||||
word_WhiteSpace, /* text is NULL or ignorable */
|
||||
word_EmphSpace, /* WhiteSpace when emphasised */
|
||||
word_CodeSpace, /* WhiteSpace when code */
|
||||
word_WkCodeSpace, /* WhiteSpace when weak code */
|
||||
/* ... and must be in the same order as these quote types ... */
|
||||
word_Quote, /* text is NULL or ignorable */
|
||||
word_EmphQuote, /* Quote when emphasised */
|
||||
word_CodeQuote, /* (can't happen) */
|
||||
word_WkCodeQuote, /* (can't happen) */
|
||||
/* END ORDERING CONSTRAINT */
|
||||
word_internal_endattrs,
|
||||
word_UpperXref, /* \K */
|
||||
word_LowerXref, /* \k */
|
||||
word_XrefEnd, /* (invisible; no text) */
|
||||
word_IndexRef, /* (always an invisible one) */
|
||||
word_HyperLink, /* (invisible) */
|
||||
word_HyperEnd, /* (also invisible; no text) */
|
||||
word_FreeTextXref /* \R */
|
||||
/* ORDERING CONSTRAINT: these normal-word types ... */
|
||||
word_Normal,
|
||||
word_Emph,
|
||||
word_Code, /* monospaced; `quoted' in text */
|
||||
word_WeakCode, /* monospaced, normal in text */
|
||||
/* ... must be in the same order as these space types ... */
|
||||
word_WhiteSpace, /* text is NULL or ignorable */
|
||||
word_EmphSpace, /* WhiteSpace when emphasised */
|
||||
word_CodeSpace, /* WhiteSpace when code */
|
||||
word_WkCodeSpace, /* WhiteSpace when weak code */
|
||||
/* ... and must be in the same order as these quote types ... */
|
||||
word_Quote, /* text is NULL or ignorable */
|
||||
word_EmphQuote, /* Quote when emphasised */
|
||||
word_CodeQuote, /* (can't happen) */
|
||||
word_WkCodeQuote, /* (can't happen) */
|
||||
/* END ORDERING CONSTRAINT */
|
||||
word_internal_endattrs,
|
||||
word_UpperXref, /* \K */
|
||||
word_LowerXref, /* \k */
|
||||
word_XrefEnd, /* (invisible; no text) */
|
||||
word_IndexRef, /* (always an invisible one) */
|
||||
word_HyperLink, /* (invisible) */
|
||||
word_HyperEnd, /* (also invisible; no text) */
|
||||
word_FreeTextXref /* \R */
|
||||
};
|
||||
/* aux values for attributed words */
|
||||
enum {
|
||||
attr_Only = 0x0000, /* a lone word with the attribute */
|
||||
attr_First = 0x0001, /* the first of a series */
|
||||
attr_Last = 0x0002, /* the last of a series */
|
||||
attr_Always = 0x0003, /* any other part of a series */
|
||||
attr_mask = 0x0003,
|
||||
attr_Only = 0x0000, /* a lone word with the attribute */
|
||||
attr_First = 0x0001, /* the first of a series */
|
||||
attr_Last = 0x0002, /* the last of a series */
|
||||
attr_Always = 0x0003, /* any other part of a series */
|
||||
attr_mask = 0x0003,
|
||||
};
|
||||
/* aux values for quote-type words */
|
||||
enum {
|
||||
quote_Open = 0x0010,
|
||||
quote_Close = 0x0020,
|
||||
quote_mask = 0x0030,
|
||||
quote_Open = 0x0010,
|
||||
quote_Close = 0x0020,
|
||||
quote_mask = 0x0030,
|
||||
};
|
||||
#define isattr(x) ( ( (x) > word_Normal && (x) < word_WhiteSpace ) || \
|
||||
( (x) > word_WhiteSpace && (x) < word_internal_endattrs ) )
|
||||
|
|
@ -179,36 +179,36 @@ enum {
|
|||
void fatal(int code, ...) NORETURN;
|
||||
void error(int code, ...);
|
||||
enum {
|
||||
err_nomemory, /* out of memory */
|
||||
err_optnoarg, /* option `-%s' requires an argument */
|
||||
err_nosuchopt, /* unrecognised option `-%s' */
|
||||
err_noinput, /* no input files */
|
||||
err_cantopen, /* unable to open input file `%s' */
|
||||
err_nodata, /* no data in input files */
|
||||
err_brokencodepara, /* line in codepara didn't begin `\c' */
|
||||
err_kwunclosed, /* expected `}' after keyword */
|
||||
err_kwillegal, /* paragraph type expects no keyword */
|
||||
err_kwexpected, /* paragraph type expects a keyword */
|
||||
err_kwtoomany, /* paragraph type expects only 1 */
|
||||
err_bodyillegal, /* paragraph type expects only kws! */
|
||||
err_badparatype, /* invalid command at start of para */
|
||||
err_badmidcmd, /* invalid command in mid-para */
|
||||
err_unexbrace, /* unexpected brace */
|
||||
err_explbr, /* expected `{' after command */
|
||||
err_commenteof, /* EOF inside braced comment */
|
||||
err_kwexprbr, /* expected `}' after cross-ref */
|
||||
err_missingrbrace, /* unclosed braces at end of para */
|
||||
err_nestedstyles, /* unable to nest text styles */
|
||||
err_nestedindex, /* unable to nest `\i' thingys */
|
||||
err_nosuchkw, /* unresolved cross-reference */
|
||||
err_multiBR, /* multiple \BRs on same keyword */
|
||||
err_nosuchidxtag, /* \IM on unknown index tag (warning) */
|
||||
err_cantopenw, /* can't open output file for write */
|
||||
err_macroexists, /* this macro already exists */
|
||||
err_sectjump, /* jump a heading level, eg \C -> \S */
|
||||
err_winhelp_ctxclash, /* WinHelp context ID hash clash */
|
||||
err_multikw, /* keyword clash in sections */
|
||||
err_whatever /* random error of another type */
|
||||
err_nomemory, /* out of memory */
|
||||
err_optnoarg, /* option `-%s' requires an argument */
|
||||
err_nosuchopt, /* unrecognised option `-%s' */
|
||||
err_noinput, /* no input files */
|
||||
err_cantopen, /* unable to open input file `%s' */
|
||||
err_nodata, /* no data in input files */
|
||||
err_brokencodepara, /* line in codepara didn't begin `\c' */
|
||||
err_kwunclosed, /* expected `}' after keyword */
|
||||
err_kwillegal, /* paragraph type expects no keyword */
|
||||
err_kwexpected, /* paragraph type expects a keyword */
|
||||
err_kwtoomany, /* paragraph type expects only 1 */
|
||||
err_bodyillegal, /* paragraph type expects only kws! */
|
||||
err_badparatype, /* invalid command at start of para */
|
||||
err_badmidcmd, /* invalid command in mid-para */
|
||||
err_unexbrace, /* unexpected brace */
|
||||
err_explbr, /* expected `{' after command */
|
||||
err_commenteof, /* EOF inside braced comment */
|
||||
err_kwexprbr, /* expected `}' after cross-ref */
|
||||
err_missingrbrace, /* unclosed braces at end of para */
|
||||
err_nestedstyles, /* unable to nest text styles */
|
||||
err_nestedindex, /* unable to nest `\i' thingys */
|
||||
err_nosuchkw, /* unresolved cross-reference */
|
||||
err_multiBR, /* multiple \BRs on same keyword */
|
||||
err_nosuchidxtag, /* \IM on unknown index tag (warning) */
|
||||
err_cantopenw, /* can't open output file for write */
|
||||
err_macroexists, /* this macro already exists */
|
||||
err_sectjump, /* jump a heading level, eg \C -> \S */
|
||||
err_winhelp_ctxclash, /* WinHelp context ID hash clash */
|
||||
err_multikw, /* keyword clash in sections */
|
||||
err_whatever /* random error of another type */
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -280,13 +280,13 @@ void *stk_pop(stack);
|
|||
|
||||
typedef struct tagRdstring rdstring;
|
||||
struct tagRdstring {
|
||||
int pos, size;
|
||||
wchar_t *text;
|
||||
int pos, size;
|
||||
wchar_t *text;
|
||||
};
|
||||
typedef struct tagRdstringc rdstringc;
|
||||
struct tagRdstringc {
|
||||
int pos, size;
|
||||
char *text;
|
||||
int pos, size;
|
||||
char *text;
|
||||
};
|
||||
extern const rdstring empty_rdstring;
|
||||
extern const rdstringc empty_rdstringc;
|
||||
|
|
@ -303,10 +303,10 @@ void mark_attr_ends(paragraph * sourceform);
|
|||
|
||||
typedef struct tagWrappedLine wrappedline;
|
||||
struct tagWrappedLine {
|
||||
wrappedline *next;
|
||||
word *begin, *end; /* first & last words of line */
|
||||
int nspaces; /* number of whitespaces in line */
|
||||
int shortfall; /* how much shorter than max width */
|
||||
wrappedline *next;
|
||||
word *begin, *end; /* first & last words of line */
|
||||
int nspaces; /* number of whitespaces in line */
|
||||
int shortfall; /* how much shorter than max width */
|
||||
};
|
||||
wrappedline *wrap_para(word *, int, int, int (*)(word *));
|
||||
void wrap_free(wrappedline *);
|
||||
|
|
@ -320,18 +320,18 @@ paragraph *read_input(input * in, indexdata * idx);
|
|||
* keywords.c
|
||||
*/
|
||||
struct keywordlist_Tag {
|
||||
int nkeywords;
|
||||
int size;
|
||||
tree234 *keys; /* sorted by `key' field */
|
||||
word **looseends; /* non-keyword list element numbers */
|
||||
int nlooseends;
|
||||
int looseendssize;
|
||||
int nkeywords;
|
||||
int size;
|
||||
tree234 *keys; /* sorted by `key' field */
|
||||
word **looseends; /* non-keyword list element numbers */
|
||||
int nlooseends;
|
||||
int looseendssize;
|
||||
};
|
||||
struct keyword_Tag {
|
||||
wchar_t *key; /* the keyword itself */
|
||||
word *text; /* "Chapter 2", "Appendix Q"... */
|
||||
/* (NB: filepos are not set) */
|
||||
paragraph *para; /* the paragraph referenced */
|
||||
wchar_t *key; /* the keyword itself */
|
||||
word *text; /* "Chapter 2", "Appendix Q"... */
|
||||
/* (NB: filepos are not set) */
|
||||
paragraph *para; /* the paragraph referenced */
|
||||
};
|
||||
keyword *kw_lookup(keywordlist *, wchar_t *);
|
||||
keywordlist *get_keywords(paragraph *);
|
||||
|
|
@ -346,28 +346,28 @@ void subst_keywords(paragraph *, keywordlist *);
|
|||
* Data structure to hold both sides of the index.
|
||||
*/
|
||||
struct indexdata_Tag {
|
||||
tree234 *tags; /* holds type `indextag' */
|
||||
tree234 *entries; /* holds type `indexentry' */
|
||||
tree234 *tags; /* holds type `indextag' */
|
||||
tree234 *entries; /* holds type `indexentry' */
|
||||
};
|
||||
|
||||
/*
|
||||
* Data structure to hold an index tag (LHS of index).
|
||||
*/
|
||||
struct indextag_Tag {
|
||||
wchar_t *name;
|
||||
word *implicit_text;
|
||||
word **explicit_texts;
|
||||
int nexplicit, explicit_size;
|
||||
int nrefs;
|
||||
indexentry **refs; /* array of entries referenced by tag */
|
||||
wchar_t *name;
|
||||
word *implicit_text;
|
||||
word **explicit_texts;
|
||||
int nexplicit, explicit_size;
|
||||
int nrefs;
|
||||
indexentry **refs; /* array of entries referenced by tag */
|
||||
};
|
||||
|
||||
/*
|
||||
* Data structure to hold an index entry (RHS of index).
|
||||
*/
|
||||
struct indexentry_Tag {
|
||||
word *text;
|
||||
void *backend_data; /* private to back end */
|
||||
word *text;
|
||||
void *backend_data; /* private to back end */
|
||||
};
|
||||
|
||||
indexdata *make_index(void);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue