parser: consolidate tokens

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

diff --git a/src/types/let_exp.c b/src/types/let_exp.c
index bb9cb90a9440368fb00b96a98915ee85430d99a7..d4fe6db63d556072463ac2736fed65b8b1e5c646 100644 (file)
--- a/src/types/let_exp.c
+++ b/src/types/let_exp.c
@@ -162,22 +162,23 @@ bool psi_let_exp_validate(struct psi_data *data, struct psi_let_exp *val,
 
        switch (val->kind) {
        case PSI_LET_TMP:
-               if (!psi_decl_var_validate(data, val->data.var, impl->decl, val, NULL)) {
+               if (!psi_decl_var_validate(data, val->data.var, impl, impl->decl, val, NULL)) {
                        data->error(data, dvar->token ? : **(struct psi_token ***) &val->data,
-                                       PSI_WARNING, "Unknown variable '%s'", dvar->name);
+                                       PSI_WARNING, "Unknown variable '%s' in temp let statment of implementation '%s'",
+                                       dvar->name, impl->func->name);
                        return false;
                }
                break;
 
        default:
-               if (!psi_decl_var_validate(data, dvar, impl->decl, val, NULL)) {
+               if (!psi_decl_var_validate(data, dvar, impl, impl->decl, val, NULL)) {
                        data->error(data, dvar->token ? : **(struct psi_token ***) &val->data,
-                                       PSI_WARNING, "Unknown variable '%s'", dvar->name);
+                                       PSI_WARNING, "Unknown variable '%s' in let statement of implementation '%s'",
+                                       dvar->name, impl->func->name);
                        return false;
                }
                break;
        }
-
        switch (val->kind) {
        case PSI_LET_NULL:
                break;
@@ -237,8 +238,8 @@ void *psi_let_exp_exec(struct psi_let_exp *val, struct psi_decl_arg *darg,
 
        case PSI_LET_TMP:
                {
-                       struct psi_let_stmt *let_temp = psi_impl_get_let(frame->impl,
-                                       val->data.var);
+                       struct psi_impl *impl = psi_call_frame_get_impl(frame);
+                       struct psi_let_stmt *let_temp = psi_impl_get_let(impl, val->data.var);
                        struct psi_call_frame_symbol *temp_arg;
 
                        temp_arg = psi_call_frame_fetch_symbol(frame, let_temp->exp->var);