X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=ion.c;h=017b5ad4bbe1428072a7134817e22d353a005a74;hb=88c23f4cc4dc2d119fc2f8ac5feac1e7f324b90a;hp=8bf7e0a3e11b63a5f2ab0361fb3ee629ee1f2726;hpb=ac7822dd9dd0d5cf0855df8a750468d453bc3053;p=awesomized%2Fext-ion

diff --git a/ion.c b/ion.c
index 8bf7e0a..017b5ad 100644
--- a/ion.c
+++ b/ion.c
@@ -125,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();
 
@@ -135,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();
 
@@ -410,14 +410,15 @@ static ZEND_METHOD(ion_Timestamp, __construct)
 
 	zend_long precision;
 	zend_object *precision_obj = NULL, *format_obj = NULL;
-	zend_string *fmt = NULL, *dt = NULL;
-	zval *tz = NULL;
+	zend_string *fmt = NULL, *dt = NULL, *tz = NULL;
+	zend_object *tz_obj = NULL;
+	zval z_tz_tmp, *z_tz_ptr = 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_OBJ_OF_CLASS_OR_STR_OR_NULL(format_obj, ce_Timestamp_Format, fmt)
 		Z_PARAM_STR_OR_NULL(dt)
-		Z_PARAM_ZVAL(tz)
+		Z_PARAM_OBJ_OF_CLASS_OR_STR_OR_NULL(tz_obj, php_date_get_timezone_ce(), tz)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (precision_obj) {
@@ -426,7 +427,21 @@ static ZEND_METHOD(ion_Timestamp, __construct)
 	if (format_obj) {
 		fmt = Z_STR_P(zend_enum_fetch_case_value(format_obj));
 	}
-	php_ion_timestamp_ctor(obj, precision, fmt, dt, tz);
+	if (tz_obj) {
+		ZVAL_OBJ(z_tz_ptr = &z_tz_tmp, tz_obj);
+	} else if (tz) {
+		// there's no public API, so call timezone_open
+		zend_function *tz_open = zend_fetch_function_str(ZEND_STRL("timezone_open"));
+		if (tz_open) {
+			zval z_arg;
+			ZVAL_STR(&z_arg, tz);
+			zend_call_known_function(tz_open, NULL, NULL, z_tz_ptr = &z_tz_tmp, 1, &z_arg, NULL);
+		}
+	}
+	php_ion_timestamp_ctor(obj, precision, fmt, dt, z_tz_ptr);
+	if (tz && z_tz_ptr) {
+		zval_ptr_dtor(z_tz_ptr);
+	}
 }
 static ZEND_METHOD(ion_Timestamp, __toString)
 {
@@ -597,12 +612,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)
@@ -612,22 +626,14 @@ 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();
@@ -655,22 +661,14 @@ static ZEND_METHOD(ion_Reader_Options, __construct)
 	}
 	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 = (int) ch_nl);
 	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("maxContainerDepth"),
 		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("maxAnnotationBuffered"),
-		opt->opt.max_annotation_buffered = (SIZE) max_ann_buf);
-	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("symbolThreshold"),
-		opt->opt.symbol_threshold = (SIZE) sym_thr);
-	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("userValueThreshold"),
-		opt->opt.user_value_threshold = (SIZE) uval_thr);
-	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("chunkThreshold"),
-		opt->opt.chunk_threshold = (SIZE) chunk_thr);
-	zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("allocationPageSize"),
-		opt->opt.allocation_page_size = (SIZE) alloc_pgsz);
+	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 = (SIZE) skip_validation);
 }
@@ -864,7 +862,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) {
@@ -955,7 +958,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)
 {
@@ -1036,9 +1041,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;
 }
@@ -1198,7 +1201,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();
@@ -1218,9 +1221,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)
@@ -1238,10 +1241,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,
@@ -1250,8 +1249,6 @@ 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) {
@@ -1278,10 +1275,6 @@ static ZEND_METHOD(ion_Writer_Options, __construct)
 			obj->opt.indent_with_tabs = tabs);
 	zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("indentSize"),
 			obj->opt.indent_size = (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);
 	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"),
@@ -1290,8 +1283,6 @@ static ZEND_METHOD(ion_Writer_Options, __construct)
 			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 = (SIZE) temp);
-	zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("allocationPageSize"),
-			obj->opt.allocation_page_size = (SIZE) alloc);
 }
 static ZEND_METHOD(ion_Writer_Writer, writeNull)
 {
@@ -1371,8 +1362,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));
@@ -1580,9 +1580,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 +1591,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 +1613,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)
 {
@@ -1661,6 +1653,25 @@ static ZEND_METHOD(ion_Writer_Stream_Writer, getStream)
 	RETURN_RES(obj->stream.ptr->res);
 }
 
