diff options
Diffstat (limited to 'universal_parser.c')
| -rw-r--r-- | universal_parser.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/universal_parser.c b/universal_parser.c index d2105a9465..84c71748af 100644 --- a/universal_parser.c +++ b/universal_parser.c @@ -13,7 +13,6 @@ #include "ruby/backward/2/inttypes.h" #include "probes.h" -#define LIKELY(x) RB_LIKELY(x) #define UNLIKELY(x) RB_UNLIKELY(x) #ifndef TRUE # define TRUE 1 @@ -23,13 +22,9 @@ # define FALSE 0 #endif #define numberof(array) ((int)(sizeof(array) / sizeof((array)[0]))) -#define rb_strlen_lit(str) (sizeof(str "") - 1) +#define rb_strlen_lit(str) ((sizeof(str "") / sizeof(str ""[0])) - 1) #undef FIXNUM_MAX #define FIXNUM_MAX (LONG_MAX / 2) -#undef RSTRING_GETMEM -#define RSTRING_GETMEM(str, ptrvar, lenvar) \ - ((ptrvar) = RSTRING_PTR(str), \ - (lenvar) = RSTRING_LEN(str)) /* parser_st */ #define st_table parser_st_table @@ -90,8 +85,6 @@ #define rb_attr_get p->config->attr_get -#define rb_ary_new p->config->ary_new -#define rb_ary_push p->config->ary_push #undef rb_ary_new_from_args #define rb_ary_new_from_args p->config->ary_new_from_args #define rb_ary_unshift p->config->ary_unshift @@ -113,32 +106,23 @@ #define rb_id2str p->config->id2str #undef ID2SYM #define ID2SYM p->config->id2sym -#undef SYM2ID -#define SYM2ID p->config->sym2id #define rb_str_catf p->config->str_catf #undef rb_str_cat_cstr #define rb_str_cat_cstr p->config->str_cat_cstr -#define rb_str_modify p->config->str_modify -#define rb_str_set_len p->config->str_set_len -#define rb_str_cat p->config->str_cat #define rb_str_resize p->config->str_resize #undef rb_str_new #define rb_str_new p->config->str_new #undef rb_str_new_cstr #define rb_str_new_cstr p->config->str_new_cstr #define rb_str_to_interned_str p->config->str_to_interned_str -#define is_ascii_string p->config->is_ascii_string #define rb_enc_str_new p->config->enc_str_new #define rb_str_vcatf p->config->str_vcatf #define rb_sprintf p->config->rb_sprintf #undef RSTRING_PTR #define RSTRING_PTR p->config->rstring_ptr -#undef RSTRING_END -#define RSTRING_END p->config->rstring_end #undef RSTRING_LEN #define RSTRING_LEN p->config->rstring_len -#define rb_obj_as_string p->config->obj_as_string #undef INT2NUM #define INT2NUM p->config->int2num @@ -162,7 +146,6 @@ #define rb_enc_get p->config->enc_get #define rb_enc_asciicompat p->config->enc_asciicompat #define rb_utf8_encoding p->config->utf8_encoding -#define rb_enc_associate p->config->enc_associate #define rb_ascii8bit_encoding p->config->ascii8bit_encoding #define rb_enc_codelen p->config->enc_codelen #define rb_enc_mbcput p->config->enc_mbcput @@ -171,7 +154,6 @@ #define rb_enc_isspace p->config->enc_isspace #define ENC_CODERANGE_7BIT p->config->enc_coderange_7bit #define ENC_CODERANGE_UNKNOWN p->config->enc_coderange_unknown -#define rb_usascii_encoding p->config->usascii_encoding #define rb_local_defined p->config->local_defined #define rb_dvar_defined p->config->dvar_defined @@ -182,7 +164,6 @@ #define rb_errinfo p->config->errinfo #define rb_set_errinfo p->config->set_errinfo -#define rb_exc_raise p->config->exc_raise #define rb_make_exception p->config->make_exception #define ruby_sized_xfree p->config->sized_xfree |