X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=ion.c;h=cffeee5ec81febd08cd34a7cbe40f85a4cef0aaa;hb=b372aaf7f0eeabb9d0e73d142039d5c062ca59c7;hp=53b65dfbe667c3499f050379719d3ff528b91d7f;hpb=2a37e54dbc0c6cb355bb715565fb108328250f01;p=awesomized%2Fext-ion

diff --git a/ion.c b/ion.c
index 53b65df..cffeee5 100644
--- a/ion.c
+++ b/ion.c
@@ -25,7 +25,6 @@
 
 #include "ext/date/php_date.h"
 #include "ext/spl/spl_exceptions.h"
-#include "ext/spl/spl_iterators.h"
 
 #include "php_ion.h"
 #include "ion_private.h"
@@ -41,7 +40,7 @@ static ZEND_METHOD(ion_Symbol_ImportLocation, __construct)
 		Z_PARAM_LONG(location)
 	ZEND_PARSE_PARAMETERS_END();
 
-	obj->loc.location = location;
+	obj->loc.location = (SID) location;
 	php_ion_symbol_iloc_ctor(obj);
 }
 static ZEND_METHOD(ion_Symbol, __construct)
@@ -57,7 +56,7 @@ static ZEND_METHOD(ion_Symbol, __construct)
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->iloc, ce_Symbol_ImportLocation)
 	ZEND_PARSE_PARAMETERS_END();
 
-	obj->sym.sid = sid;
+	obj->sym.sid = (SID) sid;
 	php_ion_symbol_ctor(obj);
 }
 static ZEND_METHOD(ion_Symbol, equals)
@@ -126,7 +125,7 @@ static ZEND_METHOD(ion_Symbol_Enum, toString)
 	zval tmp;
 	RETVAL_ZVAL(zend_read_property(Z_OBJCE_P(zsym), Z_OBJ_P(zsym), ZEND_STRL("value"), 0, &tmp), 1, 0);
 }
-static ZEND_FUNCTION(ion_Symbol_Table_System)
+static ZEND_METHOD(ion_Symbol_System, asTable)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 
@@ -136,7 +135,7 @@ static ZEND_FUNCTION(ion_Symbol_Table_System)
 	php_ion_symbol_table_ctor(obj);
 	ion_symbol_table_lock(obj->tab);
 }
-static ZEND_FUNCTION(ion_Symbol_Table_PHP)
+static ZEND_METHOD(ion_Symbol_PHP, asTable)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 
@@ -201,8 +200,8 @@ static ZEND_METHOD(ion_Symbol_Table_Shared, __construct)
 			break;
 		}
 
-		ION_STRING is;
-		ION_CHECK(ion_symbol_table_add_symbol(obj->tab, ion_string_from_zend(&is, str), NULL), zend_string_release(str));
+		ION_STRING istr;
+		ION_CHECK(ion_symbol_table_add_symbol(obj->tab, ion_string_from_zend(&istr, str), NULL), zend_string_release(str));
 		zend_string_release(str);
 	}
 	ZEND_HASH_FOREACH_END();
@@ -325,26 +324,7 @@ static ZEND_METHOD(ion_Catalog, add)
 	php_ion_symbol_table *o_symtab = php_ion_obj(symbol_table, zo_symtab);
 	php_ion_catalog_add_symbol_table(obj, o_symtab);
 }
