From 94c70c7d724870baf4a6eb108200128b7319c4ea Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 4 Feb 2016 06:35:34 +0000 Subject: fstring_enc_new * string.c (rb_fstring_enc_new, rb_fstring_enc_cstr): functions to make fstring with encoding. * re.c (rb_reg_initialize): make fstring without copying. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ internal.h | 14 ++++++++++++++ re.c | 2 +- string.c | 14 ++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6a3cf5e222..f6626a6f07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Feb 4 15:35:29 2016 Nobuyoshi Nakada + + * string.c (rb_fstring_enc_new, rb_fstring_enc_cstr): functions to + make fstring with encoding. + + * re.c (rb_reg_initialize): make fstring without copying. + Thu Feb 4 14:42:29 2016 Martin Duerst * common.mk: Added Unicode data file SpecialCasing.txt to be additionally diff --git a/internal.h b/internal.h index 0ebda869c6..637ef1619b 100644 --- a/internal.h +++ b/internal.h @@ -1135,6 +1135,20 @@ VALUE rb_fstring_cstr(const char *str); rb_fstring_cstr(str); \ }) #endif +#ifdef RUBY_ENCODING_H +VALUE rb_fstring_enc_new(const char *ptr, long len, rb_encoding *enc); +#define rb_fstring_enc_lit(str, enc) rb_fstring_enc_new((str), rb_strlen_lit(str), (enc)) +#define rb_fstring_enc_literal(str, enc) rb_fstring_enc_lit(str, enc) +VALUE rb_fstring_enc_cstr(const char *ptr, rb_encoding *enc); +#if defined(__GNUC__) && !defined(__PCC__) +#define rb_fstring_enc_cstr(str, enc) __extension__ ( \ +{ \ + (__builtin_constant_p(str)) ? \ + rb_fstring_enc_new((str), (long)strlen(str), (enc)) : \ + rb_fstring_enc_cstr(str, enc); \ +}) +#endif +#endif int rb_str_buf_cat_escaped_char(VALUE result, unsigned int c, int unicode_p); int rb_str_symname_p(VALUE); VALUE rb_str_quote_unprintable(VALUE); diff --git a/re.c b/re.c index 4036df2910..46526af9a8 100644 --- a/re.c +++ b/re.c @@ -2580,7 +2580,7 @@ rb_reg_initialize(VALUE obj, const char *s, long len, rb_encoding *enc, options & ARG_REG_OPTION_MASK, err, sourcefile, sourceline); if (!re->ptr) return -1; - RB_OBJ_WRITE(obj, &re->src, rb_fstring(rb_enc_str_new(s, len, enc))); + RB_OBJ_WRITE(obj, &re->src, rb_fstring_enc_new(s, len, enc)); RB_GC_GUARD(unescaped); return 0; } diff --git a/string.c b/string.c index b6de5f2b1b..e4a02eb5cd 100644 --- a/string.c +++ b/string.c @@ -49,6 +49,7 @@ #undef rb_str_cat2 #undef rb_str_cat_cstr #undef rb_fstring_cstr +#undef rb_fstring_enc_cstr static VALUE rb_str_clear(VALUE str); @@ -359,12 +360,25 @@ rb_fstring_new(const char *ptr, long len) return register_fstring(setup_fake_str(&fake_str, ptr, len, ENCINDEX_US_ASCII)); } +VALUE +rb_fstring_enc_new(const char *ptr, long len, rb_encoding *enc) +{ + struct RString fake_str; + return register_fstring(rb_setup_fake_str(&fake_str, ptr, len, enc)); +} + VALUE rb_fstring_cstr(const char *ptr) { return rb_fstring_new(ptr, strlen(ptr)); } +VALUE +rb_fstring_enc_cstr(const char *ptr, rb_encoding *enc) +{ + return rb_fstring_enc_new(ptr, strlen(ptr), enc); +} + static int fstring_set_class_i(st_data_t key, st_data_t val, st_data_t arg) { -- cgit v1.2.3