Merge branch 'slimconfigure'

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

diff --git a/src/types/let_exp.c b/src/types/let_exp.c
index 1d8e2ec93b8a92d6c280a364fdac8aa18a07f302..31750604abb26e01c13b7028b54e2a898d25de14 100644 (file)
--- a/src/types/let_exp.c
+++ b/src/types/let_exp.c
@@ -26,6 +26,7 @@
 #include "php_psi_stdinc.h"
 #include "data.h"
 #include "call.h"
+#include "calc.h"
 
 #include <assert.h>
 
@@ -155,28 +156,29 @@ void psi_let_exp_dump(int fd, struct psi_let_exp *val, unsigned level, int last)
 }
 
 bool psi_let_exp_validate(struct psi_data *data, struct psi_let_exp *val,
-               struct psi_impl *impl)
+               struct psi_validate_scope *scope)
 {
        struct psi_decl_var *dvar = psi_let_exp_get_decl_var(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, scope)) {
                        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, scope->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, scope)) {
                        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, scope->impl->func->name);
                        return false;
                }
                break;
        }
-
        switch (val->kind) {
        case PSI_LET_NULL:
                break;
@@ -187,28 +189,28 @@ bool psi_let_exp_validate(struct psi_data *data, struct psi_let_exp *val,
                val->var->arg = val->data.var->arg;
                break;
        case PSI_LET_NUMEXP:
-               if (!psi_num_exp_validate(data, val->data.num, impl, NULL, val, NULL, NULL)) {
+               if (!psi_num_exp_validate(data, val->data.num, scope)) {
                        return false;
                }
                break;
        case PSI_LET_CALLOC:
-               if (!psi_num_exp_validate(data, val->data.alloc->nmemb, impl, NULL, val, NULL, NULL)) {
+               if (!psi_num_exp_validate(data, val->data.alloc->nmemb, scope)) {
                        return false;
                }
-               if (!psi_num_exp_validate(data, val->data.alloc->size, impl, NULL, val, NULL, NULL)) {
+               if (!psi_num_exp_validate(data, val->data.alloc->size, scope)) {
                        return false;
                }
                break;
        case PSI_LET_CALLBACK:
-               if (!psi_let_func_validate(data, val, val->data.callback->func, impl)) {
+               if (!psi_let_func_validate(data, val->data.callback->func, scope)) {
                        return false;
                }
-               if (!psi_let_callback_validate(data, val, val->data.callback, impl)) {
+               if (!psi_let_callback_validate(data, val->data.callback, scope)) {
                        return false;
                }
                break;
        case PSI_LET_FUNC:
-               if (!psi_let_func_validate(data, val, val->data.func, impl)) {
+               if (!psi_let_func_validate(data, val->data.func, scope)) {
                        return false;
                }
                break;
@@ -236,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);
@@ -247,10 +249,15 @@ void *psi_let_exp_exec(struct psi_let_exp *val, struct psi_decl_arg *darg,
 
        case PSI_LET_CALLOC:
                {
-                       zend_long n = psi_long_num_exp(val->data.alloc->nmemb, frame);
-                       zend_long s = psi_long_num_exp(val->data.alloc->size, frame);
-                       void *tmp = *psi_call_frame_push_auto(frame,
-                                       safe_emalloc(n, s, sizeof(void *)));
+                       zend_long n = psi_num_exp_get_long(val->data.alloc->nmemb, frame, NULL);
+                       zend_long s = psi_num_exp_get_long(val->data.alloc->size, frame, NULL);
+                       void *tmp;
+
+                       if (val->data.alloc->static_memory) {
+                               tmp = safe_pemalloc(n, s, sizeof(void *), 1);
+                       } else {
+                               tmp = *psi_call_frame_push_auto(frame, safe_emalloc(n, s, sizeof(void *)));
+                       }
 
                        memset(tmp, 0, n * s + sizeof(void *));
                        frame_sym->temp_val.ptr = tmp;
@@ -258,7 +265,17 @@ void *psi_let_exp_exec(struct psi_let_exp *val, struct psi_decl_arg *darg,
                break;
 
        case PSI_LET_NUMEXP:
-               frame_sym->temp_val.zend.lval = psi_long_num_exp(val->data.num, frame);
+               {
+                       impl_val res;
+                       token_t val_type = psi_decl_type_get_real(val->var->arg->type)->type;
+                       token_t res_type = psi_num_exp_exec(val->data.num, &res, frame, NULL);
+
+                       if (val_type == res_type) {
+                               frame_sym->temp_val = res;
+                       } else {
+                               psi_calc_cast(res_type, &res, val_type, &frame_sym->temp_val);
+                       }
+               }
                break;
 
        case PSI_LET_CALLBACK: