From 602a3cd5163e85e5941b6bd43e9942956f0bd93d Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 13 Jan 2016 08:05:07 +0000 Subject: vm_eval.c: fstring format * vm_eval.c (make_no_method_exception): make format string fstring. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_eval.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'vm_eval.c') diff --git a/vm_eval.c b/vm_eval.c index b765ad6692..105e348509 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -680,15 +680,15 @@ rb_method_missing(int argc, const VALUE *argv, VALUE obj) } static VALUE -make_no_method_exception(VALUE exc, const char *format, VALUE obj, int argc, const VALUE *argv) +make_no_method_exception(VALUE exc, VALUE format, VALUE obj, int argc, const VALUE *argv) { int n = 0; VALUE args[3]; if (!format) { - format = "undefined method `%s' for %s%s%s"; + format = rb_fstring_cstr("undefined method `%s' for %s%s%s"); } - args[n++] = rb_name_err_mesg_new(rb_str_new_cstr(format), obj, argv[0]); + args[n++] = rb_name_err_mesg_new(format, obj, argv[0]); args[n++] = argv[0]; if (exc == rb_eNoMethodError) { args[n++] = rb_ary_new4(argc - 1, argv + 1); @@ -701,7 +701,7 @@ raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv, VALUE obj, enum method_missing_reason last_call_status) { VALUE exc = rb_eNoMethodError; - const char *format = 0; + VALUE format = 0; if (UNLIKELY(argc == 0)) { rb_raise(rb_eArgError, "no method name given"); @@ -715,17 +715,17 @@ raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv, VALUE obj, stack_check(); if (last_call_status & MISSING_PRIVATE) { - format = "private method `%s' called for %s%s%s"; + format = rb_fstring_cstr("private method `%s' called for %s%s%s"); } else if (last_call_status & MISSING_PROTECTED) { - format = "protected method `%s' called for %s%s%s"; + format = rb_fstring_cstr("protected method `%s' called for %s%s%s"); } else if (last_call_status & MISSING_VCALL) { - format = "undefined local variable or method `%s' for %s%s%s"; + format = rb_fstring_cstr("undefined local variable or method `%s' for %s%s%s"); exc = rb_eNameError; } else if (last_call_status & MISSING_SUPER) { - format = "super: no superclass method `%s' for %s%s%s"; + format = rb_fstring_cstr("super: no superclass method `%s' for %s%s%s"); } { @@ -920,7 +920,7 @@ send_internal(int argc, const VALUE *argv, VALUE recv, call_type scope) id = rb_check_id(&vid); if (!id) { if (rb_method_basic_definition_p(CLASS_OF(recv), idMethodMissing)) { - VALUE exc = make_no_method_exception(rb_eNoMethodError, NULL, + VALUE exc = make_no_method_exception(rb_eNoMethodError, 0, recv, argc, argv); rb_exc_raise(exc); } -- cgit v1.2.3