summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawpatchinlineside by side (parent: fcc55dc)
rawpatchinlineside by side (parent: fcc55dc)
| author | Nobuyoshi Nakada <[email protected]> | |
| Mon, 19 Feb 2024 05:46:40 +0000 (19 14:46 +0900) | ||
| committer | Nobuyoshi Nakada <[email protected]> | |
| Mon, 19 Feb 2024 07:33:26 +0000 (19 16:33 +0900) |
Co-authored-by: Yuichiro Kaneko <[email protected]>
diff --git a/internal/string.h b/internal/string.h
--- a/internal/string.h
+++ b/internal/string.h
int rb_ascii8bit_appendable_encoding_index(rb_encoding *enc, unsigned int code);
VALUE rb_str_include(VALUE str, VALUE arg);
VALUE rb_str_byte_substr(VALUE str, VALUE beg, VALUE len);
-VALUE rb_str_valid_encoding_p(VALUE str);
static inline bool STR_EMBED_P(VALUE str);
static inline bool STR_SHARED_P(VALUE str);
--- a/parse.y
+++ b/parse.y
static NODE*
str_to_sym_node(struct parser_params *p, NODE *node, const YYLTYPE *loc)
{
- VALUE lit = rb_node_str_string_val(node);
- if (!rb_str_valid_encoding_p(lit)) {
+ VALUE lit;
+ rb_parser_string_t *str = RNODE_STR(node)->string;
+ if (rb_parser_enc_str_coderange(p, str) == RB_PARSER_ENC_CODERANGE_BROKEN) {
yyerror1(loc, "invalid symbol");
lit = STR_NEW0();
}
+ else {
+ lit = rb_str_new_parser_string(str);
+ }
return NEW_SYM(lit, loc);
}
diff --git a/ruby_parser.c b/ruby_parser.c
--- a/ruby_parser.c
+++ b/ruby_parser.c
.id2str = rb_id2str,
.id2sym = rb_id2sym,
.sym2id = rb_sym2id,
- .str_valid_encoding_p = rb_str_valid_encoding_p,
.str_catf = rb_str_catf,
.str_cat_cstr = rb_str_cat_cstr,
diff --git a/rubyparser.h b/rubyparser.h
--- a/rubyparser.h
+++ b/rubyparser.h
VALUE (*id2str)(ID id);
VALUE (*id2sym)(ID x);
ID (*sym2id)(VALUE sym);
- VALUE (*str_valid_encoding_p)(VALUE str);
/* String */
RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 2, 3)
diff --git a/string.c b/string.c
--- a/string.c
+++ b/string.c
* "\x80".force_encoding("UTF-8").valid_encoding? # => false
*/
-VALUE
+static VALUE
rb_str_valid_encoding_p(VALUE str)
{
int cr = rb_enc_str_coderange(str);
diff --git a/universal_parser.c b/universal_parser.c
--- a/universal_parser.c
+++ b/universal_parser.c
#define ID2SYM p->config->id2sym
#undef SYM2ID
#define SYM2ID p->config->sym2id
-#define rb_str_valid_encoding_p p->config->str_valid_encoding_p
#define rb_str_catf p->config->str_catf
#undef rb_str_cat_cstr