projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
marshal: array return values
[m6w6/ext-psi]
/
src
/
types
/
let_callback.c
diff --git
a/src/types/let_callback.c
b/src/types/let_callback.c
index 7d44f33a98c9b7f73ea7826a7641ffbd519ab144..45639f82449dbded4f8c76252f6a796915ea9e9d 100644
(file)
--- a/
src/types/let_callback.c
+++ b/
src/types/let_callback.c
@@
-44,7
+44,9
@@
void psi_let_callback_free(struct psi_let_callback **cb_ptr)
*cb_ptr = NULL;
psi_let_func_free(&cb->func);
psi_plist_free(cb->args);
*cb_ptr = NULL;
psi_let_func_free(&cb->func);
psi_plist_free(cb->args);
- psi_plist_free(cb->cb_args);
+ if (cb->cb_args) {
+ psi_plist_free(cb->cb_args);
+ }
if (cb->token) {
free(cb->token);
}
if (cb->token) {
free(cb->token);
}
@@
-76,13
+78,14
@@
static inline bool psi_let_callback_validate_decl_args(struct psi_data *data,
return true;
}
return true;
}
-bool psi_let_callback_validate(struct psi_data *data, struct psi_let_
exp *exp
,
- struct psi_
let_callback *cb, struct psi_impl *impl
)
+bool psi_let_callback_validate(struct psi_data *data, struct psi_let_
callback *cb
,
+ struct psi_
validate_scope *scope
)
{
size_t i = 0;
struct psi_decl_type *cb_type;
{
size_t i = 0;
struct psi_decl_type *cb_type;
+ struct psi_let_exp *exp = scope->current_let;
struct psi_decl_var *cb_var = exp->var;
struct psi_decl_var *cb_var = exp->var;
- struct psi_set_exp *set_exp;
+ struct psi_set_exp *set_exp
, *parent_set = scope->current_set
;
cb_type = psi_decl_type_get_real(cb_var->arg->type);
if (cb_type->type != PSI_T_FUNCTION) {
cb_type = psi_decl_type_get_real(cb_var->arg->type);
if (cb_type->type != PSI_T_FUNCTION) {
@@
-93,22
+96,32
@@
bool psi_let_callback_validate(struct psi_data *data, struct psi_let_exp *exp,
}
cb->decl = cb_type->real.func;
}
cb->decl = cb_type->real.func;
- if (!psi_decl_validate_nodl(data, cb->decl,
NULL /* FIXME type_stack */
)) {
+ if (!psi_decl_validate_nodl(data, cb->decl,
scope
)) {
return false;
}
return false;
}
- if (!psi_let_callback_validate_decl_args(data, cb, cb->decl, impl)) {
+ if (!psi_let_callback_validate_decl_args(data, cb, cb->decl,
scope->
impl)) {
return false;
}
while (psi_plist_get(cb->args, i++, &set_exp)) {
return false;
}
while (psi_plist_get(cb->args, i++, &set_exp)) {
- struct psi_decl_var *cb_var, *dvar = psi_set_exp_get_decl_var(set_exp);
+ if (cb->cb_args) {
+ struct psi_decl_var *cb_var;
- if (psi_plist_get(cb->cb_args, i - 1, &cb_var)) {
- dvar->arg = cb_var->arg;
+ if (psi_plist_get(cb->cb_args, i - 1, &cb_var)) {
+ struct psi_decl_var *dvar = psi_set_exp_get_decl_var(set_exp);
+ dvar->arg = cb_var->arg;
+ }
}
}
- if (!psi_set_exp_validate(data, set_exp, impl, cb->decl)) {
+ scope->current_set = set_exp;
+ scope->cb_decl = cb->decl;
+
+ if (!psi_set_exp_validate(data, set_exp, scope)) {
+ scope->cb_decl = NULL;
+ scope->current_set = parent_set;
return false;
}
return false;
}
+ scope->cb_decl = NULL;
+ scope->current_set = parent_set;
}
return true;
}
return true;