X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=ion.c;h=45f34b86d425ae776a4e47b1ef605171dd338384;hb=e1d8621fc8f0e88bd98174e11e2384a09d838d7f;hp=14261726854de7a6d836052968ca1f894b8589e7;hpb=ebedd44165b65ea28405d41e50757182cf90f658;p=awesomized%2Fext-ion

diff --git a/ion.c b/ion.c
index 1426172..45f34b8 100644
--- a/ion.c
+++ b/ion.c
@@ -325,26 +325,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 +345,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);
 		}
 	}
 }
@@ -639,17 +630,26 @@ static ZEND_METHOD(ion_Reader_Options, __construct)
 		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);
@@ -657,7 +657,7 @@ static ZEND_METHOD(ion_Reader_Options, __construct)
 		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"),
+	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("maxAnnotations"),
 		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);
@@ -1222,8 +1222,6 @@ static ZEND_METHOD(ion_Writer_Options, __construct)
 		Z_PARAM_OPTIONAL
 		//public readonly ?\ion\Catalog $catalog = null,
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->cat, ce_Catalog)
-		//public readonly ?\ion\Collection $encodingSymbolTable = null,
-		Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->col, ce_Collection)
 		//public readonly ?\ion\Decimal\Context $decimalContext = null,
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->dec_ctx, ce_Decimal_Context)
 		//public readonly bool $outputBinary = false,
@@ -1257,19 +1255,20 @@ static ZEND_METHOD(ion_Writer_Options, __construct)
 	if (obj->cat) {
 		update_property_obj(&obj->std, ZEND_STRL("catalog"), obj->cat);
 		obj->opt.pcatalog = php_ion_obj(catalog, obj->cat)->cat;
-	}
-	if (obj->col) {
-		// TODO
+	} 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);
@@ -1673,7 +1672,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)
@@ -1683,7 +1682,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);
 
@@ -1692,12 +1691,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)
 {
@@ -1714,21 +1708,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)
 {
@@ -1737,7 +1719,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)
@@ -1747,7 +1729,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);
 
@@ -1756,11 +1738,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)
 {
@@ -1780,18 +1758,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)
 {