diff options
author | 卜部昌平 <[email protected]> | 2019-12-03 15:11:09 +0900 |
---|---|---|
committer | 卜部昌平 <[email protected]> | 2019-12-26 20:45:12 +0900 |
commit | f3a229fe2d8b1b5dcc4fc4577341256743421f10 () | |
tree | 87068ea64f768b77e3bfb4e9324ad8c4bef1b6ef | |
parent | 989068cf7087bf48f30c7f7c3f9acfa0bfd263ef (diff) |
internal/variable.h rework
Eliminated macros. Also marked MJIT_FUNC_EXPORTED functions as such. Some of them are declared in constant.h so edited that file also.
Notes: Merged: https://.com/ruby/ruby/pull/2711
-rw-r--r-- | constant.h | 9 | ||||
-rw-r--r-- | internal/variable.h | 63 |
2 files changed, 54 insertions, 18 deletions
@@ -39,12 +39,15 @@ VALUE rb_mod_private_constant(int argc, const VALUE *argv, VALUE obj); VALUE rb_mod_public_constant(int argc, const VALUE *argv, VALUE obj); VALUE rb_mod_deprecate_constant(int argc, const VALUE *argv, VALUE obj); void rb_free_const_table(struct rb_id_table *tbl); VALUE rb_public_const_get_at(VALUE klass, ID id); VALUE rb_public_const_get_from(VALUE klass, ID id); int rb_public_const_defined_from(VALUE klass, ID id); -rb_const_entry_t *rb_const_lookup(VALUE klass, ID id); -int rb_autoloading_value(VALUE mod, ID id, VALUE *value, rb_const_flag_t *flag); -VALUE rb_const_source_location(VALUE, ID); VALUE rb_const_source_location_at(VALUE, ID); #endif /* CONSTANT_H */ @@ -10,29 +10,24 @@ * file COPYING are met. Consult the file for details. */ /* global variable */ struct rb_global_entry { struct rb_global_variable *var; ID id; }; -struct rb_global_entry *rb_global_entry(ID); -VALUE rb_gvar_get(struct rb_global_entry *); -VALUE rb_gvar_set(struct rb_global_entry *, VALUE); -VALUE rb_gvar_defined(struct rb_global_entry *); - /* variable.c */ -#if USE_TRANSIENT_HEAP -#define ROBJECT_TRANSIENT_FLAG FL_USER13 -#define ROBJ_TRANSIENT_P(obj) FL_TEST_RAW((obj), ROBJECT_TRANSIENT_FLAG) -#define ROBJ_TRANSIENT_SET(obj) FL_SET_RAW((obj), ROBJECT_TRANSIENT_FLAG) -#define ROBJ_TRANSIENT_UNSET(obj) FL_UNSET_RAW((obj), ROBJECT_TRANSIENT_FLAG) -#else -#define ROBJ_TRANSIENT_P(obj) 0 -#define ROBJ_TRANSIENT_SET(obj) ((void)0) -#define ROBJ_TRANSIENT_UNSET(obj) ((void)0) -#endif void rb_gc_mark_global_tbl(void); size_t rb_generic_ivar_memsize(VALUE); VALUE rb_search_class_path(VALUE); @@ -46,6 +41,9 @@ rb_gvar_getter_t *rb_gvar_getter_function_of(const struct rb_global_entry *); rb_gvar_setter_t *rb_gvar_setter_function_of(const struct rb_global_entry *); bool rb_gvar_is_traced(const struct rb_global_entry *); void rb_gvar_readonly_setter(VALUE v, ID id, VALUE *_); RUBY_SYMBOL_EXPORT_BEGIN /* variable.c (export) */ @@ -56,4 +54,39 @@ int rb_class_ivar_set(VALUE klass, ID vid, VALUE value); void rb_iv_tbl_copy(VALUE dst, VALUE src); RUBY_SYMBOL_EXPORT_END #endif /* INTERNAL_VARIABLE_H */ |