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

Move ripper_validate_object to ripper_init.c.tmpl

Browse Source
This commit is contained in:
yui-knk 2024-02-18 18:14:42 +09:00 committed by Yuichiro Kaneko
parent fa3d6aafb7
commit 7cb8fd7800
2 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ext/ripper/ripper_init.c.tmpl
View File

@ -477,6 +477,37 @@ ripper_raw_value(VALUE self, VALUE obj)
{ {
return ULONG2NUM(obj); return ULONG2NUM(obj);
} }
/* :nodoc: */
static VALUE
ripper_validate_object(VALUE self, VALUE x)
{
if (x == Qfalse) return x;
if (x == Qtrue) return x;
if (NIL_P(x)) return x;
if (UNDEF_P(x))
rb_raise(rb_eArgError, "Qundef given");
if (FIXNUM_P(x)) return x;
if (SYMBOL_P(x)) return x;
switch (BUILTIN_TYPE(x)) {
case T_STRING:
case T_OBJECT:
case T_ARRAY:
case T_BIGNUM:
case T_FLOAT:
case T_COMPLEX:
case T_RATIONAL:
break;
default:
rb_raise(rb_eArgError, "wrong type of ruby object: %p (%s)",
(void *)x, rb_obj_classname(x));
}
if (!RBASIC_CLASS(x)) {
rb_raise(rb_eArgError, "hidden ruby object: %p (%s)",
(void *)x, rb_builtin_type_name(TYPE(x)));
}
return x;
}
#endif #endif
#ifdef UNIVERSAL_PARSER #ifdef UNIVERSAL_PARSER

33
parse.y
View File

@ -16549,39 +16549,6 @@ rb_yytnamerr(struct parser_params *p, char *yyres, const char *yystr)
#endif #endif
#ifdef RIPPER #ifdef RIPPER
#ifdef RIPPER_DEBUG
/* :nodoc: */
static VALUE
ripper_validate_object(VALUE self, VALUE x)
{
if (x == Qfalse) return x;
if (x == Qtrue) return x;
if (NIL_P(x)) return x;
if (UNDEF_P(x))
rb_raise(rb_eArgError, "Qundef given");
if (FIXNUM_P(x)) return x;
if (SYMBOL_P(x)) return x;
switch (BUILTIN_TYPE(x)) {
case T_STRING:
case T_OBJECT:
case T_ARRAY:
case T_BIGNUM:
case T_FLOAT:
case T_COMPLEX:
case T_RATIONAL:
break;
default:
rb_raise(rb_eArgError, "wrong type of ruby object: %p (%s)",
(void *)x, rb_obj_classname(x));
}
if (!RBASIC_CLASS(x)) {
rb_raise(rb_eArgError, "hidden ruby object: %p (%s)",
(void *)x, rb_builtin_type_name(TYPE(x)));
}
return x;
}
#endif
#define validate(x) ((x) = (x) == rb_ripper_none ? Qnil : x) #define validate(x) ((x) = (x) == rb_ripper_none ? Qnil : x)
static VALUE static VALUE