kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[memory_view][fiddle] Use bool for boolean return value

Browse source
This commit is contained in:
Kenta Murata 2020-12-22 17:33:14 +09:00
parent 74a3569b59
commit 05014dcb88
No known key found for this signature in database
GPG key ID: CEFE8AFB6081B062
4 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/-test-/memory_view/memory_view.c
View file

@ -24,15 +24,15 @@ static VALUE sym_endianness;
static VALUE sym_little_endian; static VALUE sym_little_endian;
static VALUE sym_big_endian; static VALUE sym_big_endian;
static int static bool
exportable_string_get_memory_view(VALUE obj, rb_memory_view_t *view, int flags) exportable_string_get_memory_view(VALUE obj, rb_memory_view_t *view, int flags)
{ {
VALUE str = rb_ivar_get(obj, id_str); VALUE str = rb_ivar_get(obj, id_str);
rb_memory_view_init_as_byte_array(view, obj, RSTRING_PTR(str), RSTRING_LEN(str), true); rb_memory_view_init_as_byte_array(view, obj, RSTRING_PTR(str), RSTRING_LEN(str), true);
return 1; return true;
} }
static int static bool
exportable_string_memory_view_available_p(VALUE obj) exportable_string_memory_view_available_p(VALUE obj)
{ {
VALUE str = rb_ivar_get(obj, id_str); VALUE str = rb_ivar_get(obj, id_str);
@ -260,7 +260,7 @@ expstr_initialize(VALUE obj, VALUE s)
return Qnil; return Qnil;
} }
static int static bool
mdview_get_memory_view(VALUE obj, rb_memory_view_t *view, int flags) mdview_get_memory_view(VALUE obj, rb_memory_view_t *view, int flags)
{ {
VALUE buf_v = rb_ivar_get(obj, id_str); VALUE buf_v = rb_ivar_get(obj, id_str);
@ -272,7 +272,7 @@ mdview_get_memory_view(VALUE obj, rb_memory_view_t *view, int flags)
const char *err; const char *err;
const ssize_t item_size = rb_memory_view_item_size_from_format(format, &err); const ssize_t item_size = rb_memory_view_item_size_from_format(format, &err);
if (item_size < 0) { if (item_size < 0) {
return 0; return false;
} }
ssize_t ndim = RARRAY_LEN(shape_v); ssize_t ndim = RARRAY_LEN(shape_v);
@ -308,10 +308,10 @@ mdview_get_memory_view(VALUE obj, rb_memory_view_t *view, int flags)
view->shape = shape; view->shape = shape;
view->strides = strides; view->strides = strides;
return 1; return true;
} }
static int static bool
mdview_memory_view_available_p(VALUE obj) mdview_memory_view_available_p(VALUE obj)
{ {
return true; return true;

6
ext/fiddle/pointer.c
View file

@ -102,19 +102,19 @@ fiddle_ptr_check_memory_view(VALUE obj)
return data; return data;
} }
static int static bool
fiddle_ptr_memory_view_available_p(VALUE obj) fiddle_ptr_memory_view_available_p(VALUE obj)
{ {
return fiddle_ptr_check_memory_view(obj) != NULL; return fiddle_ptr_check_memory_view(obj) != NULL;
} }
static int static bool
fiddle_ptr_get_memory_view(VALUE obj, rb_memory_view_t *view, int flags) fiddle_ptr_get_memory_view(VALUE obj, rb_memory_view_t *view, int flags)
{ {
struct ptr_data *data = fiddle_ptr_check_memory_view(obj); struct ptr_data *data = fiddle_ptr_check_memory_view(obj);
rb_memory_view_init_as_byte_array(view, obj, data->ptr, data->size, true); rb_memory_view_init_as_byte_array(view, obj, data->ptr, data->size, true);
return 1; return true;
} }
static const rb_memory_view_entry_t fiddle_ptr_memory_view_entry = { static const rb_memory_view_entry_t fiddle_ptr_memory_view_entry = {

16
include/ruby/memory_view.h
View file

@ -48,7 +48,7 @@ typedef struct {
/* The number of bytes in data. */ /* The number of bytes in data. */
ssize_t len; ssize_t len;
/* 1 for readonly memory, 0 for writable memory. */ /* true for readonly memory, false for writable memory. */
bool readonly; bool readonly;
/* A string to describe the format of an element, or NULL for unsigned byte. /* A string to describe the format of an element, or NULL for unsigned byte.
@ -105,9 +105,9 @@ typedef struct {
void *const private; void *const private;
} rb_memory_view_t; } rb_memory_view_t;
typedef int (* rb_memory_view_get_func_t)(VALUE obj, rb_memory_view_t *view, int flags); typedef bool (* rb_memory_view_get_func_t)(VALUE obj, rb_memory_view_t *view, int flags);
typedef int (* rb_memory_view_release_func_t)(VALUE obj, rb_memory_view_t *view); typedef bool (* rb_memory_view_release_func_t)(VALUE obj, rb_memory_view_t *view);
typedef int (* rb_memory_view_available_p_func_t)(VALUE obj); typedef bool (* rb_memory_view_available_p_func_t)(VALUE obj);
typedef struct { typedef struct {
rb_memory_view_get_func_t get_func; rb_memory_view_get_func_t get_func;
@ -127,7 +127,7 @@ bool rb_memory_view_is_column_major_contiguous(const rb_memory_view_t *view);
RBIMPL_ATTR_NOALIAS() RBIMPL_ATTR_NOALIAS()
void rb_memory_view_fill_contiguous_strides(const ssize_t ndim, const ssize_t item_size, const ssize_t *const shape, const bool row_major_p, ssize_t *const strides); void rb_memory_view_fill_contiguous_strides(const ssize_t ndim, const ssize_t item_size, const ssize_t *const shape, const bool row_major_p, ssize_t *const strides);
RBIMPL_ATTR_NOALIAS() RBIMPL_ATTR_NOALIAS()
int rb_memory_view_init_as_byte_array(rb_memory_view_t *view, VALUE obj, void *data, const ssize_t len, const bool readonly); bool rb_memory_view_init_as_byte_array(rb_memory_view_t *view, VALUE obj, void *data, const ssize_t len, const bool readonly);
ssize_t rb_memory_view_parse_item_format(const char *format, ssize_t rb_memory_view_parse_item_format(const char *format,
rb_memory_view_item_component_t **members, rb_memory_view_item_component_t **members,
size_t *n_members, const char **err); size_t *n_members, const char **err);
@ -137,9 +137,9 @@ VALUE rb_memory_view_extract_item_members(const void *ptr, const rb_memory_view_
void rb_memory_view_prepare_item_desc(rb_memory_view_t *view); void rb_memory_view_prepare_item_desc(rb_memory_view_t *view);
VALUE rb_memory_view_get_item(rb_memory_view_t *view, const ssize_t *indices); VALUE rb_memory_view_get_item(rb_memory_view_t *view, const ssize_t *indices);
int rb_memory_view_available_p(VALUE obj); bool rb_memory_view_available_p(VALUE obj);
int rb_memory_view_get(VALUE obj, rb_memory_view_t* memory_view, int flags); bool rb_memory_view_get(VALUE obj, rb_memory_view_t* memory_view, int flags);
int rb_memory_view_release(rb_memory_view_t* memory_view); bool rb_memory_view_release(rb_memory_view_t* memory_view);
/* for testing */ /* for testing */
RUBY_EXTERN VALUE rb_memory_view_exported_object_registry; RUBY_EXTERN VALUE rb_memory_view_exported_object_registry;

22
memory_view.c
View file

@ -194,7 +194,7 @@ rb_memory_view_fill_contiguous_strides(const ssize_t ndim, const ssize_t item_si
} }
/* Initialize view to expose a simple byte array */ /* Initialize view to expose a simple byte array */
int bool
rb_memory_view_init_as_byte_array(rb_memory_view_t *view, VALUE obj, void *data, const ssize_t len, const bool readonly) rb_memory_view_init_as_byte_array(rb_memory_view_t *view, VALUE obj, void *data, const ssize_t len, const bool readonly)
{ {
view->obj = obj; view->obj = obj;
@ -211,7 +211,7 @@ rb_memory_view_init_as_byte_array(rb_memory_view_t *view, VALUE obj, void *data,
view->sub_offsets = NULL; view->sub_offsets = NULL;
*((void **)&view->private) = NULL; *((void **)&view->private) = NULL;
return 1; return true;
} }
#ifdef HAVE_TRUE_LONG_LONG #ifdef HAVE_TRUE_LONG_LONG
@ -794,7 +794,7 @@ lookup_memory_view_entry(VALUE klass)
} }
/* Examine whether the given object supports memory view. */ /* Examine whether the given object supports memory view. */
int bool
rb_memory_view_available_p(VALUE obj) rb_memory_view_available_p(VALUE obj)
{ {
VALUE klass = CLASS_OF(obj); VALUE klass = CLASS_OF(obj);
@ -802,38 +802,38 @@ rb_memory_view_available_p(VALUE obj)
if (entry) if (entry)
return (* entry->available_p_func)(obj); return (* entry->available_p_func)(obj);
else else
return 0; return false;
} }
/* Obtain a memory view from obj, and substitute the information to view. */ /* Obtain a memory view from obj, and substitute the information to view. */
int bool
rb_memory_view_get(VALUE obj, rb_memory_view_t* view, int flags) rb_memory_view_get(VALUE obj, rb_memory_view_t* view, int flags)
{ {
VALUE klass = CLASS_OF(obj); VALUE klass = CLASS_OF(obj);
const rb_memory_view_entry_t *entry = lookup_memory_view_entry(klass); const rb_memory_view_entry_t *entry = lookup_memory_view_entry(klass);
if (entry) { if (entry) {
if (!(*entry->available_p_func)(obj)) { if (!(*entry->available_p_func)(obj)) {
return 0; return false;
} }
int rv = (*entry->get_func)(obj, view, flags); bool rv = (*entry->get_func)(obj, view, flags);
if (rv) { if (rv) {
register_exported_object(view->obj); register_exported_object(view->obj);
} }
return rv; return rv;
} }
else else
return 0; return false;
} }
/* Release the memory view obtained from obj. */ /* Release the memory view obtained from obj. */
int bool
rb_memory_view_release(rb_memory_view_t* view) rb_memory_view_release(rb_memory_view_t* view)
{ {
VALUE klass = CLASS_OF(view->obj); VALUE klass = CLASS_OF(view->obj);
const rb_memory_view_entry_t *entry = lookup_memory_view_entry(klass); const rb_memory_view_entry_t *entry = lookup_memory_view_entry(klass);
if (entry) { if (entry) {
int rv = 1; bool rv = true;
if (entry->release_func) { if (entry->release_func) {
rv = (*entry->release_func)(view->obj, view); rv = (*entry->release_func)(view->obj, view);
} }
@ -847,7 +847,7 @@ rb_memory_view_release(rb_memory_view_t* view)
return rv; return rv;
} }
else else
return 0; return false;
} }
void void