pg 1.2.3 → 1.3.0.rc1

data/ext/pg_type_map.c

@@ -6,6 +6,40 @@
 
 #include "pg.h"
 
+void
+pg_typemap_mark( void *_this )
+{
+	t_typemap *this = (t_typemap *)_this;
+	rb_gc_mark_movable(this->default_typemap);
+}
+
+size_t
+pg_typemap_memsize( const void *_this )
+{
+	t_typemap *this = (t_typemap *)_this;
+	return sizeof(*this);
+}
+
+void
+pg_typemap_compact( void *_this )
+{
+	t_typemap *this = (t_typemap *)_this;
+	pg_gc_location(this->default_typemap);
+}
+
+const rb_data_type_t pg_typemap_type = {
+	"PG::TypeMap",
+	{
+		pg_typemap_mark,
+		RUBY_TYPED_DEFAULT_FREE,
+		pg_typemap_memsize,
+		pg_compact_callback(pg_typemap_compact),
+	},
+	0,
+	0,
+	RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 VALUE rb_cTypeMap;
 VALUE rb_mDefaultTypeMappable;
 static ID s_id_fit_to_query;
@@ -75,7 +109,7 @@ pg_typemap_s_allocate( VALUE klass )
 	VALUE self;
 	t_typemap *this;
 
-	self = Data_Make_Struct( klass, t_typemap, NULL, -1, this );
+	self = TypedData_Make_Struct( klass, t_typemap, &pg_typemap_type, this );
 	this->funcs = pg_typemap_funcs;
 
 	return self;
@@ -94,13 +128,12 @@ pg_typemap_s_allocate( VALUE klass )
 static VALUE
 pg_typemap_default_type_map_set(VALUE self, VALUE typemap)
 {
-	t_typemap *this = DATA_PTR( self );
+	t_typemap *this = RTYPEDDATA_DATA( self );
+	t_typemap *tm;
+	UNUSED(tm);
 
-	if ( !rb_obj_is_kind_of(typemap, rb_cTypeMap) ) {
-		rb_raise( rb_eTypeError, "wrong argument type %s (expected kind of PG::TypeMap)",
-				rb_obj_classname( typemap ) );
-	}
-	Check_Type(typemap, T_DATA);
+	/* Check type of method param */
+	TypedData_Get_Struct(typemap, t_typemap, &pg_typemap_type, tm);
 	this->default_typemap = typemap;
 
 	return typemap;
@@ -119,7 +152,7 @@ pg_typemap_default_type_map_set(VALUE self, VALUE typemap)
 static VALUE
 pg_typemap_default_type_map_get(VALUE self)
 {
-	t_typemap *this = DATA_PTR( self );
+	t_typemap *this = RTYPEDDATA_DATA( self );
 
 	return this->default_typemap;
 }

data/ext/pg_type_map_all_strings.c

@@ -8,6 +8,19 @@
 
 #include "pg.h"
 
+static const rb_data_type_t pg_tmas_type = {
+	"PG::TypeMapAllStrings",
+	{
+		pg_typemap_mark,
+		RUBY_TYPED_DEFAULT_FREE,
+		pg_typemap_memsize,
+		pg_compact_callback(pg_typemap_compact),
+	},
+	&pg_typemap_type,
+	0,
+	RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 VALUE rb_cTypeMapAllStrings;
 VALUE pg_typemap_all_strings;
 
@@ -77,7 +90,7 @@ pg_tmas_s_allocate( VALUE klass )
 	t_typemap *this;
 	VALUE self;
 
-	self = Data_Make_Struct( klass, t_typemap, NULL, -1, this );
+	self = TypedData_Make_Struct( klass, t_typemap, &pg_tmas_type, this );
 
 	this->funcs.fit_to_result = pg_tmas_fit_to_result;
 	this->funcs.fit_to_query = pg_tmas_fit_to_query;

data/ext/pg_type_map_by_class.c

@@ -10,7 +10,6 @@
 #include "pg.h"
 
 static VALUE rb_cTypeMapByClass;
-static ID s_id_ancestors;
 
 typedef struct {
 	t_typemap typemap;
@@ -48,7 +47,7 @@ pg_tmbk_lookup_klass(t_tmbk *this, VALUE klass, VALUE param_value)
 
 		if( NIL_P(obj) ){
 			int i;
-			VALUE ancestors = rb_funcall( klass, s_id_ancestors, 0 );
+			VALUE ancestors = rb_mod_ancestors( klass );
 
 			Check_Type( ancestors, T_ARRAY );
 			/* Don't look at the first element, it's expected to equal klass. */
@@ -63,7 +62,7 @@ pg_tmbk_lookup_klass(t_tmbk *this, VALUE klass, VALUE param_value)
 		if(NIL_P(obj)){
 			p_coder = NULL;
 		}else if(rb_obj_is_kind_of(obj, rb_cPG_Coder)){
-			Data_Get_Struct(obj, t_pg_coder, p_coder);
+			TypedData_Get_Struct(obj, t_pg_coder, &pg_coder_type, p_coder);
 		}else{
 			if( RB_TYPE_P(obj, T_SYMBOL) ){
 				/* A Symbol: Call the method with this name. */
@@ -75,11 +74,9 @@ pg_tmbk_lookup_klass(t_tmbk *this, VALUE klass, VALUE param_value)
 
 			if( NIL_P(obj) ){
 				p_coder = NULL;
-			}else if( rb_obj_is_kind_of(obj, rb_cPG_Coder) ){
-				Data_Get_Struct(obj, t_pg_coder, p_coder);
 			}else{
-				rb_raise(rb_eTypeError, "argument has invalid type %s (should be nil or some kind of PG::Coder)",
-							rb_obj_classname( obj ));
+				/* Check retrieved coder type */
+				TypedData_Get_Struct(obj, t_pg_coder, &pg_coder_type, p_coder);
 			}
 
 			/* We can not cache coders retrieved by ruby code, because we can not anticipate
@@ -104,7 +101,7 @@ pg_tmbk_typecast_query_param( t_typemap *p_typemap, VALUE param_value, int field
   p_coder = pg_tmbk_lookup_klass( this, rb_obj_class(param_value), param_value );
 
 	if( !p_coder ){
-		t_typemap *default_tm = DATA_PTR( this->typemap.default_typemap );
+		t_typemap *default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
 		return default_tm->funcs.typecast_query_param( default_tm, param_value, field );
 	}
 
@@ -114,32 +111,62 @@ pg_tmbk_typecast_query_param( t_typemap *p_typemap, VALUE param_value, int field
 static VALUE
 pg_tmbk_fit_to_query( VALUE self, VALUE params )
 {
-	t_tmbk *this = (t_tmbk *)DATA_PTR(self);
+	t_tmbk *this = (t_tmbk *)RTYPEDDATA_DATA(self);
 	/* Nothing to check at this typemap, but ensure that the default type map fits. */
-	t_typemap *default_tm = DATA_PTR( this->typemap.default_typemap );
+	t_typemap *default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
 	default_tm->funcs.fit_to_query( this->typemap.default_typemap, params );
 	return self;
 }
 
 static void
-pg_tmbk_mark( t_tmbk *this )
+pg_tmbk_mark( void *_this )
 {
-	rb_gc_mark(this->typemap.default_typemap);
-	rb_gc_mark(this->klass_to_coder);
-	rb_gc_mark(this->self);
-	/* Clear the cache, to be safe from changes of klass VALUE by GC.compact.
-	 * TODO: Move cache clearing to compactation callback provided by Ruby-2.7+.
-	 */
+	t_tmbk *this = (t_tmbk *)_this;
+	pg_typemap_mark(&this->typemap);
+	rb_gc_mark_movable(this->klass_to_coder);
+	rb_gc_mark_movable(this->self);
+}
+
+static size_t
+pg_tmbk_memsize( const void *_this )
+{
+	const t_tmbk *this = (const t_tmbk *)_this;
+	return sizeof(*this);
+}
+
+static void
+pg_tmbk_compact(void *ptr)
+{
+	t_tmbk *this = (t_tmbk *)ptr;
+
+	pg_typemap_compact(&this->typemap);
+	pg_gc_location(this->klass_to_coder);
+	pg_gc_location(this->self);
+
+	/* Clear the cache, to be safe from changes of klass VALUE by GC.compact. */
 	memset(&this->cache_row, 0, sizeof(this->cache_row));
 }
 
+static const rb_data_type_t pg_tmbk_type = {
+	"PG::TypeMapByClass",
+	{
+		pg_tmbk_mark,
+		RUBY_TYPED_DEFAULT_FREE,
+		pg_tmbk_memsize,
+		pg_compact_callback(pg_tmbk_compact),
+	},
+	&pg_typemap_type,
+	0,
+	RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static VALUE
 pg_tmbk_s_allocate( VALUE klass )
 {
 	t_tmbk *this;
 	VALUE self;
 
-	self = Data_Make_Struct( klass, t_tmbk, pg_tmbk_mark, -1, this );
+	self = TypedData_Make_Struct( klass, t_tmbk, &pg_tmbk_type, this );
 	this->typemap.funcs.fit_to_result = pg_typemap_fit_to_result;
 	this->typemap.funcs.fit_to_query = pg_tmbk_fit_to_query;
 	this->typemap.funcs.fit_to_copy_get = pg_typemap_fit_to_copy_get;
@@ -153,7 +180,7 @@ pg_tmbk_s_allocate( VALUE klass )
 	this->self = self;
 	this->klass_to_coder = rb_hash_new();
 
-	/* The cache is properly initialized by Data_Make_Struct(). */
+	/* The cache is properly initialized by TypedData_Make_Struct(). */
 
 	return self;
 }
@@ -176,7 +203,7 @@ pg_tmbk_s_allocate( VALUE klass )
 static VALUE
 pg_tmbk_aset( VALUE self, VALUE klass, VALUE coder )
 {
-	t_tmbk *this = DATA_PTR( self );
+	t_tmbk *this = RTYPEDDATA_DATA( self );
 
 	if(NIL_P(coder)){
 		rb_hash_delete( this->klass_to_coder, klass );
@@ -200,7 +227,7 @@ pg_tmbk_aset( VALUE self, VALUE klass, VALUE coder )
 static VALUE
 pg_tmbk_aref( VALUE self, VALUE klass )
 {
-	t_tmbk *this = DATA_PTR( self );
+	t_tmbk *this = RTYPEDDATA_DATA( self );
 
 	return rb_hash_lookup(this->klass_to_coder, klass);
 }
@@ -214,7 +241,7 @@ pg_tmbk_aref( VALUE self, VALUE klass )
 static VALUE
 pg_tmbk_coders( VALUE self )
 {
-	t_tmbk *this = DATA_PTR( self );
+	t_tmbk *this = RTYPEDDATA_DATA( self );
 
 	return rb_obj_freeze(rb_hash_dup(this->klass_to_coder));
 }
@@ -222,8 +249,6 @@ pg_tmbk_coders( VALUE self )
 void
 init_pg_type_map_by_class()
 {
-	s_id_ancestors = rb_intern("ancestors");
-
 	/*
 	 * Document-class: PG::TypeMapByClass < PG::TypeMap
 	 *

data/ext/pg_type_map_by_column.c

@@ -16,7 +16,7 @@ static VALUE
 pg_tmbc_fit_to_result( VALUE self, VALUE result )
 {
 	int nfields;
-	t_tmbc *this = DATA_PTR( self );
+	t_tmbc *this = RTYPEDDATA_DATA( self );
 	t_typemap *default_tm;
 	VALUE sub_typemap;
 
@@ -26,8 +26,8 @@ pg_tmbc_fit_to_result( VALUE self, VALUE result )
 				nfields, this->nfields );
 	}
 
-	/* Ensure that the default type map fits equaly. */
-	default_tm = DATA_PTR( this->typemap.default_typemap );
+	/* Ensure that the default type map fits equally. */
+	default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
 	sub_typemap = default_tm->funcs.fit_to_result( this->typemap.default_typemap, result );
 
 	/* Did the default type return the same object ? */
@@ -42,7 +42,7 @@ pg_tmbc_fit_to_result( VALUE self, VALUE result )
 
 		memcpy( p_new_typemap, this, struct_size );
 		p_new_typemap->typemap.default_typemap = sub_typemap;
-		DATA_PTR(new_typemap) = p_new_typemap;
+		RTYPEDDATA_DATA(new_typemap) = p_new_typemap;
 		return new_typemap;
 	}
 }
@@ -51,7 +51,7 @@ static VALUE
 pg_tmbc_fit_to_query( VALUE self, VALUE params )
 {
 	int nfields;
-	t_tmbc *this = DATA_PTR( self );
+	t_tmbc *this = RTYPEDDATA_DATA( self );
 	t_typemap *default_tm;
 
 	nfields = (int)RARRAY_LEN( params );
@@ -60,8 +60,8 @@ pg_tmbc_fit_to_query( VALUE self, VALUE params )
 				nfields, this->nfields );
 	}
 
-	/* Ensure that the default type map fits equaly. */
-	default_tm = DATA_PTR( this->typemap.default_typemap );
+	/* Ensure that the default type map fits equally. */
+	default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
 	default_tm->funcs.fit_to_query( this->typemap.default_typemap, params );
 
 	return self;
@@ -70,10 +70,10 @@ pg_tmbc_fit_to_query( VALUE self, VALUE params )
 static int
 pg_tmbc_fit_to_copy_get( VALUE self )
 {
-	t_tmbc *this = DATA_PTR( self );
+	t_tmbc *this = RTYPEDDATA_DATA( self );
 
-	/* Ensure that the default type map fits equaly. */
-	t_typemap *default_tm = DATA_PTR( this->typemap.default_typemap );
+	/* Ensure that the default type map fits equally. */
+	t_typemap *default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
 	default_tm->funcs.fit_to_copy_get( this->typemap.default_typemap );
 
 	return this->nfields;
@@ -107,7 +107,7 @@ pg_tmbc_result_value( t_typemap *p_typemap, VALUE result, int tuple, int field )
 		}
 	}
 
-	default_tm = DATA_PTR( this->typemap.default_typemap );
+	default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
 	return default_tm->funcs.typecast_result_value( default_tm, result, tuple, field );
 }
 
@@ -120,7 +120,7 @@ pg_tmbc_typecast_query_param( t_typemap *p_typemap, VALUE param_value, int field
 	t_pg_coder *p_coder = this->convs[field].cconv;
 
 	if( !p_coder ){
-		t_typemap *default_tm = DATA_PTR( this->typemap.default_typemap );
+		t_typemap *default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
 		return default_tm->funcs.typecast_query_param( default_tm, param_value, field );
 	}
 
@@ -142,7 +142,7 @@ pg_tmbc_typecast_copy_get( t_typemap *p_typemap, VALUE field_str, int fieldno, i
 	p_coder = this->convs[fieldno].cconv;
 
 	if( !p_coder ){
-		t_typemap *default_tm = DATA_PTR( this->typemap.default_typemap );
+		t_typemap *default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
 		return default_tm->funcs.typecast_copy_get( default_tm, field_str, fieldno, format, enc_idx );
 	}
 
@@ -158,7 +158,7 @@ pg_tmbc_typecast_copy_get( t_typemap *p_typemap, VALUE field_str, int fieldno, i
 		return field_str;
 	}
 
-	return dec_func( p_coder, RSTRING_PTR(field_str), RSTRING_LEN(field_str), 0, fieldno, enc_idx );
+	return dec_func( p_coder, RSTRING_PTR(field_str), RSTRING_LENINT(field_str), 0, fieldno, enc_idx );
 }
 
 const struct pg_typemap_funcs pg_tmbc_funcs = {
@@ -171,34 +171,73 @@ const struct pg_typemap_funcs pg_tmbc_funcs = {
 };
 
 static void
-pg_tmbc_mark( t_tmbc *this )
+pg_tmbc_mark( void *_this )
 {
+	t_tmbc *this = (t_tmbc *)_this;
 	int i;
 
 	/* allocated but not initialized ? */
 	if( this == (t_tmbc *)&pg_typemap_funcs ) return;
 
-	rb_gc_mark(this->typemap.default_typemap);
+	pg_typemap_mark(&this->typemap);
 	for( i=0; i<this->nfields; i++){
 		t_pg_coder *p_coder = this->convs[i].cconv;
 		if( p_coder )
-			rb_gc_mark(p_coder->coder_obj);
+			rb_gc_mark_movable(p_coder->coder_obj);
+	}
+}
+
+static size_t
+pg_tmbc_memsize( const void *_this )
+{
+	const t_tmbc *this = (const t_tmbc *)_this;
+	return sizeof(t_tmbc) + sizeof(struct pg_tmbc_converter) * this->nfields;
+}
+
+static void
+pg_tmbc_compact( void *_this )
+{
+	t_tmbc *this = (t_tmbc *)_this;
+	int i;
+
+	/* allocated but not initialized ? */
+	if( this == (t_tmbc *)&pg_typemap_funcs ) return;
+
+	pg_typemap_compact(&this->typemap);
+	for( i=0; i<this->nfields; i++){
+		t_pg_coder *p_coder = this->convs[i].cconv;
+		if( p_coder )
+			pg_gc_location(p_coder->coder_obj);
 	}
 }
 
 static void
-pg_tmbc_free( t_tmbc *this )
+pg_tmbc_free( void *_this )
 {
+	t_tmbc *this = (t_tmbc *)_this;
 	/* allocated but not initialized ? */
 	if( this == (t_tmbc *)&pg_typemap_funcs ) return;
 	xfree( this );
 }
 
+static const rb_data_type_t pg_tmbc_type = {
+	"PG::TypeMapByColumn",
+	{
+		pg_tmbc_mark,
+		pg_tmbc_free,
+		pg_tmbc_memsize,
+		pg_compact_callback(pg_tmbc_compact),
+	},
+	&pg_typemap_type,
+	0,
+	RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static VALUE
 pg_tmbc_s_allocate( VALUE klass )
 {
 	/* Use pg_typemap_funcs as interim struct until #initialize is called. */
-	return Data_Wrap_Struct( klass, pg_tmbc_mark, pg_tmbc_free, (t_tmbc *)&pg_typemap_funcs );
+	return TypedData_Wrap_Struct( klass, &pg_tmbc_type, (t_tmbc *)&pg_typemap_funcs );
 }
 
 VALUE
@@ -221,19 +260,18 @@ pg_tmbc_allocate()
 static VALUE
 pg_tmbc_init(VALUE self, VALUE conv_ary)
 {
-	int i;
+	long i;
 	t_tmbc *this;
 	int conv_ary_len;
 
-	Check_Type(self, T_DATA);
 	Check_Type(conv_ary, T_ARRAY);
-	conv_ary_len = RARRAY_LEN(conv_ary);
+	conv_ary_len = RARRAY_LENINT(conv_ary);
 	this = xmalloc(sizeof(t_tmbc) + sizeof(struct pg_tmbc_converter) * conv_ary_len);
 	/* Set nfields to 0 at first, so that GC mark function doesn't access uninitialized memory. */
 	this->nfields = 0;
 	this->typemap.funcs = pg_tmbc_funcs;
 	this->typemap.default_typemap = pg_typemap_all_strings;
-	DATA_PTR(self) = this;
+	RTYPEDDATA_DATA(self) = this;
 
 	for(i=0; i<conv_ary_len; i++)
 	{
@@ -242,11 +280,9 @@ pg_tmbc_init(VALUE self, VALUE conv_ary)
 		if( obj == Qnil ){
 			/* no type cast */
 			this->convs[i].cconv = NULL;
-		} else if( rb_obj_is_kind_of(obj, rb_cPG_Coder) ){
-			Data_Get_Struct(obj, t_pg_coder, this->convs[i].cconv);
 		} else {
-			rb_raise(rb_eArgError, "argument %d has invalid type %s (should be nil or some kind of PG::Coder)",
-							 i+1, rb_obj_classname( obj ));
+			/* Check argument type and store the coder pointer */
+			TypedData_Get_Struct(obj, t_pg_coder, &pg_coder_type, this->convs[i].cconv);
 		}
 	}
 
@@ -266,7 +302,7 @@ static VALUE
 pg_tmbc_coders(VALUE self)
 {
 	int i;
-	t_tmbc *this = DATA_PTR( self );
+	t_tmbc *this = RTYPEDDATA_DATA( self );
 	VALUE ary_coders = rb_ary_new();
 
 	for( i=0; i<this->nfields; i++){

data/ext/pg_type_map_by_mri_type.c

@@ -71,16 +71,12 @@ pg_tmbmt_typecast_query_param( t_typemap *p_typemap, VALUE param_value, int fiel
 
 		obj = rb_funcall(ask_for_coder, rb_intern("call"), 1, param_value);
 
-		if( rb_obj_is_kind_of(obj, rb_cPG_Coder) ){
-			Data_Get_Struct(obj, t_pg_coder, p_coder);
-		}else{
-			rb_raise(rb_eTypeError, "argument %d has invalid type %s (should be nil or some kind of PG::Coder)",
-						field+1, rb_obj_classname( obj ));
-		}
+		/* Check argument type and store the coder pointer */
+		TypedData_Get_Struct(obj, t_pg_coder, &pg_coder_type, p_coder);
 	}
 
 	if( !p_coder ){
-		t_typemap *default_tm = DATA_PTR( this->typemap.default_typemap );
+		t_typemap *default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
 		return default_tm->funcs.typecast_query_param( default_tm, param_value, field );
 	}
 
@@ -90,24 +86,57 @@ pg_tmbmt_typecast_query_param( t_typemap *p_typemap, VALUE param_value, int fiel
 static VALUE
 pg_tmbmt_fit_to_query( VALUE self, VALUE params )
 {
-	t_tmbmt *this = (t_tmbmt *)DATA_PTR(self);
+	t_tmbmt *this = (t_tmbmt *)RTYPEDDATA_DATA(self);
 	/* Nothing to check at this typemap, but ensure that the default type map fits. */
-	t_typemap *default_tm = DATA_PTR( this->typemap.default_typemap );
+	t_typemap *default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
 	default_tm->funcs.fit_to_query( this->typemap.default_typemap, params );
 	return self;
 }
 
 #define GC_MARK_AS_USED(type) \
-	rb_gc_mark( this->coders.ask_##type ); \
-	rb_gc_mark( this->coders.coder_obj_##type );
+	rb_gc_mark_movable( this->coders.ask_##type ); \
+	rb_gc_mark_movable( this->coders.coder_obj_##type );
 
 static void
-pg_tmbmt_mark( t_tmbmt *this )
+pg_tmbmt_mark( void *_this )
 {
-	rb_gc_mark(this->typemap.default_typemap);
+	t_tmbmt *this = (t_tmbmt *)_this;
+	pg_typemap_mark(&this->typemap);
 	FOR_EACH_MRI_TYPE( GC_MARK_AS_USED );
 }
 
+static size_t
+pg_tmbmt_memsize( const void *_this )
+{
+	const t_tmbmt *this = (const t_tmbmt *)_this;
+	return sizeof(*this);
+}
+
+#define GC_COMPACT(type) \
+	pg_gc_location( this->coders.ask_##type ); \
+	pg_gc_location( this->coders.coder_obj_##type );
+
+static void
+pg_tmbmt_compact( void *_this )
+{
+	t_tmbmt *this = (t_tmbmt *)_this;
+	pg_typemap_compact(&this->typemap);
+	FOR_EACH_MRI_TYPE( GC_COMPACT );
+}
+
+static const rb_data_type_t pg_tmbmt_type = {
+	"PG::TypeMapByMriType",
+	{
+		pg_tmbmt_mark,
+		RUBY_TYPED_DEFAULT_FREE,
+		pg_tmbmt_memsize,
+		pg_compact_callback(pg_tmbmt_compact),
+	},
+	&pg_typemap_type,
+	0,
+	RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 #define INIT_VARIABLES(type) \
 	this->coders.coder_##type = NULL; \
 	this->coders.ask_##type = Qnil; \
@@ -119,7 +148,7 @@ pg_tmbmt_s_allocate( VALUE klass )
 	t_tmbmt *this;
 	VALUE self;
 
-	self = Data_Make_Struct( klass, t_tmbmt, pg_tmbmt_mark, -1, this );
+	self = TypedData_Make_Struct( klass, t_tmbmt, &pg_tmbmt_type, this );
 	this->typemap.funcs.fit_to_result = pg_typemap_fit_to_result;
 	this->typemap.funcs.fit_to_query = pg_tmbmt_fit_to_query;
 	this->typemap.funcs.fit_to_copy_get = pg_typemap_fit_to_copy_get;
@@ -140,7 +169,7 @@ pg_tmbmt_s_allocate( VALUE klass )
 			this->coders.coder_##type = NULL; \
 			this->coders.ask_##type = Qnil; \
 		}else if(rb_obj_is_kind_of(coder, rb_cPG_Coder)){ \
-			Data_Get_Struct(coder, t_pg_coder, this->coders.coder_##type); \
+			TypedData_Get_Struct(coder, t_pg_coder, &pg_coder_type, this->coders.coder_##type); \
 			this->coders.ask_##type = Qnil; \
 		}else if(RB_TYPE_P(coder, T_SYMBOL)){ \
 			this->coders.coder_##type = NULL; \
@@ -188,7 +217,7 @@ pg_tmbmt_s_allocate( VALUE klass )
 static VALUE
 pg_tmbmt_aset( VALUE self, VALUE mri_type, VALUE coder )
 {
-	t_tmbmt *this = DATA_PTR( self );
+	t_tmbmt *this = RTYPEDDATA_DATA( self );
 	char *p_mri_type;
 
 	p_mri_type = StringValueCStr(mri_type);
@@ -220,7 +249,7 @@ static VALUE
 pg_tmbmt_aref( VALUE self, VALUE mri_type )
 {
 	VALUE coder;
-	t_tmbmt *this = DATA_PTR( self );
+	t_tmbmt *this = RTYPEDDATA_DATA( self );
 	char *p_mri_type;
 
 	p_mri_type = StringValueCStr(mri_type);
@@ -248,7 +277,7 @@ pg_tmbmt_aref( VALUE self, VALUE mri_type )
 static VALUE
 pg_tmbmt_coders( VALUE self )
 {
-	t_tmbmt *this = DATA_PTR( self );
+	t_tmbmt *this = RTYPEDDATA_DATA( self );
 	VALUE hash_coders = rb_hash_new();
 
 	FOR_EACH_MRI_TYPE( ADD_TO_HASH );