-struct remove_symtab_ctx {
-	const char *name;
-	zend_bool deleted;
-};
-static int remove_symtab(zval *ztab, void *ctx)
-{
-	struct remove_symtab_ctx *rsc = ctx;
-	php_ion_symbol_table *tab = php_ion_obj(symbol_table, Z_OBJ_P(ztab));
-	if (tab && tab->tab) {
-		ION_STRING is;
-		if (IERR_OK == ion_symbol_table_get_name(tab->tab, &is)) {
-			if (strcmp((const char *) is.value, rsc->name)) {
-				return ZEND_HASH_APPLY_KEEP;
-			}
-		}
-	}
-	rsc->deleted = true;
-	return ZEND_HASH_APPLY_REMOVE;
 
-}
 static ZEND_METHOD(ion_Catalog, remove)
 {
 	php_ion_catalog *obj = php_ion_obj(catalog, Z_OBJ_P(ZEND_THIS));
@@ -364,12 +344,22 @@ static ZEND_METHOD(ion_Catalog, remove)
 		if (zo_symtab) {
 			// fast path
 			zend_ulong idx = (uintptr_t) &zo_symtab->gc;
-			RETURN_BOOL(SUCCESS == zend_hash_index_del(Z_ARRVAL_P(ztabs), idx));
+			RETVAL_BOOL(SUCCESS == zend_hash_index_del(Z_ARRVAL_P(ztabs), idx));
+			ION_CHECK(ion_catalog_release_symbol_table(obj->cat, php_ion_obj(symbol_table, zo_symtab)->tab));
 		} else {
-			// iterate over all symbol tables and delete any with matching name
-			struct remove_symtab_ctx ctx = {zs_symtab->val, false};
-			zend_hash_apply_with_argument(Z_ARRVAL_P(ztabs), remove_symtab, &ctx);
-			RETURN_BOOL(ctx.deleted);
+			bool deleted = false;
+			ION_SYMBOL_TABLE *tab;
+			ION_STRING is;
+			ion_string_from_zend(&is, zs_symtab);
+			do {
+				tab = NULL;
+				ION_CHECK(ion_catalog_find_best_match(obj->cat, &is, 0, &tab));
+				if (tab) {
+					ION_CHECK(ion_catalog_release_symbol_table(obj->cat, tab));
+					deleted = true;
+				}
+			} while(tab);
+			RETVAL_BOOL(deleted);
 		}
 	}
 }
@@ -419,13 +409,13 @@ static ZEND_METHOD(ion_Timestamp, __construct)
 	PTR_CHECK(obj);
 
 	zend_long precision;
-	zend_object *precision_obj;
+	zend_object *precision_obj = NULL, *format_obj = NULL;
 	zend_string *fmt = NULL, *dt = NULL;
 	zval *tz = NULL;
 	ZEND_PARSE_PARAMETERS_START(1, 4)
 		Z_PARAM_OBJ_OF_CLASS_OR_LONG(precision_obj, ce_Timestamp_Precision, precision)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_STR_OR_NULL(fmt)
+		Z_PARAM_OBJ_OF_CLASS_OR_STR_OR_NULL(format_obj, ce_Timestamp_Format, fmt)
 		Z_PARAM_STR_OR_NULL(dt)
 		Z_PARAM_ZVAL(tz)
 	ZEND_PARSE_PARAMETERS_END();
@@ -433,6 +423,9 @@ static ZEND_METHOD(ion_Timestamp, __construct)
 	if (precision_obj) {
 		precision = Z_LVAL_P(zend_enum_fetch_case_value(precision_obj));
 	}
+	if (format_obj) {
+		fmt = Z_STR_P(zend_enum_fetch_case_value(format_obj));
+	}
 	php_ion_timestamp_ctor(obj, precision, fmt, dt, tz);
 }
 static ZEND_METHOD(ion_Timestamp, __toString)
@@ -466,7 +459,7 @@ static ZEND_METHOD(ion_Decimal_Context, __construct)
 	if (o_round) {
 		round = Z_LVAL_P(zend_enum_fetch_case_value(o_round));
 	}
-	php_ion_decimal_ctx_init(&obj->ctx, digits, emax, emin, round, clamp);
+	php_ion_decimal_ctx_init(&obj->ctx, digits, emax, emin, round, clamp); // NOLINT(cppcoreguidelines-narrowing-conversions)
 	php_ion_decimal_ctx_ctor(obj, o_round);
 }
 static inline void make_decimal_ctx(INTERNAL_FUNCTION_PARAMETERS, int kind)
