debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ruby: move towards more modern RTypedData

Browse source 
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>
This commit is contained in:
Felipe Contreras 2021-05-15 16:21:01 -05:00 committed by David Bremner
parent 12c36a5e3f
commit fba9774a81
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bindings/ruby/database.c
View file

@ -74,7 +74,7 @@ notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE self)
mode = NOTMUCH_DATABASE_MODE_READ_ONLY; mode = NOTMUCH_DATABASE_MODE_READ_ONLY;
} }
Check_Type (self, T_DATA); rb_check_typeddata (self, &notmuch_rb_object_type);
if (create) if (create)
ret = notmuch_database_create (path, &database); ret = notmuch_database_create (path, &database);
else else

6
bindings/ruby/defs.h
View file

@ -55,9 +55,11 @@ extern ID ID_db_mode;
# define RSTRING_PTR(v) (RSTRING((v))->ptr) # define RSTRING_PTR(v) (RSTRING((v))->ptr)
#endif /* !defined (RSTRING_PTR) */ #endif /* !defined (RSTRING_PTR) */
extern const rb_data_type_t notmuch_rb_object_type;
#define Data_Get_Notmuch_Object(obj, ptr) \ #define Data_Get_Notmuch_Object(obj, ptr) \
do { \ do { \
(ptr) = rb_data_object_get ((obj)); \ (ptr) = rb_check_typeddata ((obj), &notmuch_rb_object_type); \
if (RB_UNLIKELY (!(ptr))) { \ if (RB_UNLIKELY (!(ptr))) { \
VALUE cname = rb_class_name (CLASS_OF ((obj))); \ VALUE cname = rb_class_name (CLASS_OF ((obj))); \
rb_raise (rb_eRuntimeError, "%"PRIsVALUE" object destroyed", cname); \ rb_raise (rb_eRuntimeError, "%"PRIsVALUE" object destroyed", cname); \
@ -65,7 +67,7 @@ extern ID ID_db_mode;
} while (0) } while (0)
#define Data_Wrap_Notmuch_Object(klass, ptr) \ #define Data_Wrap_Notmuch_Object(klass, ptr) \
Data_Wrap_Struct ((klass), NULL, NULL, (ptr)) TypedData_Wrap_Struct ((klass), &notmuch_rb_object_type, (ptr))
#define Data_Get_Notmuch_Database(obj, ptr) \ #define Data_Get_Notmuch_Database(obj, ptr) \
Data_Get_Notmuch_Object ((obj), (ptr)) Data_Get_Notmuch_Object ((obj), (ptr))

4
bindings/ruby/init.c
View file

@ -46,6 +46,10 @@ ID ID_call;
ID ID_db_create; ID ID_db_create;
ID ID_db_mode; ID ID_db_mode;
const rb_data_type_t notmuch_rb_object_type = {
.wrap_struct_name = "notmuch_object",
};
/* /*
* Document-module: Notmuch * Document-module: Notmuch
* *