#ifdef HAVE_TIME_H
# include <time.h>
#endif
+#ifdef HAVE_SYSLOG_H
+# include <syslog.h>
+#endif
#ifdef HAVE_WCHAR_H
# include <wchar.h>
#endif
PSI_DECLS
{0}
};
+static struct psi_predef_decl psi_predef_vararg_decls[] = {
+ PSI_VA_DECLS
+ {0}
+};
static struct psi_predef_struct {
token_t type_tag;
} else if (!strchr(ptr, '/')) {
len = snprintf(lib, MAXPATHLEN, "lib%s.%s", ptr, PHP_PSI_SHLIB_SUFFIX);
if (MAXPATHLEN == len) {
- data->error(PSI_WARNING, "Library name too long: '%s'", ptr);
+ data->error(NULL, PSI_WARNING, "Library name too long: '%s'", ptr);
}
lib[len] = 0;
ptr = lib;
}
if (!(*dlopened = dlopen(ptr, RTLD_LAZY|RTLD_LOCAL))) {
- data->error(PSI_WARNING, "Could not open library '%s': %s.",
+ data->error(NULL, PSI_WARNING, "Could not open library '%s': %s.",
data->psi.file.ln, dlerror());
return 0;
}
}
static inline int validate_decl_typedef(PSI_Data *data, decl_typedef *def) {
if (!validate_decl_type(data, def->type)) {
- data->error(PSI_WARNING, "Type '%s' cannot be aliased to %s'%s'",
+ data->error(def->token, PSI_WARNING,
+ "Type '%s' cannot be aliased to %s'%s'",
def->type->name, def->type->type == PSI_T_STRUCT?"struct ":"",def->alias);
return 0;
}
static inline int validate_decl_arg(PSI_Data *data, decl_arg *arg) {
if (!validate_decl_type(data, arg->type)) {
- data->error(PSI_WARNING, "Cannot use '%s'(%d) as type for decl var '%s'"
- " in %s on line %zu at col %zu",
- arg->type->name, arg->type->type, arg->var->name,
- arg->type->token->file, arg->type->token->line, arg->type->token->col);
+ data->error(arg->type->token, PSI_WARNING,
+ "Cannot use '%s'(%d) as type for decl var '%s'",
+ arg->type->name, arg->type->type, arg->var->name);
return 0;
}
return 1;
"default", /* \ */
"extern", /* > - all the same */
"cdecl", /* / */
+ "mscdecl",
"stdcall",
"fastcall",
};
return 1;
}
}
- data->error(PSI_WARNING, "Invalid calling convention: '%s'", abi->convention);
return 0;
}
static inline int validate_decl_func(PSI_Data *data, void *dl, decl *decl, decl_arg *func)
struct psi_func_redir *redir;
if (!strcmp(func->var->name, "dlsym")) {
- data->error(PSI_WARNING, "Cannot dlsym dlsym (sic!)");
+ data->error(func->token, PSI_WARNING, "Cannot dlsym dlsym (sic!)");
return 0;
}
#endif
decl->call.sym = dlsym(dl ?: RTLD_NEXT, func->var->name);
if (!decl->call.sym) {
- data->error(PSI_WARNING, "Failed to locate symbol '%s': %s",
+ data->error(func->token, PSI_WARNING,
+ "Failed to locate symbol '%s': %s",
func->var->name, dlerror());
}
}
static inline int validate_decl(PSI_Data *data, void *dl, decl *decl) {
if (!validate_decl_abi(data, decl->abi)) {
+ data->error(decl->abi->token, PSI_WARNING,
+ "Invalid calling convention: '%s'", decl->abi->token->text);
return 0;
}
if (!validate_decl_func(data, dl, decl, decl->func)) {
switch (exp->t) {
case PSI_T_NAME:
if (!locate_decl_var_arg(exp->u.dvar, dargs, func)) {
- data->error(PSI_WARNING, "Unknown variable '%s' in numeric expression",
+ data->error(exp->token, PSI_WARNING, "Unknown variable '%s' in numeric expression",
exp->u.dvar->name);
return 0;
}
return 1;
case PSI_T_NSNAME:
if (!locate_num_exp_constant(exp, data->consts)) {
- data->error(PSI_WARNING, "Unknown constant '%s' in numeric expression",
+ data->error(exp->token, PSI_WARNING, "Unknown constant '%s' in numeric expression",
exp->u.numb);
return 0;
}
case PSI_T_VOID:
set->func->handler = psi_to_void;
break;
+ case PSI_T_ELLIPSIS:
+ if (set->outer.set && set->outer.set->func->type == PSI_T_TO_ARRAY) {
+ set->func->handler = psi_to_recursive;
+ break;
+ }
+ /* no break */
default:
return 0;
}
decl_var *set_var = set->vars->vars[0];
if (!validate_set_value_handler(set)) {
- data->error(PSI_WARNING, "Invalid cast '%s'", set->func->name);
+ data->error(set->func->token, PSI_WARNING, "Invalid cast '%s' in `set` statement", set->func->name);
return 0;
}
for (i = 0; i < set->vars->count; ++i) {
decl_var *svar = set->vars->vars[i];
if (!svar->arg && !locate_decl_var_arg(svar, ref_list, NULL)) {
- data->error(PSI_WARNING, "Unknown variable '%s'", svar->name);
+ data->error(svar->token, PSI_WARNING, "Unknown variable '%s' in `set` statement", svar->name);
return 0;
}
}
int is_pointer_to_struct = (ref_type->type == PSI_T_STRUCT && ref->var->pointer_level);
if (!is_to_array && !is_pointer_to_struct) {
- data->error(E_WARNING, "Inner `set` statement casts only work with "
+ data->error(set->func->token, E_WARNING, "Inner `set` statement casts only work with "
"to_array() casts on structs or pointers: %s(%s...", set->func->name, set->vars->vars[0]->name);
return 0;
}
decl_var *sub_var = set->inner[i]->vars->vars[0];
decl_arg *sub_ref = locate_struct_member(ref_type->strct, sub_var);
- set->inner[i]->outer.set = set;
if (sub_ref) {
if (!validate_set_value_ex(data, set->inner[i], sub_ref, ref_type->strct->args)) {
return 0;
decl_var *sub_var = set->inner[0]->vars->vars[0];
decl_arg *sub_ref = locate_decl_var_arg(sub_var, ref_list, ref);
- set->inner[0]->outer.set = set;
if (sub_ref) {
if (strcmp(sub_var->name, set_var->name)) {
- data->error(E_WARNING, "Inner `set` statement casts on pointers must reference the same variable");
+ data->error(sub_var->token, E_WARNING, "Inner `set` statement casts on pointers must reference the same variable");
return 0;
}
if (!validate_set_value_ex(data, set->inner[0], sub_ref, ref_list)) {
}
}
} else if (set->count > 1) {
- data->error(E_WARNING, "Inner `set` statement casts on pointers may only occur once");
+ data->error(set->func->token, E_WARNING, "Inner `set` statement casts on pointers may only occur once");
return 0;
}
/* and which type cast to apply */
if (impl->stmts->ret.count != 1) {
if (impl->stmts->ret.count > 1) {
- data->error(PSI_WARNING, "Too many `return` statements for implmentation %s;"
+ data->error(impl->stmts->ret.list[1]->token, PSI_WARNING,
+ "Too many `return` statements for implmentation %s;"
" found %zu, exactly one is needed",
impl->func->name, impl->stmts->ret.count);
} else {
- data->error(PSI_WARNING, "Missing `return` statement for implementation %s",
+ data->error(impl->func->token, PSI_WARNING,
+ "Missing `return` statement for implementation %s",
impl->func->name);
}
return 0;
ret = impl->stmts->ret.list[0];
if (!(impl->decl = locate_impl_decl(data->decls, ret))) {
- data->error(PSI_WARNING, "Missing declaration for implementation %s",
- impl->func->name);
+ data->error(ret->token, PSI_WARNING,
+ "Missing declaration '%s' for `return` statment for implementation %s",
+ ret->set->vars->vars[0]->name, impl->func->name);
return 0;
}
}
if (!locate_decl_var_arg(let_var, impl->decl->args, impl->decl->func)) {
- data->error(PSI_WARNING, "Unknown variable '%s' in `let` statement"
+ data->error(let_var->token, PSI_WARNING, "Unknown variable '%s' in `let` statement"
" of implementation '%s'", let_var->name, impl->func->name);
return 0;
}
}
}
if (!check) {
- data->error(PSI_WARNING, "Unknown value '$%s' of `let` statement"
+ data->error(let->var->token, PSI_WARNING, "Unknown value '$%s' of `let` statement"
" for variable '%s' of implementation '%s'",
let->val->data.func->var->name, let->var->name, impl->func->name);
return 0;
}
}
if (!check) {
- data->error(PSI_WARNING, "Missing `let` statement for arg '%s %.*s%s'"
+ data->error(impl->func->token, PSI_WARNING,
+ "Missing `let` statement for arg '%s %.*s%s'"
" of declaration '%s' for implementation '%s'",
darg->type->name, (int) darg->var->pointer_level, "*****",
darg->var->name, impl->decl->func->var->name, impl->func->name);
}
}
if (!check) {
- data->error(PSI_WARNING, "Unknown variable '$%s' of `set` statement"
+ data->error(set->var->token, PSI_WARNING, "Unknown variable '$%s' of `set` statement"
" of implementation '%s'",
set->var->name, impl->func->name);
return 0;
}
if (!check) {
- data->error(PSI_WARNING, "Unknown value '%s' of `set` statement"
+ data->error(set_var->token, PSI_WARNING, "Unknown value '%s' of `set` statement"
" for variable '$%s' of implementation '%s'",
set_var->name, set->arg->var->name, impl->func->name);
return 0;
/* first find the decl of the free func */
if (!locate_free_decl(data->decls, free_call)) {
- data->error(PSI_WARNING, "Unknown function '%s' in `free` statement"
- " of implementation '%s'", free_call->func, impl->func->name);
+ data->error(free_call->token, PSI_WARNING,
+ "Missing declaration '%s' in `free` statement"
+ " of implementation '%s'",
+ free_call->func, impl->func->name);
return 0;
}
if (!impl->decl->args) {
- data->error(PSI_WARNING, "Declaration '%s' of implementation '%s'"
+ data->error(free_call->token, PSI_WARNING,
+ "Declaration '%s' of implementation '%s'"
" does not have any arguments to free",
impl->decl->func->var->name, impl->func->name);
}
}
if (!check) {
- data->error(PSI_WARNING, "Unknown variable '%s' of `free` statement"
+ data->error(free_var->token, PSI_WARNING,
+ "Unknown variable '%s' of `free` statement"
" of implementation '%s'",
free_var->name, impl->func->name);
return 0;
}
static inline int validate_impl_stmts(PSI_Data *data, impl *impl) {
if (!impl->stmts) {
- data->error(PSI_WARNING, "Missing body for implementation %s!",
+ data->error(impl->func->token, PSI_WARNING,
+ "Missing body for implementation %s!",
impl->func->name);
return 0;
}
decl_args *args = init_decl_args(NULL);
decl *decl = init_decl(init_decl_abi("default"), func, args);
+ for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
+ decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name);
+ decl_var *arg_var = init_decl_var(farg->var_name, farg->pointer_level, farg->array_size);
+ decl_arg *darg = init_decl_arg(arg_type, arg_var);
+ args = add_decl_arg(args, darg);
+ }
+
+ T.decls = add_decl(T.decls, decl);
+ predef_decl = farg;
+ }
+
+ for (predef_decl = &psi_predef_vararg_decls[0]; predef_decl->type_tag; ++predef_decl) {
+ struct psi_predef_decl *farg;
+ decl_type *ftype = init_decl_type(predef_decl->type_tag, predef_decl->type_name);
+ decl_var *fname = init_decl_var(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size);
+ decl_arg *func = init_decl_arg(ftype, fname);
+ decl_args *args = init_decl_args(NULL);
+ decl *decl = init_decl(init_decl_abi("default"), func, args);
for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name);
decl_arg *darg = init_decl_arg(arg_type, arg_var);
args = add_decl_arg(args, darg);
}
+ args->varargs = 1;
T.decls = add_decl(T.decls, decl);
predef_decl = farg;
PSI_Parser P;
if (MAXPATHLEN <= slprintf(psi, MAXPATHLEN, "%s/%s", ptr, entries[i]->d_name)) {
- C->error(PSI_WARNING, "Path to PSI file too long: %s/%s",
+ C->error(NULL, PSI_WARNING, "Path to PSI file too long: %s/%s",
ptr, entries[i]->d_name);
}
if (!PSI_ParserInit(&P, psi, C->error, flags)) {
- C->error(PSI_WARNING, "Failed to init PSI parser (%s): %s",
+ C->error(NULL, PSI_WARNING, "Failed to init PSI parser (%s): %s",
psi, strerror(errno));
continue;
}
if (PSI_ContextCompile(C) && SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) {
- C->error(PSI_WARNING, "Failed to register functions!");
+ C->error(NULL, PSI_WARNING, "Failed to register functions!");
}
free(cpy);
}
-void PSI_ContextCall(PSI_Context *C, impl_val *ret_val, decl *decl)
+void PSI_ContextCall(PSI_Context *C, decl_callinfo *decl_call, impl_vararg *va)
{
- C->ops->call(C, ret_val, decl);
+ C->ops->call(C, decl_call, va);
}
static inline void dump_decl_type(int fd, decl_type *t) {
exp = exp->operand;
}
}
+
static inline void dump_impl_set_value(int fd, set_value *set, unsigned level) {
- size_t i;
+ size_t i, j;
if (level > 1) {
/* only if not directly after `set ...` */
dump_level(fd, level);
}
- dprintf(fd, "%s(", set->func->name);
+
+ if (set->func->type == PSI_T_ELLIPSIS) {
+ dprintf(fd, "%s(", set->outer.set->func->name);
+ } else {
+ dprintf(fd, "%s(", set->func->name);
+ }
for (i = 0; i < set->vars->count; ++i) {
decl_var *svar = set->vars->vars[i];
}
dump_decl_var(fd, svar);
}
+
+ if (set->func->type == PSI_T_ELLIPSIS) {
+ dprintf(fd, ", ...");
+ }
if (set->num) {
dprintf(fd, ", ");
dump_num_exp(fd, set->num);
dprintf(fd, " = %s", iarg->def->text);
}
}
- if (impl->func->args->vararg) {
- impl_arg *vararg = impl->func->args->vararg;
+ if (impl->func->args->vararg.name) {
+ impl_arg *vararg = impl->func->args->vararg.name;
dprintf(fd, ", %s %s...$%s",
vararg->type->name,
projects / m6w6 / ext-psi / blobdiff