@@ -604,12 +597,11 @@ static ZEND_METHOD(ion_Reader_Options, __construct)
 {
 	php_ion_reader_options *opt = php_ion_obj(reader_options, Z_OBJ_P(ZEND_THIS));
 	zend_bool ret_sys_val = false, skip_validation = false;
-	zend_long ch_nl = 0xa, max_depth = 10, max_ann = 10, max_ann_buf = 512,
-			sym_thr = 0x4000, uval_thr = 0x4000, chunk_thr = 0x4000, alloc_pgsz = 0x10000;
+	zend_long max_depth = 10, max_ann = 10, ann_buf_siz = 0x4000, tmp_buf_siz = 0x4000;
 
 	PTR_CHECK(opt);
 
-	ZEND_PARSE_PARAMETERS_START(0, 13)
+	ZEND_PARSE_PARAMETERS_START(0, 9)
 		Z_PARAM_OPTIONAL
         // public readonly ?\ion\Catalog $catalog = null,
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(opt->cat, ce_Catalog)
@@ -619,58 +611,51 @@ static ZEND_METHOD(ion_Reader_Options, __construct)
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(opt->cb, zend_ce_closure);
         // public readonly bool $returnSystemValues = false,
 		Z_PARAM_BOOL(ret_sys_val)
-        // public readonly int $newLine = 0xa,
-		Z_PARAM_LONG(ch_nl)
         // public readonly int $maxContainerDepth = 10,
 		Z_PARAM_LONG(max_depth)
         // public readonly int $maxAnnotations = 10,
 		Z_PARAM_LONG(max_ann)
-        // public readonly int $maxAnnotationBuffered = 512,
-		Z_PARAM_LONG(max_ann_buf)
-        // public readonly int $symbolThreshold = 0x4000,
-		Z_PARAM_LONG(sym_thr)
-        // public readonly int $userValueThreshold = 0x4000,
-		Z_PARAM_LONG(uval_thr)
-        // public readonly int $chunkThreshold = 0x4000,
-		Z_PARAM_LONG(chunk_thr)
-        // public readonly int $allocationPageSize = 0x10000,
-		Z_PARAM_LONG(alloc_pgsz)
+        // public readonly int $annotationBufferSize = 0x4000,
+		Z_PARAM_LONG(ann_buf_siz)
+        // public readonly int $tempBufferSize = 0x4000,
+		Z_PARAM_LONG(tmp_buf_siz)
         // public readonly bool $skipCharacterValidation = false,
 		Z_PARAM_BOOL(skip_validation)
 	ZEND_PARSE_PARAMETERS_END();
 
-	opt->opt.context_change_notifier = EMPTY_READER_CHANGE_NOTIFIER;
 	if (opt->cb) {
+		zval zcb;
+		ZVAL_OBJ(&zcb, opt->cb);
+		zend_fcall_info_init(&zcb, 0, &opt->ccn.fci, &opt->ccn.fcc, NULL, NULL);
+		opt->opt.context_change_notifier.context = &opt->ccn;
 		update_property_obj(&opt->std, ZEND_STRL("onContextChange"), opt->cb);
+	} else {
+		zend_update_property_null(NULL, &opt->std, ZEND_STRL("onContextChange"));
 	}
 	if (opt->cat) {
 		update_property_obj(&opt->std, ZEND_STRL("catalog"), opt->cat);
 		opt->opt.pcatalog = php_ion_obj(catalog, opt->cat)->cat;
+	} else {
+		zend_update_property_null(NULL, &opt->std, ZEND_STRL("catalog"));
 	}
 	if (opt->dec_ctx) {
 		update_property_obj(&opt->std, ZEND_STRL("decimalContext"), opt->dec_ctx);
 		opt->opt.decimal_context = &php_ion_obj(decimal_ctx, opt->dec_ctx)->ctx;
+	} else {
+		zend_update_property_null(NULL, &opt->std, ZEND_STRL("decimalContext"));
 	}
 	zend_update_property_bool(opt->std.ce, &opt->std, ZEND_STRL("returnSystemValues"),
 		opt->opt.return_system_values = ret_sys_val);
-	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("newLine"),
-		opt->opt.new_line_char = ch_nl);
 	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("maxContainerDepth"),
-		opt->opt.max_container_depth = max_depth);
-	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("maxAnnotationCount"),
-		opt->opt.max_annotation_count = max_ann);
-	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("maxAnnotationBuffered"),
-		opt->opt.max_annotation_buffered = max_ann_buf);
-	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("symbolThreshold"),
-		opt->opt.symbol_threshold = sym_thr);
-	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("userValueThreshold"),
-		opt->opt.user_value_threshold = uval_thr);
-	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("chunkThreshold"),
-		opt->opt.chunk_threshold = chunk_thr);
-	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("allocationPageSize"),
-		opt->opt.allocation_page_size = alloc_pgsz);
+		opt->opt.max_container_depth = (SIZE) max_depth);
+	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("maxAnnotations"),
+		opt->opt.max_annotation_count = (SIZE) max_ann);
+	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("annotationBufferSize"),
+		opt->opt.max_annotation_buffered = (SIZE) ann_buf_siz);
+	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("tempBufferSize"),
+		opt->opt.chunk_threshold = opt->opt.user_value_threshold = opt->opt.symbol_threshold = (SIZE) tmp_buf_siz);
 	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("skipCharacterValidation"),
