X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fparser.h;h=0f5671d38ebf7782f3b42ae68120df801182487a;hb=9bd48d16d68944f3a1e9366fe8c6f3c6d985bf56;hp=daf99dc8eda359cc02e2a1d0fba8ae75bbee7ced;hpb=6a459a08a40a2c243b0211ceb0cb263d29302627;p=m6w6%2Fext-psi diff --git a/src/parser.h b/src/parser.h index daf99dc..0f5671d 100644 --- a/src/parser.h +++ b/src/parser.h @@ -22,11 +22,13 @@ size_t psi_t_size(token_t); typedef struct PSI_Token { token_t type; - unsigned size, line; + unsigned size, line, col; char *text, *file; char buf[1]; } PSI_Token; +static inline PSI_Token *PSI_TokenCopy(PSI_Token *src); + typedef union impl_val { char cval; int8_t i8; @@ -61,6 +63,7 @@ typedef struct decl_type { struct decl_type *real; struct decl_struct *strct; struct decl_enum *enm; + struct decl *func; } decl_type; static inline decl_type *init_decl_type(token_t type, const char *name) { @@ -77,60 +80,18 @@ static inline decl_type *real_decl_type(decl_type *type) { return type; } +static inline void free_decl(struct decl *decl); static inline void free_decl_type(decl_type *type) { if (type->token) { free(type->token); } + if (type->type == PSI_T_FUNCTION) { + free_decl(type->func); + } free(type->name); free(type); } -typedef struct decl_typedef { - PSI_Token *token; - char *alias; - decl_type *type; -} decl_typedef; - -static inline decl_typedef *init_decl_typedef(const char *name, decl_type *type) { - decl_typedef *t = calloc(1, sizeof(*t)); - t->alias = strdup(name); - t->type = type; - return t; -} - -static inline void free_decl_typedef(decl_typedef *t) { - if (t->token) { - free(t->token); - } - free(t->alias); - free_decl_type(t->type); - free(t); -} - -typedef struct decl_typedefs { - size_t count; - decl_typedef **list; -} decl_typedefs; - -static inline decl_typedefs *add_decl_typedef(decl_typedefs *defs, decl_typedef *def) { - if (!defs) { - defs = calloc(1, sizeof(*defs)); - } - defs->list = realloc(defs->list, ++defs->count * sizeof(*defs->list)); - defs->list[defs->count-1] = def; - return defs; -} - -static void free_decl_typedefs(decl_typedefs *defs) { - size_t i; - - for (i = 0; i < defs->count; ++i) { - free_decl_typedef(defs->list[i]); - } - free(defs->list); - free(defs); -} - typedef struct decl_var { PSI_Token *token; char *name; @@ -147,6 +108,17 @@ static inline decl_var *init_decl_var(const char *name, unsigned pl, unsigned as return v; } +static inline decl_var *copy_decl_var(decl_var *src) { + decl_var *dest = calloc(1, sizeof(*dest)); + + memcpy(dest, src, sizeof(*dest)); + dest->name = strdup(dest->name); + if (dest->token) { + dest->token = PSI_TokenCopy(dest->token); + } + return dest; +} + static inline void free_decl_var(decl_var *var) { if (var->token) { free(var->token); @@ -162,7 +134,7 @@ typedef struct decl_struct_layout { static inline decl_struct_layout *init_decl_struct_layout(size_t pos, size_t len) { decl_struct_layout *l = calloc(1, sizeof(*l)); - + ZEND_ASSERT(pos+len); l->pos = pos; l->len = len; return l; @@ -202,6 +174,30 @@ static inline void free_decl_arg(decl_arg *arg) { free(arg); } +typedef struct decl_typedefs { + size_t count; + decl_arg **list; +} decl_typedefs; + +static inline decl_typedefs *add_decl_typedef(decl_typedefs *defs, decl_arg *def) { + if (!defs) { + defs = calloc(1, sizeof(*defs)); + } + defs->list = realloc(defs->list, ++defs->count * sizeof(*defs->list)); + defs->list[defs->count-1] = def; + return defs; +} + +static void free_decl_typedefs(decl_typedefs *defs) { + size_t i; + + for (i = 0; i < defs->count; ++i) { + free_decl_arg(defs->list[i]); + } + free(defs->list); + free(defs); +} + typedef struct decl_vars { decl_var **vars; size_t count; @@ -640,7 +636,6 @@ static inline num_exp *init_num_exp(token_t t, void *num) { return exp; } -static inline PSI_Token *PSI_TokenCopy(PSI_Token *src); static inline num_exp *copy_num_exp(num_exp *exp) { decl_var *dvar; num_exp *num = calloc(1, sizeof(*num)); @@ -1441,6 +1436,7 @@ static inline PSI_Token *PSI_TokenAlloc(PSI_Parser *P) { T->text = &T->buf[0]; T->file = &T->buf[token_len + 1]; T->line = P->line; + T->col = P->col; memcpy(T->text, P->tok, token_len); memcpy(T->file, P->psi.file.fn, fname_len); @@ -1488,8 +1484,60 @@ static inline PSI_Token *PSI_TokenCat(unsigned argc, ...) { return T; } -static inline const char *PSI_TokenLocation(PSI_Token *t) { - return t ? t->file : ":0:0"; +static inline PSI_Token *PSI_TokenAppend(PSI_Token *T, unsigned argc, ...) { + va_list argv; + unsigned i; + + va_start(argv, argc); + for (i = 0; i < argc; ++i) { + char *str = va_arg(argv, char *); + size_t str_len = strlen(str), token_len = T->size, fname_len = strlen(T->file); + + T = realloc(T, PSI_TokenAllocSize(T->size += str_len + 1, fname_len)); + T->text = &T->buf[0]; + T->file = &T->buf[T->size + 1]; + T->buf[token_len] = ' '; + memmove(&T->buf[T->size + 1], &T->buf[token_len + 1], fname_len + 1); + memcpy(&T->buf[token_len + 1], str, str_len + 1); + } + va_end(argv); + + return T; +} + +char *php_strtr(char *str, size_t len, char *str_from, char *str_to, size_t trlen); +static inline PSI_Token *PSI_TokenTranslit(PSI_Token *T, char *from, char *to) { + php_strtr(T->text, T->size, from, to, MIN(strlen(from), strlen(to))); + return T; +} + +static inline uint64_t psi_hash(char *digest_buf, ...) +{ + uint64_t hash = 5381; + uint8_t c; + const uint8_t *ptr; + va_list argv; + + va_start(argv, digest_buf); + while ((ptr = va_arg(argv, const uint8_t *))) { + while ((c = *ptr++)) { + hash = ((hash << 5) + hash) + c; + } + } + va_end(argv); + + if (digest_buf) { + sprintf(digest_buf, "%" PRIx64, hash); + } + + return hash; +} + +static inline uint64_t PSI_TokenHash(PSI_Token *t, char *digest_buf) { + char loc_buf[48]; + + sprintf(loc_buf, "%u%u", t->line, t->col); + return psi_hash(digest_buf, t->file, loc_buf, NULL); } #define PSI_PARSER_DEBUG 0x1