X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fnumber.c;fp=src%2Ftypes%2Fnumber.c;h=e6edb40b342960f0177658c072accbdd90f20971;hp=3428905f5a031464d4896d7c0d671dd9394dcbd9;hb=cacb11fac1eb3f21eb55365cbff3c5e223cc7092;hpb=086682dac4050b3b58beb5da7f92c331e85c58b7

diff --git a/src/types/number.c b/src/types/number.c
index 3428905..e6edb40 100644
--- a/src/types/number.c
+++ b/src/types/number.c
@@ -602,6 +602,7 @@ bool psi_number_validate(struct psi_data *data, struct psi_number *exp,
 	size_t i = 0;
 	struct psi_const *cnst;
 	struct psi_decl_enum *enm;
+	struct psi_decl_extvar *evar;
 
 	switch (exp->type) {
 	case PSI_T_NULL:
@@ -647,13 +648,21 @@ bool psi_number_validate(struct psi_data *data, struct psi_number *exp,
 		if (exp->data.dvar->arg) {
 			return true;
 		}
+		for (i = 0; psi_plist_get(data->vars, i, &evar); ++i) {
+			if (zend_string_equals(exp->data.dvar->name, evar->arg->var->name)) {
+				exp->data.dvar->arg = evar->arg;
+				return true;
+			}
+		}
 		if (psi_decl_var_validate(data, exp->data.dvar, scope)) {
 			return true;
+		} else {
+			data->error(data, exp->token, PSI_WARNING,
+					"Unknown variable '%s' in numeric expression",
+					exp->data.dvar->name->val);
+			return false;
 		}
-		data->error(data, exp->token, PSI_WARNING,
-				"Unknown variable '%s' in numeric expression",
-				exp->data.dvar->name->val);
-		return false;
+		break;
 
 	case PSI_T_FUNCTION:
 		if (scope && scope->cpp && zend_hash_exists(&scope->cpp->defs, exp->data.call->name)) {
@@ -692,6 +701,7 @@ bool psi_number_validate(struct psi_data *data, struct psi_number *exp,
 				return true;
 			}
 		}
+		/* undefined */
 		return false;
 
 	case PSI_T_SIZEOF:
@@ -805,10 +815,13 @@ static inline token_t psi_number_eval_decl_var(struct psi_number *exp,
 	var = exp->data.dvar;
 	real = psi_decl_type_get_real(var->arg->type);
 	size = psi_decl_arg_get_size(var->arg);
-	sym = psi_call_frame_fetch_symbol(frame, var);
-	ref = deref_impl_val(sym->ptr, var);
 
-	memcpy(res, ref, size);
+	if (frame) {
+		sym = psi_call_frame_fetch_symbol(frame, var);
+		ref = deref_impl_val(sym->ptr, var);
+
+		memcpy(res, ref, size);
+	}
 
 	if (var->arg->var->pointer_level > var->pointer_level) {
 		switch (SIZEOF_VOID_P) {