-		opt->opt.skip_character_validation = skip_validation);
+		opt->opt.skip_character_validation = (SIZE) skip_validation);
 }
 static ZEND_METHOD(ion_Reader_Reader, hasChildren)
 {
@@ -862,7 +847,12 @@ static ZEND_METHOD(ion_Reader_Reader, getAnnotationSymbols)
 
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	int32_t count, max = php_ion_obj(reader_options, obj->opt)->opt.max_annotation_count;
+	int32_t count, max;
+	if (obj->opt) {
+		max = php_ion_obj(reader_options, obj->opt)->opt.max_annotation_count;
+	} else {
+		max = 10;
+	}
 	ION_SYMBOL *ptr = ecalloc(sizeof(*ptr), max);
 	iERR err = ion_reader_get_annotation_symbols(obj->reader, ptr, max, &count);
 	if (!err) {
@@ -924,7 +914,7 @@ static ZEND_METHOD(ion_Reader_Reader, readNull)
 
 	ION_TYPE typ;
 	ION_CHECK(ion_reader_read_null(obj->reader, &typ));
-	RETURN_OBJ_COPY(php_ion_type_fetch(typ));
+	RETURN_IONTYPE(typ);
 }
 static ZEND_METHOD(ion_Reader_Reader, readBool)
 {
@@ -953,7 +943,9 @@ static ZEND_METHOD(ion_Reader_Reader, readFloat)
 
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	ION_CHECK(ion_reader_read_double(obj->reader, &Z_DVAL_P(return_value)));
+	double dval;
+	ION_CHECK(ion_reader_read_double(obj->reader, &dval));
+	RETURN_DOUBLE(dval);
 }
 static ZEND_METHOD(ion_Reader_Reader, readDecimal)
 {
@@ -1034,9 +1026,7 @@ static void read_part(INTERNAL_FUNCTION_PARAMETERS, read_part_fn fn)
 		RETURN_TRUE;
 	}
 fail:
-	if (zstr != Z_STR_P(ref)) {
-		zend_string_release(zstr);
-	}
+	zend_string_release(zstr);
 	ZVAL_EMPTY_STRING(ref);
 	RETURN_FALSE;
 }
@@ -1196,7 +1186,7 @@ static ZEND_METHOD(ion_Reader_Stream_Reader, resetStreamWithLength)
 
 	zval *zstream;
 	zend_long length;
-	ZEND_PARSE_PARAMETERS_START(1, 2);
+	ZEND_PARSE_PARAMETERS_START(2, 2);
 		Z_PARAM_RESOURCE(zstream);
 		Z_PARAM_LONG(length)
 	ZEND_PARSE_PARAMETERS_END();
@@ -1216,9 +1206,9 @@ static ZEND_METHOD(ion_Writer_Options, __construct)
 	PTR_CHECK(obj);
 
 	zend_bool binary = false, compact_floats = false, escape = false, pretty = false,
-			tabs = true, small_cntr_inl = true, suppress_sys = false, flush = false;
-	zend_long indent = 2, max_depth = 10, max_ann = 10, temp = 0x4000, alloc = 0x10000;
-	ZEND_PARSE_PARAMETERS_START(0, 16)
+			tabs = true, flush = false;
+	zend_long indent = 2, max_depth = 10, max_ann = 10, temp = 0x4000;
+	ZEND_PARSE_PARAMETERS_START(0, 12)
 		Z_PARAM_OPTIONAL
 		//public readonly ?\ion\Catalog $catalog = null,
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->cat, ce_Catalog)
@@ -1236,10 +1226,6 @@ static ZEND_METHOD(ion_Writer_Options, __construct)
 		Z_PARAM_BOOL(tabs)
 		//public readonly int $indentSize = 2,
 		Z_PARAM_LONG(indent)
