X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fimpl_def_val.c;h=6d983cddc7e948a24dd388b3e4174c5644af0438;hb=ad2c22df5e451fffecc7b7ebdc9c5a4bb36e543e;hp=61c4e8ba6ef275ca61eac4b4690cde8f21eae0d8;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84;p=m6w6%2Fext-psi

diff --git a/src/types/impl_def_val.c b/src/types/impl_def_val.c
index 61c4e8b..6d983cd 100644
--- a/src/types/impl_def_val.c
+++ b/src/types/impl_def_val.c
@@ -33,7 +33,7 @@ struct psi_impl_def_val *psi_impl_def_val_init(token_t t, const char *text)
 	struct psi_impl_def_val *def = calloc(1, sizeof(*def));
 
 	def->type = t;
-	def->text = strdup(text);
+	def->text = text ? strdup(text) : NULL;
 
 	return def;
 }
@@ -49,24 +49,26 @@ void psi_impl_def_val_free(struct psi_impl_def_val **def_ptr)
 		}
 		switch (def->type) {
 		case PSI_T_STRING:
-			assert(0);
-			/* no break */
 		case PSI_T_QUOTED_STRING:
 			if (def->ival.zend.str) {
 				zend_string_release(def->ival.zend.str);
 			}
 			break;
+		default:
+			break;
+		}
+		if (def->text) {
+			free(def->text);
 		}
-		free(def->text);
 		free(def);
 	}
 }
 
 bool psi_impl_def_val_validate(struct psi_data *data,
-		struct psi_impl_def_val *def, struct psi_impl_type *type)
+		struct psi_impl_def_val *def, token_t type_t, const char *type_name)
 {
-	if (def->type != PSI_T_NULL) {
-		switch (type->type) {
+	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;
@@ -78,15 +80,13 @@ bool psi_impl_def_val_validate(struct psi_data *data,
 			def->ival.dval = zend_strtod(def->text, NULL);
 			break;
 		case PSI_T_STRING:
-			assert(0);
-			/* no break */
 		case PSI_T_QUOTED_STRING:
-			def->ival.zend.str = zend_string_init(&def->text[1], strlen(def->text) - 2, 1);
+			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);
+					type_name);
 			return false;
 		}
 	}
@@ -95,13 +95,28 @@ bool psi_impl_def_val_validate(struct psi_data *data,
 
 void psi_impl_def_val_dump(int fd, struct psi_impl_def_val *val) {
 	switch (val->type) {
+	case PSI_T_BOOL:
+		dprintf(fd, "%s", val->ival.zend.bval ? "true" : "false");
+		break;
+	case PSI_T_INT:
+		dprintf(fd, "%ld", val->ival.zend.lval);
+		break;
+	case PSI_T_FLOAT:
+	case PSI_T_DOUBLE:
+		dprintf(fd, "%f", val->ival.dval);
+		break;
 	case PSI_T_STRING:
-		assert(0);
-		/* no break */
+		dprintf(fd, "\"%s\"", val->ival.zend.str->val);
+		break;
 	case PSI_T_QUOTED_STRING:
 		dprintf(fd, "\"%s\"", val->text);
 		break;
 	default:
-		dprintf(fd, "%s", val->text);
+		if (val->text) {
+			dprintf(fd, "%s", val->text);
+		} else {
+			assert(0);
+		}
+		break;
 	}
 }