#define ION_CHECK_RETURN(r, err, ...) do { \
iERR __err = err; \
- if (__err) { \
+ if (UNEXPECTED(__err)) { \
zend_throw_exception_ex(spl_ce_RuntimeException, __err, "%s: %s", ion_error_to_str(__err), #err); \
__VA_ARGS__; \
return r; \
ION_CHECK_RETURN(, err, __VA_ARGS__)
#define ION_CATCH(...) do { \
- if (EG(exception)) { \
+ if (UNEXPECTED(EG(exception))) { \
__VA_ARGS__; \
return; \
} \
} while (0)
#define PTR_CHECK_RETURN(ret, ptr, ...) do { \
- if (!(ptr)) { \
+ if (UNEXPECTED(!(ptr))) { \
zend_throw_error(NULL, "Uninitialized object"); \
__VA_ARGS__; \
return ret; \
zend_update_property(obj->ce, obj, n, l, &zobj);
}
-LOCAL zend_object *get_property_obj(zend_object *obj, const char *n, size_t l, int type)
-{
- zval tmp, *zv = zend_read_property(obj->ce, obj, n, l, 0, &tmp);
- if (zv && type & Z_TYPE_P(zv)) {
- return Z_PTR_P(zv);
- }
- return NULL;
-}
-
#define RETURN_IONTYPE(typ) do { \
zend_object *__zo = php_ion_type_fetch(typ); \
if (UNEXPECTED(!__zo)) { \
{
OBJ_CHECK(obj);
- ION_STRING is;
- if (IERR_OK == ion_symbol_table_get_name(obj->tab, &is)) {
- zend_update_property_stringl(obj->std.ce, &obj->std, ZEND_STRL("name"), (char *) is.value, is.length);
- }
- int32_t iv;
- if (IERR_OK == ion_symbol_table_get_version(obj->tab, &iv)) {
- zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("version"), iv);
+ ION_SYMBOL_TABLE_TYPE typ = ist_EMPTY;
+ ion_symbol_table_get_type(obj->tab, &typ);
+ if (typ != ist_LOCAL) {
+ ION_STRING is;
+ if (IERR_OK == ion_symbol_table_get_name(obj->tab, &is)) {
+ zend_update_property_stringl(obj->std.ce, &obj->std, ZEND_STRL("name"), (char *) is.value, is.length);
+ }
+ int32_t iv;
+ if (IERR_OK == ion_symbol_table_get_version(obj->tab, &iv)) {
+ zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("version"), iv);
+ }
}
}
case ION_TS_YEAR:
return php_ion_timestamp_format_fetch(g_intern_str.Year);
default:
- return zend_one_char_string['c'];
+ return ZSTR_CHAR('c');
}
}
}
}
- php_error_docref(NULL, E_NOTICE, "Previously unknown ion\\Symbol\\Table encountered: %s", key->val);
-
object_init_ex(return_value, ce_Symbol_Table_Shared);
php_ion_symbol_table *o_tab = php_ion_obj(symbol_table, Z_OBJ_P(return_value));
- OBJ_CHECK(o_tab, zend_string_release(key));
+ o_tab->tab = tab;
php_ion_symbol_table_ctor(o_tab);
if (ztabs) {
obj->stream.buf.value = emalloc(obj->stream.buf.length);
}
-LOCAL void php_ion_writer_buffer_init(php_ion_writer *obj)
+LOCAL void php_ion_writer_buffer_offer(php_ion_writer *obj)
{
- smart_str_alloc(&obj->buffer.str, 0, false);
if (obj->buffer.usr) {
obj->buffer.usr->curr = (BYTE *) &obj->buffer.str.s->val[obj->buffer.str.s->len];
obj->buffer.usr->limit = obj->buffer.usr->curr + obj->buffer.str.a - obj->buffer.str.s->len;
}
}
+LOCAL void php_ion_writer_buffer_init(php_ion_writer *obj)
+{
+ smart_str_alloc(&obj->buffer.str, 0, false);
+ php_ion_writer_buffer_offer(obj);
+}
+
LOCAL void php_ion_writer_buffer_reset(php_ion_writer *obj)
{
smart_str_free(&obj->buffer.str);
php_ion_writer_buffer_init(obj);
}
+LOCAL zend_string *php_ion_writer_buffer_copy(php_ion_writer *obj)
+{
+ if (obj->buffer.usr) {
+ // ensure that brain-dead ion_stream interface calls us again
+ obj->buffer.usr->curr = NULL;
+ obj->buffer.usr->limit = NULL;
+ }
+ smart_str_0(&obj->buffer.str);
+ return zend_string_copy(obj->buffer.str.s);
+}
+
+LOCAL void php_ion_writer_buffer_separate(php_ion_writer *obj, bool grow)
+{
+ // see zend_string_separate and smart_str_erealloc
+ zend_string *old_str = obj->buffer.str.s;
+ zend_string *new_str = zend_string_alloc(obj->buffer.str.a << grow, false);
+ memcpy(new_str->val, old_str->val, new_str->len = old_str->len);
+ zend_string_release(old_str);
+ obj->buffer.str.s = new_str;
+}
+
LOCAL void php_ion_writer_buffer_grow(php_ion_writer *obj)
{
- if (GC_REFCOUNT(obj->buffer.str.s) > 1) {
- zend_string *keep = obj->buffer.str.s;
- obj->buffer.str.s = NULL;
- smart_str_alloc(&obj->buffer.str, obj->buffer.str.a << 1, 0);
- memcpy(obj->buffer.str.s->val, keep->val, keep->len + 1);
- obj->buffer.str.s->len = keep->len;
- zend_string_release(keep);
- } else {
- smart_str_erealloc(&obj->buffer.str, obj->buffer.str.a << 1);
+ if (obj->buffer.usr && obj->buffer.usr->curr) {
+ obj->buffer.str.s->len = obj->buffer.usr->curr - (BYTE *) obj->buffer.str.s->val;
+ }
+ if (obj->buffer.usr && obj->buffer.usr->curr && obj->buffer.usr->curr == obj->buffer.usr->limit) {
+ if (UNEXPECTED(GC_REFCOUNT(obj->buffer.str.s) > 1)) {
+ php_ion_writer_buffer_separate(obj, true);
+ } else {
+ smart_str_erealloc(&obj->buffer.str, obj->buffer.str.a << 1);
+ }
+ } else if (UNEXPECTED(GC_REFCOUNT(obj->buffer.str.s) > 1)) {
+ php_ion_writer_buffer_separate(obj, false);
}
+ php_ion_writer_buffer_offer(obj);
}
+
LOCAL iERR php_ion_writer_buffer_handler(struct _ion_user_stream *user)
{
php_ion_writer *writer = (php_ion_writer *) user->handler_state;
writer->buffer.usr = user;
-
- if (user->curr) {
- writer->buffer.str.s->len = user->curr - (BYTE *) writer->buffer.str.s->val;
- if (user->limit == user->curr) {
- php_ion_writer_buffer_grow(writer);
- }
- }
- user->curr = (BYTE *) &writer->buffer.str.s->val[writer->buffer.str.s->len];
- user->limit = user->curr + writer->buffer.str.a - writer->buffer.str.s->len;
-
+ php_ion_writer_buffer_grow(writer);
return IERR_OK;
}
ION_COLLECTION_NEXT(cur, ptr);
if (*ptr) {
ION_CHECK(ion_writer_options_add_shared_imports_symbol_tables(&opt->opt, ptr, 1));
- } else {
- break;
}
}
}
LOCAL void php_ion_serialize_object_lob(php_ion_serializer *ser, zend_object *zobject)
{
- zval tmp_type, *type = zend_read_property(NULL, zobject, ZEND_STRL("type"), 0, &tmp_type);
- zval tmp_value, *value = zend_read_property(NULL, zobject, ZEND_STRL("value"), 0, &tmp_value);
+ zval tmp_type, *type = zend_read_property_ex(NULL, zobject, ZSTR_KNOWN(ZEND_STR_TYPE), 0, &tmp_type);
+ zval tmp_value, *value = zend_read_property_ex(NULL, zobject, ZSTR_KNOWN(ZEND_STR_VALUE), 0, &tmp_value);
switch (Z_LVAL_P(zend_enum_fetch_case_value(Z_OBJ_P(type)))) {
case tid_BLOB_INT:
ION_CHECK(ion_writer_write_blob(ser->writer, (BYTE *) Z_STRVAL_P(value), Z_STRLEN_P(value)));
zval *backref = zend_hash_next_index_insert(ser->ids, return_value);
if (SUCCESS == ce->unserialize(backref, ce, (BYTE *) s->val, s->len, NULL)) {
RETVAL_ZVAL(backref, 0, 0);
- } else if (!EG(exception)) {
- zend_throw_exception_ex(spl_ce_UnexpectedValueException, IERR_INTERNAL_ERROR,
- "Failed to unserialize class %s", ce->name->val);
+ } else {
+ zval_ptr_dtor(backref);
+ ZVAL_NULL(backref);
+ if (!EG(exception)) {
+ zend_throw_exception_ex(spl_ce_UnexpectedValueException, IERR_INTERNAL_ERROR,
+ "Failed to unserialize class %s", ce->name->val);
+ }
}
zend_string_release(s);
} else {
*key = zend_string_init(ptr, end - ptr, 0);
break;
case 1:
- *key = zend_one_char_string[*name.value];
+ *key = ZSTR_CHAR(*name.value);
break;
default:
if (is_prop) {
projects / awesomized / ext-ion / blobdiff