X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=ion_private.h;h=57aaa6f9f886787e20b80036149482e14b89a2c2;hb=d31afba7b6dc66b25f6070b5fc5195e4a1c8a85c;hp=0070754fd1de3657681ff02aa99f46efb7a67bf0;hpb=d7bbeb1d8fb5cf9f507ac1f19de226ba226054c8;p=awesomized%2Fext-ion

diff --git a/ion_private.h b/ion_private.h
index 0070754..57aaa6f 100644
--- a/ion_private.h
+++ b/ion_private.h
@@ -17,26 +17,43 @@
 #include "ionc/ion.h"
 
 #define PHP_ION_SYMBOL_TABLE_VERSION 1
-#define PHP_ION_SYMBOL(e, s) {0, {sizeof(e)-1, (BYTE *) e}, {sizeof(s)-1, (BYTE *) s}},
+#define PHP_ION_SYMBOL(c, s) { \
+	{ \
+		0, \
+		{ sizeof(s)-1, (BYTE *) s }, \
+		{ { 0, NULL }, 0 }, \
+		0 \
+	}, \
+	{ sizeof(c)-1, (BYTE *) c } \
+},
 
 typedef struct php_ion_global_symbol {
-	SID id;
+	ION_SYMBOL s;
 	ION_STRING e;
-	ION_STRING s;
 } php_ion_global_symbol;
 
 static php_ion_global_symbol g_sym_tab_php_sym[] = {
-	PHP_ION_SYMBOL("PHP", "PHP")
-	PHP_ION_SYMBOL("Reference", "R")
-	PHP_ION_SYMBOL("Backref", "r")
-	PHP_ION_SYMBOL("Property", "p")
-	PHP_ION_SYMBOL("ClassObject", "c")
-	PHP_ION_SYMBOL("CustomObject", "C")
-	PHP_ION_SYMBOL("Object", "o")
-	PHP_ION_SYMBOL("MagicObject", "O")
-	PHP_ION_SYMBOL("Serializable", "S")
+#define PHP_ION_SYMBOL_PHP				(g_sym_tab_php_sym[0]).s
+	PHP_ION_SYMBOL("PHP",			"PHP")
+#define PHP_ION_SYMBOL_REFERENCE		(g_sym_tab_php_sym[1]).s
+	PHP_ION_SYMBOL("Reference",		"R")
+#define PHP_ION_SYMBOL_BACKREF			(g_sym_tab_php_sym[2]).s
+	PHP_ION_SYMBOL("Backref",		"r")
+#define PHP_ION_SYMBOL_PROPERTY			(g_sym_tab_php_sym[3]).s
+	PHP_ION_SYMBOL("Property",		"p")
+#define PHP_ION_SYMBOL_CLASS_OBJECT		(g_sym_tab_php_sym[4]).s
+	PHP_ION_SYMBOL("ClassObject",	"c")
+#define PHP_ION_SYMBOL_CUSTOM_OBJECT	(g_sym_tab_php_sym[5]).s
+	PHP_ION_SYMBOL("CustomObject",	"C")
+#define PHP_ION_SYMBOL_OBJECT			(g_sym_tab_php_sym[6]).s
+	PHP_ION_SYMBOL("Object",		"o")
+#define PHP_ION_SYMBOL_MAGIC_OBJECT		(g_sym_tab_php_sym[7]).s
+	PHP_ION_SYMBOL("MagicObject",	"O")
+#define PHP_ION_SYMBOL_SERIALIZEABLE	(g_sym_tab_php_sym[8]).s
+	PHP_ION_SYMBOL("Serializable",	"S")
+#define PHP_ION_SYMBOL_ENUM				(g_sym_tab_php_sym[9]).s
 	PHP_ION_SYMBOL("Enum", "E")
-	{0}
+	{{0}, {0}}
 };
 #undef PHP_ION_SYMBOL
 
@@ -94,11 +111,11 @@ static inline int g_sym_init(void)
 	}
 	php_ion_global_symbol *ptr = g_sym_tab_php_sym;
 	ion_symbol_table_set_version(g_sym_tab_php, PHP_ION_SYMBOL_TABLE_VERSION);
-	ion_symbol_table_set_name(g_sym_tab_php, &ptr->s);
+	ion_symbol_table_set_name(g_sym_tab_php, &ptr->s.value);
 	while (ptr->e.value) {
-		ion_symbol_table_add_symbol(g_sym_tab_php, &ptr->s, &ptr->id);
-		g_sym_hash_add(sys_max_id + ptr->id, (const char *) ptr->s.value, ptr->s.length);
-		g_sym_map_add(sys_max_id + ptr->id, (const char *) ptr->e.value, ptr->e.length);
+		ion_symbol_table_add_symbol(g_sym_tab_php, &ptr->s.value, &ptr->s.sid);
+		g_sym_hash_add(sys_max_id + ptr->s.sid, (const char *) ptr->s.value.value, ptr->s.value.length);
+		g_sym_map_add(sys_max_id + ptr->s.sid, (const char *) ptr->e.value, ptr->e.length);
 		++ptr;
 	}
 	ion_symbol_table_lock(g_sym_tab_php);
