X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.h;h=94860c5248d0e0fd9e6076b4ae90e5e4ce5a2fe5;hp=41741c0152abdd2e51c9672573f67e9ab195b4f7;hb=d3171526ab7658114cac4ebe1098af4b038e576e;hpb=1c837573a87e0d375768e990a28d1b2706dbaf43 diff --git a/src/parser.h b/src/parser.h index 41741c0..94860c5 100644 --- a/src/parser.h +++ b/src/parser.h @@ -27,6 +27,8 @@ typedef struct PSI_Token { char buf[1]; } PSI_Token; +static inline PSI_Token *PSI_TokenCopy(PSI_Token *src); + typedef union impl_val { char cval; int8_t i8; @@ -60,6 +62,7 @@ typedef struct decl_type { token_t type; struct decl_type *real; struct decl_struct *strct; + struct decl_union *unn; struct decl_enum *enm; struct decl *func; } decl_type; @@ -78,60 +81,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; @@ -148,6 +109,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); @@ -195,6 +167,9 @@ static inline decl_arg *init_decl_arg(decl_type *type, decl_var *var) { } static inline void free_decl_arg(decl_arg *arg) { + if (arg->token && arg->token != arg->var->token) { + free(arg->token); + } free_decl_type(arg->type); free_decl_var(arg->var); if (arg->layout) { @@ -203,6 +178,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; @@ -348,6 +347,7 @@ typedef struct decl_struct { char *name; decl_args *args; size_t size; + size_t align; struct { void *type; void (*dtor)(void *type); @@ -399,6 +399,56 @@ static inline void free_decl_structs(decl_structs *ss) { free(ss); } +typedef struct decl_union { + PSI_Token *token; + char *name; + decl_args *args; + size_t size; + size_t align; +} decl_union; + +static inline decl_union *init_decl_union(const char *name, decl_args *args) { + decl_union *u = calloc(1, sizeof(*u)); + u->name = strdup(name); + u->args = args; + return u; +} + +static inline void free_decl_union(decl_union *u) { + if (u->token) { + free(u->token); + } + if (u->args) { + free_decl_args(u->args); + } + free(u->name); + free(u); +} + +typedef struct decl_unions { + decl_union **list; + size_t count; +} decl_unions; + +static inline decl_unions *add_decl_union(decl_unions *uu, decl_union *u) { + if (!uu) { + uu = calloc(1, sizeof(*uu)); + } + uu->list = realloc(uu->list, ++uu->count * sizeof(*uu->list)); + uu->list[uu->count-1] = u; + return uu; +} + +static inline void free_decl_unions(decl_unions *uu) { + size_t i; + + for (i = 0; i < uu->count; ++i) { + free_decl_union(uu->list[i]); + } + free(uu->list); + free(uu); +} + typedef struct impl_type { char *name; token_t type; @@ -641,7 +691,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)); @@ -1360,13 +1409,14 @@ static inline impl_val *struct_member_ref(decl_arg *set_arg, impl_val *struct_pt #define PSI_ERROR 16 #define PSI_WARNING 32 -typedef void (*psi_error_cb)(PSI_Token *token, int type, const char *msg, ...); +typedef void (*psi_error_cb)(void *context, PSI_Token *token, int type, const char *msg, ...); #define PSI_DATA(D) ((PSI_Data *) (D)) #define PSI_DATA_MEMBERS \ constants *consts; \ decl_typedefs *defs; \ decl_structs *structs; \ + decl_unions *unions; \ decl_enums *enums; \ decls *decls; \ impls *impls; \ @@ -1374,7 +1424,9 @@ typedef void (*psi_error_cb)(PSI_Token *token, int type, const char *msg, ...); decl_file file; \ decl_libs libs; \ } psi; \ - psi_error_cb error + psi_error_cb error; \ + unsigned errors; \ + unsigned flags typedef struct PSI_Data { PSI_DATA_MEMBERS; } PSI_Data; @@ -1398,6 +1450,9 @@ static inline void PSI_DataDtor(PSI_Data *data) { if (data->structs) { free_decl_structs(data->structs); } + if (data->unions) { + free_decl_unions(data->unions); + } if (data->enums) { free_decl_enums(data->enums); } @@ -1415,7 +1470,7 @@ typedef struct PSI_Parser { FILE *fp; token_t num; void *proc; - unsigned flags, errors, line, col; + unsigned line, col; char *cur, *tok, *lim, *eof, *ctx, *mrk, buf[BSIZE]; } PSI_Parser; @@ -1511,6 +1566,7 @@ static inline PSI_Token *PSI_TokenAppend(PSI_Token *T, unsigned argc, ...) { 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; @@ -1546,6 +1602,7 @@ static inline uint64_t PSI_TokenHash(PSI_Token *t, char *digest_buf) { } #define PSI_PARSER_DEBUG 0x1 +#define PSI_PARSER_SILENT 0x2 PSI_Parser *PSI_ParserInit(PSI_Parser *P, const char *filename, psi_error_cb error, unsigned flags); void PSI_ParserSyntaxError(PSI_Parser *P, const char *fn, size_t ln, const char *msg, ...);