Virtually the whole ruby core moved from RData to RTypeData, let's do so
ourselves too.
Basically the information typically passed through Data_Wrap_Struct is
now stored in a struct rb_data_type_t (mark and free functions). This
has the advantage that more information can be easily added, like the
name of the type, a custom data ponter, and more.
Data_Wrap_Struct is replaced with TypedData_Wrap_Struct, and the
information is stored in a struct rb_data_type_t, rather than passed
as arguments.
Check_Type is replaced with Check_TypedStruct, which is a wrapper for
rb_check_typeddata (with casts).
#define Check_TypedStruct(v, t) \
rb_check_typeddata(RBIMPL_CAST((VALUE)(v)), (t))
We can use rb_check_typeddata directly, just like we use rb_data_object_get
directly.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
mode = NOTMUCH_DATABASE_MODE_READ_ONLY;
}
mode = NOTMUCH_DATABASE_MODE_READ_ONLY;
}
- Check_Type (self, T_DATA);
+ rb_check_typeddata (self, ¬much_rb_object_type);
if (create)
ret = notmuch_database_create (path, &database);
else
if (create)
ret = notmuch_database_create (path, &database);
else
# define RSTRING_PTR(v) (RSTRING((v))->ptr)
#endif /* !defined (RSTRING_PTR) */
# define RSTRING_PTR(v) (RSTRING((v))->ptr)
#endif /* !defined (RSTRING_PTR) */
+extern const rb_data_type_t notmuch_rb_object_type;
+
#define Data_Get_Notmuch_Object(obj, ptr) \
do { \
#define Data_Get_Notmuch_Object(obj, ptr) \
do { \
- (ptr) = rb_data_object_get ((obj)); \
+ (ptr) = rb_check_typeddata ((obj), ¬much_rb_object_type); \
if (RB_UNLIKELY (!(ptr))) { \
VALUE cname = rb_class_name (CLASS_OF ((obj))); \
rb_raise (rb_eRuntimeError, "%"PRIsVALUE" object destroyed", cname); \
if (RB_UNLIKELY (!(ptr))) { \
VALUE cname = rb_class_name (CLASS_OF ((obj))); \
rb_raise (rb_eRuntimeError, "%"PRIsVALUE" object destroyed", cname); \
} while (0)
#define Data_Wrap_Notmuch_Object(klass, ptr) \
} while (0)
#define Data_Wrap_Notmuch_Object(klass, ptr) \
- Data_Wrap_Struct ((klass), NULL, NULL, (ptr))
+ TypedData_Wrap_Struct ((klass), ¬much_rb_object_type, (ptr))
#define Data_Get_Notmuch_Database(obj, ptr) \
Data_Get_Notmuch_Object ((obj), (ptr))
#define Data_Get_Notmuch_Database(obj, ptr) \
Data_Get_Notmuch_Object ((obj), (ptr))
ID ID_db_create;
ID ID_db_mode;
ID ID_db_create;
ID ID_db_mode;
+const rb_data_type_t notmuch_rb_object_type = {
+ .wrap_struct_name = "notmuch_object",
+};
+
/*
* Document-module: Notmuch
*
/*
* Document-module: Notmuch
*