@@ -120,6 +137,7 @@ typedef struct php_ion_serializer {
 } php_ion_serializer;
 
 typedef struct php_ion_annotaions {
+	uint8_t shared_symtab:1;
 	uint8_t backref:1;
 	uint8_t makeref:1;
 	uint8_t object_prop:1;
@@ -177,7 +195,6 @@ ZEND_DECLARE_MODULE_GLOBALS(ion);
 
 static zend_class_entry
 	*ce_Catalog,
-	*ce_Collection,
 	*ce_Decimal,
 	*ce_Decimal_Context,
 	*ce_Decimal_Context_Rounding,
@@ -341,7 +358,7 @@ static inline void php_ion_globals_unserializer_dtor(void)
 } while (0)
 
 #define php_ion_obj(type, obj) \
-	((php_ion_ ## type *) (obj ? ((char *)(obj) - XtOffsetOf(php_ion_ ## type, std)) : NULL))
+	((php_ion_ ## type *) ((obj) ? ((char *)(obj) - XtOffsetOf(php_ion_ ## type, std)) : NULL))
 
 #define ION_CHECK_RETURN(r, err, ...) do { \
 	iERR __err = err; \
@@ -362,22 +379,24 @@ static inline void php_ion_globals_unserializer_dtor(void)
 	} \
 } while (0)
 
-#define PTR_CHECK(ptr, ...) do { \
+#define PTR_CHECK_RETURN(ret, ptr, ...) do { \
 	if (!(ptr)) { \
 		zend_throw_error(NULL, "Uninitialized object"); \
 		__VA_ARGS__; \
-		return; \
+		return ret; \
 	} \
 } while (0)
+#define PTR_CHECK(ptr, ...) PTR_CHECK_RETURN(, ptr, __VA_ARGS__)
 
-#define OBJ_CHECK(obj, ...) do { \
-	PTR_CHECK(obj, __VA_ARGS__); \
-	PTR_CHECK(*((void **)obj), __VA_ARGS__); \
+#define OBJ_CHECK_RETURN(ret, obj, ...) do { \
+	PTR_CHECK_RETURN(ret, obj, __VA_ARGS__); \
+	PTR_CHECK_RETURN(ret, *((void **)obj), __VA_ARGS__); \
 } while (0)
+#define OBJ_CHECK(obj, ...) OBJ_CHECK_RETURN(, obj, __VA_ARGS__)
 
 static inline ION_STRING *ion_string_from_zend(ION_STRING *is, const zend_string *zs)
 {
-	is->length = zs ? zs->len : 0;
+	is->length = zs ? (SIZE) zs->len : 0;
 	is->value = (BYTE *) (zs ? zs->val : NULL);
 	return is;
 }
@@ -394,13 +413,6 @@ static inline void update_property_obj(zend_object *obj, const char *n, size_t l
 	zend_update_property(obj->ce, obj, n, l, &zobj);
 }
 
-typedef struct php_ion_type {
-	ION_TYPE typ;
-	zend_object std;
-} php_ion_type;
-
-php_ion_decl(type, Type);
-
 #define RETURN_IONTYPE(typ) do { \
 	zend_object *__zo = php_ion_type_fetch(typ); \
 	if (UNEXPECTED(!__zo)) { \
@@ -421,6 +433,11 @@ static inline zend_object *php_ion_type_fetch(ION_TYPE typ)
 	return zend_enum_get_case(ce_Type, Z_STR_P(ztype));
 }
 
+static inline ION_TYPE ion_type_from_enum(zend_object *zo)
+{
+	return (ION_TYPE) Z_LVAL_P(zend_enum_fetch_case_value(zo));
+}
+
 typedef struct php_ion_symbol_iloc {
 	ION_SYMBOL_IMPORT_LOCATION loc;
 	zend_string *name;
@@ -519,6 +536,27 @@ static inline void php_ion_symbol_zval(ION_SYMBOL *sym_ptr, zval *return_value)
 	}
 }
 