-		//public readonly bool $smallContainersInline = true,
-		Z_PARAM_BOOL(small_cntr_inl)
-		//public readonly bool $suppressSystemValues = false,
-		Z_PARAM_BOOL(suppress_sys)
 		//public readonly bool $flushEveryValue = false,
 		Z_PARAM_BOOL(flush)
 		//public readonly int $maxContainerDepth = 10,
@@ -1248,44 +1234,40 @@ static ZEND_METHOD(ion_Writer_Options, __construct)
 		Z_PARAM_LONG(max_ann)
 		//public readonly int $tempBufferSize = 0x4000,
 		Z_PARAM_LONG(temp)
-		//public readonly int $allocationPageSize = 0x10000,
-		Z_PARAM_LONG(alloc)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (obj->cat) {
 		update_property_obj(&obj->std, ZEND_STRL("catalog"), obj->cat);
 		obj->opt.pcatalog = php_ion_obj(catalog, obj->cat)->cat;
+	} else {
+		zend_update_property_null(NULL, &obj->std, ZEND_STRL("catalog"));
 	}
 	if (obj->dec_ctx) {
 		update_property_obj(&obj->std, ZEND_STRL("decimalContext"), obj->dec_ctx);
 		obj->opt.decimal_context = &php_ion_obj(decimal_ctx, obj->dec_ctx)->ctx;
+	} else {
+		zend_update_property_null(NULL, &obj->std, ZEND_STRL("decimalContext"));
 	}
 	zend_update_property_bool(obj->std.ce, &obj->std, ZEND_STRL("outputBinary"),
 			obj->opt.output_as_binary = binary);
-	zend_update_property_bool(obj->std.ce, &obj->std, ZEND_STRL("comactFloats"),
+	zend_update_property_bool(obj->std.ce, &obj->std, ZEND_STRL("compactFloats"),
 			obj->opt.compact_floats = compact_floats);
-	zend_update_property_bool(obj->std.ce, &obj->std, ZEND_STRL("excapeNonAscii"),
+	zend_update_property_bool(obj->std.ce, &obj->std, ZEND_STRL("escapeNonAscii"),
 			obj->opt.escape_all_non_ascii = escape);
 	zend_update_property_bool(obj->std.ce, &obj->std, ZEND_STRL("prettyPrint"),
 			obj->opt.pretty_print = pretty);
 	zend_update_property_bool(obj->std.ce, &obj->std, ZEND_STRL("indentTabs"),
 			obj->opt.indent_with_tabs = tabs);
 	zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("indentSize"),
-			obj->opt.indent_size = indent);
-	zend_update_property_bool(obj->std.ce, &obj->std, ZEND_STRL("smallContainersInline"),
-			obj->opt.small_containers_in_line = small_cntr_inl);
-	zend_update_property_bool(obj->std.ce, &obj->std, ZEND_STRL("suppressSystemValues"),
-			obj->opt.supress_system_values = suppress_sys);
+			obj->opt.indent_size = (SIZE) indent);
 	zend_update_property_bool(obj->std.ce, &obj->std, ZEND_STRL("flushEveryValue"),
 			obj->opt.flush_every_value = flush);
 	zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("maxContainerDepth"),
-			obj->opt.max_container_depth = max_depth);
+			obj->opt.max_container_depth = (SIZE) max_depth);
 	zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("maxAnnotations"),
-			obj->opt.max_annotation_count = max_ann);
+			obj->opt.max_annotation_count = (SIZE) max_ann);
 	zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("tempBufferSize"),
