OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
#include "cpp.h"
#include "parser.h"
-void psi_cpp_tokiter_dump(int fd, struct psi_cpp *cpp)
+void psi_cpp_tokiter_dump(struct psi_dump *dump, struct psi_cpp *cpp);
+void psi_cpp_tokiter_dump(struct psi_dump *dump, struct psi_cpp *cpp)
{
size_t i = cpp->index;
struct psi_token *T;
i = 0;
}
while (psi_plist_get(cpp->tokens.iter, i, &T)) {
- dprintf(fd, "PSI: CPP tokens %5zu %c ", i, cpp->index == i ? '*' : ' ');
- if (T) {
- psi_token_dump(fd, T);
- } else {
- dprintf(fd, "TOKEN deleted\n");
- }
+ PSI_DUMP(dump, "PSI: CPP tokens %5zu %c ", i, cpp->index == i ? '*' : ' ');
+ psi_token_dump(dump, T);
if (i >= cpp->index + 40) {
- dprintf(fd, "PSI: CPP tokens .....\n");
+ PSI_DUMP(dump, "PSI: CPP tokens .....\n");
break;
}
++i;
void psi_cpp_tokiter_reset(struct psi_cpp *cpp)
{
-#if PSI_CPP_DEBUG
- PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP reset -> iter.count=%zu, next.count=%zu\n",
- psi_plist_count(cpp->tokens.iter),
- psi_plist_count(cpp->tokens.next));
-# if PSI_CPP_DEBUG > 1
- PSI_DEBUG_DUMP(cpp->parser, psi_cpp_tokiter_dump, cpp);
-# endif
-#endif
cpp->index = 0;
cpp->expanded = 0;
cpp->skip = 0;
cpp->seen = 0;
cpp->level = 0;
+ cpp->do_cpp = false;
if (cpp->tokens.next) {
- free(cpp->tokens.iter);
+ psi_plist_free(cpp->tokens.iter);
cpp->tokens.iter = cpp->tokens.next;
}
cpp->tokens.next = psi_plist_init((psi_plist_dtor) psi_token_free);
+ if (cpp->tokens.exec) {
+ assert(!psi_plist_count(cpp->tokens.exec));
+ psi_plist_clean(cpp->tokens.exec);
+ } else {
+ cpp->tokens.exec = psi_plist_init((psi_plist_dtor) psi_token_free);
+ }
+#if PSI_CPP_DEBUG
+ PSI_DEBUG_PRINT(cpp->parser,
+ "PSI: CPP reset -> iter.count=%zu, next.count=%zu, exec.count=%zu\n",
+ psi_plist_count(cpp->tokens.iter),
+ psi_plist_count(cpp->tokens.next),
+ psi_plist_count(cpp->tokens.exec));
+# if PSI_CPP_DEBUG > 1
+ PSI_DEBUG_DUMP(cpp->parser, psi_cpp_tokiter_dump, cpp);
+# endif
+#endif
}
bool psi_cpp_tokiter_seek(struct psi_cpp *cpp, size_t index)
struct psi_token *cur = NULL;
if (psi_plist_get(cpp->tokens.iter, cpp->index, &cur)) {
- struct psi_plist *tokens = psi_plist_add(cpp->tokens.next, &cur);
-
- if (tokens) {
- cpp->tokens.next = tokens;
+ psi_plist_unset(cpp->tokens.iter, cpp->index);
+ if (cpp->do_cpp) {
+ cpp->tokens.exec = psi_plist_add(cpp->tokens.exec, &cur);
+ } else {
+ cpp->tokens.next = psi_plist_add(cpp->tokens.next, &cur);
+ }
#if PSI_CPP_DEBUG
- PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP add_cur -> index=%zu, iter.count=%zu, next.count=%zu ",
- cpp->index, psi_plist_count(cpp->tokens.iter), psi_plist_count(cpp->tokens.next));
- PSI_DEBUG_DUMP(cpp->parser, psi_token_dump, cur);
+ PSI_DEBUG_PRINT(cpp->parser,
+ "PSI: CPP add_cur -> index=%zu, iter.count=%zu, next.count=%zu, exec.count=%zu ",
+ cpp->index, psi_plist_count(cpp->tokens.iter), psi_plist_count(cpp->tokens.next),
+ psi_plist_count(cpp->tokens.exec));
+ PSI_DEBUG_DUMP(cpp->parser, psi_token_dump, cur);
#endif
- return true;
- }
+ return true;
}
return false;
bool psi_cpp_tokiter_add(struct psi_cpp *cpp, struct psi_token *tok)
{
- struct psi_plist *tokens = psi_plist_add(cpp->tokens.next, &tok);
-
- if (!tokens) {
- return false;
+ if (cpp->do_cpp) {
+ cpp->tokens.exec = psi_plist_add(cpp->tokens.exec, &tok);
+ } else {
+ cpp->tokens.next = psi_plist_add(cpp->tokens.next, &tok);
}
- cpp->tokens.next = tokens;
#if PSI_CPP_DEBUG
- PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP add -> index=%zu, iter.count=%zu, next.count=%zu ",
- cpp->index, psi_plist_count(cpp->tokens.iter), psi_plist_count(cpp->tokens.next));
+ PSI_DEBUG_PRINT(cpp->parser,
+ "PSI: CPP add -> index=%zu, iter.count=%zu, next.count=%zu, exec.count=%zu ",
+ cpp->index, psi_plist_count(cpp->tokens.iter), psi_plist_count(cpp->tokens.next),
+ psi_plist_count(cpp->tokens.exec));
PSI_DEBUG_DUMP(cpp->parser, psi_token_dump, tok);
#endif
bool psi_cpp_tokiter_add_range(struct psi_cpp *cpp, size_t num_eles, void **eles)
{
- struct psi_plist *tokens;
-
if (!num_eles) {
return true;
}
- tokens = psi_plist_add_r(cpp->tokens.next, num_eles, eles);
- if (!tokens) {
- return false;
+ if (cpp->do_cpp) {
+ cpp->tokens.exec = psi_plist_add_r(cpp->tokens.exec, num_eles, eles);
+ } else {
+ cpp->tokens.next = psi_plist_add_r(cpp->tokens.next, num_eles, eles);
}
- cpp->tokens.next = tokens;
#if PSI_CPP_DEBUG
- PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP add_range -> index=%zu, num_eles=%zu, iter.count=%zu, next.count=%zu\n",
- cpp->index, num_eles, psi_plist_count(cpp->tokens.iter), psi_plist_count(cpp->tokens.next));
+ PSI_DEBUG_PRINT(cpp->parser,
+ "PSI: CPP add_range -> index=%zu, num_eles=%zu, iter.count=%zu, next.count=%zu, exec.count=%zu\n",
+ cpp->index, num_eles, psi_plist_count(cpp->tokens.iter), psi_plist_count(cpp->tokens.next),
+ psi_plist_count(cpp->tokens.exec));
#endif
return true;
bool psi_cpp_tokiter_valid(struct psi_cpp *cpp)
{
-#if 0 && PSI_CPP_DEBUG
- PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP valid -> index=%zu -> %d\n",
- cpp->index, cpp->index < psi_plist_count(cpp->tokens.iter));
+#if PSI_CPP_DEBUG > 1
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP valid -> index=%zu -> %s\n",
+ cpp->index, cpp->index < psi_plist_count(cpp->tokens.iter)
+ ? "true" : "false");
#endif
return cpp->index < psi_plist_count(cpp->tokens.iter);
}
struct psi_token *cur = NULL;
#if PSI_CPP_DEBUG
- PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP del_prev -> index=%zu, iter.count=%zu, next.count=%zu\n",
- cpp->index, psi_plist_count(cpp->tokens.iter), psi_plist_count(cpp->tokens.next));
+ PSI_DEBUG_PRINT(cpp->parser,
+ "PSI: CPP del_prev -> index=%zu, iter.count=%zu, next.count=%zu, exec.count=%zu\n",
+ cpp->index, psi_plist_count(cpp->tokens.iter), psi_plist_count(cpp->tokens.next),
+ psi_plist_count(cpp->tokens.exec));
#endif
- if (psi_plist_pop(cpp->tokens.next, NULL) && psi_plist_get(cpp->tokens.iter, cpp->index - 1, &cur)) {
- psi_plist_unset(cpp->tokens.iter, cpp->index - 1);
- if (free_token && cur) {
- psi_token_free(&cur);
+ if (cpp->do_cpp) {
+ if (!psi_plist_pop(cpp->tokens.exec, &cur)) {
+ return false;
}
- return true;
+ } else if (!psi_plist_pop(cpp->tokens.next, &cur)) {
+ return false;
}
-
- return false;
+ if (free_token && cur) {
+ psi_token_free(&cur);
+ }
+ return true;
}
+
bool psi_cpp_tokiter_del_cur(struct psi_cpp *cpp, bool free_token)
{
struct psi_token *cur = NULL;
#if PSI_CPP_DEBUG
- PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP del_cur -> index=%zu, iter.count=%zu, next.count=%zu ",
- cpp->index, psi_plist_count(cpp->tokens.iter), psi_plist_count(cpp->tokens.next));
+ PSI_DEBUG_PRINT(cpp->parser,
+ "PSI: CPP del_cur -> index=%zu, iter.count=%zu, next.count=%zu, exec.count=%zu ",
+ cpp->index, psi_plist_count(cpp->tokens.iter), psi_plist_count(cpp->tokens.next),
+ psi_plist_count(cpp->tokens.exec));
#endif
if (psi_plist_get(cpp->tokens.iter, cpp->index, &cur)) {
#if PSI_CPP_DEBUG
PSI_DEBUG_DUMP(cpp->parser, psi_token_dump, cur);
#endif
- psi_plist_unset(cpp->tokens.iter, cpp->index);
+ if (cpp->index == psi_plist_count(cpp->tokens.iter) - 1) {
+ psi_plist_pop(cpp->tokens.iter, NULL);
+ } else {
+ psi_plist_unset(cpp->tokens.iter, cpp->index);
+ }
if (free_token && cur) {
psi_token_free(&cur);
}
size_t i;
#if PSI_CPP_DEBUG
- PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP del_range -> index=%zu, offset=%zu, num_eles=%zu, iter.count=%zu, next.count=%zu\n",
- cpp->index, offset, num_eles, psi_plist_count(cpp->tokens.iter), psi_plist_count(cpp->tokens.next));
+ PSI_DEBUG_PRINT(cpp->parser,
+ "PSI: CPP del_range -> index=%zu, offset=%zu, num_eles=%zu, iter.count=%zu, next.count=%zu, exec.count=%zu\n",
+ cpp->index, offset, num_eles, psi_plist_count(cpp->tokens.iter), psi_plist_count(cpp->tokens.next),
+ psi_plist_count(cpp->tokens.exec));
#endif
for (i = offset; i < offset + num_eles; ++i) {
return false;
}
#if PSI_CPP_DEBUG
- PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP del_range -> ");
- PSI_DEBUG_DUMP(cpp->parser, psi_token_dump, ptr);
+ PSI_DEBUG_LOCK(cpp->parser,
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP del_range -> ");
+ PSI_DEBUG_DUMP(cpp->parser, psi_token_dump, ptr);
+ );
#endif
psi_plist_unset(cpp->tokens.iter, i);
if (free_tokens && ptr) {
return true;
}
-bool psi_cpp_tokiter_ins_range(struct psi_cpp *cpp, size_t num_eles, void **eles)
-{
- struct psi_plist *tokens;
-
- if (!num_eles) {
- return true;
- }
-
- tokens = psi_plist_ins_r(cpp->tokens.iter, cpp->index, num_eles, eles);
- if (!tokens) {
- return false;
- }
- cpp->tokens.iter = tokens;
-
-#if PSI_CPP_DEBUG
- PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP ins_range -> index=%zu, num_eles=%zu, iter.count=%zu, next.count=%zu\n",
- cpp->index, num_eles, psi_plist_count(cpp->tokens.iter), psi_plist_count(cpp->tokens.next));
-#endif
-
- return true;
-}
-
bool psi_cpp_tokiter_defined(struct psi_cpp *cpp)
{
if (psi_cpp_tokiter_valid(cpp)) {
stringify = false;
}
+ bool processed = psi_cpp_process(cpp, &exp, target);
+ assert(processed);
+
n = psi_plist_count(exp);
- psi_cpp_tokiter_ins_range(cpp, n, psi_plist_eles(exp));
+ psi_cpp_tokiter_add_range(cpp, n, psi_plist_eles(exp));
free(exp);
return n;
for (s = 0; psi_plist_get(macro->sig, s, &arg_name); ++s) {
if (zend_string_equals(arg_name->text, tok->text)) {
if (prescan) {
- bool processed = psi_cpp_process(cpp, &arg_tokens_list[s]);
+ bool processed = psi_cpp_process(cpp,
+ &arg_tokens_list[s], target);
assert(processed);
}
/* prescan */
for (s = 0; s < argc; ++s) {
- bool processed = psi_cpp_process(cpp, &arg_tokens_list[s]);
+ bool processed = psi_cpp_process(cpp, &arg_tokens_list[s],
+ target);
assert(processed);
}
if (!builtin->func(cpp, target, arg_tokens_list, &res)) {
struct psi_token *zero = psi_token_init(PSI_T_NUMBER, "0", 1,
target->col, target->line, target->file);
- psi_cpp_tokiter_ins_range(cpp, 1, (void *) &zero);
+ psi_cpp_tokiter_add(cpp, zero);
} else if (!res) {
struct psi_token *one = psi_token_init(PSI_T_NUMBER, "1", 1,
target->col, target->line, target->file);
- psi_cpp_tokiter_ins_range(cpp, 1, (void *) &one);
+ psi_cpp_tokiter_add(cpp, one);
} else {
psi_cpp_tokiter_expand_tokens(cpp, target, res);
psi_plist_free(res);
return false;
}
} else {
- psi_cpp_tokiter_next(cpp);
+ psi_cpp_tokiter_del_cur(cpp, false);
}
psi_cpp_tokiter_expand_builtin_tokens(cpp, target, builtin, arg_tokens_list);
static inline bool psi_cpp_tokiter_expand_def(struct psi_cpp *cpp,
struct psi_token *target, struct psi_cpp_macro_decl *macro)
{
- /* delete current token from stream */
- psi_cpp_tokiter_del_cur(cpp, false);
- /* replace with tokens from macro */
- psi_cpp_tokiter_expand_tokens(cpp, target, macro->tokens);
+ if (macro->tokens) {
+ struct psi_plist *tokens = psi_plist_copy(macro->tokens,
+ (void (*)(void *)) psi_token_copy_ctor);
+ bool processed = psi_cpp_process(cpp, &tokens, target);
+
+ if (processed) {
+ /* replace with tokens from macro */
+ psi_cpp_tokiter_expand_tokens(cpp, target, tokens);
+ }
+ psi_plist_free(tokens);
+ ++cpp->expanded;
+ }
- psi_token_free(&target);
- ++cpp->expanded;
+ psi_cpp_tokiter_del_cur(cpp, true);
return true;
}
return false;
}
- /* don't expand itself */
- if (macro->token == target) {
- return false;
- }
-
if (macro->sig) {
return psi_cpp_tokiter_expand_call(cpp, target, macro);
} else if (psi_cpp_tokiter_expand_cmp(target, macro)) {
projects / m6w6 / ext-psi / blobdiff