#include "parser.h"
-void psi_cpp_tokiter_dump(int fd, struct psi_cpp_data *cpp)
+void psi_cpp_tokiter_dump(int fd, struct psi_cpp *cpp)
{
size_t i;
struct psi_token *T;
}
}
-void psi_cpp_tokiter_reset(struct psi_cpp_data *cpp)
+void psi_cpp_tokiter_reset(struct psi_cpp *cpp)
{
#if PSI_CPP_DEBUG
fprintf(stderr, "PSI: CPP reset (%zu tokens)\n", psi_plist_count(cpp->tokens));
+# if PSI_CPP_DEBUG > 1
psi_cpp_tokiter_dump(2, cpp);
+# endif
#endif
cpp->index = 0;
cpp->expanded = 0;
}
-bool psi_cpp_tokiter_seek(struct psi_cpp_data *cpp, size_t index)
+bool psi_cpp_tokiter_seek(struct psi_cpp *cpp, size_t index)
{
if (index < psi_plist_count(cpp->tokens)) {
cpp->index = index;
return false;
}
-struct psi_token *psi_cpp_tokiter_current(struct psi_cpp_data *cpp)
+struct psi_token *psi_cpp_tokiter_current(struct psi_cpp *cpp)
{
struct psi_token *current = NULL;
bool found = psi_plist_get(cpp->tokens, cpp->index, ¤t);
return current;
}
-size_t psi_cpp_tokiter_index(struct psi_cpp_data *cpp)
+size_t psi_cpp_tokiter_index(struct psi_cpp *cpp)
{
return cpp->index;
}
-void psi_cpp_tokiter_next(struct psi_cpp_data *cpp)
+void psi_cpp_tokiter_next(struct psi_cpp *cpp)
{
#if 0 && PSI_CPP_DEBUG
fprintf(stderr, "PSI: CPP next -> index=%zu -> index=%zu\n", cpp->index, cpp->index+1);
++cpp->index;
}
-void psi_cpp_tokiter_prev(struct psi_cpp_data *cpp)
+void psi_cpp_tokiter_prev(struct psi_cpp *cpp)
{
#if 0 && PSI_CPP_DEBUG
fprintf(stderr, "PSI: CPP prev -> index=%zu -> index=%zu\n", cpp->index, cpp->index-1);
}
}
-bool psi_cpp_tokiter_valid(struct psi_cpp_data *cpp)
+bool psi_cpp_tokiter_valid(struct psi_cpp *cpp)
{
#if 0 && PSI_CPP_DEBUG
fprintf(stderr, "PSI: CPP valid -> index=%zu -> %d\n", cpp->index, cpp->index < psi_plist_count(cpp->tokens));
return cpp->index < psi_plist_count(cpp->tokens);
}
-bool psi_cpp_tokiter_del_cur(struct psi_cpp_data *cpp, bool free_token)
+bool psi_cpp_tokiter_del_cur(struct psi_cpp *cpp, bool free_token)
{
struct psi_token *cur = NULL;
bool deleted = psi_plist_del(cpp->tokens, cpp->index, &cur);
+ size_t count;
#if PSI_CPP_DEBUG
- fprintf(stderr, "PSI: CPP del_cur -> index=%zu, del=%d, free=%d ",
- cpp->index, (int) deleted, (int) free_token);
+ fprintf(stderr, "PSI: CPP del_cur -> index=%zu, del=%d, free=%d, count=%zu ",
+ cpp->index, (int) deleted, (int) free_token, psi_plist_count(cpp->tokens));
if (cur) {
psi_token_dump(2, cur);
} else {
if (cur && free_token) {
free(cur);
}
- if (deleted && cpp->index >= psi_plist_count(cpp->tokens)) {
- cpp->index = MAX(0, psi_plist_count(cpp->tokens)-1);
+ count = psi_plist_count(cpp->tokens);
+ if (deleted && cpp->index >= count) {
+ if (count > 0) {
+ cpp->index = count - 1;
+ } else {
+ cpp->index = 0;
+ }
}
return deleted;
}
-bool psi_cpp_tokiter_del_range(struct psi_cpp_data *cpp, size_t offset, size_t num_eles, bool free_tokens)
+bool psi_cpp_tokiter_del_range(struct psi_cpp *cpp, size_t offset, size_t num_eles, bool free_tokens)
{
struct psi_token **ptr;
bool deleted;
}
#if PSI_CPP_DEBUG
- fprintf(stderr, "PSI: CPP del_range -> index=%zu, offset=%zu, num_eles=%zu\n", cpp->index, offset, num_eles);
+ fprintf(stderr, "PSI: CPP del_range -> index=%zu, offset=%zu, num_eles=%zu, count=%zu\n",
+ cpp->index, offset, num_eles, psi_plist_count(cpp->tokens));
#endif
- deleted = psi_plist_del_range(cpp->tokens, offset, num_eles, (void *) ptr);
+ deleted = psi_plist_del_r(cpp->tokens, offset, num_eles, (void *) ptr);
if (deleted) {
if (cpp->index >= psi_plist_count(cpp->tokens)) {
return deleted;
}
-bool psi_cpp_tokiter_ins_cur(struct psi_cpp_data *cpp, struct psi_token *tok)
+bool psi_cpp_tokiter_ins_cur(struct psi_cpp *cpp, struct psi_token *tok)
{
struct psi_plist *tokens = psi_plist_ins(cpp->tokens, cpp->index, &tok);
return true;
}
-bool psi_cpp_tokiter_ins_range(struct psi_cpp_data *cpp, size_t offset,
+bool psi_cpp_tokiter_ins_range(struct psi_cpp *cpp, size_t offset,
size_t num_eles, void **eles)
{
- struct psi_plist *tokens = psi_plist_ins_range(cpp->tokens, offset,
- num_eles, eles);
+ struct psi_plist *tokens;
+
+ if (!num_eles) {
+ return true;
+ }
+
+ tokens = psi_plist_ins_r(cpp->tokens, offset, num_eles, eles);
#if PSI_CPP_DEBUG
- fprintf(stderr, "PSI: CPP ins_range -> index=%zu, offset=%zu, num_eles=%zu\n", cpp->index, offset, num_eles);
+ fprintf(stderr, "PSI: CPP ins_range -> index=%zu, offset=%zu, num_eles=%zu, count=%zu\n",
+ cpp->index, offset, num_eles, psi_plist_count(tokens));
#endif
if (!tokens) {
return true;
}
-bool psi_cpp_tokiter_defined(struct psi_cpp_data *cpp)
+bool psi_cpp_tokiter_defined(struct psi_cpp *cpp)
{
if (psi_cpp_tokiter_valid(cpp)) {
struct psi_token *current = psi_cpp_tokiter_current(cpp);
return false;
}
-void psi_cpp_tokiter_expand_tokens(struct psi_cpp_data *cpp, struct psi_plist *tokens)
+void psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp, struct psi_plist *tokens)
{
if (tokens && psi_plist_count(tokens)) {
- size_t i;
- struct psi_token **exp_tokens = calloc(psi_plist_count(tokens), sizeof(*exp_tokens));
+ size_t i = 0, n = 0;
+ bool stringify = false, paste = false;
+ struct psi_token *tok, **exp_tokens = calloc(psi_plist_count(tokens), sizeof(*exp_tokens));
+
+ while (psi_plist_get(tokens, i++, &tok)) {
+ struct psi_token *new_tok;
+
+ if (tok->type == PSI_T_HASH) {
+ if (stringify) {
+ stringify = false;
+ paste = true;
+ } else {
+ stringify = true;
+ }
+ continue;
+ }
- for (i = 0; psi_plist_get(tokens, i, &exp_tokens[i]); ++i) {
- exp_tokens[i] = psi_token_copy(exp_tokens[i]);
+ if (paste && n > 0 && exp_tokens[n - 1] &&
+ (new_tok = psi_token_cat(NULL, 2, exp_tokens[n - 1], tok))) {
+ free(exp_tokens[n - 1]);
+ exp_tokens[n - 1] = new_tok;
+ } else {
+ struct psi_token *cpy = psi_token_copy(tok);
+
+ if (stringify) {
+ cpy = psi_token_append(NULL,
+ psi_token_prepend(NULL, cpy, 1, "\""), 1, "\"");
+ cpy->type = PSI_T_QUOTED_STRING;
+ }
+ exp_tokens[n++] = cpy;
+ }
#if PSI_CPP_DEBUG
fprintf(stderr, "PSI: CPP expand > ");
- psi_token_dump(2, exp_tokens[i]);
+ psi_token_dump(2, tok);
#endif
+ paste = false;
+ stringify = false;
}
- psi_cpp_tokiter_ins_range(cpp, psi_cpp_tokiter_index(cpp), i, (void *) exp_tokens);
+ psi_cpp_tokiter_ins_range(cpp, psi_cpp_tokiter_index(cpp), n, (void *) exp_tokens);
free(exp_tokens);
}
}
}
static struct psi_plist **psi_cpp_tokiter_read_call_tokens(
- struct psi_cpp_data *cpp, size_t arg_count)
+ struct psi_cpp *cpp, size_t arg_count)
{
size_t arg_index = 0, lparens = 1, rparens = 0;
struct psi_plist **arg_tokens = calloc(arg_count, sizeof(*arg_tokens));
- struct psi_plist *free_tokens = psi_plist_init((void (*)(void *)) psi_token_free);
+ struct psi_plist *free_tokens = psi_plist_init((psi_plist_dtor) psi_token_free);
struct psi_token *tok;
arg_tokens[0] = psi_plist_init(NULL);
return NULL;
}
-static void psi_cpp_tokiter_expand_call_tokens(struct psi_cpp_data *cpp,
+static void psi_cpp_tokiter_expand_call_tokens(struct psi_cpp *cpp,
struct psi_cpp_macro_decl *macro, struct psi_plist **arg_tokens_list)
{
size_t i;
struct psi_token *tok;
+ struct psi_plist *tokens = psi_plist_init(NULL);
for (i = 0; psi_plist_get(macro->tokens, i, &tok); ++i) {
struct psi_plist *arg_tokens = NULL;
}
if (arg_tokens) {
- size_t tok_count = psi_plist_count(arg_tokens);
-
- if (tok_count) {
- psi_cpp_tokiter_expand_tokens(cpp, arg_tokens);
- psi_cpp_tokiter_seek(cpp, psi_cpp_tokiter_index(cpp) + tok_count);
- }
+ tokens = psi_plist_add_r(tokens, psi_plist_count(arg_tokens), psi_plist_eles(arg_tokens));
} else {
- psi_cpp_tokiter_ins_cur(cpp, psi_token_copy(tok));
- psi_cpp_tokiter_next(cpp);
+ tokens = psi_plist_add(tokens, &tok);
}
}
+
+ psi_cpp_tokiter_expand_tokens(cpp, tokens);
+ psi_plist_free(tokens);
}
-static bool psi_cpp_tokiter_expand_call(struct psi_cpp_data *cpp,
+static bool psi_cpp_tokiter_expand_call(struct psi_cpp *cpp,
struct psi_cpp_macro_decl *macro)
{
/* function-like macro
return true;
}
-bool psi_cpp_tokiter_expand(struct psi_cpp_data *cpp)
+bool psi_cpp_tokiter_expand(struct psi_cpp *cpp)
{
if (psi_cpp_tokiter_valid(cpp)) {
struct psi_token *current = psi_cpp_tokiter_current(cpp);
if (current) {
struct psi_cpp_macro_decl *macro = zend_hash_str_find_ptr(
- &cpp->defs, current->text, current->size);
+ cpp->defs, current->text, current->size);
/* don't expand itself */
if (macro && macro->token != current) {
projects / m6w6 / ext-psi / blobdiff