-			obj->opt.temp_buffer_size = temp);
-	zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("allocationPageSize"),
-			obj->opt.allocation_page_size = alloc);
+			obj->opt.temp_buffer_size = (SIZE) temp);
 }
 static ZEND_METHOD(ion_Writer_Writer, writeNull)
 {
@@ -1306,9 +1288,7 @@ static ZEND_METHOD(ion_Writer_Writer, writeTypedNull)
 		Z_PARAM_OBJ_OF_CLASS(typ_obj, ce_Type)
 	ZEND_PARSE_PARAMETERS_END();
 
-	php_ion_type *typ = php_ion_obj(type, typ_obj);
-	OBJ_CHECK(typ);
-	ION_CHECK(ion_writer_write_typed_null(obj->writer, php_ion_obj(type, typ)->typ));
+	ION_CHECK(ion_writer_write_typed_null(obj->writer, ion_type_from_enum(typ_obj)));
 }
 static ZEND_METHOD(ion_Writer_Writer, writeBool)
 {
@@ -1367,8 +1347,17 @@ static ZEND_METHOD(ion_Writer_Writer, writeDecimal)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (dec_str) {
-		ION_STRING s;
-		ION_CHECK(ion_writer_write_string(obj->writer, ion_string_from_zend(&s, dec_str)));
+		decContext *ctx = &php_ion_globals.decimal.ctx;
+		ION_DECIMAL dec = {0};
+
+		if (obj->opt) {
+			php_ion_writer_options *opt_obj = php_ion_obj(writer_options, obj->opt);
+			if (opt_obj->opt.decimal_context) {
+				ctx = opt_obj->opt.decimal_context;
+			}
+		}
+		ION_CHECK(ion_decimal_from_string(&dec, dec_str->val, ctx));
+		ION_CHECK(ion_writer_write_ion_decimal(obj->writer, &dec));
 	} else {
 		php_ion_decimal *dec = php_ion_obj(decimal, dec_obj);
 		ION_CHECK(ion_writer_write_ion_decimal(obj->writer, &dec->dec));
@@ -1468,9 +1457,7 @@ static ZEND_METHOD(ion_Writer_Writer, startLob)
 		Z_PARAM_OBJ_OF_CLASS(typ_obj, ce_Type)
 	ZEND_PARSE_PARAMETERS_END();
 
-	php_ion_type *typ = php_ion_obj(type, typ_obj);
-	OBJ_CHECK(typ);
-	ION_CHECK(ion_writer_start_lob(obj->writer, php_ion_obj(type, typ)->typ));
+	ION_CHECK(ion_writer_start_lob(obj->writer, ion_type_from_enum(typ_obj)));
 }
 static ZEND_METHOD(ion_Writer_Writer, appendLob)
 {
@@ -1503,9 +1490,7 @@ static ZEND_METHOD(ion_Writer_Writer, startContainer)
 		Z_PARAM_OBJ_OF_CLASS(typ_obj, ce_Type)
 	ZEND_PARSE_PARAMETERS_END();
 
-	php_ion_type *typ = php_ion_obj(type, typ_obj);
-	OBJ_CHECK(typ);
-	ION_CHECK(ion_writer_start_container(obj->writer, php_ion_obj(type, typ)->typ));
+	ION_CHECK(ion_writer_start_container(obj->writer, ion_type_from_enum(typ_obj)));
 }
 static ZEND_METHOD(ion_Writer_Writer, finishContainer)
 {
@@ -1549,7 +1534,7 @@ static ZEND_METHOD(ion_Writer_Writer, writeAnnotation)
 
 	for (unsigned i = 0; i < argc; ++i) {
 		switch (Z_TYPE(args[i])) {
-		case IS_STRING:
+		case IS_STRING: ;
 			ION_STRING is;
 			ION_CHECK(ion_writer_add_annotation(obj->writer, ion_string_from_zend(&is, Z_STR(args[i]))));
 			break;
@@ -1580,9 +1565,6 @@ static ZEND_METHOD(ion_Writer_Writer, flush)
 
 	SIZE flushed;
 	ION_CHECK(ion_writer_flush(obj->writer, &flushed));
-	if (obj->type == BUFFER_WRITER) {
-		smart_str_0(&obj->buffer.str);
-	}
 	RETURN_LONG(flushed);
 }
 static ZEND_METHOD(ion_Writer_Writer, finish)
@@ -1594,33 +1576,19 @@ static ZEND_METHOD(ion_Writer_Writer, finish)
 
 	SIZE flushed;
 	ION_CHECK(ion_writer_finish(obj->writer, &flushed));
-	if (obj->type == BUFFER_WRITER) {
-		smart_str_0(&obj->buffer.str);
-	}
 	RETURN_LONG(flushed);
 }
-static ZEND_METHOD(ion_Writer_Writer, writeOne)
-{
-}
-static ZEND_METHOD(ion_Writer_Writer, writeAll)
-{
-}
 static ZEND_METHOD(ion_Writer_Buffer_Writer, __construct)
 {
 	php_ion_writer *obj = php_ion_obj(writer, Z_OBJ_P(ZEND_THIS));
 	PTR_CHECK(obj);
 
-	zval *ref;
-	ZEND_PARSE_PARAMETERS_START(1, 2)
-		Z_PARAM_ZVAL(ref)
+	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->opt, ce_Writer_Options)
 	ZEND_PARSE_PARAMETERS_END();
 
 	obj->type = BUFFER_WRITER;
-	ZVAL_COPY(&obj->buffer.val, ref);
-	zval_dtor(Z_REFVAL_P(ref));
-
 	php_ion_writer_ctor(obj);
 }
 static ZEND_METHOD(ion_Writer_Buffer_Writer, getBuffer)
@@ -1630,7 +1598,16 @@ static ZEND_METHOD(ion_Writer_Buffer_Writer, getBuffer)
 
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	RETVAL_STR(zend_string_dup(obj->buffer.str.s, 0));
+	RETVAL_STR(php_ion_writer_buffer_copy(obj));
+}
+static ZEND_METHOD(ion_Writer_Buffer_Writer, resetBuffer)
+{
+	php_ion_writer *obj = php_ion_obj(writer, Z_OBJ_P(ZEND_THIS));
+	OBJ_CHECK(obj);
+
+	ZEND_PARSE_PARAMETERS_NONE();
+
+	php_ion_writer_buffer_reset(obj);
 }
 static ZEND_METHOD(ion_Writer_Stream_Writer, __construct)
 {
@@ -1668,7 +1645,7 @@ static ZEND_METHOD(ion_Serializer_PHP, __construct)
 
 	obj->serializer.call_magic = true;
 
-	ZEND_PARSE_PARAMETERS_START(0, 3)
+	ZEND_PARSE_PARAMETERS_START(0, 4)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->opt, ce_Writer_Options)
 		Z_PARAM_BOOL(obj->serializer.multi_seq)
