summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawpatchinlineside by side (parent: d132417)
rawpatchinlineside by side (parent: d132417)
| author | Nobuyoshi Nakada <[email protected]> | |
| Fri, 27 Sep 2024 15:20:09 +0000 (28 00:20 +0900) | ||
| committer | Nobuyoshi Nakada <[email protected]> | |
| Fri, 27 Sep 2024 16:59:33 +0000 (28 01:59 +0900) |
| parse.y | patchblobblamehistory | |
| ruby_parser.c | patchblobblamehistory | |
| rubyparser.h | patchblobblamehistory | |
| universal_parser.c | patchblobblamehistory |
--- a/parse.y
+++ b/parse.y
#define VALID_SYMNAME_P(s, l, enc, type) (rb_enc_symname_type(s, l, enc, (1U<<(type))) == (int)(type))
#ifndef RIPPER
-static inline bool
-end_with_newline_p(struct parser_params *p, VALUE str)
+static inline int
+char_at_end(struct parser_params *p, VALUE str, int when_empty)
{
- return RSTRING_LEN(str) > 0 && RSTRING_END(str)[-1] == '\n';
+ long len = RSTRING_LEN(str);
+ return len > 0 ? (unsigned char)RSTRING_PTR(str)[len-1] : when_empty;
}
#endif
((ptrvar) = str->ptr, \
(lenvar) = str->len)
-static inline bool
-parser_string_end_with_newline_p(struct parser_params *p, rb_parser_string_t *str)
+static inline int
+parser_string_char_at_end(struct parser_params *p, rb_parser_string_t *str, int when_empty)
{
- return PARSER_STRING_LEN(str) > 0 && PARSER_STRING_END(str)[-1] == '\n';
+ return PARSER_STRING_LEN(str) > 0 ? (unsigned char)PARSER_STRING_END(str)[-1] : when_empty;
}
static rb_parser_string_t *
@@ -7354,7 +7355,7 @@ ruby_show_error_line(struct parser_params *p, VALUE errbuf, const YYLTYPE *yyllo
}
if (RTEST(errbuf)) {
mesg = rb_attr_get(errbuf, idMesg);
- if (RSTRING_LEN(mesg) > 0 && *(RSTRING_END(mesg)-1) != '\n')
+ if (char_at_end(p, mesg, '\n') != '\n')
rb_str_cat_cstr(mesg, "\n");
}
else {
@@ -7750,7 +7751,7 @@ parser_add_delayed_token(struct parser_params *p, const char *tok, const char *e
if (tok < end) {
if (has_delayed_token(p)) {
- bool next_line = parser_string_end_with_newline_p(p, p->delayed.token);
+ bool next_line = parser_string_char_at_end(p, p->delayed.token, 0) == '\n';
int end_line = (next_line ? 1 : 0) + p->delayed.end_line;
int end_col = (next_line ? 0 : p->delayed.end_col);
if (end_line != p->ruby_sourceline || end_col != tok - p->lex.pbeg) {
va_start(ap, fmt);
rb_str_vcatf(mesg, fmt, ap);
va_end(ap);
- if (end_with_newline_p(p, mesg)) {
+ if (char_at_end(p, mesg, 0) == '\n') {
rb_io_write(p->debug_output, mesg);
p->debug_buffer = Qnil;
}
diff --git a/ruby_parser.c b/ruby_parser.c
--- a/ruby_parser.c
+++ b/ruby_parser.c
.str_vcatf = rb_str_vcatf,
.rb_sprintf = rb_sprintf,
.rstring_ptr = RSTRING_PTR,
- .rstring_end = RSTRING_END,
.rstring_len = RSTRING_LEN,
.obj_as_string = rb_obj_as_string,
diff --git a/rubyparser.h b/rubyparser.h
--- a/rubyparser.h
+++ b/rubyparser.h
RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 1, 2)
VALUE (*rb_sprintf)(const char *format, ...);
char *(*rstring_ptr)(VALUE str);
- char *(*rstring_end)(VALUE str);
long (*rstring_len)(VALUE str);
VALUE (*obj_as_string)(VALUE);
diff --git a/universal_parser.c b/universal_parser.c
--- a/universal_parser.c
+++ b/universal_parser.c
#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