basic support for builtins

[m6w6/ext-psi] / src / types / let_callback.c

diff --git a/src/types/let_callback.c b/src/types/let_callback.c
index 322e3b096a73fe0507e08c64c0e2df308677829a..4d65df408c6cde0cf8929e536c4d51f758c8937d 100644 (file)
--- a/src/types/let_callback.c
+++ b/src/types/let_callback.c
@@ -29,7 +29,7 @@
 struct psi_let_callback *psi_let_callback_init(struct psi_let_func *func,
                struct psi_plist *args, struct psi_plist *cb_args)
 {
-       struct psi_let_callback *cb = calloc(1, sizeof(*cb));
+       struct psi_let_callback *cb = pecalloc(1, sizeof(*cb), 1);
        cb->func = func;
        cb->args = args;
        cb->cb_args = cb_args;
@@ -47,9 +47,7 @@ void psi_let_callback_free(struct psi_let_callback **cb_ptr)
                if (cb->cb_args) {
                        psi_plist_free(cb->cb_args);
                }
-               if (cb->token) {
-                       free(cb->token);
-               }
+               psi_token_free(&cb->token);
                free(cb);
        }
 }
@@ -67,7 +65,7 @@ static inline bool psi_let_callback_validate_decl_args(struct psi_data *data,
                        data->error(data, cb->token, PSI_WARNING,
                                        "Argument count of callback statement of implementation '%s'"
                                        "does not match argument count of callback declaration '%s'",
-                                       impl->func->name, cb_decl->func->var->name);
+                                       impl->func->name->val, cb_decl->func->var->name->val);
                        return false;
                }
 
@@ -78,27 +76,28 @@ static inline bool psi_let_callback_validate_decl_args(struct psi_data *data,
        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;
+       struct psi_let_exp *exp = scope->current_let;
        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) {
                data->error(data, cb_var->token, PSI_WARNING,
                                "Expected a function: %s",
-                               cb_var->name);
+                               cb_var->name->val);
                return false;
        }
        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;
        }
-       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)) {
@@ -110,9 +109,17 @@ bool psi_let_callback_validate(struct psi_data *data, struct psi_let_exp *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;
                }
+               scope->cb_decl = NULL;
+               scope->current_set = parent_set;
        }
 
        return true;
@@ -134,8 +141,8 @@ void psi_let_callback_dump(int fd, struct psi_let_callback *callback,
                }
        }
        dprintf(fd, ") as %s(%s(",
-                       callback->func->name,
-                       callback->func->var->name);
+                       callback->func->name->val,
+                       callback->func->var->name->val);
 
        if (callback->args) {
                size_t i = 0, last = psi_plist_count(callback->args);