@@ -1678,7 +1655,7 @@ static ZEND_METHOD(ion_Serializer_PHP, __construct)
 
 	php_ion_serializer_php_ctor(obj);
 }
-static ZEND_METHOD(ion_Serializer_PHP, __invoke)
+static ZEND_METHOD(ion_Serializer_PHP, serialize)
 {
 	zend_object *obj = Z_OBJ_P(ZEND_THIS);
 
@@ -1687,12 +1664,7 @@ static ZEND_METHOD(ion_Serializer_PHP, __invoke)
 		Z_PARAM_ZVAL(data)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (obj->ce == ce_Serializer_PHP) {
-		// default, fast path
-		php_ion_serialize(&php_ion_obj(serializer_php, obj)->serializer, data, return_value);
-	} else {
-		zend_call_method_with_1_params(obj, obj->ce, NULL /* TODO */, "serialize", return_value, data);
-	}
+	php_ion_serialize(&php_ion_obj(serializer_php, obj)->serializer, data, return_value);
 }
 static ZEND_FUNCTION(ion_serialize)
 {
@@ -1709,21 +1681,9 @@ static ZEND_FUNCTION(ion_serialize)
 		php_ion_serializer *ser = zo_ser ? &php_ion_obj(serializer_php, zo_ser)->serializer : NULL;
 		php_ion_serialize(ser, data, return_value);
 	} else {
-		zend_call_method_with_1_params(zo_ser, NULL, NULL, "__invoke", return_value, data);
+		zend_call_method_with_1_params(zo_ser, NULL, NULL, "serialize", return_value, data);
 	}
 }
-static ZEND_METHOD(ion_Serializer_PHP, serialize)
-{
-	//zend_object *obj = Z_OBJ_P(ZEND_THIS);
-
-	zval *data;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_ZVAL(data)
-	ZEND_PARSE_PARAMETERS_END();
-
-	// TODO
-	zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Not implemented");
-}
 
 static ZEND_METHOD(ion_Unserializer_PHP, __construct)
 {
@@ -1732,7 +1692,7 @@ static ZEND_METHOD(ion_Unserializer_PHP, __construct)
 
 	obj->unserializer.call_magic = true;
 
-	ZEND_PARSE_PARAMETERS_START(0, 3)
+	ZEND_PARSE_PARAMETERS_START(0, 4)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->opt, ce_Reader_Options)
 		Z_PARAM_BOOL(obj->unserializer.multi_seq)