+static inline zval *php_ion_global_symbol_fetch_by_enum(zend_string *name)
+{
+	zval *zgs = zend_hash_find(&php_ion_globals.symbol.cache, name);
+	if (!zgs) {
+		zval *zid = zend_hash_find(&g_sym_map, name);
+		if (zid) {
+			zval *zss = zend_hash_index_find(&g_sym_hash, Z_LVAL_P(zid));
+			if (zss) {
+				zval zsym;
+				object_init_ex(&zsym, ce_Symbol);
+				php_ion_symbol *sym = php_ion_obj(symbol, Z_OBJ(zsym));
+				sym->sym.sid = Z_LVAL_P(zid);
+				sym->value = zval_get_string(zss);
+				php_ion_symbol_ctor(sym);
+				zgs = zend_hash_add(&php_ion_globals.symbol.cache, name, &zsym);
+			}
+		}
+	}
+	return zgs;
+}
+
 php_ion_decl(symbol, Symbol, php_ion_symbol_dtor(obj));
 
 typedef struct php_ion_symbol_table {
@@ -601,7 +639,7 @@ typedef struct php_ion_decimal_ctx {
 #define php_ion_decimal_ctx_init_max(c, rounding) \
 	php_ion_decimal_ctx_init((c), DEC_MAX_DIGITS, DEC_MAX_EMAX, DEC_MIN_EMIN, (rounding), false)
 static inline void php_ion_decimal_ctx_init(decContext *ctx,
-		zend_long digits, zend_long emax, zend_long emin, zend_long round, zend_bool clamp)
+		int digits, int emax, int emin, enum rounding round, zend_bool clamp)
 {
 	memset(ctx, 0, sizeof(*ctx));
 	ctx->digits = digits;
@@ -733,7 +771,7 @@ static inline zend_long php_usec_from_ion(const decQuad *frac, decContext *ctx)
 	return (zend_long) decQuadToUInt32(&result, ctx, DEC_ROUND_HALF_EVEN);
 }
 
-static inline decQuad *ion_ts_frac_from_usec(decQuad *frac, zend_long usec, decContext *ctx)
+static inline decQuad *ion_ts_frac_from_usec(decQuad *frac, int usec, decContext *ctx)
 {
 	if (!ctx) {
 		ctx = &php_ion_globals.decimal.ctx;
@@ -742,7 +780,7 @@ static inline decQuad *ion_ts_frac_from_usec(decQuad *frac, zend_long usec, decC
  	return decQuadDivide(frac, decQuadFromInt32(&us, usec), decQuadFromInt32(&microsecs, 1000000), ctx);
 }
 
-static inline zend_string *php_dt_format_from_precision(int precision)
+static inline zend_string *php_dt_format_from_precision(uint8_t precision)
 {
 	switch (precision & 0x7f) {
 	case ION_TS_FRAC:
@@ -764,7 +802,7 @@ static inline zend_string *php_dt_format_from_precision(int precision)
 
 static inline timelib_time* php_time_from_ion(const ION_TIMESTAMP *ts, decContext *ctx, zend_string **fmt)
 {
-	timelib_time *time = timelib_time_ctor();
+	timelib_time *time = ecalloc(1, sizeof(*time));
 
 	int precision = ION_TS_FRAC;
 	ion_timestamp_get_precision(ts,  &precision);
@@ -816,7 +854,7 @@ static inline ION_TIMESTAMP *ion_timestamp_from_php(ION_TIMESTAMP *buf, php_ion_
 				"Invalid precision (%d) of ion\\Timestamp", precision);
 	} else switch ((buf->precision = precision)) {
 	case ION_TS_FRAC:
-		ion_ts_frac_from_usec(&buf->fraction, ts->time->us, ctx);
+		ion_ts_frac_from_usec(&buf->fraction, (int) ts->time->us, ctx);
 		/* fallthrough */
 	case ION_TS_SEC:
 		buf->seconds = ts->time->s;
@@ -835,7 +873,7 @@ static inline ION_TIMESTAMP *ion_timestamp_from_php(ION_TIMESTAMP *buf, php_ion_
 		buf->year = ts->time->y;
 		/* fallthrough */
 	default:
-		buf->tz_offset = ts->time->z / 60;
+		buf->tz_offset = (short) (ts->time->z / 60);
 		if (buf->tz_offset) {
 			buf->precision |= 0x80;
 		}
@@ -927,8 +965,6 @@ static inline void php_ion_catalog_symbol_table_zval(php_ion_catalog *obj, ION_S
 		if (ztab) {
 			zend_string_release(key);
 			RETURN_COPY(ztab);
-		} else {
-			fprintf(stderr, "FAIL\n");
 		}
 	}
 
@@ -946,16 +982,38 @@ static inline void php_ion_catalog_symbol_table_zval(php_ion_catalog *obj, ION_S
 		ZVAL_ADDREF(return_value);
 		add_assoc_zval_ex(ztabs, key->val, key->len, return_value);
 	}
+	zend_string_release(key);
 }
 
 php_ion_decl(catalog, Catalog, php_ion_catalog_dtor(obj));
 
+typedef struct php_ion_reader_options_ccn_ctx {
+	zend_object *obj;
+	zend_fcall_info fci;
+	zend_fcall_info_cache fcc;
+} php_ion_reader_options_ccn_ctx;
+
 typedef struct php_ion_reader_options {
 	ION_READER_OPTIONS opt;
+	php_ion_reader_options_ccn_ctx ccn;
 	zend_object *cat, *dec_ctx, *cb, std;
 } php_ion_reader_options;
 
-php_ion_decl(reader_options, Reader_Options);
+static inline void php_ion_reader_options_dtor(php_ion_reader_options *obj)
+{
+	if (obj->cb) {
+		zend_fcall_info_args_clear(&obj->ccn.fci, true);
+	}
+}
+
+php_ion_decl(reader_options, Reader_Options, php_ion_reader_options_dtor(obj));
+
+static inline zend_object *php_ion_reader_options_new(void)
+{
+	zend_object *obj = create_ion_Reader_Options(NULL);
+	zend_call_known_instance_method_with_0_params(obj->ce->constructor, obj, NULL);
+	return obj;
+}
 
 typedef struct php_ion_reader {
 	ION_READER *reader;
@@ -1002,25 +1060,31 @@ static inline iERR php_ion_reader_stream_handler(struct _ion_user_stream *user)
 
 static inline iERR on_context_change(void *context, ION_COLLECTION *imports)
 {
+	iERR e = IERR_OK;
+
 	if (context) {
-		php_ion_reader *obj = php_ion_obj(reader, context);
-		(void) obj;
+		php_ion_reader_options_ccn_ctx *ctx = context;
+
+		zval zobj;
+		ZVAL_OBJ(&zobj, ctx->obj);
+		zend_fcall_info_argn(&ctx->fci, 1, &zobj);
+		if (SUCCESS != zend_fcall_info_call(&ctx->fci, &ctx->fcc, NULL, NULL)) {
+			e = IERR_INTERNAL_ERROR;
+		}
+		zend_fcall_info_args_clear(&ctx->fci, false);
 	}
-	return IERR_OK;
+	return e;
 }
 
-static ION_READER_CONTEXT_CHANGE_NOTIFIER EMPTY_READER_CHANGE_NOTIFIER = {
-	on_context_change,
-	NULL
-};
-
 static inline void php_ion_reader_ctor(php_ion_reader *obj)
 {
 	iERR err;
 	php_ion_reader_options *opt = php_ion_obj(reader_options, obj->opt);
 
-	if (opt) {
-		opt->opt.context_change_notifier.context = obj;
+	if (opt && opt->opt.context_change_notifier.context) {
+		php_ion_reader_options_ccn_ctx *ctx = opt->opt.context_change_notifier.context;
+		ctx->obj = &obj->std;
+		opt->opt.context_change_notifier.notify = on_context_change;
 	}
 	if (obj->type == STREAM_READER) {
 		PTR_CHECK(obj->stream.ptr);
@@ -1031,12 +1095,7 @@ static inline void php_ion_reader_ctor(php_ion_reader *obj)
 		err = ion_reader_open_stream(&obj->reader, obj, php_ion_reader_stream_handler, opt ? &opt->opt : NULL);
 
 	} else {
-		err = ion_reader_open_buffer(&obj->reader,
-				(BYTE *) obj->buffer->val, obj->buffer->len,
-				opt ? &opt->opt : NULL);
-	}
-	if (opt) {
-		opt->opt.context_change_notifier.context = NULL;
+		err = ion_reader_open_buffer(&obj->reader, (BYTE *) obj->buffer->val, (SIZE) obj->buffer->len, opt ? &opt->opt : NULL);
 	}
 
 	ION_CHECK(err);
@@ -1065,11 +1124,18 @@ php_ion_decl(reader, Reader_Reader, php_ion_reader_dtor(obj));
 
 typedef struct php_ion_writer_options {
 	ION_WRITER_OPTIONS opt;
-	zend_object *cat, *dec_ctx, *col, std;
+	zend_object *cat, *dec_ctx, std;
 } php_ion_writer_options;
 
 php_ion_decl(writer_options, Writer_Options);
 
+static inline zend_object *php_ion_writer_options_new(void)
+{
+	zend_object *obj = create_ion_Writer_Options(NULL);
+	zend_call_known_instance_method_with_0_params(obj->ce->constructor, obj, NULL);
+	return obj;
+}
+
 typedef struct php_ion_writer {
 	ION_WRITER *writer;
 	enum {
@@ -1184,13 +1250,56 @@ static inline iERR php_ion_writer_buffer_handler(struct _ion_user_stream *user)
 	return IERR_OK;
 }
 
+static inline ION_COLLECTION *php_ion_catalog_collection(php_ion_catalog *cat)
+{
+	/* do not look too close */
+	struct {
+		void *owner;
+		ION_SYMBOL_TABLE *sys;
+		ION_COLLECTION collection;
+	} *cat_ptr = (void *) cat->cat;
+	return &cat_ptr->collection;
+}
+
+static inline void php_ion_writer_options_init_shared_imports(php_ion_writer_options *opt)
+{
+	php_ion_catalog *cat = php_ion_obj(catalog, opt->cat);
+	OBJ_CHECK(cat);
+
+	ION_CHECK(ion_writer_options_initialize_shared_imports(&opt->opt));
+
+	ION_COLLECTION *col = php_ion_catalog_collection(cat);
+	if (!ION_COLLECTION_IS_EMPTY(col)) {
+		// holy, nah, forget it batman...
+#ifndef IPCN_pNODE_TO_pDATA
+# define IPCN_pNODE_TO_pDATA(x)    (&((x)->_data[0]))
+#endif
+		ION_COLLECTION_CURSOR cur;
+		ION_COLLECTION_OPEN(col, cur);
+		while (cur) {
+			ION_SYMBOL_TABLE **ptr;
+			ION_COLLECTION_NEXT(cur, ptr);
+			if (*ptr) {
+				ION_CHECK(ion_writer_options_add_shared_imports_symbol_tables(&opt->opt, ptr, 1));
+			} else {
+				break;
+			}
+		}
+	}
+}
+
 static inline void php_ion_writer_ctor(php_ion_writer *obj)
 {
+	php_ion_writer_options *opt = NULL;
+
 	if (obj->opt) {
 		update_property_obj(&obj->std, ZEND_STRL("options"), obj->opt);
+		opt = php_ion_obj(writer_options, obj->opt);
+		if (opt->cat) {
+			php_ion_writer_options_init_shared_imports(opt);
+		}
 	}
 
-	php_ion_writer_options *opt = php_ion_obj(writer_options, obj->opt);
 	ION_STREAM_HANDLER h;
 	if (obj->type == STREAM_WRITER) {
 		h = php_ion_writer_stream_handler;
@@ -1200,6 +1309,7 @@ static inline void php_ion_writer_ctor(php_ion_writer *obj)
 		php_ion_writer_buffer_init(obj);
 	}
 
+
 	ION_CHECK(ion_writer_open_stream(&obj->writer, h, obj, opt ? &opt->opt : NULL));
 	OBJ_CHECK(obj);
 }
@@ -1209,6 +1319,12 @@ static inline void php_ion_writer_dtor(php_ion_writer *obj)
 	if (obj->writer) {
 		ion_writer_close(obj->writer);
 	}
+	if (obj->opt) {
+		php_ion_writer_options *opt = php_ion_obj(writer_options, obj->opt);
+		if (opt->cat) {
+			ion_writer_options_close_shared_imports(&opt->opt);
+		}
+	}
 	if (obj->type == STREAM_WRITER) {
 		if (obj->stream.buf.value) {
 			efree(obj->stream.buf.value);
@@ -1238,6 +1354,8 @@ static inline void php_ion_serializer_php_ctor(php_ion_serializer_php *ser_obj)
 	ser_obj->serializer.ids = global_ser->ids;
 	ser_obj->serializer.tmp = global_ser->tmp;
 
+	zend_update_property_bool(ser_obj->std.ce, &ser_obj->std, ZEND_STRL("multiSequence"),
+			ser_obj->serializer.multi_seq);
 	zend_update_property_bool(ser_obj->std.ce, &ser_obj->std, ZEND_STRL("callMagicSerialize"),
 			ser_obj->serializer.call_magic);
 	if (ser_obj->serializer.call_custom) {
@@ -1248,7 +1366,7 @@ static inline void php_ion_serializer_php_ctor(php_ion_serializer_php *ser_obj)
 		zend_update_property_null(ser_obj->std.ce, &ser_obj->std, ZEND_STRL("callCustomSerialize"));
 	}
 	if (!ser_obj->opt) {
-		ser_obj->opt = create_ion_Writer_Options(NULL);
+		ser_obj->opt = php_ion_writer_options_new();
 	} else {
 		GC_ADDREF(ser_obj->opt);
 	}
@@ -1266,7 +1384,7 @@ static inline void php_ion_serializer_php_dtor(php_ion_serializer_php *obj)
 
 static inline void php_ion_serialize_zval(php_ion_serializer *, zval *);
 
-static inline void php_ion_serialize_struct(php_ion_serializer *ser, zend_array *arr, bool props)
+static inline void php_ion_serialize_struct(php_ion_serializer *ser, zend_array *arr, bool unmangle_props, bool annotate_props)
 {
 	ION_CHECK(ion_writer_start_container(ser->writer, tid_STRUCT));
 
@@ -1274,22 +1392,25 @@ static inline void php_ion_serialize_struct(php_ion_serializer *ser, zend_array
 	zend_ulong h;
 	zend_string *k = NULL;
 	if (arr) ZEND_HASH_FOREACH_KEY_VAL_IND(arr, h, k, v)
+		char buf[MAX_LENGTH_OF_LONG + 1];
 		ION_STRING is;
 		if (k) {
 			size_t prop_len;
 			const char *class_name, *prop_name;
-			if (props && (SUCCESS == zend_unmangle_property_name_ex(k, &class_name, &prop_name, &prop_len)) && class_name) {
-				ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_assign_cstr(&is, ZEND_STRL("p"))));
-				ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_assign_cstr(&is, (char *) class_name, prop_name - class_name - 1)));
+			if (unmangle_props && (SUCCESS == zend_unmangle_property_name_ex(k, &class_name, &prop_name, &prop_len)) && class_name) {
+				if (annotate_props) {
+					ION_CHECK(ion_writer_add_annotation_symbol(ser->writer, &PHP_ION_SYMBOL_PROPERTY));
+					ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_assign_cstr(&is, (char *) class_name, prop_name - class_name - 1)));
+				}
 			} else {
 				prop_name = k->val;
 				prop_len = k->len;
 			}
-			ion_string_assign_cstr(&is, (char *) prop_name, prop_len);
+			ion_string_assign_cstr(&is, (char *) prop_name, (SIZE) prop_len);
 		} else {
-			char buf[MAX_LENGTH_OF_LONG + 1], *end = buf + sizeof(buf) - 1;
+			char *end = buf + sizeof(buf) - 1;
 			char *ptr = zend_print_long_to_buf(end, (zend_long) h);
-			ion_string_assign_cstr(&is, ptr, end - ptr);
+			ion_string_assign_cstr(&is, ptr, (SIZE) (end - ptr));
 		}
 
 		// WATCH OUT: field names need to be copied
@@ -1322,7 +1443,7 @@ static inline void php_ion_serialize_array(php_ion_serializer *ser, zend_array *
 	if (zend_array_is_list(arr)) {
 		php_ion_serialize_list(ser, arr);
 	} else {
-		php_ion_serialize_struct(ser, arr, false);
+		php_ion_serialize_struct(ser, arr, false, false);
 	}
 }
 
@@ -1335,9 +1456,9 @@ static inline void php_ion_serialize_object_iface(php_ion_serializer *ser, zend_
 	ZVAL_OBJ(&tmp, zobject);
 	if (SUCCESS == zobject->ce->serialize(&tmp, &buf, &len, NULL)) {
 		ION_STRING is;
-		ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_assign_cstr(&is, ZEND_STRL("S"))));
+		ION_CHECK(ion_writer_add_annotation_symbol(ser->writer, &PHP_ION_SYMBOL_SERIALIZEABLE));
 		ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_from_zend(&is, zobject->ce->name)));
-		ION_CHECK(ion_writer_write_string(ser->writer, ion_string_assign_cstr(&is, (char *) buf, len)));
+		ION_CHECK(ion_writer_write_clob(ser->writer, buf, len));
 		efree(buf);
 	} else if (!EG(exception)){
 		zend_throw_exception_ex(spl_ce_UnexpectedValueException, IERR_INTERNAL_ERROR,
@@ -1355,7 +1476,7 @@ static inline void php_ion_serialize_object_magic(php_ion_serializer *ser, zend_
 
 	if (IS_ARRAY == Z_TYPE(rv)) {
 		ION_STRING is;
-		ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_assign_cstr(&is, fn ? "C" : "O", 1)));
+		ION_CHECK(ion_writer_add_annotation_symbol(ser->writer, fn ? &PHP_ION_SYMBOL_CUSTOM_OBJECT : &PHP_ION_SYMBOL_MAGIC_OBJECT));
 		ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_from_zend(&is, zobject->ce->name)));
 		php_ion_serialize_zval(ser, &rv);
 		zval_ptr_dtor(&rv);
@@ -1370,7 +1491,7 @@ static inline void php_ion_serialize_object_magic(php_ion_serializer *ser, zend_
 static inline void php_ion_serialize_object_enum(php_ion_serializer *ser, zend_object *zobject)
 {
 	ION_STRING is;
-	ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_assign_cstr(&is, ZEND_STRL("E"))));
+	ION_CHECK(ion_writer_add_annotation_symbol(ser->writer, &PHP_ION_SYMBOL_ENUM));
 
 	ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_from_zend(&is, zobject->ce->name)));
 	zval *z_cname = zend_enum_fetch_case_name(zobject);
@@ -1382,17 +1503,17 @@ static inline void php_ion_serialize_object_std(php_ion_serializer *ser, zend_ob
 	ION_STRING is;
 
 	if (zobject->ce != zend_standard_class_def) {
-		ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_assign_cstr(&is, ZEND_STRL("c"))));
+		ION_CHECK(ion_writer_add_annotation_symbol(ser->writer, &PHP_ION_SYMBOL_CLASS_OBJECT));
 		ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_from_zend(&is, zobject->ce->name)));
 	} else {
-		ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_assign_cstr(&is, ZEND_STRL("o"))));
+		ION_CHECK(ion_writer_add_annotation_symbol(ser->writer, &PHP_ION_SYMBOL_OBJECT));
 	}
 
 	zval zobj;
 	ZVAL_OBJ(&zobj, zobject);
 	HashTable *props = zend_get_properties_for(&zobj, ZEND_PROP_PURPOSE_SERIALIZE);
 	if (props) {
-		php_ion_serialize_struct(ser, props, true);
+		php_ion_serialize_struct(ser, props, true, true);
 		zend_release_properties(props);
 	} else {
 		zend_throw_exception_ex(spl_ce_UnexpectedValueException, IERR_INTERNAL_ERROR,
@@ -1424,15 +1545,16 @@ static inline bool can_call_magic_serialize(php_ion_serializer *ser, zend_class_
 	return ce->__serialize && ser->call_magic;
 }
 
-static inline bool can_call_iface_serialize(php_ion_serializer *, zend_class_entry *ce)
+static inline bool can_call_iface_serialize(php_ion_serializer *ser, zend_class_entry *ce)
 {
-	return !!ce->serialize;
+  (void) ser;
+	return !!ce->serialize; // NOLINT
 }
 
 static inline bool can_call_custom_serialize(php_ion_serializer *ser, zend_object *zobject, zend_function **fn)
 {
 	if (ser->call_custom) {
-		return !!(*fn = zend_hash_find_ptr(&zobject->ce->function_table, ser->call_custom));
+		return !!(*fn = zend_hash_find_ptr(&zobject->ce->function_table, ser->call_custom)); // NOLINT
 	}
 	return false;
 }
@@ -1473,15 +1595,33 @@ static inline void php_ion_serialize_object(php_ion_serializer *ser, zend_object
 	}
 }
 
+static inline bool php_ion_serialize_system_value(php_ion_serializer *ser, zval *zv)
+{
+	if (1 == php_ion_globals.serializer.level) {
+		if (Z_TYPE_P(zv) == IS_OBJECT) {
+			if (Z_OBJCE_P(zv) == ce_Symbol_Table_Shared) {
+				php_ion_symbol_table *obj = php_ion_obj(symbol_table, Z_OBJ_P(zv));
+				ION_CHECK_RETURN(true, ion_symbol_table_unload(obj->tab, ser->writer));
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
 static inline void php_ion_serialize_refcounted(php_ion_serializer *ser, zval *zv)
 {
+	if (php_ion_serialize_system_value(ser, zv)) {
+		return;
+	}
+
 	zend_ulong idx = (zend_ulong) (uintptr_t) Z_COUNTED_P(zv);
 
 	ION_STRING is;
 	if (zend_hash_index_exists(ser->ids, idx)) {
 		zval *num = zend_hash_index_find(ser->ids, idx);
 
-		ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_assign_cstr(&is, ZEND_STRL("r"))));
+		ION_CHECK(ion_writer_add_annotation_symbol(ser->writer, &PHP_ION_SYMBOL_BACKREF));
 		ION_CHECK(ion_writer_write_int64(ser->writer, Z_LVAL_P(num)));
 	} else {
 		zval num;
@@ -1506,7 +1646,7 @@ static inline void php_ion_serialize_refcounted(php_ion_serializer *ser, zval *z
 			break;
 
 		case IS_REFERENCE:
-			ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_assign_cstr(&is, ZEND_STRL("R"))));
+			ION_CHECK(ion_writer_add_annotation_symbol(ser->writer, &PHP_ION_SYMBOL_REFERENCE));
 			php_ion_serialize_zval(ser, Z_REFVAL_P(zv));
 			break;
 		}
@@ -1566,11 +1706,7 @@ static inline void php_ion_serialize_ex(php_ion_serializer *ser, zval *zv)
 	}
 
 	while (zv) {
-		/* start off with a global PHP annotation instead of repeating it all over the place */
-		if (0 == php_ion_globals_serializer_step()) {
-			ION_STRING is;
-			ION_CHECK(ion_writer_add_annotation(ser->writer, ion_string_assign_cstr(&is, ZEND_STRL("PHP"))));
-		}
+		php_ion_globals_serializer_step();
 		php_ion_serialize_zval(ser, zv);
 		php_ion_globals_serializer_exit();
 
@@ -1601,7 +1737,7 @@ void php_ion_serialize(php_ion_serializer *ser, zval *zv, zval *return_value)
 	writer->type = BUFFER_WRITER;
 
 	if (ser->options) {
-		zo_opt = writer->opt = create_ion_Writer_Options(NULL);
+		zo_opt = writer->opt = php_ion_writer_options_new();
 		php_ion_obj(writer_options, writer->opt)->opt = *ser->options;
 	}
 
@@ -1638,17 +1774,19 @@ static inline void php_ion_unserializer_php_ctor(php_ion_unserializer_php *ser_o
 	ser_obj->unserializer.tmp = global_ser->tmp;
 	ser_obj->unserializer.addref = global_ser->addref;
 
-	zend_update_property_bool(ser_obj->std.ce, &ser_obj->std, ZEND_STRL("callMagicSerialize"),
+	zend_update_property_bool(ser_obj->std.ce, &ser_obj->std, ZEND_STRL("multiSequence"),
+			ser_obj->unserializer.multi_seq);
+	zend_update_property_bool(ser_obj->std.ce, &ser_obj->std, ZEND_STRL("callMagicUnserialize"),
 			ser_obj->unserializer.call_magic);
 	if (ser_obj->unserializer.call_custom) {
-		zend_update_property_str(ser_obj->std.ce, &ser_obj->std, ZEND_STRL("callCustomSerialize"),
+		zend_update_property_str(ser_obj->std.ce, &ser_obj->std, ZEND_STRL("callCustomUnserialize"),
 				ser_obj->unserializer.call_custom);
 		ser_obj->unserializer.call_custom = zend_string_tolower(ser_obj->unserializer.call_custom);
 	} else {
-		zend_update_property_null(ser_obj->std.ce, &ser_obj->std, ZEND_STRL("callCustomSerialize"));
+		zend_update_property_null(ser_obj->std.ce, &ser_obj->std, ZEND_STRL("callCustomUnserialize"));
 	}
 	if (!ser_obj->opt) {
-		ser_obj->opt = create_ion_Reader_Options(NULL);
+		ser_obj->opt = php_ion_reader_options_new();
 	} else {
 		GC_ADDREF(ser_obj->opt);
 	}
@@ -1679,7 +1817,7 @@ static inline bool can_call_iface_unserialize(php_ion_unserializer *ser, zend_cl
 static inline bool can_call_custom_unserialize(php_ion_unserializer *ser, zend_object *zobject, zend_function **fn)
 {
 	if (ser->call_custom) {
-		return !!(*fn = zend_hash_find_ptr(&zobject->ce->function_table, ser->call_custom));
+		return !!(*fn = zend_hash_find_ptr(&zobject->ce->function_table, ser->call_custom)); // NOLINT
 	}
 	return false;
 }
@@ -1917,8 +2055,16 @@ static inline void php_ion_unserialize_struct(php_ion_unserializer *ser, zval *r
 			php_ion_unserialize_object(ser, return_value);
 		}
 	} else if (!ser->annotations.object_type) {
+		bool is_shared_symtab = ser->annotations.shared_symtab;
 		array_init(return_value);
 		php_ion_unserialize_hash(ser, return_value);
+		if (is_shared_symtab) {
+			zval zobj;
+			object_init_ex(&zobj, ce_Symbol_Table_Shared);
+			zend_call_known_function(Z_OBJCE(zobj)->constructor, Z_OBJ(zobj), Z_OBJCE(zobj), NULL, 0, NULL, Z_ARRVAL_P(return_value));
+			zval_ptr_dtor(return_value);
+			RETURN_COPY_VALUE(&zobj);
+		}
 	} else if (ser->annotations.object_type == 'o') {
 		object_init(return_value);
 		php_ion_unserialize_hash(ser, return_value);
@@ -1955,9 +2101,9 @@ static inline void php_ion_unserialize_list(php_ion_unserializer *ser, zval *ret
 static inline void php_ion_reader_read_lob(ION_READER *reader, zval *return_value)
 {
 	zend_string *zstr = zend_string_alloc(0x1000, 0);
-again:
+again: ;
 	SIZE read = 0;
-	iERR err = ion_reader_read_lob_bytes(reader, (BYTE *) zstr->val, zstr->len, &read);
+	iERR err = ion_reader_read_lob_bytes(reader, (BYTE *) zstr->val, (SIZE) zstr->len, &read);
 	if (err == IERR_BUFFER_TOO_SMALL) {
 		zstr = zend_string_extend(zstr, zstr->len << 2, 0);
 		goto again;
@@ -2001,7 +2147,7 @@ static inline void php_ion_reader_read_int(ION_READER *reader, zval *return_valu
 		RETVAL_LONG(i64);
 		goto done;
 
-	case IERR_NUMERIC_OVERFLOW:
+	case IERR_NUMERIC_OVERFLOW: ;
 		SIZE max, len;
 		ION_CHECK(ion_int_char_length(num, &max));
 		zend_string *zs = zend_string_alloc(max, 0);
@@ -2027,7 +2173,7 @@ static inline void php_ion_unserialize_backref(php_ion_unserializer *ser, zval *
 		zend_hash_next_index_insert(ser->addref, return_value);
 	} else {
 		zend_throw_exception_ex(spl_ce_RuntimeException, IERR_INTERNAL_ERROR,
-				"Could not find back reference %ld", Z_LVAL_P(return_value));
+				"Could not find back reference " ZEND_LONG_FMT, Z_LVAL_P(return_value));
 	}
 }
 
@@ -2042,6 +2188,9 @@ static inline void php_ion_unserialize_annotations(php_ion_unserializer *ser)
 		ION_CHECK(ion_reader_get_an_annotation(ser->reader, i, &ann_str));
 
 		if (ann_str.length != 1) {
+			if (ION_STRING_EQUALS(&ann_str, &ION_SYMBOL_SHARED_SYMBOL_TABLE_STRING)) {
+				ser->annotations.shared_symtab = true;
+			}
 			continue;
 		}
 
@@ -2122,7 +2271,7 @@ static inline void php_ion_unserialize_annotations(php_ion_unserializer *ser)
 static inline void php_ion_unserialize_zval(php_ion_unserializer *ser, zval *return_value, ION_TYPE *typ)
 {
 	if (typ) {
-		memcpy(&ser->type, typ, sizeof(ser->type));
+		memcpy(&ser->type, typ, sizeof(ser->type)); // NOLINT
 	} else {
 		typ = &ser->type;
 		ION_CHECK(ion_reader_next(ser->reader, typ));
@@ -2150,7 +2299,7 @@ static inline void php_ion_unserialize_zval(php_ion_unserializer *ser, zval *ret
 		ION_CHECK(ion_reader_read_null(ser->reader, typ));
 		RETURN_NULL();
 
-	case tid_BOOL_INT:
+	case tid_BOOL_INT: ;
 		BOOL bval;
 		ION_CHECK(ion_reader_read_bool(ser->reader, &bval));
 		RETURN_BOOL(bval);
@@ -2172,7 +2321,7 @@ static inline void php_ion_unserialize_zval(php_ion_unserializer *ser, zval *ret
 		}
 		return;
 
-	case tid_FLOAT_INT:
+	case tid_FLOAT_INT: ;
 		double d;
 		ION_CHECK(ion_reader_read_double(ser->reader, &d));
 		RETURN_DOUBLE(d);
@@ -2190,7 +2339,7 @@ static inline void php_ion_unserialize_zval(php_ion_unserializer *ser, zval *ret
 		zend_hash_next_index_insert(ser->ids, return_value);
 		return;
 
-	case tid_SYMBOL_INT:
+	case tid_SYMBOL_INT: ;
 		ION_SYMBOL sym;
 		ION_CHECK(ion_reader_read_ion_symbol(ser->reader, &sym));
 		php_ion_symbol_zval(&sym, return_value);
@@ -2201,7 +2350,7 @@ static inline void php_ion_unserialize_zval(php_ion_unserializer *ser, zval *ret
 		zend_hash_next_index_insert(ser->ids, return_value);
 		return;
 
-	case tid_STRING_INT:
+	case tid_STRING_INT: ;
 		ION_STRING str;
 		ION_CHECK(ion_reader_read_string(ser->reader, &str));
 		RETVAL_STRINGL((char *) str.value, str.length);
@@ -2308,7 +2457,7 @@ void php_ion_unserialize(php_ion_unserializer *ser, zval *zdata, zval *return_va
 	}
 
 	if (ser->options) {
-		zo_opt = reader->opt = create_ion_Reader_Options(NULL);
+		zo_opt = reader->opt = php_ion_reader_options_new();
 		php_ion_obj(reader_options, reader->opt)->opt = *ser->options;
 	}
 
@@ -2327,24 +2476,3 @@ void php_ion_unserialize(php_ion_unserializer *ser, zval *zdata, zval *return_va
 		OBJ_RELEASE(zo_ser);
 	}
 }
-
-static inline zval *php_ion_global_symbol_fetch_by_enum(zend_string *name)
-{
-	zval *zgs = zend_hash_find(&php_ion_globals.symbol.cache, name);
-	if (!zgs) {
-		zval *zid = zend_hash_find(&g_sym_map, name);
-		if (zid) {
-			zval *zss = zend_hash_index_find(&g_sym_hash, Z_LVAL_P(zid));
-			if (zss) {
-				zval zsym;
-				object_init_ex(&zsym, ce_Symbol);
-				php_ion_symbol *sym = php_ion_obj(symbol, Z_OBJ(zsym));
-				sym->sym.sid = Z_LVAL_P(zid);
-				sym->value = zval_get_string(zss);
-				php_ion_symbol_ctor(sym);
-				zgs = zend_hash_add(&php_ion_globals.symbol.cache, name, &zsym);
-			}
-		}
-	}
-	return zgs;
-}