New upstream version 24.0.1+dfsg1

This commit is contained in:
Sebastian Ramacher 2019-09-22 23:19:10 +02:00
parent b14f9eae6d
commit 5a730d6ec3
842 changed files with 42245 additions and 33385 deletions

View file

@ -57,13 +57,13 @@ static inline void cf_token_clear(struct cf_token *t)
}
static inline void cf_token_copy(struct cf_token *dst,
const struct cf_token *src)
const struct cf_token *src)
{
memcpy(dst, src, sizeof(struct cf_token));
}
static inline void cf_token_add(struct cf_token *dst,
const struct cf_token *add)
const struct cf_token *add)
{
strref_add(&dst->str, &add->str);
strref_add(&dst->unmerged_str, &add->unmerged_str);
@ -99,7 +99,7 @@ static inline struct cf_token *cf_lexer_get_tokens(struct cf_lexer *lex)
}
EXPORT bool cf_lexer_lex(struct cf_lexer *lex, const char *str,
const char *file);
const char *file);
/* ------------------------------------------------------------------------- */
/* c-family preprocessor definition */
@ -130,9 +130,9 @@ static inline void cf_def_addtoken(struct cf_def *cfd, struct cf_token *token)
}
static inline struct cf_token *cf_def_getparam(const struct cf_def *cfd,
size_t idx)
size_t idx)
{
return cfd->params.array+idx;
return cfd->params.array + idx;
}
static inline void cf_def_free(struct cf_def *cfd)
@ -170,8 +170,8 @@ static inline void cf_def_free(struct cf_def *cfd)
struct cf_preprocessor {
struct cf_lexer *lex;
struct error_data *ed;
DARRAY(struct cf_def) defines;
DARRAY(char*) sys_include_dirs;
DARRAY(struct cf_def) defines;
DARRAY(char *) sys_include_dirs;
DARRAY(struct cf_lexer) dependencies;
DARRAY(struct cf_token) tokens;
bool ignore_state;
@ -181,22 +181,23 @@ EXPORT void cf_preprocessor_init(struct cf_preprocessor *pp);
EXPORT void cf_preprocessor_free(struct cf_preprocessor *pp);
EXPORT bool cf_preprocess(struct cf_preprocessor *pp, struct cf_lexer *lex,
struct error_data *ed);
struct error_data *ed);
static inline void cf_preprocessor_add_sys_include_dir(
struct cf_preprocessor *pp, const char *include_dir)
static inline void
cf_preprocessor_add_sys_include_dir(struct cf_preprocessor *pp,
const char *include_dir)
{
if (include_dir)
da_push_back(pp->sys_include_dirs, bstrdup(include_dir));
}
EXPORT void cf_preprocessor_add_def(struct cf_preprocessor *pp,
struct cf_def *def);
struct cf_def *def);
EXPORT void cf_preprocessor_remove_def(struct cf_preprocessor *pp,
const char *def_name);
const char *def_name);
static inline struct cf_token *cf_preprocessor_get_tokens(
struct cf_preprocessor *pp)
static inline struct cf_token *
cf_preprocessor_get_tokens(struct cf_preprocessor *pp)
{
return pp->tokens.array;
}