X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl_var.h;h=08f4b140f043af56ed3c768e53458975640ac0bf;hb=4bf8ff5e477da2fa4f82518bb947055c2c0374d6;hp=69f9adc34749eab2b27c50e17493db9da916180c;hpb=c9384515a81cb64d345b299908b2852f51bb8e6e;p=m6w6%2Fext-psi diff --git a/src/types/decl_var.h b/src/types/decl_var.h index 69f9adc..08f4b14 100644 --- a/src/types/decl_var.h +++ b/src/types/decl_var.h @@ -35,31 +35,16 @@ struct psi_validate_scope; struct psi_decl_var { struct psi_token *token; - char *name, *fqn; + zend_string *name, *fqn; unsigned pointer_level; unsigned array_size; struct psi_decl_arg *arg; }; -struct psi_decl_var *psi_decl_var_init(const char *name, unsigned pl, unsigned as); +struct psi_decl_var *psi_decl_var_init(zend_string *name, unsigned pl, unsigned as); struct psi_decl_var *psi_decl_var_copy(struct psi_decl_var *src); void psi_decl_var_free(struct psi_decl_var **var_ptr); -void psi_decl_var_dump(int fd, struct psi_decl_var *var); - -#include - -static inline char *psi_decl_var_name_prepend(char *current, const char *prepend) { - size_t c_len = strlen(current); - size_t p_len = strlen(prepend); - - current = realloc(current, p_len + 1 + c_len + 1); - if (current) { - memmove(current + p_len + 1, current, c_len + 1); - current[p_len] = '.'; - memcpy(current, prepend, p_len); - } - return current; -} +void psi_decl_var_dump(struct psi_dump *dump, struct psi_decl_var *var); bool psi_decl_var_validate(struct psi_data *data, struct psi_decl_var *dvar, struct psi_validate_scope *scope);