1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* parse.y (must_be_dynamic_symbol): refactoring.

Browse Source 
* add `inline'.
  * use UNLIKELY().
  * check only DYNAMIC_SYM_P(), otherwise it is a bug.
  * lookup_id_str() is not needed in second condition.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2014-07-04 09:11:05 +00:00
parent 535ee0197f
commit a227b16eba
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Fri Jul 4 18:03:35 2014 Koichi Sasada <ko1@atdot.net>
* parse.y (must_be_dynamic_symbol): refactoring.
* add `inline'.
* use UNLIKELY().
* check only DYNAMIC_SYM_P(), otherwise it is a bug.
* lookup_id_str() is not needed in second condition.
Fri Jul 4 11:53:56 2014 Koichi Sasada <ko1@atdot.net> Fri Jul 4 11:53:56 2014 Koichi Sasada <ko1@atdot.net>
* parse.y: remove unused code * parse.y: remove unused code

21
parse.y
View File

@ -10414,16 +10414,23 @@ sym_check_asciionly(VALUE str)
*/ */
static ID intern_str(VALUE str); static ID intern_str(VALUE str);
static void static inline void
must_be_dynamic_symbol(VALUE x) must_be_dynamic_symbol(VALUE x)
{ {
st_data_t data; if (UNLIKELY(DYNAMIC_SYM_P(x))) {
if (STATIC_SYM_P(x) && lookup_id_str(RSHIFT((unsigned long)(x),RUBY_SPECIAL_SHIFT), &data)) { if (STATIC_SYM_P(x)) {
rb_bug("wrong argument :%s (inappropriate Symbol)", RSTRING_PTR((VALUE)data)); VALUE str;
if (lookup_id_str(RSHIFT((unsigned long)(x),RUBY_SPECIAL_SHIFT), (st_data_t *)&str)) {
rb_bug("wrong argument: %s (inappropriate Symbol)", RSTRING_PTR(str));
}
else {
rb_bug("wrong argument: inappropriate Symbol (%p)", (void *)x);
}
}
else {
rb_bug("wrong argument type %s (expected Symbol)", rb_builtin_class_name(x));
} }
if (SPECIAL_CONST_P(x) || BUILTIN_TYPE(x) != T_SYMBOL) {
rb_bug("wrong argument type %s (expected Symbol)",
rb_builtin_class_name(x));
} }
} }