+#define Z_PARAM_OBJ_OF_CLASS_OR_NAMED_OR_NULL(obj_dest, iface_ce, impl_ce, arr_dest) \
+	Z_PARAM_PROLOGUE(0,0) \
+	if (!zend_parse_arg_obj(_arg, &(obj_dest), iface_ce, true)) {         \
+		if (UNEXPECTED(!zend_parse_arg_array(_arg, &(arr_dest), true, 0))) { \
+			_error = (iface_ce)->name->val; \
+			_error_code = ZPP_ERROR_WRONG_CLASS_OR_NULL; \
+			break; \
+		} \
+		zval tmp; \
+		object_init_ex(&tmp, impl_ce); \
+		*(&(obj_dest)) = Z_OBJ(tmp); \
+		zend_call_known_function((impl_ce)->constructor, obj_dest, impl_ce, \
+								 NULL, 0, NULL, Z_ARRVAL_P(arr_dest));                                       \
+		if (EG(exception)) { \
+			OBJ_RELEASE(obj_dest); \
+			return; \
+		} \
+	}
+
 static ZEND_METHOD(ion_Serializer_PHP, __construct)
 {
 	php_ion_serializer_php *obj = php_ion_obj(serializer_php, Z_OBJ_P(ZEND_THIS));
@@ -1668,15 +1679,19 @@ static ZEND_METHOD(ion_Serializer_PHP, __construct)
 
 	obj->serializer.call_magic = true;
 
+	zval *za_opt = NULL;
 	ZEND_PARSE_PARAMETERS_START(0, 4)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->opt, ce_Writer_Options)
+		Z_PARAM_OBJ_OF_CLASS_OR_NAMED_OR_NULL(obj->opt, ce_Writer_Options, ce_Writer_Options, za_opt)
 		Z_PARAM_BOOL(obj->serializer.multi_seq)
 		Z_PARAM_BOOL(obj->serializer.call_magic)
 		Z_PARAM_STR_OR_NULL(obj->serializer.call_custom)
 	ZEND_PARSE_PARAMETERS_END();
 
 	php_ion_serializer_php_ctor(obj);
+	if (za_opt) {
+		OBJ_RELEASE(obj->opt);
+	}
 }
 static ZEND_METHOD(ion_Serializer_PHP, serialize)
 {
@@ -1691,12 +1706,12 @@ static ZEND_METHOD(ion_Serializer_PHP, serialize)
 }
 static ZEND_FUNCTION(ion_serialize)
 {
-	zval *data;
+	zval *data, *za_ser = NULL;
 	zend_object *zo_ser = NULL;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(data)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_OBJ_OF_CLASS_OR_NULL(zo_ser, ce_Serializer)
+		Z_PARAM_OBJ_OF_CLASS_OR_NAMED_OR_NULL(zo_ser, ce_Serializer, ce_Serializer_PHP, za_ser)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (!zo_ser || zo_ser->ce == ce_Serializer_PHP) {
@@ -1706,6 +1721,10 @@ static ZEND_FUNCTION(ion_serialize)
 	} else {
 		zend_call_method_with_1_params(zo_ser, NULL, NULL, "serialize", return_value, data);
 	}
+
+	if (za_ser) {
+		OBJ_RELEASE(zo_ser);
+	}
 }
 
 static ZEND_METHOD(ion_Unserializer_PHP, __construct)
@@ -1715,15 +1734,19 @@ static ZEND_METHOD(ion_Unserializer_PHP, __construct)
 
 	obj->unserializer.call_magic = true;
 
+	zval *za_opt = NULL;
 	ZEND_PARSE_PARAMETERS_START(0, 4)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->opt, ce_Reader_Options)
+		Z_PARAM_OBJ_OF_CLASS_OR_NAMED_OR_NULL(obj->opt, ce_Reader_Options, ce_Reader_Options, za_opt)
 		Z_PARAM_BOOL(obj->unserializer.multi_seq)
 		Z_PARAM_BOOL(obj->unserializer.call_magic)
 		Z_PARAM_STR_OR_NULL(obj->unserializer.call_custom)
 	ZEND_PARSE_PARAMETERS_END();
 
 	php_ion_unserializer_php_ctor(obj);
+	if (za_opt) {
+		OBJ_RELEASE(obj->opt);
+	}
 }
 static ZEND_METHOD(ion_Unserializer_PHP, unserialize)
 {
@@ -1738,12 +1761,12 @@ static ZEND_METHOD(ion_Unserializer_PHP, unserialize)
 }
 static ZEND_FUNCTION(ion_unserialize)
 {
-	zval *data;
+	zval *data, *za_ser = NULL;
 	zend_object *zo_ser = NULL;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(data)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_OBJ_OF_CLASS_OR_NULL(zo_ser, ce_Unserializer)
+		Z_PARAM_OBJ_OF_CLASS_OR_NAMED_OR_NULL(zo_ser, ce_Unserializer, ce_Unserializer_PHP, za_ser)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (!zo_ser || zo_ser->ce == ce_Unserializer_PHP) {
@@ -1751,7 +1774,11 @@ static ZEND_FUNCTION(ion_unserialize)
 		php_ion_unserializer *ser = zo_ser ? &php_ion_obj(unserializer_php, zo_ser)->unserializer : NULL;
 		php_ion_unserialize(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, "unserialize", return_value, data);
+	}
+
+	if (za_ser) {
+		OBJ_RELEASE(zo_ser);
 	}
 }
 
@@ -1798,6 +1825,9 @@ PHP_MINIT_FUNCTION(ion)
 	php_ion_register(decimal_ctx, Decimal_Context);
 	ce_Decimal_Context_Rounding = register_class_ion_Decimal_Context_Rounding();
 
+	// Exception
+	ce_Exception = register_class_ion_Exception(zend_ce_exception);
+
 	// LOB
 	ce_LOB = register_class_ion_LOB();
 
@@ -1825,8 +1855,8 @@ 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());