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;
}
}
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;
}
- free(def->text);
+ if (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;
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;
}
}
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;
}
}