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 "php_psi.h"
#include <libgen.h>
#include "cpp.h"
#include "parser.h"
+#include "debug.h"
#define PSI_CPP_SEARCH
#define PSI_CPP_PREDEF
-#include "php_psi_cpp.h"
-
-#include "php_psi.h"
+#include "php_psi_predef.h"
HashTable psi_cpp_defaults;
+PHP_MINIT_FUNCTION(psi_cpp);
PHP_MINIT_FUNCTION(psi_cpp)
{
struct psi_parser parser;
struct psi_parser_input *predef;
- if (!psi_parser_init(&parser, NULL, 0)) {
+ PSI_G(search_path) = pemalloc(strlen(PSI_G(directory)) + strlen(psi_cpp_search) + 1 + 1, 1);
+ sprintf(PSI_G(search_path), "%s:%s", PSI_G(directory), psi_cpp_search);
+
+ if (!psi_parser_init(&parser, psi_error_wrapper, PSI_SILENT)) {
return FAILURE;
}
return SUCCESS;
}
+PHP_MSHUTDOWN_FUNCTION(psi_cpp);
PHP_MSHUTDOWN_FUNCTION(psi_cpp)
{
struct psi_cpp_macro_decl *macro;
struct psi_cpp *psi_cpp_init(struct psi_parser *P)
{
- struct psi_cpp *cpp = calloc(1, sizeof(*cpp));
+ struct psi_cpp *cpp = pecalloc(1, sizeof(*cpp), 1);
cpp->parser = P;
zend_hash_init(&cpp->once, 0, NULL, NULL, 1);
zend_hash_init(&cpp->defs, 0, NULL, free_cpp_def, 1);
zend_hash_copy(&cpp->defs, &psi_cpp_defaults, NULL);
+ zend_hash_init(&cpp->expanding, 0, NULL, NULL, 1);
return cpp;
}
-#if PSI_CPP_DEBUG
-static int dump_def(zval *p)
-{
- struct psi_cpp_macro_decl *decl = Z_PTR_P(p);
-
- if (decl) {
- fflush(stderr);
- dprintf(2, "PSI: CPP decl -> #define ");
- psi_cpp_macro_decl_dump(2, decl);
- dprintf(2, "\n");
- }
- return ZEND_HASH_APPLY_KEEP;
-}
-#endif
+static char *include_flavor[] = {
+ "include",
+ "include next",
+ "include once"
+};
void psi_cpp_free(struct psi_cpp **cpp_ptr)
{
if (*cpp_ptr) {
struct psi_cpp *cpp = *cpp_ptr;
-#if PSI_CPP_DEBUG
- zend_hash_apply(&cpp->defs, dump_def);
-#endif
*cpp_ptr = NULL;
zend_hash_destroy(&cpp->defs);
zend_hash_destroy(&cpp->once);
+ zend_hash_destroy(&cpp->expanding);
free(cpp);
}
}
no_ws->type = PSI_T_NO_WHITESPACE;
zend_string_release(no_ws->text);
- no_ws->text = zend_string_init_interned("\xA0", 1, 1);
+ no_ws->text = psi_string_init_interned("\xA0", 1, 1);
psi_cpp_tokiter_add(cpp, no_ws);
continue;
}
static bool psi_cpp_stage2(struct psi_cpp *cpp)
{
- struct psi_plist *parser_tokens = psi_plist_init((psi_plist_dtor) psi_token_free);
- bool is_eol = true, do_cpp = false, do_expansion = true, skip_paren = false, skip_all = false;
+ bool is_eol = true, do_expansion = true, skip_paren = false, skip_all = false;
PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP %s\n", "stage2");
if (current->type == PSI_T_HASH) {
if (is_eol) {
- do_cpp = true;
+ cpp->do_cpp = true;
is_eol = false;
}
} else if (current->type == PSI_T_EOL) {
#if PSI_CPP_DEBUG
- fprintf(stderr, "PSI: CPP do_expansion=true, PSI_T_EOL\n");
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP do_expansion=true, PSI_T_EOL\n");
#endif
is_eol = true;
skip_all = false;
do_expansion = true;
- if (!do_cpp) {
+ if (!cpp->do_cpp) {
psi_cpp_tokiter_del_cur(cpp, true);
continue;
}
} else {
is_eol = false;
- if (do_cpp) {
+ if (cpp->do_cpp) {
switch (current->type) {
case PSI_T_DEFINE:
#if PSI_CPP_DEBUG
- fprintf(stderr, "PSI: CPP do_expansion=false, PSI_T_DEFINE, skip_all\n");
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP do_expansion=false, PSI_T_DEFINE, skip_all\n");
#endif
do_expansion = false;
skip_all = true;
case PSI_T_IFNDEF:
case PSI_T_UNDEF:
#if PSI_CPP_DEBUG
- fprintf(stderr, "PSI: CPP do_expansion=false, PSI_T_{IF{,N},UN}DEF\n");
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP do_expansion=false, PSI_T_{IF{,N},UN}DEF\n");
#endif
do_expansion = false;
break;
} else {
do_expansion = true;
#if PSI_CPP_DEBUG
- fprintf(stderr, "PSI: CPP do_expansion=true, PSI_T_LPAREN, !skip_all, !skip_paren\n");
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP do_expansion=true, PSI_T_LPAREN, !skip_all, !skip_paren\n");
#endif
}
}
default:
do_expansion = !skip_all;
#if PSI_CPP_DEBUG
- fprintf(stderr, "PSI: CPP do_expansion=%s, <- !skip_all\n", do_expansion?"true":"false");
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP do_expansion=%s, <- !skip_all\n", do_expansion?"true":"false");
#endif
}
}
}
if (cpp->skip) {
- if (!do_cpp) {
+ if (!cpp->do_cpp) {
#if PSI_CPP_DEBUG
- fprintf(stderr, "PSI: CPP skip ");
- psi_token_dump(2, current);
+ PSI_DEBUG_LOCK(cpp->parser,
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP skip ");
+ PSI_DEBUG_DUMP(cpp->parser, psi_token_dump, current);
+ );
#endif
psi_cpp_tokiter_del_cur(cpp, true);
continue;
}
}
- if (do_expansion && current->type == PSI_T_NAME && psi_cpp_tokiter_defined(cpp)) {
+ if (do_expansion && psi_cpp_defined(cpp, current)) {
bool expanded = false;
- while (psi_cpp_tokiter_expand(cpp)) {
+ if (psi_cpp_tokiter_expand(cpp)) {
expanded = true;
}
if (expanded) {
}
}
- if (do_cpp) {
- parser_tokens = psi_plist_add(parser_tokens, ¤t);
+ psi_cpp_tokiter_add_cur(cpp);
+
+ if (cpp->do_cpp && is_eol) {
+ size_t processed = 0;
+ bool parsed;
- if (is_eol) {
- size_t processed = 0;
- bool parsed = psi_parser_process(cpp->parser, parser_tokens, &processed);
+ cpp->do_cpp = false;
- /* EOL */
- psi_plist_pop(parser_tokens, NULL);
- psi_plist_clean(parser_tokens);
- do_cpp = false;
+ parsed = psi_parser_process(cpp->parser, cpp->tokens.exec, &processed);
- if (!parsed) {
- psi_plist_free(parser_tokens);
- return false;
- }
- } else {
- /* leave EOLs in the input stream, else we might end up
- * with a hash not preceded with a new line after include */
- psi_cpp_tokiter_del_cur(cpp, false);
+ /* leave EOLs in the input stream, else we might end up
+ * with a hash not preceded with a new line after include */
+ psi_cpp_tokiter_add(cpp, current);
+ psi_plist_pop(cpp->tokens.exec, NULL);
+ psi_plist_clean(cpp->tokens.exec);
+
+ if (!parsed) {
+ psi_plist_free(cpp->tokens.exec);
+ return false;
}
#if PSI_CPP_DEBUG > 1
- psi_cpp_tokiter_dump(2, cpp);
+ PSI_DEBUG_DUMP(cpp->parser, psi_cpp_tokiter_dump, cpp);
#endif
-
- continue;
}
- psi_cpp_tokiter_add_cur(cpp);
psi_cpp_tokiter_next(cpp);
}
- psi_plist_free(parser_tokens);
+ psi_plist_free(cpp->tokens.exec);
+ cpp->tokens.exec = NULL;
return true;
}
-bool psi_cpp_process(struct psi_cpp *cpp, struct psi_plist **tokens)
+bool psi_cpp_process(struct psi_cpp *cpp, struct psi_plist **tokens,
+ struct psi_token *expanding)
{
bool parsed = false;
struct psi_cpp temp = *cpp;
cpp->tokens.iter = *tokens;
cpp->tokens.next = NULL;
+ cpp->tokens.exec = NULL;
+ if (expanding) {
+ zend_hash_add_empty_element(&cpp->expanding, expanding->text);
+ }
if (psi_cpp_stage1(cpp) && psi_cpp_stage2(cpp)) {
parsed = true;
}
-
- if (cpp->tokens.next) {
- free(cpp->tokens.iter);
- cpp->tokens.iter = cpp->tokens.next;
- cpp->tokens.next = NULL;
+ if (expanding) {
+ zend_hash_del(&cpp->expanding, expanding->text);
}
- *tokens = cpp->tokens.iter;
-
- if (temp.tokens.iter) {
- cpp->tokens.iter = temp.tokens.iter;
- cpp->tokens.next = temp.tokens.next;
- cpp->index = temp.index;
+ *tokens = cpp->tokens.next;
+ psi_plist_free(cpp->tokens.iter);
+ if (cpp->tokens.exec) {
+ assert(!psi_plist_count(cpp->tokens.exec));
+ psi_plist_free(cpp->tokens.exec);
}
+ cpp->tokens = temp.tokens;
+ cpp->index = temp.index;
+ cpp->skip = temp.skip;
+ cpp->level = temp.level;
+ cpp->seen = temp.seen;
+ cpp->do_cpp = temp.do_cpp;
+
return parsed;
}
bool psi_cpp_defined(struct psi_cpp *cpp, struct psi_token *tok)
{
- bool defined;
+ bool defined = false;
if (tok->type == PSI_T_NAME) {
- defined = zend_hash_exists(&cpp->defs, tok->text);
- } else {
- defined = false;
- }
-
+ if (psi_builtin_exists(tok->text)) {
+ defined = true;
+ } else if (!zend_hash_exists(&cpp->expanding, tok->text)) {
+ defined = zend_hash_exists(&cpp->defs, tok->text);
+ }
#if PSI_CPP_DEBUG
- fprintf(stderr, "PSI: CPP defined -> %s ", defined ? "true" : "false");
- if (defined) {
- struct psi_cpp_macro_decl *macro = zend_hash_find_ptr(&cpp->defs, tok->text);
- fprintf(stderr, " @ %s:%u ", macro->token->file->val, macro->token->line);
- }
- psi_token_dump(2, tok);
+ PSI_DEBUG_LOCK(cpp->parser,
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP defined -> %s ", defined ? "true" : "false");
+ if (defined) {
+ struct psi_cpp_macro_decl *macro = zend_hash_find_ptr(&cpp->defs, tok->text);
+ if (macro) {
+ PSI_DEBUG_PRINT(cpp->parser, " @ %s:%u ", macro->token->file->val, macro->token->line);
+ }
+ } else {
+ zend_string *key;
+
+ PSI_DEBUG_PRINT(cpp->parser, " expanding=");
+ ZEND_HASH_FOREACH_STR_KEY(&cpp->expanding, key)
+ {
+ PSI_DEBUG_PRINT(cpp->parser, "%s,", key->val);
+ }
+ ZEND_HASH_FOREACH_END();
+ PSI_DEBUG_PRINT(cpp->parser, "\t");
+ }
+ PSI_DEBUG_DUMP(cpp->parser, psi_token_dump, tok);
+ );
#endif
+ }
return defined;
}
"'%s' previously defined", old->token->text->val);
}
#if PSI_CPP_DEBUG
- if (decl->exp) {
- fprintf(stderr, "PSI: CPP MACRO num_exp -> %s ", decl->token->text->val);
- } else {
- fprintf(stderr, "PSI: CPP MACRO decl -> %s ", decl->token->text->val);
- }
- psi_cpp_macro_decl_dump(2, decl);
- fprintf(stderr, "\n");
+ PSI_DEBUG_LOCK(cpp->parser,
+ if (decl->exp) {
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP MACRO num_exp -> ");
+ } else {
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP MACRO decl -> ");
+ }
+ PSI_DEBUG_DUMP(cpp->parser, psi_cpp_macro_decl_dump, decl);
+ PSI_DEBUG_PRINT(cpp->parser, "\n");
+ );
#endif
zend_hash_update_ptr(&cpp->defs, decl->token->text, decl);
}
{
struct psi_validate_scope scope = {0};
- scope.defs = &cpp->defs;
+ scope.cpp = cpp;
if (!psi_num_exp_validate(PSI_DATA(cpp->parser), exp->data.num, &scope)) {
return false;
}
- if (!psi_num_exp_get_long(exp->data.num, NULL, &cpp->defs)) {
+ if (!psi_num_exp_get_long(exp->data.num, NULL, cpp)) {
return false;
}
return true;
}
-static inline bool try_include(struct psi_cpp *cpp, const char *path, bool *parsed)
+bool psi_cpp_include(struct psi_cpp *cpp, const struct psi_token *file, unsigned flags)
{
+ bool parsed = false;
+ char path[PATH_MAX];
+ struct psi_plist *tokens;
struct psi_parser_input *include;
- PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP include trying %s\n", path);
-
- include = psi_parser_open_file(cpp->parser, path, false);
- if (include) {
- struct psi_plist *tokens;
-
- PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP include scanning %s\n", path);
-
- tokens = psi_parser_scan(cpp->parser, include);
- if (tokens) {
- *parsed = psi_cpp_process(cpp, &tokens);
-
- if (*parsed) {
- size_t num_tokens = psi_plist_count(tokens);
+ if (!psi_cpp_has_include(cpp, file, flags, path)) {
+ return false;
+ }
- ++cpp->expanded;
- psi_cpp_tokiter_add_range(cpp, num_tokens, psi_plist_eles(tokens));
- free(tokens);
- } else {
- psi_plist_free(tokens);
- }
+ if (flags & PSI_CPP_INCLUDE_ONCE) {
+ if (zend_hash_str_exists(&cpp->once, path, strlen(path))) {
+ return true;
}
- psi_parser_input_free(&include);
+ }
+
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP %s opening %s\n",
+ include_flavor[flags], path);
- zend_hash_str_add_empty_element(&cpp->once, path, strlen(path));
- return true;
+ include = psi_parser_open_file(cpp->parser, path, false);
+ if (!include) {
+ return false;
}
- return false;
-}
-static inline void include_path(const struct psi_token *file, char **path)
-{
- if (file->text->val[0] == '/') {
- *path = file->text->val;
- } else {
- char *dir;
- size_t len;
+ zend_hash_str_add_empty_element(&cpp->once, path, strlen(path));
- strncpy(*path, file->file->val, PATH_MAX);
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP include scanning %s\n", path);
- dir = dirname(*path);
- len = strlen(dir);
+ tokens = psi_parser_scan(cpp->parser, include);
+ psi_parser_input_free(&include);
- assert(len + file->text->len + 1 < PATH_MAX);
+ if (!tokens) {
+ return false;
+ }
- memmove(*path, dir, len);
- (*path)[len] = '/';
- memcpy(&(*path)[len + 1], file->text->val, file->text->len + 1);
+ parsed = psi_cpp_process(cpp, &tokens, NULL);
+ if (!parsed) {
+ psi_plist_free(tokens);
+ return false;
}
+
+ psi_cpp_tokiter_add_range(cpp, psi_plist_count(tokens), psi_plist_eles(tokens));
+ free(tokens);
+
+ ++cpp->expanded;
+ return true;
}
-bool psi_cpp_include(struct psi_cpp *cpp, const struct psi_token *file, unsigned flags)
+#ifndef HAVE_EACCESS
+# define eaccess access
+#endif
+bool psi_cpp_has_include(struct psi_cpp *cpp, const struct psi_token *file, unsigned flags, char *path)
{
- bool parsed = false;
+ char temp[PATH_MAX];
+
+ if (!path) {
+ path = temp;
+ }
if (file->type == PSI_T_QUOTED_STRING && (!(flags & PSI_CPP_INCLUDE_NEXT) || file->text->val[0] == '/')) {
/* first try as is, full or relative path */
- char temp[PATH_MAX], *path = temp;
+ if (file->text->val[0] == '/') {
+ path = file->text->val;
+ } else {
+ char *dir;
+ size_t len;
- include_path(file, &path);
+ strncpy(path, file->file->val, PATH_MAX);
- if ((flags & PSI_CPP_INCLUDE_ONCE) && zend_hash_str_exists(&cpp->once, path, strlen(path))) {
- return true;
+ dir = dirname(path);
+ len = strlen(dir);
+
+ assert(len + file->text->len + 1 < PATH_MAX);
+
+ memmove(path, dir, len);
+ path[len] = '/';
+ memcpy(&(path)[len + 1], file->text->val, file->text->len + 1);
}
- if (try_include(cpp, path, &parsed)) {
- /* found */
- return parsed;
+
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP %s trying %s\n",
+ include_flavor[flags], path);
+ if (0 == eaccess(path, R_OK)) {
+ return true;
}
}
/* look through search paths */
if (file->text->val[0] != '/') {
- char path[PATH_MAX];
const char *sep;
int p_len;
d_len = sep ? sep - cpp->search : strlen(cpp->search);
if (PATH_MAX > (p_len = snprintf(path, PATH_MAX, "%.*s/%.*s", d_len, cpp->search, (int) file->text->len, file->text->val))) {
- if ((flags & PSI_CPP_INCLUDE_ONCE) && zend_hash_str_exists(&cpp->once, path, p_len)) {
- return true;
- }
- if (try_include(cpp, path, &parsed)) {
- break;
- }
+ PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP %s trying %s\n",
+ include_flavor[flags], path);
+ if (0 == eaccess(path, R_OK)) {
+ return true;
+ }
}
if (sep) {
} while (sep);
}
- return parsed;
+ return false;
}
projects / m6w6 / ext-psi / blobdiff