Skip to content

Commit f37e6d7

Browse files
committed
Merge rb_parser_enc_compatible_latter into rb_parser_enc_compatible
1 parent 4b065bb commit f37e6d7

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

parse.y

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2216,15 +2216,25 @@ rb_parser_is_ascii_string(struct parser_params *p, rb_parser_string_t *str)
22162216
}
22172217

22182218
static rb_encoding *
2219-
rb_parser_enc_compatible_latter(struct parser_params *p, rb_parser_string_t *str1, rb_parser_string_t *str2, rb_encoding *enc1, rb_encoding *enc2)
2219+
rb_parser_enc_compatible(struct parser_params *p, rb_parser_string_t *str1, rb_parser_string_t *str2)
22202220
{
2221-
int cr1, cr2;
2221+
rb_encoding *enc1 = rb_parser_str_get_encoding(str1);
2222+
rb_encoding *enc2 = rb_parser_str_get_encoding(str2);
2223+
2224+
if (enc1 == NULL || enc2 == NULL)
2225+
return 0;
2226+
2227+
if (enc1 == enc2) {
2228+
return enc1;
2229+
}
22222230

22232231
if (PARSER_STRING_LEN(str2) == 0)
22242232
return enc1;
22252233
if (PARSER_STRING_LEN(str1) == 0)
22262234
return rb_parser_is_ascii_string(p, str2) ? enc1 : enc2;
22272235

2236+
int cr1, cr2;
2237+
22282238
cr1 = rb_parser_enc_str_coderange(p, str1);
22292239
cr2 = rb_parser_enc_str_coderange(p, str2);
22302240

@@ -2244,22 +2254,6 @@ rb_parser_enc_compatible_latter(struct parser_params *p, rb_parser_string_t *str
22442254
return 0;
22452255
}
22462256

2247-
static rb_encoding *
2248-
rb_parser_enc_compatible(struct parser_params *p, rb_parser_string_t *str1, rb_parser_string_t *str2)
2249-
{
2250-
rb_encoding *enc1 = rb_parser_str_get_encoding(str1);
2251-
rb_encoding *enc2 = rb_parser_str_get_encoding(str2);
2252-
2253-
if (enc1 == NULL || enc2 == NULL)
2254-
return 0;
2255-
2256-
if (enc1 == enc2) {
2257-
return enc1;
2258-
}
2259-
2260-
return rb_parser_enc_compatible_latter(p, str1, str2, enc1, enc2);
2261-
}
2262-
22632257
static void
22642258
rb_parser_str_modify(rb_parser_string_t *str)
22652259
{

0 commit comments

Comments
 (0)