diff options
| author | Jemma Issroff <[email protected]> | 2022-11-10 11:36:24 -0500 |
|---|---|---|
| committer | Peter Zhu <[email protected]> | 2022-11-10 13:02:50 -0500 |
| commit | 7ee1cacb84e6b19908ac0e692601447597d40605 () | |
| tree | 4c1a527fe9c71af4dc96a51436093cf699798a08 /shape.c | |
| parent | 354791c248d7e21d5b70ded7c548af954491e247 (diff) | |
Extract `rb_shape_get_parent` helper
Extract an `rb_shape_get_parent` method instead of continually calling `rb_shape_get_shape_by_id(shape->parent_id)`
Notes: Merged: https://.com/ruby/ruby/pull/6708
| -rw-r--r-- | shape.c | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -51,6 +51,12 @@ rb_shape_get_shape_by_id_without_assertion(shape_id_t shape_id) return shape; } #if !SHAPE_IN_BASIC_FLAGS shape_id_t rb_rclass_shape_id(VALUE obj) @@ -105,7 +111,7 @@ rb_shape_lookup_id(rb_shape_t* shape, ID id, enum shape_type shape_type) return NULL; } } - shape = rb_shape_get_shape_by_id(shape->parent_id); } return NULL; } @@ -273,7 +279,7 @@ rb_shape_get_iv_index(rb_shape_t * shape, ID id, attr_index_t *value) rb_bug("Ivar should not exist on transition\n"); } } - shape = rb_shape_get_shape_by_id(shape->parent_id); } return false; } @@ -338,7 +344,7 @@ rb_shape_rebuild_shape(rb_shape_t * initial_shape, rb_shape_t * dest_shape) rb_shape_t * midway_shape; if (dest_shape->type != SHAPE_ROOT) { - midway_shape = rb_shape_rebuild_shape(initial_shape, rb_shape_get_shape_by_id(dest_shape->parent_id)); } else { midway_shape = initial_shape; @@ -504,7 +510,7 @@ rb_shape_export_depth(VALUE self) unsigned int depth = 0; while (shape->parent_id != INVALID_SHAPE_ID) { depth++; - shape = rb_shape_get_shape_by_id(shape->parent_id); } return INT2NUM(depth); } @@ -515,7 +521,7 @@ rb_shape_parent(VALUE self) rb_shape_t * shape; TypedData_Get_Struct(self, rb_shape_t, &shape_data_type, shape); if (shape->parent_id != INVALID_SHAPE_ID) { - return rb_shape_t_to_rb_cShape(rb_shape_get_shape_by_id(shape->parent_id)); } else { return Qnil; |