@@ -1742,7 +1702,7 @@ static ZEND_METHOD(ion_Unserializer_PHP, __construct)
 
 	php_ion_unserializer_php_ctor(obj);
 }
-static ZEND_METHOD(ion_Unserializer_PHP, __invoke)
+static ZEND_METHOD(ion_Unserializer_PHP, unserialize)
 {
 	zend_object *obj = Z_OBJ_P(ZEND_THIS);
 
@@ -1751,11 +1711,7 @@ static ZEND_METHOD(ion_Unserializer_PHP, __invoke)
 		Z_PARAM_ZVAL(data)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (obj->ce == ce_Unserializer_PHP) {
-		php_ion_unserialize(&php_ion_obj(unserializer_php, obj)->unserializer, data, return_value);
-	} else {
-		zend_call_method_with_1_params(obj, obj->ce, NULL /* TODO */, "unserialize", return_value, data);
-	}
+	php_ion_unserialize(&php_ion_obj(unserializer_php, obj)->unserializer, data, return_value);
 }
 static ZEND_FUNCTION(ion_unserialize)
 {
@@ -1775,18 +1731,6 @@ static ZEND_FUNCTION(ion_unserialize)
 		zend_call_method_with_1_params(zo_ser, NULL, NULL, "__invoke", return_value, data);
 	}
 }
-static ZEND_METHOD(ion_Unserializer_PHP, unserialize)
-{
-	//zend_object *obj = Z_OBJ_P(ZEND_THIS);
-
-	zval *data;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_ZVAL(data)
-	ZEND_PARSE_PARAMETERS_END();
-
-	// TODO
-	zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Not implemented");
-}
 
 PHP_RINIT_FUNCTION(ion)
 {
@@ -1809,15 +1753,19 @@ PHP_RSHUTDOWN_FUNCTION(ion)
 }
 
 #define ZEND_ARG_VARIADIC_OBJ_TYPE_MASK(pass_by_ref, name, classname, type_mask, default_value) \
-	{ #name, ZEND_TYPE_INIT_CLASS_CONST_MASK(#classname, type_mask | _ZEND_ARG_INFO_FLAGS(pass_by_ref, 1, 0)), default_value },
+	{ #name, ZEND_TYPE_INIT_CLASS_CONST_MASK(#classname, ((type_mask) | _ZEND_ARG_INFO_FLAGS(pass_by_ref, 1, 0))), default_value },
 #include "ion_arginfo.h"
 
+// spl_iterators.h includes ext/pcre/php_pcre.h which might not find pcre2.h
+extern PHPAPI zend_class_entry *spl_ce_RecursiveIterator;
+
 PHP_MINIT_FUNCTION(ion)
 {
 	// true globals
 	if (SUCCESS != g_sym_init())  {
 		return FAILURE;
 	}
+	g_intern_str_init();
 
 	// Catalog
 	php_ion_register(catalog, Catalog, zend_ce_countable);
@@ -1854,15 +1802,16 @@ PHP_MINIT_FUNCTION(ion)
 	ce_Symbol_Table_Shared = register_class_ion_Symbol_Table_Shared(ce_Symbol_Table);
 	ce_Symbol_Table_Shared->create_object = create_ion_Symbol_Table;
 	ce_Symbol_Enum = register_class_ion_Symbol_Enum();
-	ce_Symbol_Table_System = register_class_ion_Symbol_Table_System(ce_Symbol_Enum);
-	ce_Symbol_Table_PHP = register_class_ion_Symbol_Table_PHP(ce_Symbol_Enum);
+	ce_Symbol_Table_System = register_class_ion_Symbol_System(ce_Symbol_Enum);
+	ce_Symbol_Table_PHP = register_class_ion_Symbol_PHP(ce_Symbol_Enum);
 
 	// Timestamp
 	ce_Timestamp = register_class_ion_Timestamp(php_date_get_date_ce());
+	ce_Timestamp_Format = register_class_ion_Timestamp_Format();
 	ce_Timestamp_Precision = register_class_ion_Timestamp_Precision();
 
 	// Type
-	php_ion_register(type, Type);
+	ce_Type = register_class_ion_Type();
 
 	// Writer
 	ce_Writer = register_class_ion_Writer();