X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fimpl_def_val.c;h=f78a6b9c0d4355523dd365c24a7e0fd43853b78a;hp=69b5db4ca067321a3541d5025295d85789842671;hb=2559f07a178b681dc240e20153ff5abdff54cb34;hpb=c101a4de2983791d5892e60d765b73b6b3ccf6f8

diff --git a/src/types/impl_def_val.c b/src/types/impl_def_val.c
index 69b5db4..f78a6b9 100644
--- a/src/types/impl_def_val.c
+++ b/src/types/impl_def_val.c
@@ -27,13 +27,34 @@
 #include "data.h"
 
 #include <assert.h>
+#include <math.h>
 
-struct psi_impl_def_val *psi_impl_def_val_init(token_t t, const char *text)
+struct psi_impl_def_val *psi_impl_def_val_init(token_t t, void *data)
 {
 	struct psi_impl_def_val *def = calloc(1, sizeof(*def));
 
-	def->type = t;
-	def->text = text ? strdup(text) : NULL;
+	switch ((def->type = t)) {
+	case PSI_T_TRUE:
+	case PSI_T_FALSE:
+	case PSI_T_NULL:
+		break;
+	case PSI_T_QUOTED_STRING:
+		/* immediate upgrade */
+		def->type = PSI_T_STRING;
+		/* no break */
+	case PSI_T_STRING:
+		if (data) {
+			def->ival.zend.str = zend_string_copy(data);
+		}
+		break;
+
+	case PSI_T_NUMBER:
+		def->data.num = data;
+		break;
+
+	default:
+		assert(0);
+	}
 
 	return def;
 }
@@ -44,55 +65,118 @@ void psi_impl_def_val_free(struct psi_impl_def_val **def_ptr)
 		struct psi_impl_def_val *def = *def_ptr;
 
 		*def_ptr = NULL;
-		if (def->token) {
-			free(def->token);
-		}
+		psi_token_free(&def->token);
 		switch (def->type) {
+		case PSI_T_NUMBER:
+			psi_num_exp_free(&def->data.num);
+			break;
+
 		case PSI_T_STRING:
-		case PSI_T_QUOTED_STRING:
 			if (def->ival.zend.str) {
 				zend_string_release(def->ival.zend.str);
 			}
 			break;
-		}
-		if (def->text) {
-			free(def->text);
+		default:
+			break;
 		}
 		free(def);
 	}
 }
 
 bool psi_impl_def_val_validate(struct psi_data *data,
-		struct psi_impl_def_val *def, token_t type_t, const char *type_name)
+		struct psi_impl_def_val *val, struct psi_impl_type *type,
+		struct psi_validate_scope *scope)
 {
-	if (def->type != PSI_T_NULL && def->text) {
-		switch (type_t) {
-		case PSI_T_BOOL:
-			def->ival.zend.bval = def->type == PSI_T_TRUE ? 1 : 0;
-			break;
-		case PSI_T_INT:
-			def->ival.zend.lval = zend_atol(def->text, strlen(def->text));
-			break;
-		case PSI_T_FLOAT:
-		case PSI_T_DOUBLE:
-			def->ival.dval = zend_strtod(def->text, NULL);
-			break;
-		case PSI_T_STRING:
-		case PSI_T_QUOTED_STRING:
-			def->ival.zend.str = zend_string_init(def->text, strlen(def->text), 1);
-			break;
-		default:
-			data->error(data, def->token, PSI_WARNING,
-					"Invalid default value type '%s', expected one of bool, int, double, string.",
-					type_name);
+	if (val->type == PSI_T_NULL) {
+		return true;
+	} else if (val->type == PSI_T_NUMBER) {
+		if (!psi_num_exp_validate(data, val->data.num, scope)) {
 			return false;
 		}
 	}
-	return true;
+
+	switch (type->type) {
+	case PSI_T_BOOL:
+		val->ival.zend.bval = val->type == PSI_T_TRUE ? 1 : 0;
+		break;
+
+	/* macros */
+	case PSI_T_NUMBER:
+		if (val->type == PSI_T_NUMBER) {
+			token_t typ = psi_num_exp_exec(val->data.num, &val->ival, NULL, scope->defs);
+
+			switch (typ) {
+			case PSI_T_FLOAT:
+				val->ival.dval = val->ival.fval;
+				/* no break */
+			case PSI_T_DOUBLE:
+				val->type = PSI_T_FLOAT;
+				type->type = PSI_T_FLOAT;
+				zend_string_release(type->name);
+				type->name = zend_string_init_interned(ZEND_STRL("float"), 1);
+				break;
+			default:
+				val->type = PSI_T_INT;
+				type->type = PSI_T_INT;
+				zend_string_release(type->name);
+				type->name = zend_string_init_interned(ZEND_STRL("int"), 1);
+				break;
+			}
+			psi_num_exp_free(&val->data.num);
+			return true;
+		}
+		break;
+
+	case PSI_T_INT:
+		if (val->type == PSI_T_NUMBER) {
+			val->type = PSI_T_INT;
+			val->ival.zend.lval = psi_num_exp_get_long(val->data.num, NULL, scope->defs);
+			psi_num_exp_free(&val->data.num);
+		}
+		if (val->type == PSI_T_INT) {
+			return true;
+		}
+		break;
+
+	case PSI_T_FLOAT:
+	case PSI_T_DOUBLE:
+		if (val->type == PSI_T_NUMBER) {
+			val->type = PSI_T_DOUBLE;
+			val->ival.dval = psi_num_exp_get_double(val->data.num, NULL, scope->defs);
+			psi_num_exp_free(&val->data.num);
+		}
+		if (val->type == PSI_T_DOUBLE) {
+			return true;
+		}
+		break;
+
+	case PSI_T_STRING:
+		if (val->type == PSI_T_STRING) {
+			return true;
+		}
+		break;
+
+	default:
+		data->error(data, val->token, PSI_WARNING,
+				"Invalid default value type '%s', "
+				"expected one of bool, int, float, string.",
+				type->name->val);
+	}
+
+	return false;
 }
 
 void psi_impl_def_val_dump(int fd, struct psi_impl_def_val *val) {
 	switch (val->type) {
+	case PSI_T_NULL:
+		dprintf(fd, "NULL");
+		break;
+	case PSI_T_TRUE:
+		dprintf(fd, "true");
+		break;
+	case PSI_T_FALSE:
+		dprintf(fd, "false");
+		break;
 	case PSI_T_BOOL:
 		dprintf(fd, "%s", val->ival.zend.bval ? "true" : "false");
 		break;
@@ -101,20 +185,18 @@ void psi_impl_def_val_dump(int fd, struct psi_impl_def_val *val) {
 		break;
 	case PSI_T_FLOAT:
 	case PSI_T_DOUBLE:
-		dprintf(fd, "%f", val->ival.dval);
+		if (isinf(val->ival.dval)) {
+			dprintf(fd, "\\INF");
+		} else if (isnan(val->ival.dval)) {
+			dprintf(fd, "\\NAN");
+		} else {
+			dprintf(fd, "%" PRIdval, val->ival.dval);
+		}
 		break;
 	case PSI_T_STRING:
 		dprintf(fd, "\"%s\"", val->ival.zend.str->val);
 		break;
-	case PSI_T_QUOTED_STRING:
-		dprintf(fd, "\"%s\"", val->text);
-		break;
 	default:
-		if (val->text) {
-			dprintf(fd, "%s", val->text);
-		} else {
-			assert(0);
-		}
-		break;
+		assert(0);
 	}
 }