mirror of
https://github.com/mruby/mruby
synced 2026-06-08 16:11:16 +00:00
mruby-set: rename internal methods
Renaming all internal C methods from __set_* to a cleaner __* convention (e.g., __set_merge is now __merge), and updating their call sites in the Ruby code accordingly.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
class Set
|
||||
def initialize(enum = nil, &block)
|
||||
__set_init
|
||||
__init
|
||||
return self if enum.nil?
|
||||
|
||||
if block
|
||||
@@ -28,7 +28,7 @@ class Set
|
||||
def merge(enum)
|
||||
if enum.is_a?(Set)
|
||||
# Fast path: Call C-implemented function for Set-to-Set merge
|
||||
__set_merge(enum)
|
||||
__merge(enum)
|
||||
else
|
||||
# General path: Add each element from the enumerable
|
||||
__do_with_enum(enum) { |o| add(o) }
|
||||
@@ -54,7 +54,7 @@ class Set
|
||||
def subtract(enum)
|
||||
if enum.is_a?(Set)
|
||||
# Fast path: Call C-implemented function for Set-to-Set subtraction
|
||||
__set_subtract(enum)
|
||||
__subtract(enum)
|
||||
else
|
||||
# General path: Remove each element from the enumerable
|
||||
__do_with_enum(enum) { |o| delete(o) }
|
||||
@@ -70,7 +70,7 @@ class Set
|
||||
def intersection(enum)
|
||||
if enum.is_a?(Set)
|
||||
# Fast path: Call C-implemented function for Set-to-Set intersection
|
||||
__set_intersection(enum)
|
||||
__intersection(enum)
|
||||
else
|
||||
# General path: Implement in Ruby for any enumerable
|
||||
n = Set.new
|
||||
@@ -90,7 +90,7 @@ class Set
|
||||
def union(enum)
|
||||
if enum.is_a?(Set)
|
||||
# Fast path: Call C-implemented function for Set-to-Set union
|
||||
__set_union(enum)
|
||||
__union(enum)
|
||||
else
|
||||
# General path: Create a duplicate and merge the enumerable
|
||||
dup.merge(enum)
|
||||
@@ -109,7 +109,7 @@ class Set
|
||||
def difference(enum)
|
||||
if enum.is_a?(Set)
|
||||
# Fast path: Call C-implemented function for Set-to-Set difference
|
||||
__set_difference(enum)
|
||||
__difference(enum)
|
||||
else
|
||||
# General path: Create a duplicate and remove the enumerable elements
|
||||
result = dup
|
||||
@@ -129,7 +129,7 @@ class Set
|
||||
def ^(enum)
|
||||
if enum.is_a?(Set)
|
||||
# Fast path: Call C-implemented function for Set-to-Set XOR
|
||||
__set_xor(enum)
|
||||
__xor(enum)
|
||||
else
|
||||
# General path: Convert enum to a set and calculate (self|s2)-(self&s2)
|
||||
s2 = Set.new(enum)
|
||||
|
||||
@@ -866,16 +866,16 @@ mrb_mruby_set_gem_init(mrb_state *mrb)
|
||||
mrb_define_method(mrb, set, "delete", set_delete, MRB_ARGS_REQ(1));
|
||||
mrb_define_method(mrb, set, "delete?", set_delete_p, MRB_ARGS_REQ(1));
|
||||
|
||||
mrb_define_method(mrb, set, "__set_init", set_init, MRB_ARGS_NONE());
|
||||
mrb_define_method(mrb, set, "__set_merge", set_core_merge, MRB_ARGS_REQ(1));
|
||||
mrb_define_method(mrb, set, "__set_subtract", set_core_subtract, MRB_ARGS_REQ(1));
|
||||
mrb_define_method(mrb, set, "__init", set_init, MRB_ARGS_NONE());
|
||||
mrb_define_method(mrb, set, "__merge", set_core_merge, MRB_ARGS_REQ(1));
|
||||
mrb_define_method(mrb, set, "__subtract", set_core_subtract, MRB_ARGS_REQ(1));
|
||||
|
||||
mrb_define_method(mrb, set, "__set_union", set_core_union, MRB_ARGS_REQ(1));
|
||||
mrb_define_method(mrb, set, "__union", set_core_union, MRB_ARGS_REQ(1));
|
||||
|
||||
mrb_define_method(mrb, set, "__set_difference", set_core_difference, MRB_ARGS_REQ(1));
|
||||
mrb_define_method(mrb, set, "__difference", set_core_difference, MRB_ARGS_REQ(1));
|
||||
|
||||
mrb_define_method(mrb, set, "__set_intersection", set_core_intersection, MRB_ARGS_REQ(1));
|
||||
mrb_define_method(mrb, set, "__set_xor", set_core_xor, MRB_ARGS_REQ(1));
|
||||
mrb_define_method(mrb, set, "__intersection", set_core_intersection, MRB_ARGS_REQ(1));
|
||||
mrb_define_method(mrb, set, "__xor", set_core_xor, MRB_ARGS_REQ(1));
|
||||
|
||||
mrb_define_method(mrb, set, "==", set_equal, MRB_ARGS_REQ(1));
|
||||
mrb_define_method(mrb, set, "hash", set_hash_m, MRB_ARGS_NONE());
|
||||
|
||||
Reference in New Issue
Block a user