Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
2a6b5b8f
Commit
2a6b5b8f
authored
Jun 01, 2012
by
Yukihiro Matsumoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stop using mrb_exec_recursive_paired() from Hash#==
parent
6caeb8f8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
27 deletions
+18
-27
src/hash.c
src/hash.c
+18
-27
No files found.
src/hash.c
View file @
2a6b5b8f
...
...
@@ -37,9 +37,6 @@ mrb_hash_ht_hash_equal(mrb_state *mrb, mrb_value a, mrb_value b)
KHASH_INIT
(
ht
,
mrb_value
,
mrb_value
,
1
,
mrb_hash_ht_hash_func
,
mrb_hash_ht_hash_equal
);
mrb_value
mrb_exec_recursive_paired
(
mrb_state
*
mrb
,
mrb_value
(
*
func
)
(
mrb_state
*
,
mrb_value
,
mrb_value
,
int
),
mrb_value
obj
,
mrb_value
paired_obj
,
void
*
arg
);
#ifndef FALSE
#define FALSE 0
#endif
...
...
@@ -1136,28 +1133,6 @@ mrb_hash_has_value(mrb_state *mrb, mrb_value hash)
return
mrb_hash_has_valueWithvalue
(
mrb
,
hash
,
val
);
}
static
mrb_value
recursive_eql
(
mrb_state
*
mrb
,
mrb_value
hash
,
mrb_value
dt
,
int
recur
)
{
khash_t
(
ht
)
*
h1
=
RHASH_TBL
(
hash
);
khash_t
(
ht
)
*
h2
=
RHASH_TBL
(
dt
);
khiter_t
k1
,
k2
;
mrb_value
key1
;
for
(
k1
=
kh_begin
(
h1
);
k1
!=
kh_end
(
h1
);
k1
++
)
{
if
(
!
kh_exist
(
h1
,
k1
))
continue
;
key1
=
kh_key
(
h1
,
k1
);
k2
=
kh_get
(
ht
,
h2
,
key1
);
if
(
k2
!=
kh_end
(
h2
))
{
if
(
mrb_equal
(
mrb
,
kh_value
(
h1
,
k1
),
kh_value
(
h2
,
k2
)))
{
continue
;
/* next key */
}
}
return
mrb_false_value
();
}
return
mrb_true_value
();
}
static
mrb_value
hash_equal
(
mrb_state
*
mrb
,
mrb_value
hash1
,
mrb_value
hash2
,
int
eql
)
{
...
...
@@ -1172,9 +1147,25 @@ hash_equal(mrb_state *mrb, mrb_value hash1, mrb_value hash2, int eql)
return
mrb_fixnum_value
(
mrb_equal
(
mrb
,
hash2
,
hash1
));
}
if
(
RHASH_SIZE
(
hash1
)
!=
RHASH_SIZE
(
hash2
))
return
mrb_false_value
();
if
(
!
RHASH
(
hash1
)
->
ht
||
!
RHASH
(
hash2
)
->
ht
)
return
mrb_true_value
();
else
{
khash_t
(
ht
)
*
h1
=
RHASH_TBL
(
hash1
);
khash_t
(
ht
)
*
h2
=
RHASH_TBL
(
hash2
);
khiter_t
k1
,
k2
;
mrb_value
key
;
return
mrb_exec_recursive_paired
(
mrb
,
recursive_eql
,
hash1
,
hash2
,
(
void
*
)
0
);
for
(
k1
=
kh_begin
(
h1
);
k1
!=
kh_end
(
h1
);
k1
++
)
{
if
(
!
kh_exist
(
h1
,
k1
))
continue
;
key
=
kh_key
(
h1
,
k1
);
k2
=
kh_get
(
ht
,
h2
,
key
);
if
(
k2
!=
kh_end
(
h2
))
{
if
(
mrb_equal
(
mrb
,
kh_value
(
h1
,
k1
),
kh_value
(
h2
,
k2
)))
{
continue
;
/* next key */
}
}
return
mrb_false_value
();
}
}
return
mrb_true_value
();
}
/* 15.2.13.4.1 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment